made for/if/else constructs more consistent, some code polishing
This commit is contained in:
		
							parent
							
								
									64cfebc5e7
								
							
						
					
					
						commit
						e256afe31e
					
				
							
								
								
									
										4
									
								
								client.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								client.c
									
									
									
									
									
								
							| @ -304,8 +304,8 @@ updatesizehints(Client *c) { | ||||
| 	} | ||||
| 	else | ||||
| 		c->minax = c->minay = c->maxax = c->maxay = 0; | ||||
| 	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh && | ||||
| 				c->maxw == c->minw && c->maxh == c->minh); | ||||
| 	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh | ||||
| 			&& c->maxw == c->minw && c->maxh == c->minh); | ||||
| } | ||||
| 
 | ||||
| void | ||||
|  | ||||
							
								
								
									
										10
									
								
								event.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								event.c
									
									
									
									
									
								
							| @ -156,8 +156,8 @@ buttonpress(XEvent *e) { | ||||
| 		} | ||||
| 		else if(ev->button == Button2) | ||||
| 			zoom(NULL); | ||||
| 		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) | ||||
| 				&& !c->isfixed) | ||||
| 		else if(ev->button == Button3 | ||||
| 		&& (arrange == dofloat || c->isfloat) && !c->isfixed) | ||||
| 		{ | ||||
| 			restack(); | ||||
| 			resizemouse(c); | ||||
| @ -184,7 +184,8 @@ configurerequest(XEvent *e) { | ||||
| 				c->w = ev->width; | ||||
| 			if(ev->value_mask & CWHeight) | ||||
| 				c->h = ev->height; | ||||
| 			if((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight))) | ||||
| 			if((ev->value_mask & (CWX | CWY)) | ||||
| 			&& !(ev->value_mask & (CWWidth | CWHeight))) | ||||
| 				configure(c); | ||||
| 			resize(c, False); | ||||
| 			if(!isvisible(c)) | ||||
| @ -249,14 +250,13 @@ keypress(XEvent *e) { | ||||
| 	XKeyEvent *ev = &e->xkey; | ||||
| 
 | ||||
| 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); | ||||
| 	for(i = 0; i < len; i++) { | ||||
| 	for(i = 0; i < len; i++) | ||||
| 		if(keysym == key[i].keysym | ||||
| 		&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) | ||||
| 		{ | ||||
| 			if(key[i].func) | ||||
| 				key[i].func(&key[i].arg); | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| static void | ||||
|  | ||||
							
								
								
									
										11
									
								
								main.c
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								main.c
									
									
									
									
									
								
							| @ -69,9 +69,8 @@ scan(void) { | ||||
| 	wins = NULL; | ||||
| 	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { | ||||
| 		for(i = 0; i < num; i++) { | ||||
| 			if(!XGetWindowAttributes(dpy, wins[i], &wa)) | ||||
| 				continue; | ||||
| 			if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) | ||||
| 			if(!XGetWindowAttributes(dpy, wins[i], &wa) | ||||
| 			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) | ||||
| 				continue; | ||||
| 			if(wa.map_state == IsViewable) | ||||
| 				manage(wins[i], &wa); | ||||
| @ -104,12 +103,12 @@ setup(void) { | ||||
| 	/* init modifier map */ | ||||
| 	numlockmask = 0; | ||||
| 	modmap = XGetModifierMapping(dpy); | ||||
| 	for (i = 0; i < 8; i++) { | ||||
| 	for (i = 0; i < 8; i++) | ||||
| 		for (j = 0; j < modmap->max_keypermod; j++) { | ||||
| 			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock)) | ||||
| 			if(modmap->modifiermap[i * modmap->max_keypermod + j] | ||||
| 					== XKeysymToKeycode(dpy, XK_Num_Lock)) | ||||
| 				numlockmask = (1 << i); | ||||
| 		} | ||||
| 	} | ||||
| 	XFreeModifiermap(modmap); | ||||
| 	/* select for events */ | ||||
| 	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | ||||
|  | ||||
							
								
								
									
										3
									
								
								tag.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								tag.c
									
									
									
									
									
								
							| @ -78,10 +78,9 @@ settags(Client *c, Client *trans) { | ||||
| 	Bool matched = trans != NULL; | ||||
| 	XClassHint ch = { 0 }; | ||||
| 
 | ||||
| 	if(matched) { | ||||
| 	if(matched) | ||||
| 		for(i = 0; i < ntags; i++) | ||||
| 			c->tags[i] = trans->tags[i]; | ||||
| 	} | ||||
| 	else { | ||||
| 		XGetClassHint(dpy, c->win, &ch); | ||||
| 		snprintf(prop, sizeof prop, "%s:%s:%s", | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Anselm R. Garbe
						Anselm R. Garbe