aewl
changeset 113:b2445fd41f5e
applied Jukka's patch with s/ModKeyMask/MODKEY/g
| author | arg@10ksloc.org |
|---|---|
| date | Wed, 19 Jul 2006 16:38:39 +0200 |
| parents | 2c9e0dae41f3 |
| children | dfa5cd0969a6 |
| files | client.c config.mk dwm.h event.c |
| diffstat | 4 files changed, 25 insertions(+), 24 deletions(-) [+] |
line diff
1.1 --- a/client.c Wed Jul 19 15:03:53 2006 +0200 1.2 +++ b/client.c Wed Jul 19 16:38:39 2006 +0200 1.3 @@ -239,11 +239,11 @@ 1.4 1.5 XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask, 1.6 GrabModeAsync, GrabModeSync, None, None); 1.7 - XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask, 1.8 + XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask, 1.9 GrabModeAsync, GrabModeSync, None, None); 1.10 - XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask, 1.11 + XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask, 1.12 GrabModeAsync, GrabModeSync, None, None); 1.13 - XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask, 1.14 + XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask, 1.15 GrabModeAsync, GrabModeSync, None, None); 1.16 1.17 if(!c->isfloat)
2.1 --- a/config.mk Wed Jul 19 15:03:53 2006 +0200 2.2 +++ b/config.mk Wed Jul 19 16:38:39 2006 +0200 2.3 @@ -7,7 +7,7 @@ 2.4 X11INC = /usr/X11R6/include 2.5 X11LIB = /usr/X11R6/lib 2.6 2.7 -VERSION = 0.3 2.8 +VERSION = 0.4 2.9 2.10 # includes and libs 2.11 LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
3.1 --- a/dwm.h Wed Jul 19 15:03:53 2006 +0200 3.2 +++ b/dwm.h Wed Jul 19 16:38:39 2006 +0200 3.3 @@ -11,6 +11,7 @@ 3.4 #define BGCOLOR "#0a2c2d" 3.5 #define FGCOLOR "#ddeeee" 3.6 #define BORDERCOLOR "#176164" 3.7 +#define MODKEY Mod1Mask /* Mod4Mask */ 3.8 /* 3.9 #define BGCOLOR "#666699" 3.10 #define FGCOLOR "#eeeeee"
4.1 --- a/event.c Wed Jul 19 15:03:53 2006 +0200 4.2 +++ b/event.c Wed Jul 19 16:38:39 2006 +0200 4.3 @@ -26,30 +26,30 @@ 4.4 { ControlMask, XK_1, appendtag, { .i = Tdev } }, 4.5 { ControlMask, XK_2, appendtag, { .i = Twww } }, 4.6 { ControlMask, XK_3, appendtag, { .i = Twork } }, 4.7 - { Mod1Mask, XK_0, view, { .i = Tscratch } }, 4.8 - { Mod1Mask, XK_1, view, { .i = Tdev } }, 4.9 - { Mod1Mask, XK_2, view, { .i = Twww } }, 4.10 - { Mod1Mask, XK_3, view, { .i = Twork } }, 4.11 - { Mod1Mask, XK_j, focusnext, { 0 } }, 4.12 - { Mod1Mask, XK_k, focusprev, { 0 } }, 4.13 - { Mod1Mask, XK_m, maximize, { 0 } }, 4.14 - { Mod1Mask, XK_space, dotile, { 0 } }, 4.15 - { Mod1Mask, XK_Return, zoom, { 0 } }, 4.16 + { MODKEY, XK_0, view, { .i = Tscratch } }, 4.17 + { MODKEY, XK_1, view, { .i = Tdev } }, 4.18 + { MODKEY, XK_2, view, { .i = Twww } }, 4.19 + { MODKEY, XK_3, view, { .i = Twork } }, 4.20 + { MODKEY, XK_j, focusnext, { 0 } }, 4.21 + { MODKEY, XK_k, focusprev, { 0 } }, 4.22 + { MODKEY, XK_m, maximize, { 0 } }, 4.23 + { MODKEY, XK_space, dotile, { 0 } }, 4.24 + { MODKEY, XK_Return, zoom, { 0 } }, 4.25 { ControlMask|ShiftMask,XK_0, heretag, { .i = Tscratch } }, 4.26 { ControlMask|ShiftMask,XK_1, heretag, { .i = Tdev } }, 4.27 { ControlMask|ShiftMask,XK_2, heretag, { .i = Twww } }, 4.28 { ControlMask|ShiftMask,XK_3, heretag, { .i = Twork } }, 4.29 - { Mod1Mask|ShiftMask, XK_0, replacetag, { .i = Tscratch } }, 4.30 - { Mod1Mask|ShiftMask, XK_1, replacetag, { .i = Tdev } }, 4.31 - { Mod1Mask|ShiftMask, XK_2, replacetag, { .i = Twww } }, 4.32 - { Mod1Mask|ShiftMask, XK_3, replacetag, { .i = Twork } }, 4.33 - { Mod1Mask|ShiftMask, XK_c, killclient, { 0 } }, 4.34 - { Mod1Mask|ShiftMask, XK_g, spawn, { .argv = gimp } }, 4.35 - { Mod1Mask|ShiftMask, XK_l, spawn, { .argv = xlock } }, 4.36 - { Mod1Mask|ShiftMask, XK_q, quit, { 0 } }, 4.37 - { Mod1Mask|ShiftMask, XK_space, dofloat, { 0 } }, 4.38 - { Mod1Mask|ShiftMask, XK_w, spawn, { .argv = browse } }, 4.39 - { Mod1Mask|ShiftMask, XK_Return, spawn, { .argv = term } }, 4.40 + { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tscratch } }, 4.41 + { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } }, 4.42 + { MODKEY|ShiftMask, XK_2, replacetag, { .i = Twww } }, 4.43 + { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } }, 4.44 + { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, 4.45 + { MODKEY|ShiftMask, XK_g, spawn, { .argv = gimp } }, 4.46 + { MODKEY|ShiftMask, XK_l, spawn, { .argv = xlock } }, 4.47 + { MODKEY|ShiftMask, XK_q, quit, { 0 } }, 4.48 + { MODKEY|ShiftMask, XK_space, dofloat, { 0 } }, 4.49 + { MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } }, 4.50 + { MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } }, 4.51 }; 4.52 4.53 /* static */