X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=83301bc2ff19e047a7f24a73ca4badc4421f4e52;hb=6b25d06d7d159bf89d740847fedc876ab0137b6b;hp=c59385dc0d8bd260ab4b58067cbcebfc6bad9648;hpb=ca65478c8968434c78aacf4a102ccbbe4a66ad9e;p=dwm.git

diff --git a/event.c b/event.c
index c59385d..83301bc 100644
--- a/event.c
+++ b/event.c
@@ -21,6 +21,23 @@ KEYS
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
+synconfig(Client *c, int x, int y, int w, int h, unsigned int border) {
+	XEvent synev;
+
+	synev.type = ConfigureNotify;
+	synev.xconfigure.display = dpy;
+	synev.xconfigure.event = c->win;
+	synev.xconfigure.window = c->win;
+	synev.xconfigure.x = x;
+	synev.xconfigure.y = y;
+	synev.xconfigure.width = w;
+	synev.xconfigure.height = h;
+	synev.xconfigure.border_width = border;
+	synev.xconfigure.above = None;
+	XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
+static void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di;
 	unsigned int dui;
@@ -32,12 +49,17 @@ movemouse(Client *c) {
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
+	c->ismax = False;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
 		switch (ev.type) {
 		default:
 			break;
+		case ConfigureRequest:
+			synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
+			XSync(dpy, False);
+			break;
 		case Expose:
 			handler[Expose](&ev);
 			break;
@@ -50,6 +72,11 @@ movemouse(Client *c) {
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
 			return;
+		case DestroyNotify:
+		case UnmapNotify:
+			XUngrabPointer(dpy, CurrentTime);
+			handler[ev.type](&ev);
+			return;
 		}
 	}
 }
@@ -66,21 +93,26 @@ resizemouse(Client *c) {
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 				None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
+	c->ismax = False;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
 		switch(ev.type) {
 		default:
 			break;
+		case ConfigureRequest:
+			synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
+			XSync(dpy, False);
+			break;
 		case Expose:
 			handler[Expose](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
 			if((nw = abs(ocx - ev.xmotion.x)))
-				c->w = abs(ocx - ev.xmotion.x);
+				c->w = nw;
 			if((nh = abs(ocy - ev.xmotion.y)))
-				c->h = abs(ocy - ev.xmotion.y);
+				c->h = nh;
 			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
 			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
 			if(ocx <= ev.xmotion.x)
@@ -92,6 +124,11 @@ resizemouse(Client *c) {
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
 			return;
+		case DestroyNotify:
+		case UnmapNotify:
+			XUngrabPointer(dpy, CurrentTime);
+			handler[ev.type](&ev);
+			return;
 		}
 	}
 }
@@ -130,39 +167,22 @@ buttonpress(XEvent *e) {
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(maximized || CLEANMASK(ev->state) != MODKEY)
+		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
-			restack(c);
+			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
 		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
-			restack(c);
+			restack();
 			resizemouse(c);
 		}
 	}
 }
 
 static void
-synconfig(Client *c, int x, int y, int w, int h, unsigned int border) {
-	XEvent synev;
-
-	synev.type = ConfigureNotify;
-	synev.xconfigure.display = dpy;
-	synev.xconfigure.event = c->win;
-	synev.xconfigure.window = c->win;
-	synev.xconfigure.x = x;
-	synev.xconfigure.y = y;
-	synev.xconfigure.width = w;
-	synev.xconfigure.height = h;
-	synev.xconfigure.border_width = border;
-	synev.xconfigure.above = None;
-	XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-}
-
-static void
 configurerequest(XEvent *e) {
 	unsigned long newmask;
 	Client *c;
@@ -170,7 +190,7 @@ configurerequest(XEvent *e) {
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		if((c == sel) && !c->isfloat && (arrange != dofloat) && maximized) {
+		if((c == sel) && !c->isfloat && (arrange != dofloat)) {
 			synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
 			XSync(dpy, False);
 			return;
@@ -232,7 +252,7 @@ enternotify(XEvent *e) {
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
 
-	if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
+	if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
 		issel = True;
@@ -368,7 +388,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 void
-grabkeys() {
+grabkeys(void) {
 	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeyCode code;
@@ -388,7 +408,7 @@ grabkeys() {
 }
 
 void
-procevent() {
+procevent(void) {
 	XEvent ev;
 
 	while(XPending(dpy)) {