X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=2cebc9e576e9ce99050484a9034315f43b091280;hb=1b63f832c528958042d72fddc318af5aefdcb68a;hp=58df281687e91d4e99dc1c6137cdaabe234021f9;hpb=cd8d8e120857329800e93e22572e35560d1b0e80;p=dwm.git

diff --git a/event.c b/event.c
index 58df281..2cebc9e 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,8 +19,8 @@ typedef struct {
 
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
-const char *term[] = { 
-	"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
+const char *term[] = { /*"xterm", NULL };*/
+	"urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
 	"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
 };
 const char *xlock[] = { "xlock", 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,11 +50,11 @@ 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 } },
 };
 
 /* END CUSTOMIZE */
@@ -166,11 +165,12 @@ buttonpress(XEvent *e)
 		}
 	}
 	else if((c = getclient(ev->window))) {
+		focus(c);
 		switch(ev->button) {
 		default:
 			break;
 		case Button1:
-			if(arrange == dofloat || c->isfloat) {
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
 				higher(c);
 				movemouse(c);
 			}
@@ -179,7 +179,7 @@ buttonpress(XEvent *e)
 			lower(c);
 			break;
 		case Button3:
-			if(arrange == dofloat || c->isfloat) {
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
 				higher(c);
 				resizemouse(c);
 			}
@@ -241,7 +241,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)))
@@ -267,7 +267,7 @@ expose(XEvent *e)
 static void
 keypress(XEvent *e)
 {
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
@@ -370,7 +370,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 void
 grabkeys()
 {
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeyCode code;