X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=967be91cd7f7fee4eacabb5488a434f7efe5b602;hb=a73a88280681acdab047bd11a9ba77d97d6a0b72;hp=ba41f55638260aa35acda3f153b38cfcf429b909;hpb=896f08d7d553f7def3877648c113cf03e6ca546a;p=dwm.git

diff --git a/event.c b/event.c
index ba41f55..967be91 100644
--- a/event.c
+++ b/event.c
@@ -2,68 +2,148 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
-#include <fcntl.h>
 #include <stdlib.h>
-#include <string.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#include "wm.h"
+/* static */
 
-/* local functions */
-static void buttonpress(XEvent *e);
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void enternotify(XEvent *e);
-static void leavenotify(XEvent *e);
-static void expose(XEvent *e);
-static void keymapnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
+typedef struct {
+	unsigned long mod;
+	KeySym keysym;
+	void (*func)(Arg *arg);
+	Arg arg;
+} Key;
 
-void (*handler[LASTEvent]) (XEvent *) = {
-	[ButtonPress] = buttonpress,
-	[ConfigureRequest] = configurerequest,
-	[DestroyNotify] = destroynotify,
-	[EnterNotify] = enternotify,
-	[LeaveNotify] = leavenotify,
-	[Expose] = expose,
-	[KeyPress] = keypress,
-	[KeymapNotify] = keymapnotify,
-	[MapRequest] = maprequest,
-	[PropertyNotify] = propertynotify,
-	[UnmapNotify] = unmapnotify
-};
+CMDS
+KEYS
 
