X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/0f3acce0429bc5d2906eaf9279abc5565b189d33..d37dfa1bedbfadb5d39aa1937e77d4fd44319018:/event.c?ds=sidebyside

diff --git a/event.c b/event.c
index 85205d9..35cd4f9 100644
--- a/event.c
+++ b/event.c
@@ -18,7 +18,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
 movemouse(Client *c)
@@ -105,20 +105,26 @@ buttonpress(XEvent *e)
 	XButtonPressedEvent *ev = &e->xbutton;
 
 	if(barwin == ev->window) {
-		x = 0;
-		for(a.i = 0; a.i < ntags; a.i++) {
-			x += textw(tags[a.i]);
-			if(ev->x < x) {
-				if(ev->button == Button3)
-					toggleview(&a);
-				else
-					view(&a);
-				return;
+		if(ev->x < modew)
+			togglemode(NULL);
+		else {
+			x = modew;
+			for(a.i = 0; a.i < ntags; a.i++) {
+				x += textw(tags[a.i]);
+				if(ev->x < x) {
+					if(ev->button == Button1)
+						view(&a);
+					else if(ev->button == Button3)
+						toggleview(&a);
+					return;
+				}
 			}
 		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
+		if(CLEANMASK(ev->state) == 0)
+			return;
 		switch(ev->button) {
 		default:
 			break;
@@ -144,11 +150,11 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
+	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XEvent synev;
 	XWindowChanges wc;
-	unsigned long newmask;
 
 	if((c = getclient(ev->window))) {
 		gravitate(c, True);
@@ -378,10 +384,22 @@ grabkeys()
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+		XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+		XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XSync(dpy, False);
 	}
 }
+
+void
+procevent()
+{
+	XEvent ev;
+
+	while(XPending(dpy)) {
+		XNextEvent(dpy, &ev);
+		if(handler[ev.type])
+			(handler[ev.type])(&ev); /* call handler */
+	}
+}
+