about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorarg@mig29 <unknown>2006-12-03 11:21:25 +0100
committerarg@mig29 <unknown>2006-12-03 11:21:25 +0100
commitc53d9d516a871661414ff8110cd3c17c3dc525ec (patch)
treec84fa754ba96986c9cb17134f1d7a10a00f33efa
parent7739e6b466481e66ad6b6fc8fb49fd884035431b (diff)
downloaddwm-c53d9d516a871661414ff8110cd3c17c3dc525ec.tar.gz
applied Manuel's regex patch 2.5
-rw-r--r--tag.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tag.c b/tag.c
index 20a0a17..609ce9c 100644
--- a/tag.c
+++ b/tag.c
@@ -55,14 +55,14 @@ initrregs(void) {
 	for(i = 0; i < len; i++) {
 		if(rule[i].clpattern) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].clpattern, 0))
+			if(regcomp(reg, rule[i].clpattern, REG_EXTENDED))
 				free(reg);
 			else
 				rreg[i].clregex = reg;
 		}
 		if(rule[i].tpattern) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].tpattern, 0))
+			if(regcomp(reg, rule[i].tpattern, REG_EXTENDED))
 				free(reg);
 			else
 				rreg[i].tregex = reg;
@@ -86,7 +86,7 @@ settags(Client *c, Client *trans) {
 		snprintf(prop, sizeof prop, "%s:%s:%s",
 				ch.res_class ? ch.res_class : "",
 				ch.res_name ? ch.res_name : "", c->name);
-		for(i = 0; !matched && i < len; i++)
+		for(i = 0; i < len; i++)
 			if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 1, &tmp, 0)) {
 				c->isfloat = rule[i].isfloat;
 				for(j = 0; rreg[i].tregex && j < ntags; j++) {
alt'>
ac07e589 ^






5fe060d5 ^
































e4ac3c9e ^
5fe060d5 ^


































e4ac3c9e ^
5fe060d5 ^


e4ac3c9e ^
5fe060d5 ^



e4ac3c9e ^
5fe060d5 ^








e4ac3c9e ^
5fe060d5 ^
e4ac3c9e ^

5fe060d5 ^





e4ac3c9e ^
5fe060d5 ^


e4ac3c9e ^
5fe060d5 ^
104e521c ^
e4ac3c9e ^

5fe060d5 ^








e4ac3c9e ^
104e521c ^
e4ac3c9e ^
104e521c ^
e4ac3c9e ^
5fe060d5 ^
e4ac3c9e ^
5fe060d5 ^
e4ac3c9e ^
5fe060d5 ^
e4ac3c9e ^

5fe060d5 ^










































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