applied sanders maxfix patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index a0b3c0e..aa07427 100644 (file)
--- a/event.c
+++ b/event.c
@@ -30,27 +30,26 @@ 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_g,           spawn,          { .argv = gimp } },
        { MODKEY|ShiftMask,     XK_l,           spawn,          { .argv = xlock } },
@@ -171,7 +170,7 @@ buttonpress(XEvent *e)
                default:
                        break;
                case Button1:
-                       if(arrange == dofloat || c->isfloat) {
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
                                higher(c);
                                movemouse(c);
                        }
@@ -180,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);
                        }