X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=05f4ac5b0df75de3049f875d213c6673eabf2aaf;hb=bcaf6a7a0f492c3fafc4baabd2dc06f5191417ee;hp=e4dfad1638c5edea51c2a8868782e0bc1d43be6e;hpb=b1697e8d5fc9e7c81967cdbb5391b1587a23f310;p=dwm.git

diff --git a/event.c b/event.c
index e4dfad1..05f4ac5 100644
--- a/event.c
+++ b/event.c
@@ -12,6 +12,14 @@
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
 /* CUSTOMIZE */
+
+typedef struct {
+	unsigned long mod;
+	KeySym keysym;
+	void (*func)(Arg *arg);
+	Arg arg;
+} Key;
+
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
 const char *term[] = { 
@@ -20,36 +28,36 @@ const char *term[] = {
 };
 const char *xlock[] = { "xlock", NULL };
 
-Key key[] = {
+static Key key[] = {
 	/* modifier				key			function	arguments */
 	{ ControlMask,			XK_0,		appendtag,	{ .i = Tscratch } }, 
 	{ 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 */