{ 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 */
*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;
- if(ocx <= ev.xmotion.x) {
- if(ocy <= ev.xmotion.y)
- sticky = TopLeft;
- else
- sticky = BottomLeft;
- } else {
- if(ocy <= ev.xmotion.y)
- sticky = TopRight;
- else
- sticky = BottomRight;
- }
+ 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: