applied Jukka's patch with s/ModKeyMask/MODKEY/g - dwm - dynamic window manager
HTML git clone https://git.parazyd.org/dwm
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit f95eed34b46dfe73f1511703e0a9301c9d8d1952
DIR parent 1eaffa372f6c4186c3c1717113e3f575cf64fcfd
HTML Author: arg@10ksloc.org <unknown>
Date: Wed, 19 Jul 2006 16:38:39 +0200
applied Jukka's patch with s/ModKeyMask/MODKEY/g
Diffstat:
M client.c | 6 +++---
M config.mk | 2 +-
M dwm.h | 1 +
M event.c | 40 ++++++++++++++++----------------
4 files changed, 25 insertions(+), 24 deletions(-)
---
DIR diff --git a/client.c b/client.c
@@ -239,11 +239,11 @@ manage(Window w, XWindowAttributes *wa)
XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
DIR diff --git a/config.mk b/config.mk
@@ -7,7 +7,7 @@ MANPREFIX = ${PREFIX}/share/man
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
-VERSION = 0.3
+VERSION = 0.4
# includes and libs
LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
DIR diff --git a/dwm.h b/dwm.h
@@ -11,6 +11,7 @@
#define BGCOLOR "#0a2c2d"
#define FGCOLOR "#ddeeee"
#define BORDERCOLOR "#176164"
+#define MODKEY Mod1Mask /* Mod4Mask */
/*
#define BGCOLOR "#666699"
#define FGCOLOR "#eeeeee"
DIR diff --git 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 */