X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/5a9af492ae9fc6d28dc80bf3599d7eebda9136dd..b32cd4454b4608c29699e8e0215a5107ce357679:/event.c?ds=sidebyside

diff --git a/event.c b/event.c
index 2773c6f..4bedf18 100644
--- a/event.c
+++ b/event.c
@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,7 +16,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)		(mask & ~(numlockmask | LockMask))
 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 
 static Client *
@@ -140,25 +138,21 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if(ev->x < x + blw)
-			switch(ev->button) {
-			case Button1:
-				setlayout(NULL);
-				break;
-			}
+		if((ev->x < x + blw) && ev->button == Button1)
+			setlayout(NULL);
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
+		if(ev->button == Button1 && (isfloating() || c->isfloating)) {
 			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
 		else if(ev->button == Button3
-		&& (lt->arrange == floating || c->isfloating) && !c->isfixed)
+		&& (isfloating() || c->isfloating) && !c->isfixed)
 		{
 			restack();
 			resizemouse(c);
@@ -176,7 +170,7 @@ configurerequest(XEvent *e) {
 		c->ismax = False;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
+		if(c->isfixed || c->isfloating || isfloating()) {
 			if(ev->value_mask & CWX)
 				c->x = ev->x;
 			if(ev->value_mask & CWY)
@@ -222,7 +216,7 @@ configurenotify(XEvent *e) {
 		dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 		XResizeWindow(dpy, barwin, sw, bh);
 		updatebarpos();
-		lt->arrange();
+		arrange();
 	}
 }
 
@@ -242,11 +236,11 @@ enternotify(XEvent *e) {
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-	if((c = getclient(ev->window)) && isvisible(c))
+	if((c = getclient(ev->window)))
 		focus(c);
 	else if(ev->window == root) {
 		selscreen = True;
-		focustopvisible();
+		focus(NULL);
 	}
 }
 
@@ -323,7 +317,7 @@ propertynotify(XEvent *e) {
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
 				if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-					lt->arrange();
+					arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
 				updatesizehints(c);
@@ -342,8 +336,10 @@ unmapnotify(XEvent *e) {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 
-	if((c = getclient(ev->window)))
-		unmanage(c);
+	if((c = getclient(ev->window)) && (ev->event == root)) {
+		if(ev->send_event || c->unmapped-- == 0)
+			unmanage(c);
+	}
 }
 
 /* extern */