X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=event.c;h=0043ed29f78a7905e75e7e90b1da7a579003f441;hp=e5ea71213812e5d65b7cdacbc8a19873d7bb3953;hb=ac24f132dba7e59d9d9ff98d984f5e0b0d20fd09;hpb=6d22782e8f991a99f9adef56b2b729e5ab5454d2

diff --git a/event.c b/event.c
index e5ea712..0043ed2 100644
--- a/event.c
+++ b/event.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -19,10 +18,10 @@ typedef struct {
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 
 static void
-movemouse(Client *c)
-{
+movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di;
 	unsigned int dui;
 	Window dummy;
@@ -33,11 +32,15 @@ movemouse(Client *c)
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
+	c->ismax = False;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
 		switch (ev.type) {
-		default: break;
+		case ButtonRelease:
+			resize(c, True, TopLeft);
+			XUngrabPointer(dpy, CurrentTime);
+			return;
 		case Expose:
 			handler[Expose](&ev);
 			break;
@@ -45,18 +48,22 @@ movemouse(Client *c)
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
+			if(abs(wax + c->x) < SNAP)
+				c->x = wax;
+			else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
+				c->x = wax + waw - c->w - 2 * BORDERPX;
+			if(abs(way - c->y) < SNAP)
+				c->y = way;
+			else if(abs((way + wah) - (c->y + c->h)) < SNAP)
+				c->y = way + wah - c->h - 2 * BORDERPX;
 			resize(c, False, TopLeft);
 			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		}
 	}
 }
 
 static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
 	int ocx, ocy;
 	int nw, nh;
 	Corner sticky;
@@ -65,22 +72,26 @@ resizemouse(Client *c)
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-				None, cursor[CurResize], CurrentTime) != GrabSuccess)
+			None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
+	c->ismax = False;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
 		switch(ev.type) {
-		default: break;
+		case ButtonRelease:
+			resize(c, True, TopLeft);
+			XUngrabPointer(dpy, CurrentTime);
+			return;
 		case Expose:
 			handler[Expose](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
 			if((nw = abs(ocx - ev.xmotion.x)))
-				c->w = abs(ocx - ev.xmotion.x);
+				c->w = nw;
 			if((nh = abs(ocy - ev.xmotion.y)))
-				c->h = abs(ocy - ev.xmotion.y);
+				c->h = nh;
 			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
 			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
 			if(ocx <= ev.xmotion.x)
@@ -89,16 +100,12 @@ resizemouse(Client *c)
 				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
 			resize(c, True, sticky);
 			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		}
 	}
 }
 
 static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
 	int x;
 	Arg a;
 	Client *c;
@@ -124,61 +131,36 @@ buttonpress(XEvent *e)
 				return;
 			}
 		}
-		if(ev->x < x + bmw) {
-			if(ev->button == Button1)
-				togglemode(NULL);
-		}
+		if((ev->x < x + bmw) && (ev->button == Button1))
+			togglemode(NULL);
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(c->ismax || CLEANMASK(ev->state) != MODKEY)
+		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if((ev->button == Button1) && ((arrange == dofloat) || c->isfloat)) {
-			restack(c);
+		if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && ((arrange == dofloat) || c->isfloat)) {
-			restack(c);
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+				!c->isfixed) {
+			restack();
 			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)
-{
+configurerequest(XEvent *e) {
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		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);
+		c->ismax = False;
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
 		if(ev->value_mask & CWY)
@@ -189,7 +171,6 @@ configurerequest(XEvent *e)
 			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		gravitate(c, False);
 		wc.x = c->x;
 		wc.y = c->y;
 		wc.width = c->w;
@@ -198,12 +179,15 @@ configurerequest(XEvent *e)
 		if(newmask)
 			XConfigureWindow(dpy, c->win, newmask, &wc);
 		else
-			synconfig(c, c->x, c->y, c->w, c->h, c->border);
+			configure(c);
 		XSync(dpy, False);
-		if(c->isfloat)
+		if(c->isfloat) {
 			resize(c, False, TopLeft);
+			if(!isvisible(c))
+				ban(c);
+		}
 		else
-			arrange(NULL);
+			arrange();
 	}
 	else {
 		wc.x = ev->x;
@@ -219,8 +203,7 @@ configurerequest(XEvent *e)
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -229,15 +212,13 @@ destroynotify(XEvent *e)
 }
 
 static void
-enternotify(XEvent *e)
-{
+enternotify(XEvent *e) {
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-
-	if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
+	if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
 		issel = True;
@@ -247,8 +228,7 @@ enternotify(XEvent *e)
 }
 
 static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
 	Client *c;
 	XExposeEvent *ev = &e->xexpose;
 
@@ -261,28 +241,25 @@ expose(XEvent *e)
 }
 
 static void
-keypress(XEvent *e)
-{
-	static unsigned int len = sizeof(key) / sizeof(key[0]);
+keypress(XEvent *e) {
+	static unsigned int len = sizeof key / sizeof key[0];
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
 
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < len; i++) {
-		if(keysym == key[i].keysym &&
-				CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+		if(keysym == key[i].keysym
+			&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
 		{
 			if(key[i].func)
 				key[i].func(&key[i].arg);
-			return;
 		}
 	}
 }
 
 static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
 	XCrossingEvent *ev = &e->xcrossing;
 
 	if((ev->window == root) && !ev->same_screen) {
@@ -292,8 +269,7 @@ leavenotify(XEvent *e)
 }
 
 static void
-mappingnotify(XEvent *e)
-{
+mappingnotify(XEvent *e) {
 	XMappingEvent *ev = &e->xmapping;
 
 	XRefreshKeyboardMapping(ev);
@@ -302,34 +278,29 @@ mappingnotify(XEvent *e)
 }
 
 static void
-maprequest(XEvent *e)
-{
+maprequest(XEvent *e) {
 	static XWindowAttributes wa;
 	XMapRequestEvent *ev = &e->xmaprequest;
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
-
 	if(wa.override_redirect) {
 		XSelectInput(dpy, ev->window,
 				(StructureNotifyMask | PropertyChangeMask));
 		return;
 	}
-
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }
 
 static void
-propertynotify(XEvent *e)
-{
+propertynotify(XEvent *e) {
 	Client *c;
 	Window trans;
 	XPropertyEvent *ev = &e->xproperty;
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
-
 	if((c = getclient(ev->window))) {
 		if(ev->atom == wmatom[WMProtocols]) {
 			c->proto = getproto(c->win);
@@ -340,22 +311,22 @@ propertynotify(XEvent *e)
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
 				if(!c->isfloat && (c->isfloat = (trans != 0)))
-					arrange(NULL);
+					arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
-				setsize(c);
+				updatesizehints(c);
 				break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-			settitle(c);
+			updatetitle(c);
+			resizetitle(c);
 			drawtitle(c);
 		}
 	}
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 
@@ -380,9 +351,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 void
-grabkeys()
-{
-	static unsigned int len = sizeof(key) / sizeof(key[0]);
+grabkeys(void) {
+	static unsigned int len = sizeof key / sizeof key[0];
 	unsigned int i;
 	KeyCode code;
 
@@ -401,8 +371,7 @@ grabkeys()
 }
 
 void
-procevent()
-{
+procevent(void) {
 	XEvent ev;
 
 	while(XPending(dpy)) {
@@ -411,4 +380,3 @@ procevent()
 			(handler[ev.type])(&ev); /* call handler */
 	}
 }
-