about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--client.c8
-rw-r--r--config.arg.h2
-rw-r--r--dwm.h2
-rw-r--r--event.c8
-rw-r--r--screen.c12
5 files changed, 16 insertions, 16 deletions
diff --git a/client.c b/client.c
index 2aa1955..fdb973c 100644
--- a/client.c
+++ b/client.c
@@ -253,8 +253,8 @@ manage(Window w, XWindowAttributes *wa) {
 	updatetitle(c);
 	for(t = clients; t && t->win != trans; t = t->next);
 	settags(c, t);
-	if(!c->versatile)
-		c->versatile = (t != NULL) || c->isfixed;
+	if(!c->isversatile)
+		c->isversatile = (t != NULL) || c->isfixed;
 	attach(c);
 	attachstack(c);
 	c->isbanned = True;
@@ -268,7 +268,7 @@ manage(Window w, XWindowAttributes *wa) {
 
 Client *
 nexttiled(Client *c) {
-	for(; c && (c->versatile || !isvisible(c)); c = c->next);
+	for(; c && (c->isversatile || !isvisible(c)); c = c->next);
 	return c;
 }
 
@@ -440,7 +440,7 @@ zoom(Arg *arg) {
 
 	if(!sel)
 		return;
-	if(sel->versatile || (lt->arrange == versatile)) {
+	if(sel->isversatile || (lt->arrange == versatile)) {
 		togglemax(sel);
 		return;
 	}
diff --git a/config.arg.h b/config.arg.h
index 05bcd07..fec7a12 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -89,7 +89,7 @@ static Key key[] = { \
 
 #define RULES \
 static Rule rule[] = { \
-	/* class:instance:title regex	tags regex	versatile */ \
+	/* class:instance:title regex	tags regex	isversatile */ \
 	{ "Firefox",			"3",		False }, \
 	{ "Gimp",			NULL,		True }, \
 	{ "MPlayer",			NULL,		True }, \
diff --git a/dwm.h b/dwm.h
index 8e68776..c8546d8 100644
--- a/dwm.h
+++ b/dwm.h
@@ -72,7 +72,7 @@ struct Client {
 	int minax, minay, maxax, maxay;
 	long flags; 
 	unsigned int border;
-	Bool isbanned, isfixed, ismax, versatile;
+	Bool isbanned, isfixed, ismax, isversatile;
 	Bool *tags;
 	Client *next;
 	Client *prev;
diff --git a/event.c b/event.c
index 00c53b6..b6a77fd 100644
--- a/event.c
+++ b/event.c
@@ -156,14 +156,14 @@ buttonpress(XEvent *e) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if(ev->button == Button1 && (lt->arrange == versatile || c->versatile)) {
+		if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
 			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
 		else if(ev->button == Button3
-		&& (lt->arrange == versatile || c->versatile) && !c->isfixed)
+		&& (lt->arrange == versatile || c->isversatile) && !c->isfixed)
 		{
 			restack();
 			resizemouse(c);
@@ -181,7 +181,7 @@ configurerequest(XEvent *e) {
 		c->ismax = False;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if(c->isfixed || c->versatile || (lt->arrange == versatile)) {
+		if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
 			if(ev->value_mask & CWX)
 				c->x = ev->x;
 			if(ev->value_mask & CWY)
@@ -309,7 +309,7 @@ propertynotify(XEvent *e) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->versatile && (c->versatile = (getclient(trans) != NULL)))
+				if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
 					lt->arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
diff --git a/screen.c b/screen.c
index e0da2cf..5907ba7 100644
--- a/screen.c
+++ b/screen.c
@@ -19,7 +19,7 @@ Layout *lt = NULL;
 typedef struct {
 	const char *prop;
 	const char *tags;
-	Bool versatile;
+	Bool isversatile;
 } Rule;
 
 typedef struct {
@@ -52,7 +52,7 @@ tile(void) {
 			if(c->isbanned)
 				XMoveWindow(dpy, c->win, c->x, c->y);
 			c->isbanned = False;
-			if(c->versatile)
+			if(c->isversatile)
 				continue;
 			c->ismax = False;
 			nx = wax;
@@ -175,10 +175,10 @@ restack(void) {
 	drawstatus();
 	if(!sel)
 		return;
-	if(sel->versatile || lt->arrange == versatile)
+	if(sel->isversatile || lt->arrange == versatile)
 		XRaiseWindow(dpy, sel->win);
 	if(lt->arrange != versatile) {
-		if(!sel->versatile)
+		if(!sel->isversatile)
 			XLowerWindow(dpy, sel->win);
 		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
 			if(c == sel)
@@ -208,7 +208,7 @@ settags(Client *c, Client *trans) {
 				ch.res_name ? ch.res_name : "", c->name);
 		for(i = 0; i < nrules; i++)
 			if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
-				c->versatile = rule[i].versatile;
+				c->isversatile = rule[i].isversatile;
 				for(j = 0; regs[i].tagregex && j < ntags; j++) {
 					if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
 						matched = True;
@@ -271,7 +271,7 @@ void
 toggleversatile(Arg *arg) {
 	if(!sel || lt->arrange == versatile)
 		return;
-	sel->versatile = !sel->versatile;
+	sel->isversatile = !sel->isversatile;
 	lt->arrange();
 }
 
; 2013-12-23 00:08:45 +0000 committer James Booth <boothj5@gmail.com> 2013-12-23 00:08:45 +0000 Bind console functions in main.c' href='/danisanti/profani-tty/commit/src/ui/ui.h?id=7fe8f61b9b43357c145ab28ab2f09bd9d870a16e'>7fe8f61b ^
b83b262d ^
a6859354 ^
1046a004 ^
5a5b1340 ^

bc3c4e09 ^
5a5b1340 ^

2101f29e ^
5a5b1340 ^

7d6ce4da ^
b19b881b ^
5a5b1340 ^

84c7fc9a ^
462e84ea ^
a3217bcf ^
462e84ea ^

84c7fc9a ^
a077d200 ^

2bc19f46 ^
84c7fc9a ^
84c7fc9a ^


1e4fc2ce ^


5a5b1340 ^


5a5b1340 ^
5a5b1340 ^



1046a004 ^

5a5b1340 ^



9daefe17 ^

5a5b1340 ^

82ad0cd3 ^
5a5b1340 ^
5a5b1340 ^
eaa19598 ^


5a5b1340 ^





1046a004 ^
bf185d99 ^

1046a004 ^
5a5b1340 ^

1046a004 ^
5a5b1340 ^


1046a004 ^
2c15aba9 ^
5a5b1340 ^

1046a004 ^
5a5b1340 ^
1046a004 ^
5a5b1340 ^
1046a004 ^
57effcd5 ^
5a5b1340 ^
1046a004 ^
5a5b1340 ^

1046a004 ^
5a5b1340 ^
1046a004 ^
5a5b1340 ^

1046a004 ^
5a5b1340 ^





3f0addbc ^

1a300ce7 ^
27293ebb ^

95c08166 ^
2c15aba9 ^
1046a004 ^

5a5b1340 ^
c65b43f0 ^
5a5b1340 ^
1925cb80 ^
5a5b1340 ^
1925cb80 ^
7aa1d931 ^
5a5b1340 ^




90ac69be ^
5a5b1340 ^

547b6cf4 ^
905571bf ^
fc406377 ^





f0f0dbfd ^

fc406377 ^
9aa282f6 ^



a7190ed7 ^
b9aac28c ^

e6e0a13e ^



02f5df5b ^
d56f6dc3 ^
5a5b1340 ^









01578066 ^
5a5b1340 ^












8dbe300d ^
5a5b1340 ^

e955df88 ^
bced3d4b ^
5a5b1340 ^





b6095ca9 ^
5a5b1340 ^





























3f0addbc ^

02f5df5b ^
107fdd35 ^
5a5b1340 ^
107fdd35 ^
5a5b1340 ^
b36fbe41 ^
5a5b1340 ^
b36fbe41 ^
5a5b1340 ^

107fdd35 ^
5a5b1340 ^
107fdd35 ^
134e5d17 ^
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
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284