1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
|
Index: fvwm/conditional.c
===================================================================
RCS file: /home/cvs/fvwm/fvwm/fvwm/conditional.c,v
retrieving revision 1.119
diff -u -r1.119 conditional.c
--- fvwm/conditional.c 27 Jan 2007 11:33:15 -0000 1.119
+++ fvwm/conditional.c 9 Mar 2007 20:23:14 -0000
@@ -2085,6 +2085,202 @@
error = 1;
}
}
+ else if (StrEquals(cond, "EnvGreaterOrEqual"))
+ {
+ char *var_name;
+ flags_ptr = GetNextSimpleOption(flags_ptr, &var_name);
+ if (var_name)
+ {
+ const char *value = getenv(var_name);
+ char *pattern;
+ /* unfortunately, GetNextSimpleOption is
+ * broken, does not accept quoted empty "" */
+ flags_ptr = GetNextSimpleOption(
+ flags_ptr, &pattern);
+ if (!value)
+ {
+ value = "";
+ }
+ if (pattern)
+ {
+ match =
+ /* include empty string case */
+ (!pattern[0] && !value[0])
+ ||
+ (atoi(value) >= atoi(pattern));
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else if (StrEquals(cond, "EnvGreater"))
+ {
+ char *var_name;
+ flags_ptr = GetNextSimpleOption(flags_ptr, &var_name);
+ if (var_name)
+ {
+ const char *value = getenv(var_name);
+ char *pattern;
+ /* unfortunately, GetNextSimpleOption is
+ * broken, does not accept quoted empty "" */
+ flags_ptr = GetNextSimpleOption(
+ flags_ptr, &pattern);
+ if (!value)
+ {
+ value = "";
+ }
+ if (pattern)
+ {
+ match =
+ /* include empty string case */
+ (!pattern[0] && !value[0])
+ ||
+ (atoi(value) > atoi(pattern));
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else if (StrEquals(cond, "EnvLesser"))
+ {
+ char *var_name;
+ flags_ptr = GetNextSimpleOption(flags_ptr, &var_name);
+ if (var_name)
+ {
+ const char *value = getenv(var_name);
+ char *pattern;
+ /* unfortunately, GetNextSimpleOption is
+ * broken, does not accept quoted empty "" */
+ flags_ptr = GetNextSimpleOption(
+ flags_ptr, &pattern);
+ if (!value)
+ {
+ value = "";
+ }
+ if (pattern)
+ {
+ match =
+ /* include empty string case */
+ (!pattern[0] && !value[0])
+ ||
+ (atoi(value) < atoi(pattern));
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else if (StrEquals(cond, "EnvLesserOrEqual"))
+ {
+ char *var_name;
+ flags_ptr = GetNextSimpleOption(flags_ptr, &var_name);
+ if (var_name)
+ {
+ const char *value = getenv(var_name);
+ char *pattern;
+ /* unfortunately, GetNextSimpleOption is
+ * broken, does not accept quoted empty "" */
+ flags_ptr = GetNextSimpleOption(
+ flags_ptr, &pattern);
+ if (!value)
+ {
+ value = "";
+ }
+ if (pattern)
+ {
+ match =
+ /* include empty string case */
+ (!pattern[0] && !value[0])
+ ||
+ (atoi(value) <= atoi(pattern));
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else if (StrEquals(cond, "Compare"))
+ {
+ char *var_name;
+ flags_ptr = GetNextSimpleOption(flags_ptr, &var_name);
+ if (var_name)
+ {
+ const char *value = getenv(var_name);
+ char *operation;
+ char *pattern;
+ /* unfortunately, GetNextSimpleOption is
+ * broken, does not accept quoted empty "" */
+ flags_ptr = GetNextSimpleOption(
+ flags_ptr, &operation);
+ flags_ptr = GetNextSimpleOption(
+ flags_ptr, &pattern);
+ if (!value)
+ {
+ value = "";
+ }
+ if (operation && pattern)
+ {
+ if (strcmp(operation,">=") == 0)
+ {
+ match = (atoi(value) >= atoi(pattern));
+ }
+ else
+ if (strcmp(operation,">") == 0)
+ {
+ match = (atoi(value) > atoi(pattern));
+ }
+ else
+ if (strcmp(operation,"==") == 0)
+ {
+ match = (atoi(value) == atoi(pattern));
+ }
+ else
+ if (strcmp(operation,"<") == 0)
+ {
+ match = (atoi(value) < atoi(pattern));
+ }
+ else
+ if (strcmp(operation,"<=") == 0)
+ {
+ match = (atoi(value) <= atoi(pattern));
+ }
+ else
+ {
+ match = (!pattern[0] && !value[0]);
+ }
+ }
+ else
+ {
+ error = 1;
+ }
+ }
+ else
+ {
+ error = 1;
+ }
+ }
else if (StrEquals(cond, "EdgeIsActive"))
{
direction_t dir= DIR_NONE;
Index: fvwm/fvwm.1.in
===================================================================
RCS file: /home/cvs/fvwm/fvwm/fvwm/fvwm.1.in,v
retrieving revision 1.251
diff -u -r1.251 fvwm.1.in
--- fvwm/fvwm.1.in 4 Feb 2007 20:25:30 -0000 1.251
+++ fvwm/fvwm.1.in 9 Mar 2007 20:23:32 -0000
@@ -11082,6 +11082,11 @@
.IR "Version operator x.y.z" ,
.IR "EnvIsSet varname" ,
.IR "EnvMatch varname pattern" ,
+.IR "EnvLesser varname pattern" ,
+.IR "EnvLesserOrEqual varname pattern" ,
+.IR "EnvGreaterOrEqual varname pattern" ,
+.IR "EnvGreater varname pattern" ,
+.IR "Compare varname operator pattern" ,
.IR "EdgeHasPointer direction" ,
.IR "EdgeIsActive direction" ,
.IR Start ,
@@ -11126,6 +11131,37 @@
.I pattern
matches the given environment variable value.
The pattern may contain special "*" and "?" chars.
+The
+.I "EnvGreaterOrEqual varname pattern"
+test-condition is true if
+.I pattern
+matches or is greater than the given environment variable value.
+The
+.I "EnvGreater varname pattern"
+test-condition is true if
+.I pattern
+is greater than the given environment variable value.
+The
+.I "EnvLesser varname pattern"
+test-condition is true if
+.I pattern
+is lesser than the given environment variable value.
+The
+.I "EnvLesserOrEqual varname pattern"
+test-condition is true if
+.I pattern
+matches or is lesser than the given environment variable value.
+
+The
+.IB "Compare varname operator pattern "
+test-condition is true if the logical operation defined by
+.IB "varname",
+.IB "operator "
+and
+.IB "pattern "
+is true. Where
+.IB "operator "
+is one of >=, >, ==, <=, <.
The
.IB "EdgeHasPointer " [ direction ]
|
GitWeb