applied Jukka's patch with s/ModKeyMask/MODKEY/g

[dwm.git] / event.c

diff --git a/event.c b/event.c
index db95dfd..f8ad44c 100644 (file)
--- a/event.c
+++ b/event.c
@@ -26,30 +26,30 @@ Key key[] = {
        { ControlMask,                  XK_1,           appendtag,      { .i = Tdev } }, 
        { ControlMask,                  XK_2,           appendtag,      { .i = Twww } }, 
        { ControlMask,                  XK_3,           appendtag,      { .i = Twork } }, 
-       { Mod1Mask,                             XK_0,           view,           { .i = Tscratch } }, 
-       { Mod1Mask,                             XK_1,           view,           { .i = Tdev } }, 
-       { Mod1Mask,                             XK_2,           view,           { .i = Twww } }, 
-       { Mod1Mask,                             XK_3,           view,           { .i = Twork } }, 
-       { Mod1Mask,                             XK_j,           focusnext,              { 0 } }, 
-       { Mod1Mask,                             XK_k,           focusprev,              { 0 } },
-       { Mod1Mask,                             XK_m,           maximize,               { 0 } }, 
-       { Mod1Mask,                             XK_space,       dotile,         { 0 } }, 
-       { Mod1Mask,                             XK_Return,      zoom,           { 0 } },
+       { MODKEY,                               XK_0,           view,           { .i = Tscratch } }, 
+       { MODKEY,                               XK_1,           view,           { .i = Tdev } }, 
+       { MODKEY,                               XK_2,           view,           { .i = Twww } }, 
+       { MODKEY,                               XK_3,           view,           { .i = Twork } }, 
+       { MODKEY,                               XK_j,           focusnext,              { 0 } }, 
+       { MODKEY,                               XK_k,           focusprev,              { 0 } },
+       { MODKEY,                               XK_m,           maximize,               { 0 } }, 
+       { MODKEY,                               XK_space,       dotile,         { 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 } }, 
-       { Mod1Mask|ShiftMask,   XK_0,           replacetag,             { .i = Tscratch } }, 
-       { Mod1Mask|ShiftMask,   XK_1,           replacetag,             { .i = Tdev } }, 
-       { Mod1Mask|ShiftMask,   XK_2,           replacetag,             { .i = Twww } }, 
-       { Mod1Mask|ShiftMask,   XK_3,           replacetag,             { .i = Twork } }, 
-       { Mod1Mask|ShiftMask,   XK_c,           killclient,             { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_g,           spawn,          { .argv = gimp } },
-       { Mod1Mask|ShiftMask,   XK_l,           spawn,          { .argv = xlock } },
-       { Mod1Mask|ShiftMask,   XK_q,           quit,           { 0 } },
-       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },
-       { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
+       { MODKEY|ShiftMask,             XK_0,           replacetag,             { .i = Tscratch } }, 
+       { MODKEY|ShiftMask,             XK_1,           replacetag,             { .i = Tdev } }, 
+       { MODKEY|ShiftMask,             XK_2,           replacetag,             { .i = Twww } }, 
+       { MODKEY|ShiftMask,             XK_3,           replacetag,             { .i = Twork } }, 
+       { MODKEY|ShiftMask,             XK_c,           killclient,             { 0 } }, 
+       { MODKEY|ShiftMask,             XK_g,           spawn,          { .argv = gimp } },
+       { MODKEY|ShiftMask,             XK_l,           spawn,          { .argv = xlock } },
+       { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } },
+       { MODKEY|ShiftMask,             XK_space,       dofloat,        { 0 } }, 
+       { MODKEY|ShiftMask,             XK_w,           spawn,          { .argv = browse } },
+       { MODKEY|ShiftMask,             XK_Return,      spawn,          { .argv = term } },
 };
 
 /* static */
@@ -79,7 +79,7 @@ movemouse(Client *c)
                        XSync(dpy, False);
                        *c->x = ocx + (ev.xmotion.x - x1);
                        *c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, False);
+                       resize(c, False, TopLeft);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
@@ -93,6 +93,7 @@ resizemouse(Client *c)
 {
        XEvent ev;
        int ocx, ocy;
+       Corner sticky;
 
        ocx = *c->x;
        ocy = *c->y;
@@ -113,7 +114,11 @@ resizemouse(Client *c)
                        *c->h = abs(ocy - ev.xmotion.y);
                        *c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - *c->w;
                        *c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - *c->h;
-                       resize(c, True);
+                       if(ocx <= ev.xmotion.x)
+                               sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
+                       else
+                               sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
+                       resize(c, True, sticky);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
@@ -153,24 +158,27 @@ buttonpress(XEvent *e)
                }
        }
        else if((c = getclient(ev->window))) {
-               if(arrange == dotile && !c->isfloat) {
-                       if((ev->state & ControlMask) && (ev->button == Button1))
-                               zoom(NULL);
-                       return;
-               }
-               /* floating windows */
-               higher(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:
-                       movemouse(c);
+                       if(arrange == dotile && !c->isfloat) {
+                               if((ev->state & ControlMask) && (ev->button == Button1))
+                                       zoom(NULL);
+                       }
+                       else {
+                               higher(c);
+                               movemouse(c);
+                       }
                        break;
                case Button2:
                        lower(c);
                        break;
                case Button3:
-                       resizemouse(c);
+                       if(arrange == dofloat || c->isfloat) {
+                               higher(c);
+                               resizemouse(c);
+                       }
                        break;
                }
        }
@@ -197,7 +205,7 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWBorderWidth)
                        c->border = 1;
                gravitate(c, False);
-               resize(c, True);
+               resize(c, True, TopLeft);
        }
 
        wc.x = ev->x;