X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=a719bf21a9bae5a0f23b5271238fd96017ef4ec7;hb=1836b6740d7fc1a2e7fa0343aa7de657592ebfeb;hp=5a1c68e1ba5b4f70ef7cda6431ef63b61959abcf;hpb=70a3e62257d05946176aad3dbe19047d3bb705c1;p=dwm.git

diff --git a/event.c b/event.c
index 5a1c68e..a719bf2 100644
--- a/event.c
+++ b/event.c
@@ -109,10 +109,20 @@ 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)
-					view(&a);
-				else if(ev->button == Button3)
-					toggleview(&a);
+				switch(ev->button) {
+				case Button1:
+					if(ev->state & MODKEY)
+						tag(&a);
+					else
+						view(&a);
+					break;
+				case Button3:
+					if(ev->state & MODKEY)
+						toggletag(&a);
+					else
+						toggleview(&a);
+					break;
+				}
 				return;
 			}
 		}
@@ -148,27 +158,35 @@ 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)
 {
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XEvent synev;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
 		if(!c->isfloat && (arrange != dofloat) && c->ismax) {
-			synev.type = ConfigureNotify;
-			synev.xconfigure.display = dpy;
-			synev.xconfigure.event = c->win;
-			synev.xconfigure.window = c->win;
-			synev.xconfigure.x = sx;
-			synev.xconfigure.y = sy + bh;
-			synev.xconfigure.width = sw - 2;
-			synev.xconfigure.height = sw - 2 - bh;
-			synev.xconfigure.border_width = ev->border_width;
-			synev.xconfigure.above = None;
-			XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+			synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
+			XSync(dpy, False);
 			return;
 		}
 		gravitate(c, True);
@@ -190,19 +208,8 @@ 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;
-			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)
 			resize(c, False, TopLeft);