X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=event.c;h=f177cbe9a90d715977d84b80ab7c0bf26e1194fc;hb=57416beefec4db451a75a1d25434b69cf50badad;hp=95b94cc36f85151dde5b650a8550f1d2771600f6;hpb=0464e42231199d7a6ea45e46cf7798f2b6cf972c;p=dwm.git

diff --git a/event.c b/event.c
index 95b94cc..f177cbe 100644
--- a/event.c
+++ b/event.c
@@ -8,9 +8,6 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-
 /* CUSTOMIZE */
 
 typedef struct {
@@ -22,7 +19,7 @@ typedef struct {
 
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
-const char *term[] = { 
+const char *term[] = { /*"xterm", NULL };*/
 	"urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
 	"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
 };
@@ -35,8 +32,10 @@ static Key key[] = {
 	{ MODKEY,		XK_2,		view,		{ .i = Tnet } }, 
 	{ MODKEY,		XK_3,		view,		{ .i = Twork } }, 
 	{ MODKEY,		XK_4,		view,		{ .i = Tmisc} }, 
+	{ MODKEY,		XK_h,		viewprev,	{ 0 } },
 	{ MODKEY,		XK_j,		focusnext,	{ 0 } }, 
 	{ MODKEY,		XK_k,		focusprev,	{ 0 } },
+	{ MODKEY,		XK_l,		viewnext,	{ 0 } },
 	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, 
 	{ MODKEY,		XK_space,	togglemode,	{ 0 } }, 
 	{ MODKEY,		XK_Return,	zoom,		{ 0 } },
@@ -51,13 +50,16 @@ static Key key[] = {
 	{ MODKEY|ShiftMask,	XK_3,		replacetag,	{ .i = Twork } }, 
 	{ MODKEY|ShiftMask,	XK_4,		replacetag,	{ .i = Tmisc } }, 
 	{ MODKEY|ShiftMask,	XK_c,		killclient,	{ 0 } }, 
+	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } },
+	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
 	{ MODKEY|ShiftMask,	XK_g,		spawn,		{ .argv = gimp } },
 	{ MODKEY|ShiftMask,	XK_l,		spawn,		{ .argv = xlock } },
-	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } },
 	{ MODKEY|ShiftMask,	XK_w,		spawn,		{ .argv = browse } },
-	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
 };
 
+#define NumLockMask Mod2Mask
+unsigned int valid_mask =  255 &  ~( NumLockMask | LockMask);
+
 /* END CUSTOMIZE */
 
 /* static */
@@ -166,6 +168,7 @@ buttonpress(XEvent *e)
 		}
 	}
 	else if((c = getclient(ev->window))) {
+		focus(c);
 		switch(ev->button) {
 		default:
 			break;
@@ -241,7 +244,7 @@ enternotify(XEvent *e)
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+	if(ev->detail == NotifyInferior)
 		return;
 
 	if((c = getclient(ev->window)))
@@ -271,10 +274,11 @@ keypress(XEvent *e)
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
+	ev->state &= valid_mask;
 
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < len; i++)
-		if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
+		if((keysym == key[i].keysym) && ((key[i].mod & valid_mask) == ev->state)) {
 			if(key[i].func)
 				key[i].func(&key[i].arg);
 			return;
@@ -377,7 +381,19 @@ grabkeys()
 	for(i = 0; i < len; i++) {
 		code = XKeysymToKeycode(dpy, key[i].keysym);
 		XUngrabKey(dpy, code, key[i].mod, root);
+		if (NumLockMask)
+		{
+			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);
+		if (NumLockMask)
+		{
+			XGrabKey(dpy, code, key[i].mod | NumLockMask, root, True,
+					GrabModeAsync, GrabModeAsync);
+			XGrabKey(dpy, code, key[i].mod | NumLockMask | LockMask, root, True,
+					GrabModeAsync, GrabModeAsync);
+		}
 	}
 }