X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/aa1bda81646e9d6188fd584009be0eee619f6966..924a0888126bd8ff12312c6e3e6a33003f271b2a:/event.c

diff --git a/event.c b/event.c
index 0f74478..e97abad 100644
--- a/event.c
+++ b/event.c
@@ -109,10 +109,17 @@ buttonpress(XEvent *e)
 		for(a.i = 0; a.i < ntags; a.i++) {
 			x += textw(tags[a.i]);
 			if(ev->x < x) {
-				if(ev->button == Button1)
+				switch(ev->button) {
+				case Button1:
 					view(&a);
-				else if(ev->button == Button3)
+					break;
+				case Button2:
+					toggletag(&a);
+					break;
+				case Button3:
 					toggleview(&a);
+					break;
+				}
 				return;
 			}
 		}
@@ -147,21 +154,38 @@ buttonpress(XEvent *e)
 	}
 }
 
+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)
 {
-	int ox, oy, ow, oh;
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XEvent synev;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		ox = c->x;
-		oy = c->y;
-		ow = c->w;
-		oh = c->h;
+		if(!c->isfloat && (arrange != dofloat) && c->ismax) {
+			synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
+			XSync(dpy, False);
+			return;
+		}
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
@@ -181,28 +205,11 @@ configurerequest(XEvent *e)
 		newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
 		if(newmask)
 			XConfigureWindow(dpy, c->win, newmask, &wc);
-		else {
-			synev.type = ConfigureNotify;
-			synev.xconfigure.display = dpy;
-			synev.xconfigure.event = c->win;
-			synev.xconfigure.window = c->win;
-			synev.xconfigure.x = c->x;
-			synev.xconfigure.y = c->y;
-			synev.xconfigure.width = c->w;
-			synev.xconfigure.height = c->h;
-			synev.xconfigure.border_width = c->border;
-			synev.xconfigure.above = None;
-			/* Send synthetic ConfigureNotify */
-			XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-		}
+		else
+			synconfig(c, c->x, c->y, c->w, c->h, c->border);
 		XSync(dpy, False);
-		if(c->isfloat || c->ismax) {
+		if(c->isfloat)
 			resize(c, False, TopLeft);
-			c->x = ox;
-			c->y = oy;
-			c->w = ow;
-			c->h = oh;
-		}
 		else
 			arrange(NULL);
 	}