X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=e66ace81b54ee0748b47cc02adfadf25a4e5270d;hp=b42fb73740754ac95d66430c02c78fb32ab9a551;hb=b1fe46c328a3aea5f18d6a0be14f69e57ee82172;hpb=5ce95a6e416345b2e6a5528d93700cb5de11a928

diff --git a/dwm.c b/dwm.c
index b42fb73..e66ace8 100644
--- a/dwm.c
+++ b/dwm.c
@@ -65,7 +65,7 @@ enum { NetSupported, NetWMName, NetWMState,
        NetWMWindowTypeDialog, NetClientList, NetSupportingWMCheck, NetLast }; /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
-       ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+       ClkClientWin, ClkRootWin, ClkAnywhere, ClkLast }; /* clicks */
 
 typedef union {
 	int i;
@@ -201,7 +201,6 @@ static void restack(Monitor *m);
 static void run(void);
 static void scan(void);
 static Bool sendevent(Client *c, Atom proto);
-static void send_keycode(KeyCode key, unsigned int state);
 static void sendmon(Client *c, Monitor *m);
 static void setclientstate(Client *c, long state);
 static void setfocus(Client *c);
@@ -243,12 +242,6 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 
 /* variables */
-typedef struct {
-	KeyCode keycode;
-	unsigned int state;
-} BufferedKey;
-static BufferedKey key_buffer[200];
-static int key_buffer_len = 0;
 static Bool key_buffering = False;
 static const char broken[] = "broken";
 static char stext[256];
@@ -500,6 +493,18 @@ buttonpress(XEvent *e) {
 	Client *c;
 	Monitor *m;
 	XButtonPressedEvent *ev = &e->xbutton;
+	Bool called = False;
+
+	for(i = 0; i < LENGTH(buttons); i++) {
+		if(buttons[i].click == ClkAnywhere && buttons[i].button == ev->button
+		&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
+			buttons[i].func(&buttons[i].arg);
+			called = True;
+		}
+	}
+	if (called) {
+		return;
+	}
 
 	click = ClkRootWin;
 	/* focus monitor if necessary */
@@ -510,15 +515,20 @@ buttonpress(XEvent *e) {
 	}
 	if(ev->window == selmon->barwin) {
 		return;
-	}
-	else if((c = wintoclient(ev->window))) {
+	} else if((c = wintoclient(ev->window))) {
 		focus(c);
 		click = ClkClientWin;
 	}
-	for(i = 0; i < LENGTH(buttons); i++)
+	for(i = 0; i < LENGTH(buttons); i++) {
 		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
-		&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+		&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
+			if (click == ClkTagBar && buttons[i].arg.i == 0) {
+				buttons[i].func(&arg);
+			} else {
+				buttons[i].func(&buttons[i].arg);
+			}
+		}
+	}
 }
 
 void
@@ -1030,16 +1040,16 @@ grabbuttons(Client *c, Bool focused) {
 		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 		if(focused) {
 			for(i = 0; i < LENGTH(buttons); i++)
-				if(buttons[i].click == ClkClientWin)
+				if(buttons[i].click == ClkClientWin || buttons[i].click == ClkAnywhere)
 					for(j = 0; j < LENGTH(modifiers); j++)
 						XGrabButton(dpy, buttons[i].button,
 						            buttons[i].mask | modifiers[j],
 						            c->win, False, BUTTONMASK,
 						            GrabModeAsync, GrabModeSync, None, None);
-		}
-		else
+		} else {
 			XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
 			            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+		}
 	}
 }
 
@@ -1047,7 +1057,19 @@ void
 grabkeys(void) {
 	updatenumlockmask();
 	//XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	XGrabKey(dpy, AnyKey, AnyModifier, root, True, GrabModeAsync, GrabModeAsync);
+	{
+		unsigned int i, j;
+		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+		KeyCode code;
+
+		XUngrabKey(dpy, AnyKey, AnyModifier, root);
+		for(i = 0; i < LENGTH(keys); i++)
+			if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+				for(j = 0; j < LENGTH(modifiers); j++)
+					XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+					         True, GrabModeAsync,
+					         keys[i].func == kbspawn ? GrabModeSync : GrabModeAsync);
+	}
 }
 
 void
