applied Sanders patches

[dwm.git] / event.c

diff --git a/event.c b/event.c
index a0b3c0e..17be71d 100644 (file)
--- 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,41 +19,40 @@ 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 };
 
 static Key key[] = {
        /* modifier             key             function        arguments */
-       { ControlMask,          XK_0,           appendtag,      { .i = Tscratch } }, 
-       { ControlMask,          XK_1,           appendtag,      { .i = Tdev } }, 
-       { ControlMask,          XK_2,           appendtag,      { .i = Twww } }, 
-       { ControlMask,          XK_3,           appendtag,      { .i = Twork } }, 
-       { MODKEY,               XK_0,           view,           { .i = Tscratch } }, 
+       { MODKEY,               XK_0,           view,           { .i = Tfnord } }, 
        { MODKEY,               XK_1,           view,           { .i = Tdev } }, 
-       { MODKEY,               XK_2,           view,           { .i = Twww } }, 
+       { MODKEY,               XK_2,           view,           { .i = Tnet } }, 
        { MODKEY,               XK_3,           view,           { .i = Twork } }, 
+       { MODKEY,               XK_4,           view,           { .i = Tmisc} }, 
        { MODKEY,               XK_j,           focusnext,      { 0 } }, 
        { MODKEY,               XK_k,           focusprev,      { 0 } },
        { MODKEY,               XK_m,           togglemax,      { 0 } }, 
        { MODKEY,               XK_space,       togglemode,     { 0 } }, 
        { MODKEY,               XK_Return,      zoom,           { 0 } },
-       { ControlMask|ShiftMask,XK_0,           heretag,        { .i = Tscratch } }, 
-       { ControlMask|ShiftMask,XK_1,           heretag,        { .i = Tdev } }, 
-       { ControlMask|ShiftMask,XK_2,           heretag,        { .i = Twww } }, 
-       { ControlMask|ShiftMask,XK_3,           heretag,        { .i = Twork } }, 
-       { MODKEY|ShiftMask,     XK_0,           replacetag,     { .i = Tscratch } }, 
+       { MODKEY|ControlMask,   XK_0,           appendtag,      { .i = Tfnord } }, 
+       { MODKEY|ControlMask,   XK_1,           appendtag,      { .i = Tdev } }, 
+       { MODKEY|ControlMask,   XK_2,           appendtag,      { .i = Tnet } }, 
+       { MODKEY|ControlMask,   XK_3,           appendtag,      { .i = Twork } }, 
+       { MODKEY|ControlMask,   XK_4,           appendtag,      { .i = Tmisc } }, 
+       { MODKEY|ShiftMask,     XK_0,           replacetag,     { .i = Tfnord } }, 
        { MODKEY|ShiftMask,     XK_1,           replacetag,     { .i = Tdev } }, 
-       { MODKEY|ShiftMask,     XK_2,           replacetag,     { .i = Twww } }, 
+       { MODKEY|ShiftMask,     XK_2,           replacetag,     { .i = Tnet } }, 
        { 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 */
@@ -167,11 +163,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);
                        }
@@ -180,7 +177,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);
                        }
@@ -242,7 +239,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)))
@@ -268,7 +265,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;
@@ -371,7 +368,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;