X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=bdef7555b7e9d10f4c00bed34126c4f42be51cd3;hb=753e0e048e13fe7cbace7c07917d26081a483eba;hp=2a4bacc5eee00ad2ed7c26dcf91610ed371860b5;hpb=addc52c9485f63a71f3afa54631f3b56b6bf2225;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 2a4bacc..bdef755 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);
 		}
 	}
 }