@@ -1068,58 +1090,18 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
 #endif /* XINERAMA */
 
 void
-send_keycode(KeyCode key, unsigned int state) {
-	XKeyEvent event;
-	if(!selmon->sel) {
-		return;
-	}
-	event.display = dpy;
-	event.root = root;
-	event.window = selmon->sel->win;
-	event.subwindow = None;
-	event.same_screen = True;
-	event.x = 1;
-	event.y = 1;
-	event.x_root = 1;
-	event.y_root = 1;
-	event.time = CurrentTime;
-	event.state = state; // modifiers
-	event.keycode = key;
-	event.type = KeyPress;
-	XSendEvent(event.display, event.window, True, KeyPressMask, (XEvent *)&event);
-	event.type = KeyRelease;
-	XSendEvent(event.display, event.window, True, KeyPressMask, (XEvent *)&event);
-}
-
-void
 keypress(XEvent *e) {
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev;
-	Bool called = False;
 
 	ev = &e->xkey;
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for(i = 0; i < LENGTH(keys); i++)
+	for(i = 0; i < LENGTH(keys); i++) {
 		if(keysym == keys[i].keysym
 		&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
 		&& keys[i].func) {
 			keys[i].func(&(keys[i].arg));
-			called = True;
-		}
-	if(!called) {
-		if(key_buffering) {
-			if(key_buffer_len == LENGTH(key_buffer)) {
-				// buffer full, bail
-				key_buffer_len = 0;
-				key_buffering = False;
-			} else {
-				key_buffer[key_buffer_len].keycode = (KeyCode)ev->keycode;
-				key_buffer[key_buffer_len].state = (KeyCode)ev->state;
-				key_buffer_len += 1;
-			}
-		} else {
-			send_keycode(ev->keycode, ev->state);
 		}
 	}
 }
@@ -1144,7 +1126,6 @@ manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
 	Window trans = None;
 	XWindowChanges wc;
-	int i;
 
 	if(!(c = calloc(1, sizeof(Client))))
 		die("fatal: could not malloc() %u bytes\n", sizeof(Client));
@@ -1207,19 +1188,15 @@ manage(Window w, XWindowAttributes *wa) {
 	XMapWindow(dpy, c->win);
 	focus(c);
 	if(key_buffering) {
-		if(key_buffer_len > 0) {
-			for(i = 0; i < key_buffer_len; ++i) {
-				send_keycode(key_buffer[i].keycode, key_buffer[i].state);
-			}
-		}
-		key_buffer_len = 0;
 		key_buffering = False;
+		XAllowEvents(dpy, AsyncKeyboard, CurrentTime);
 	}
 }
 
 void
 mappingnotify(XEvent *e) {
 	XMappingEvent *ev = &e->xmapping;
+	// fprintf(stderr, "MapNotify\n");
 
 	XRefreshKeyboardMapping(ev);
 	if(ev->request == MappingKeyboard)
@@ -1231,11 +1208,10 @@ maprequest(XEvent *e) {
 	static XWindowAttributes wa;
 	XMapRequestEvent *ev = &e->xmaprequest;
 
+	// fprintf(stderr, "MapRequest\n");
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
 	if(wa.override_redirect) {
-		key_buffer_len = 0;
-		key_buffering = False;
 		return;
 	}
 	if(!wintoclient(ev->window))
@@ -1533,9 +1509,14 @@ run(void) {
 	XEvent ev;
 	/* main event loop */
 	XSync(dpy, False);
-	while(running && !XNextEvent(dpy, &ev))
-		if(handler[ev.type])
+	while(running && !XNextEvent(dpy, &ev)) {
+		if(handler[ev.type]) {
+			// fprintf(stderr, "handling event type %i\n", ev.type);
 			handler[ev.type](&ev); /* call handler */
+		} else {
+			// fprintf(stderr, "evt type %i\n", ev.type);
+		}
+	}
 }
 
 void
@@ -1764,7 +1745,6 @@ sigchld(int unused) {
 void
 kbspawn(const Arg *arg) {
 	key_buffering = True;
-	key_buffer_len = 0;
 	spawn(arg);
 }