X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=c66aa72b8053c47fe6ac799becdb7cd23cd27f8e;hb=28ffff801bb0137ec3fe4093afc4fb29784b17ec;hp=05b42f03e86654840a6cda46af059b3c210cd910;hpb=d7413ffd2d9a84fc3140b28b26f8cb6bb80164e4;p=dwm.git

diff --git a/event.c b/event.c
index 05b42f0..c66aa72 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"
@@ -18,11 +17,11 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#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,136 +32,144 @@ 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);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
 		switch (ev.type) {
-		default: break;
+		case ButtonRelease:
+			resize(c, True);
+			XUngrabPointer(dpy, CurrentTime);
+			return;
+		case ConfigureRequest:
 		case Expose:
-			handler[Expose](&ev);
+		case MapRequest:
+			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
-			resize(c, False, TopLeft);
+			if(abs(wax + c->x) < SNAP)
+				c->x = wax;
+			else if(abs((wax + waw) - (c->x + c->w + 2 * c->border)) < SNAP)
+				c->x = wax + waw - c->w - 2 * c->border;
+			if(abs(way - c->y) < SNAP)
+				c->y = way;
+			else if(abs((way + wah) - (c->y + c->h + 2 * c->border)) < SNAP)
+				c->y = way + wah - c->h - 2 * c->border;
+			resize(c, False);
 			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		}
 	}
 }
 
 static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
 	int ocx, ocy;
-	Corner sticky;
+	int nw, nh;
 	XEvent ev;
 
 	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;
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+	c->ismax = False;
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
 		switch(ev.type) {
-		default: break;
+		case ButtonRelease:
+			resize(c, True);
+			XUngrabPointer(dpy, CurrentTime);
+			return;
+		case ConfigureRequest:
 		case Expose:
-			handler[Expose](&ev);
+		case MapRequest:
+			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			c->w = abs(ocx - ev.xmotion.x);
-			c->h = abs(ocy - ev.xmotion.y);
-			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)
-				sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
-			else
-				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
-			resize(c, True, sticky);
+			nw = ev.xmotion.x - ocx - 2 * c->border + 1;
+			c->w = nw > 0 ? nw : 1;
+			nh = ev.xmotion.y - ocy - 2 * c->border + 1;
+			c->h = nh > 0 ? nh : 1;
+			resize(c, True);
 			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		}
 	}
 }
 
 static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
 	int x;
 	Arg a;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
 	if(barwin == ev->window) {
-		switch(ev->button) {
-		default:
-			x = 0;
-			for(a.i = 0; a.i < ntags; a.i++) {
-				x += textw(tags[a.i]);
-				if(ev->x < x) {
-					if(ev->button == Button3) {
-						tsel[a.i] = True;
-						arrange(NULL);
-						drawall();
-					}
+		x = 0;
+		for(a.i = 0; a.i < ntags; a.i++) {
+			x += textw(tags[a.i]);
+			if(ev->x < x) {
+				if(ev->button == Button1) {
+					if(ev->state & MODKEY)
+						tag(&a);
 					else
 						view(&a);
-					return;
 				}
+				else if(ev->button == Button3) {
+					if(ev->state & MODKEY)
+						toggletag(&a);
+					else
+						toggleview(&a);
+				}
+				return;
 			}
-			if(ev->button == Button1)
-				viewprev(&a);
-			else if(ev->button == Button3)
-				viewnext(&a);
-			break;
-		case Button4:
-			viewprev(&a);
-			break;
-		case Button5:
-			viewnext(&a);
-			break;
 		}
+		if(ev->x < x + bmw)
+			switch(ev->button) {
+			case Button1:
+				togglemode(NULL);
+				break;
+			case Button4:
+				a.i = 1;
+				incnmaster(&a);
+				break;
+			case Button5:
+				a.i = -1;
+				incnmaster(&a);
+				break;
+			}
 	}
 	else if((c = getclient(ev->window))) {
-		higher(c);
 		focus(c);
-		switch(ev->button) {
-		default:
-			break;
-		case Button1:
-			if(!c->ismax && (arrange == dofloat || c->isfloat))
-				movemouse(c);
-			break;
-		case Button2:
+		if(CLEANMASK(ev->state) != MODKEY)
+			return;
+		if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+			restack();
+			movemouse(c);
+		}
+		else if(ev->button == Button2)
 			zoom(NULL);
-			break;
-		case Button3:
-			if(!c->ismax && (arrange == dofloat || c->isfloat))
-				resizemouse(c);
-			break;
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+				!c->isfixed) {
+			restack();
+			resizemouse(c);
 		}
 	}
 }
 
 static void
-configurerequest(XEvent *e)
-{
+configurerequest(XEvent *e) {
+	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XEvent synev;
 	XWindowChanges wc;
-	unsigned long newmask;
 
 	if((c = getclient(ev->window))) {
-		gravitate(c, True);
+		c->ismax = False;
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
 		if(ev->value_mask & CWY)
@@ -173,7 +180,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;
@@ -181,25 +187,16 @@ 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
+			configure(c);
 		XSync(dpy, False);
-		if(c->isfloat)
-			resize(c, False, TopLeft);
+		if(c->isfloat) {
+			resize(c, False);
+			if(!isvisible(c))
+				XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+		}
 		else
-			arrange(NULL);
+			arrange();
 	}
 	else {
 		wc.x = ev->x;
@@ -215,8 +212,7 @@ configurerequest(XEvent *e)
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -225,121 +221,114 @@ 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)) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
-		issel = True;
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		drawall();
+		selscreen = True;
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
 	}
 }
 
 static void
-expose(XEvent *e)
-{
-	Client *c;
+expose(XEvent *e) {
 	XExposeEvent *ev = &e->xexpose;
 
 	if(ev->count == 0) {
 		if(barwin == ev->window)
 			drawstatus();
-		else if((c = getctitle(ev->window)))
-			drawtitle(c);
 	}
 }
 
 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)) {
+	for(i = 0; i < len; i++) {
+		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) {
-		issel = False;
-		drawall();
+		selscreen = False;
+		focus(NULL);
 	}
 }
 
 static void
-maprequest(XEvent *e)
-{
+mappingnotify(XEvent *e) {
+	XMappingEvent *ev = &e->xmapping;
+
+	XRefreshKeyboardMapping(ev);
+	if(ev->request == MappingKeyboard)
+		grabkeys();
+}
+
+static void
+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);
-			return;
-		}
 		switch (ev->atom) {
 			default: break;
 			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);
-			drawtitle(c);
+			updatetitle(c);
+			if(c == sel)
+				drawstatus();
 		}
 	}
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 
@@ -357,27 +346,39 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
 	[KeyPress] = keypress,
+	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
 
 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;
 
+	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	for(i = 0; i < len; i++) {
 		code = XKeysymToKeycode(dpy, key[i].keysym);
 		XGrabKey(dpy, code, key[i].mod, root, True,
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+		XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+		XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
 	}
 }
+
+void
+procevent(void) {
+	XEvent ev;
+
+	while(XPending(dpy)) {
+		XNextEvent(dpy, &ev);
+		if(handler[ev.type])
+			(handler[ev.type])(&ev); /* call handler */
+	}
+}