made for/if/else constructs more consistent, some code polishing e256afe3
Anselm R. Garbe · 2007-02-14 09:09 5 file(s) · +18 −21
client.c +3 −3
304 304
	}
305 305
	else
306 306
		c->minax = c->minay = c->maxax = c->maxay = 0;
307 -
	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
308 -
				c->maxw == c->minw && c->maxh == c->minh);
307 +
	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
308 +
			&& c->maxw == c->minw && c->maxh == c->minh);
309 309
}
310 310
311 311
void
325 325
		strncpy(c->name, (char *)name.value, sizeof c->name);
326 326
	else {
327 327
		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
328 -
				&& n > 0 && *list)
328 +
		&& n > 0 && *list)
329 329
		{
330 330
			strncpy(c->name, *list, sizeof c->name);
331 331
			XFreeStringList(list);
event.c +6 −6
156 156
		}
157 157
		else if(ev->button == Button2)
158 158
			zoom(NULL);
159 -
		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)
160 -
				&& !c->isfixed)
159 +
		else if(ev->button == Button3
160 +
		&& (arrange == dofloat || c->isfloat) && !c->isfixed)
161 161
		{
162 162
			restack();
163 163
			resizemouse(c);
184 184
				c->w = ev->width;
185 185
			if(ev->value_mask & CWHeight)
186 186
				c->h = ev->height;
187 -
			if((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight)))
187 +
			if((ev->value_mask & (CWX | CWY))
188 +
			&& !(ev->value_mask & (CWWidth | CWHeight)))
188 189
				configure(c);
189 190
			resize(c, False);
190 191
			if(!isvisible(c))
249 250
	XKeyEvent *ev = &e->xkey;
250 251
251 252
	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
252 -
	for(i = 0; i < len; i++) {
253 +
	for(i = 0; i < len; i++)
253 254
		if(keysym == key[i].keysym
254 -
			&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
255 +
		&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
255 256
		{
256 257
			if(key[i].func)
257 258
				key[i].func(&key[i].arg);
258 259
		}
259 -
	}
260 260
}
261 261
262 262
static void
main.c +5 −6
69 69
	wins = NULL;
70 70
	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
71 71
		for(i = 0; i < num; i++) {
72 -
			if(!XGetWindowAttributes(dpy, wins[i], &wa))
73 -
				continue;
74 -
			if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
72 +
			if(!XGetWindowAttributes(dpy, wins[i], &wa)
73 +
			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
75 74
				continue;
76 75
			if(wa.map_state == IsViewable)
77 76
				manage(wins[i], &wa);
104 103
	/* init modifier map */
105 104
	numlockmask = 0;
106 105
	modmap = XGetModifierMapping(dpy);
107 -
	for (i = 0; i < 8; i++) {
106 +
	for (i = 0; i < 8; i++)
108 107
		for (j = 0; j < modmap->max_keypermod; j++) {
109 -
			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
108 +
			if(modmap->modifiermap[i * modmap->max_keypermod + j]
109 +
					== XKeysymToKeycode(dpy, XK_Num_Lock))
110 110
				numlockmask = (1 << i);
111 111
		}
112 -
	}
113 112
	XFreeModifiermap(modmap);
114 113
	/* select for events */
115 114
	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
tag.c +1 −2
78 78
	Bool matched = trans != NULL;
79 79
	XClassHint ch = { 0 };
80 80
81 -
	if(matched) {
81 +
	if(matched)
82 82
		for(i = 0; i < ntags; i++)
83 83
			c->tags[i] = trans->tags[i];
84 -
	}
85 84
	else {
86 85
		XGetClassHint(dpy, c->win, &ch);
87 86
		snprintf(prop, sizeof prop, "%s:%s:%s",
view.c +3 −4
55 55
	Client *c;
56 56
57 57
	for(c = clients; c; c = c->next) {
58 -
		if(isvisible(c)) {
58 +
		if(isvisible(c))
59 59
			resize(c, True);
60 -
		}
61 60
		else
62 61
			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
63 62
	}
150 149
void
151 150
incnmaster(Arg *arg) {
152 151
	if((arrange == dofloat) || (nmaster + arg->i < 1)
153 -
		|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
152 +
	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
154 153
		return;
155 154
	nmaster += arg->i;
156 155
	if(sel)
175 174
		master = MASTER;
176 175
	else {
177 176
		if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
178 -
			|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
177 +
		|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
179 178
			return;
180 179
		master += arg->i;
181 180
	}