git.stevedylan.dev

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

arg@10ksloc.org · 2006-07-19 16:38 4 file(s) · +25 −24

client.c +3 −3


	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)

config.mk +1 −1

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

dwm.h +1 −0

#define BGCOLOR				"#0a2c2d"
#define FGCOLOR				"#ddeeee"
#define BORDERCOLOR			"#176164"
#define MODKEY				 Mod1Mask /* Mod4Mask */
/*
#define BGCOLOR				"#666699"
#define FGCOLOR				"#eeeeee"

event.c +20 −20

	{ 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 */

239	239
240	240		XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
241	241		GrabModeAsync, GrabModeSync, None, None);
242		-	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
	242	+	XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
243	243		GrabModeAsync, GrabModeSync, None, None);
244		-	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
	244	+	XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
245	245		GrabModeAsync, GrabModeSync, None, None);
246		-	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
	246	+	XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
247	247		GrabModeAsync, GrabModeSync, None, None);
248	248
249	249		if(!c->isfloat)

26	26		{ ControlMask, XK_1, appendtag, { .i = Tdev } },
27	27		{ ControlMask, XK_2, appendtag, { .i = Twww } },
28	28		{ ControlMask, XK_3, appendtag, { .i = Twork } },
29		-	{ Mod1Mask, XK_0, view, { .i = Tscratch } },
30		-	{ Mod1Mask, XK_1, view, { .i = Tdev } },
31		-	{ Mod1Mask, XK_2, view, { .i = Twww } },
32		-	{ Mod1Mask, XK_3, view, { .i = Twork } },
33		-	{ Mod1Mask, XK_j, focusnext, { 0 } },
34		-	{ Mod1Mask, XK_k, focusprev, { 0 } },
35		-	{ Mod1Mask, XK_m, maximize, { 0 } },
36		-	{ Mod1Mask, XK_space, dotile, { 0 } },
37		-	{ Mod1Mask, XK_Return, zoom, { 0 } },
	29	+	{ MODKEY, XK_0, view, { .i = Tscratch } },
	30	+	{ MODKEY, XK_1, view, { .i = Tdev } },
	31	+	{ MODKEY, XK_2, view, { .i = Twww } },
	32	+	{ MODKEY, XK_3, view, { .i = Twork } },
	33	+	{ MODKEY, XK_j, focusnext, { 0 } },
	34	+	{ MODKEY, XK_k, focusprev, { 0 } },
	35	+	{ MODKEY, XK_m, maximize, { 0 } },
	36	+	{ MODKEY, XK_space, dotile, { 0 } },
	37	+	{ MODKEY, XK_Return, zoom, { 0 } },
38	38		{ ControlMask\|ShiftMask,XK_0, heretag, { .i = Tscratch } },
39	39		{ ControlMask\|ShiftMask,XK_1, heretag, { .i = Tdev } },
40	40		{ ControlMask\|ShiftMask,XK_2, heretag, { .i = Twww } },
41	41		{ ControlMask\|ShiftMask,XK_3, heretag, { .i = Twork } },
42		-	{ Mod1Mask\|ShiftMask, XK_0, replacetag, { .i = Tscratch } },
43		-	{ Mod1Mask\|ShiftMask, XK_1, replacetag, { .i = Tdev } },
44		-	{ Mod1Mask\|ShiftMask, XK_2, replacetag, { .i = Twww } },
45		-	{ Mod1Mask\|ShiftMask, XK_3, replacetag, { .i = Twork } },
46		-	{ Mod1Mask\|ShiftMask, XK_c, killclient, { 0 } },
47		-	{ Mod1Mask\|ShiftMask, XK_g, spawn, { .argv = gimp } },
48		-	{ Mod1Mask\|ShiftMask, XK_l, spawn, { .argv = xlock } },
49		-	{ Mod1Mask\|ShiftMask, XK_q, quit, { 0 } },
50		-	{ Mod1Mask\|ShiftMask, XK_space, dofloat, { 0 } },
51		-	{ Mod1Mask\|ShiftMask, XK_w, spawn, { .argv = browse } },
52		-	{ Mod1Mask\|ShiftMask, XK_Return, spawn, { .argv = term } },
	42	+	{ MODKEY\|ShiftMask, XK_0, replacetag, { .i = Tscratch } },
	43	+	{ MODKEY\|ShiftMask, XK_1, replacetag, { .i = Tdev } },
	44	+	{ MODKEY\|ShiftMask, XK_2, replacetag, { .i = Twww } },
	45	+	{ MODKEY\|ShiftMask, XK_3, replacetag, { .i = Twork } },
	46	+	{ MODKEY\|ShiftMask, XK_c, killclient, { 0 } },
	47	+	{ MODKEY\|ShiftMask, XK_g, spawn, { .argv = gimp } },
	48	+	{ MODKEY\|ShiftMask, XK_l, spawn, { .argv = xlock } },
	49	+	{ MODKEY\|ShiftMask, XK_q, quit, { 0 } },
	50	+	{ MODKEY\|ShiftMask, XK_space, dofloat, { 0 } },
	51	+	{ MODKEY\|ShiftMask, XK_w, spawn, { .argv = browse } },
	52	+	{ MODKEY\|ShiftMask, XK_Return, spawn, { .argv = term } },
53	53		};
54	54
55	55		/* static */

7	7		X11INC = /usr/X11R6/include
8	8		X11LIB = /usr/X11R6/lib
9	9
10		-	VERSION = 0.3
	10	+	VERSION = 0.4
11	11
12	12		# includes and libs
13	13		LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11

11	11		#define BGCOLOR "#0a2c2d"
12	12		#define FGCOLOR "#ddeeee"
13	13		#define BORDERCOLOR "#176164"
	14	+	#define MODKEY Mod1Mask /* Mod4Mask */
14	15		/*
15	16		#define BGCOLOR "#666699"
16	17		#define FGCOLOR "#eeeeee"