X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=event.c;h=a1d2d9cee11017834ccf1d6e6e2205e1c6d9a869;hb=6828fba7a002062dd383f83bb8d584a82fc7677a;hp=187c65e63492d66a83f9a130325666ef9e205a4b;hpb=3e06edeb5df0aa95614cb0b11ba1931f01b6f337;p=dwm.git

diff --git a/event.c b/event.c
index 187c65e..a1d2d9c 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)
@@ -116,9 +116,15 @@ buttonpress(XEvent *e)
 				return;
 			}
 		}
+		if(ev->x < x + bmw) {
+			if(ev->button == Button1)
+				togglemode(NULL);
+		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
+		if(CLEANMASK(ev->state) != MODKEY)
+			return;
 		switch(ev->button) {
 		default:
 			break;
@@ -144,6 +150,7 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
+	int ox, oy, ow, oh;
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
@@ -151,6 +158,10 @@ configurerequest(XEvent *e)
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
+		ox = c->x;
+		oy = c->y;
+		ow = c->w;
+		oh = c->h;
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
@@ -187,6 +198,13 @@ configurerequest(XEvent *e)
 		XSync(dpy, False);
 		if(c->isfloat)
 			resize(c, False, TopLeft);
+		else if(c->ismax) {
+			resize(c, False, TopLeft);
+			c->x = ox;
+			c->y = oy;
+			c->w = ow;
+			c->h = oh;
+		}
 		else
 			arrange(NULL);
 	}
@@ -378,9 +396,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);
 	}
 }
+
+void
+procevent()
+{
+	XEvent ev;
+
+	while(XPending(dpy)) {
+		XNextEvent(dpy, &ev);
+		if(handler[ev.type])
+			(handler[ev.type])(&ev); /* call handler */
+	}
+}
+