-unsigned int
-discard_events(long even_mask)
+static unsigned int valid_mask =  255 &  ~(NUMLOCKMASK | LockMask);
+
+static void
+movemouse(Client *c)
 {
+	int x1, y1, ocx, ocy, di;
+	unsigned int dui;
+	Window dummy;
 	XEvent ev;
-	unsigned int n = 0;
-	while(XCheckMaskEvent(dpy, even_mask, &ev)) n++;
-	return n;
+
+	ocx = c->x;
+	ocy = c->y;
+	if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+			None, cursor[CurMove], CurrentTime) != GrabSuccess)
+		return;
+	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+	for(;;) {
+		XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+		switch (ev.type) {
+		default: break;
+		case Expose:
+			handler[Expose](&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);
+			break;
+		case ButtonRelease:
+			XUngrabPointer(dpy, CurrentTime);
+			return;
+		}
+	}
+}
+
+static void
+resizemouse(Client *c)
+{
+	int ocx, ocy;
+	Corner sticky;
+	XEvent ev;
+
+	ocx = c->x;
+	ocy = c->y;
+	if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+				None, cursor[CurResize], CurrentTime) != GrabSuccess)
+		return;
+	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 Expose:
+			handler[Expose](&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);
+			break;
+		case ButtonRelease:
+			XUngrabPointer(dpy, CurrentTime);
+			return;
+		}
+	}
 }
 
 static void
 buttonpress(XEvent *e)
 {
-	XButtonPressedEvent *ev = &e->xbutton;
+	int x;
+	Arg a;
 	Client *c;
+	XButtonPressedEvent *ev = &e->xbutton;
 
-	if((c = getclient(ev->window))) {
+	if(barwin == ev->window) {
+		switch(ev->button) {
+		default:
+			x = 0;
+			for(a.i = 0; a.i < TLast; a.i++) {
+				x += textw(tags[a.i]);
+				if(ev->x < x) {
+					view(&a);
+					break;
+				}
+			}
+			break;
+		case Button4:
+			a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
+			view(&a);
+			break;
+		case Button5:
+			a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
+			view(&a);
+			break;
+		}
+	}
+	else if((c = getclient(ev->window))) {
+		focus(c);
 		switch(ev->button) {
 		default:
 			break;
 		case Button1:
-			mmove(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+				higher(c);
+				movemouse(c);
+			}
 			break;
 		case Button2:
-			XLowerWindow(dpy, c->win);
+			lower(c);
 			break;
 		case Button3:
-			mresize(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+				higher(c);
+				resizemouse(c);
+			}
 			break;
 		}
 	}
@@ -72,12 +152,13 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
+	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
-	Client *c;
 
 	ev->value_mask &= ~CWSibling;
 	if((c = getclient(ev->window))) {
+		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
 		if(ev->value_mask & CWY)
@@ -86,19 +167,23 @@ configurerequest(XEvent *e)
 			c->w = ev->width;
 		if(ev->value_mask & CWHeight)
 			c->h = ev->height;
+		if(ev->value_mask & CWBorderWidth)
+			c->border = 1;
+		gravitate(c, False);
+		resize(c, True, TopLeft);
 	}
 
 	wc.x = ev->x;
 	wc.y = ev->y;
 	wc.width = ev->width;
 	wc.height = ev->height;
-	wc.border_width = 0;
+	wc.border_width = 1;
 	wc.sibling = None;
 	wc.stack_mode = Above;
 	ev->value_mask &= ~CWStackMode;
 	ev->value_mask |= CWBorderWidth;
 	XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-	XFlush(dpy);
+	XSync(dpy, False);
 }
 
 static void
@@ -114,56 +199,64 @@ destroynotify(XEvent *e)
 static void
 enternotify(XEvent *e)
 {
-	XCrossingEvent *ev = &e->xcrossing;
 	Client *c;
+	XCrossingEvent *ev = &e->xcrossing;
 
-	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+	if(ev->detail == NotifyInferior)
 		return;
 
 	if((c = getclient(ev->window)))
 		focus(c);
-	else if(ev->window == root) {
-		sel_screen = True;
-		/*draw_frames();*/
-	}
+	else if(ev->window == root)
+		issel = True;
 }
 
 static void
-leavenotify(XEvent *e)
+expose(XEvent *e)
 {
-	XCrossingEvent *ev = &e->xcrossing;
+	Client *c;
+	XExposeEvent *ev = &e->xexpose;
 
-	if((ev->window == root) && !ev->same_screen) {
-		sel_screen = True;
-		/*draw_frames();*/
+	if(ev->count == 0) {
+		if(barwin == ev->window)
+			drawstatus();
+		else if((c = getctitle(ev->window)))
+			drawtitle(c);
 	}
 }
 
 static void
-expose(XEvent *e)
+keypress(XEvent *e)
 {
-	XExposeEvent *ev = &e->xexpose;
-	Client *c;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
+	unsigned int i;
+	KeySym keysym;
+	XKeyEvent *ev = &e->xkey;
+	ev->state &= valid_mask;
 
-	if(ev->count == 0) {
-		if((c = getclient(ev->window)))
-			draw_client(c);
-		else if(ev->window == barwin)
-			draw_bar();
-	}
+	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+	for(i = 0; i < len; i++)
+		if((keysym == key[i].keysym) && ((key[i].mod & valid_mask) == ev->state)) {
+			if(key[i].func)
+				key[i].func(&key[i].arg);
+			return;
+		}
 }
 
 static void
-keymapnotify(XEvent *e)
+leavenotify(XEvent *e)
 {
-	update_keys();
+	XCrossingEvent *ev = &e->xcrossing;
+
+	if((ev->window == root) && !ev->same_screen)
+		issel = True;
 }
 
 static void
 maprequest(XEvent *e)
 {
-	XMapRequestEvent *ev = &e->xmaprequest;
 	static XWindowAttributes wa;
+	XMapRequestEvent *ev = &e->xmaprequest;
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
@@ -181,33 +274,32 @@ maprequest(XEvent *e)
 static void
 propertynotify(XEvent *e)
 {
-	XPropertyEvent *ev = &e->xproperty;
 	Client *c;
+	Window trans;
+	XPropertyEvent *ev = &e->xproperty;
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
 
-	if(ev->atom == wm_atom[WMProtocols]) {
-		c->proto = win_proto(c->win);
-		return;
-	}
 	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, &c->trans);
+				XGetTransientForHint(dpy, c->win, &trans);
+				if(!c->isfloat && (c->isfloat = (trans != 0)))
+					arrange(NULL);
 				break;
-				update_size(c);
 			case XA_WM_NORMAL_HINTS:
-				update_size(c);
+				setsize(c);
 				break;
 		}
-		if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
-			update_name(c);
-			if(c == stack)
-				draw_bar();
-			else
-				draw_client(c);
+		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+			settitle(c);
+			drawtitle(c);
 		}
 	}
 }
@@ -221,3 +313,39 @@ unmapnotify(XEvent *e)
 	if((c = getclient(ev->window)))
 		unmanage(c);
 }
+
+/* extern */
+
+void (*handler[LASTEvent]) (XEvent *) = {
+	[ButtonPress] = buttonpress,
+	[ConfigureRequest] = configurerequest,
+	[DestroyNotify] = destroynotify,
+	[EnterNotify] = enternotify,
+	[LeaveNotify] = leavenotify,
+	[Expose] = expose,
+	[KeyPress] = keypress,
+	[MapRequest] = maprequest,
+	[PropertyNotify] = propertynotify,
+	[UnmapNotify] = unmapnotify
+};
+
+void
+grabkeys()
+{
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
+	unsigned int i;
+	KeyCode code;
+
+	for(i = 0; i < len; i++) {
+		code = XKeysymToKeycode(dpy, key[i].keysym);
+		XUngrabKey(dpy, code, key[i].mod, root);
+		XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
+		XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
+		XGrabKey(dpy, code, key[i].mod, root, True,
+				GrabModeAsync, GrabModeAsync);
+		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+				GrabModeAsync, GrabModeAsync);
+		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+				GrabModeAsync, GrabModeAsync);
+	}
+}