X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/addc52c9485f63a71f3afa54631f3b56b6bf2225..30410108eb7e9e8b977d448f611659d58b2a6992:/dwm.c

diff --git a/dwm.c b/dwm.c
index 2a4bacc..4ed5760 100644
--- a/dwm.c
+++ b/dwm.c
@@ -331,7 +331,7 @@ buttonpress(XEvent *e) {
 	for(i = 0; i < LENGTH(buttons); i++)
 		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
 		   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
+			buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 }
 
 void
@@ -763,10 +763,10 @@ grabkeys(void) {
 
 		XUngrabKey(dpy, AnyKey, AnyModifier, root);
 		for(i = 0; i < LENGTH(keys); i++) {
-			code = XKeysymToKeycode(dpy, keys[i].keysym);
-			for(j = 0; j < LENGTH(modifiers); j++)
-				XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
-					 GrabModeAsync, GrabModeAsync);
+			if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+				for(j = 0; j < LENGTH(modifiers); j++)
+					XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+						 True, GrabModeAsync, GrabModeAsync);
 		}
 	}
 }
@@ -1056,9 +1056,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
 		/* adjust for aspect limits */
 		if(c->mina > 0 && c->maxa > 0) {
-			if(c->maxa < (float)(w / h))
+			if(c->maxa < (float)w / h)
 				w = h * c->maxa;
-			else if(c->mina < (float)(h / w))
+			else if(c->mina < (float)h / w)
 				h = w * c->mina;
 		}