X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=540aeb64ec46023c1faf7ae05cd8ae637f9e95b7;hb=92105e7862822f5c884367c4cb62c0464ee8e636;hp=fbce6315e926029507c634c2116effdebe992b2c;hpb=3167373512c562f8f040203d2ee29084c76d00a0;p=dwm.git

diff --git a/event.c b/event.c
index fbce631..540aeb6 100644
--- a/event.c
+++ b/event.c
@@ -11,7 +11,7 @@
 typedef struct {
 	unsigned long mod;
 	KeySym keysym;
-	void (*func)(Arg *arg);
+	void (*func)(Arg arg);
 	Arg arg;
 } Key;
 
@@ -20,6 +20,14 @@ KEYS
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 
+static Client *
+getclient(Window w) {
+	Client *c;
+
+	for(c = clients; c && c->win != w; c = c->next);
+	return c;
+}
+
 static void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
@@ -116,31 +124,32 @@ buttonpress(XEvent *e) {
 			if(ev->x < x) {
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
-						tag(&a);
+						tag(a);
 					else
-						view(&a);
+						view(a);
 				}
 				else if(ev->button == Button3) {
 					if(ev->state & MODKEY)
-						toggletag(&a);
+						toggletag(a);
 					else
-						toggleview(&a);
+						toggleview(a);
 				}
 				return;
 			}
 		}
-		if(ev->x < x + bmw)
+		if(ev->x < x + blw)
 			switch(ev->button) {
 			case Button1:
-				togglemode(NULL);
+				a.i = -1;
+				setlayout(a);
 				break;
 			case Button4:
 				a.i = 1;
-				incnmaster(&a);
+				incnmaster(a);
 				break;
 			case Button5:
 				a.i = -1;
-				incnmaster(&a);
+				incnmaster(a);
 				break;
 			}
 	}
@@ -148,14 +157,14 @@ buttonpress(XEvent *e) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+		if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
 			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
-			zoom(NULL);
+			zoom(a);
 		else if(ev->button == Button3
-		&& (arrange == dofloat || c->isfloat) && !c->isfixed)
+		&& (lt->arrange == versatile || c->isversatile) && !c->isfixed)
 		{
 			restack();
 			resizemouse(c);
@@ -165,7 +174,6 @@ buttonpress(XEvent *e) {
 
 static void
 configurerequest(XEvent *e) {
-	int x, y, w, h;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
@@ -174,25 +182,20 @@ configurerequest(XEvent *e) {
 		c->ismax = False;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if(c->isfixed || c->isfloat || (arrange == dofloat)) {
-			x = (ev->value_mask & CWX) ? ev->x : c->x;
-			y = (ev->value_mask & CWY) ? ev->y : c->y;
-			w = (ev->value_mask & CWWidth) ? ev->width : c->w;
-			h = (ev->value_mask & CWHeight) ? ev->height : c->h;
+		if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
+			if(ev->value_mask & CWX)
+				c->x = ev->x;
+			if(ev->value_mask & CWY)
+				c->y = ev->y;
+			if(ev->value_mask & CWWidth)
+				c->w = ev->width;
+			if(ev->value_mask & CWHeight)
+				c->h = ev->height;
 			if((ev->value_mask & (CWX | CWY))
 			&& !(ev->value_mask & (CWWidth | CWHeight)))
-			{
-				c->x = x;
-				c->y = y;
 				configure(c);
-				if(isvisible(c))
-					XMoveWindow(dpy, c->win, c->x, c->y);
-			}
-			else {
-				resize(c, x, y, w, h, False);
-				if(!isvisible(c))
-					ban(c);
-			}
+			if(isvisible(c))
+				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
 			configure(c);
@@ -258,7 +261,7 @@ keypress(XEvent *e) {
 		&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
 		{
 			if(key[i].func)
-				key[i].func(&key[i].arg);
+				key[i].func(key[i].arg);
 		}
 }
 
@@ -307,8 +310,8 @@ propertynotify(XEvent *e) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->isfloat && (c->isfloat = (trans != 0)))
-					arrange();
+				if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
+					lt->arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
 				updatesizehints(c);
@@ -366,14 +369,3 @@ grabkeys(void) {
 				GrabModeAsync, GrabModeAsync);
 	}
 }
-
-void
-procevent(void) {
-	XEvent ev;
-
-	while(XPending(dpy)) {
-		XNextEvent(dpy, &ev);
-		if(handler[ev.type])
-			(handler[ev.type])(&ev); /* call handler */
-	}
-}