X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=74ae2767c5b7c836ac28b3b480570d3f237977e1;hb=b597fa46370af6594c0980f6c2ddefbe943ee933;hp=c8a87c1256bee55e18c5d0a3cb917618d10d0fee;hpb=ee31e38dc75832a66cb0fc01bcf2f419ac96a20b;p=dwm.git

diff --git a/event.c b/event.c
index c8a87c1..74ae276 100644
--- a/event.c
+++ b/event.c
@@ -109,48 +109,75 @@ 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);
+				if(ev->button == Button1) {
+					if(ev->state & MODKEY)
+						tag(&a);
+					else
+						view(&a);
+				}
+				else if(ev->button == Button3) {
+					if(ev->state & MODKEY)
+						toggletag(&a);
+					else
+						toggleview(&a);
+				}
 				return;
 			}
 		}
+		if(ev->x < x + bmw) {
+			if(ev->button == Button1)
+				togglemode(NULL);
+		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		switch(ev->button) {
-		default:
-			break;
-		case Button1:
-			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-				restack(c);
-				movemouse(c);
-			}
-			break;
-		case Button2:
+		if(maximized || CLEANMASK(ev->state) != MODKEY)
+			return;
+		if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+			restack(c);
+			movemouse(c);
+		}
+		else if(ev->button == Button2)
 			zoom(NULL);
-			break;
-		case Button3:
-			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-				restack(c);
-				resizemouse(c);
-			}
-			break;
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+			restack(c);
+			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;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XEvent synev;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
+		if((c == sel) && !c->isfloat && (arrange != dofloat) && maximized) {
+			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;
@@ -170,20 +197,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;
-			/* 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)
 			resize(c, False, TopLeft);
@@ -328,11 +343,11 @@ propertynotify(XEvent *e)
 					arrange(NULL);
 				break;
 			case XA_WM_NORMAL_HINTS:
-				setsize(c);
+				updatesize(c);
 				break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-			settitle(c);
+			updatetitle(c);
 			drawtitle(c);
 		}
 	}
@@ -384,3 +399,16 @@ grabkeys()
 				GrabModeAsync, GrabModeAsync);
 	}
 }
+
+void
+procevent()
+{
+	XEvent ev;
+
+	while(XPending(dpy)) {
+		XNextEvent(dpy, &ev);
+		if(handler[ev.type])
+			(handler[ev.type])(&ev); /* call handler */
+	}
+}
+