X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dev.c;h=7f500d9f753bbd7f625addc4681117ff03c89db8;hb=a1d0f819661f2be48f7a03ddd001f2a1a8f325e4;hp=c77ef587074f263b623d8ef719c8db16f6a2dd61;hpb=3aad92202d58208c4197857d3f17c535ba0bd56a;p=dwm.git

diff --git a/dev.c b/dev.c
index c77ef58..7f500d9 100644
--- a/dev.c
+++ b/dev.c
@@ -20,27 +20,30 @@ const char *browse[] = { "firefox", NULL };
 const char *xlock[] = { "xlock", NULL };
 
 static Key key[] = {
-	{ Mod1Mask, XK_Return, spawn, { .argv = term } },
-	{ Mod1Mask, XK_w, spawn, { .argv = browse } },
-	{ Mod1Mask, XK_l, spawn, { .argv = xlock } },
-	{ Mod1Mask, XK_k, prevc, { 0 } },
-	{ Mod1Mask, XK_j, nextc, { 0 } }, 
-	{ Mod1Mask, XK_m, max, { 0 } }, 
-	{ Mod1Mask, XK_0, view, { .i = Tscratch } }, 
-	{ Mod1Mask, XK_1, view, { .i = Tdev } }, 
-	{ Mod1Mask, XK_2, view, { .i = Tirc } }, 
-	{ Mod1Mask, XK_3, view, { .i = Twww } }, 
-	{ Mod1Mask, XK_4, view, { .i = Twork } }, 
-	{ Mod1Mask, XK_space, tiling, { 0 } }, 
-	{ Mod1Mask | ShiftMask, XK_Return, zoom, { 0 } },
-	{ Mod1Mask | ShiftMask, XK_space, floating, { 0 } }, 
-	{ Mod1Mask | ShiftMask, XK_0, tag, { .i = Tscratch } }, 
-	{ Mod1Mask | ShiftMask, XK_1, tag, { .i = Tdev } }, 
-	{ Mod1Mask | ShiftMask, XK_2, tag, { .i = Tirc } }, 
-	{ Mod1Mask | ShiftMask, XK_3, tag, { .i = Twww } }, 
-	{ Mod1Mask | ShiftMask, XK_4, tag, { .i = Twork } }, 
-	{ Mod1Mask | ShiftMask, XK_c, ckill, { 0 } }, 
-	{ Mod1Mask | ShiftMask, XK_q, quit, { 0 } },
+	/* modifier				key			function	arguments */
+	{ Mod1Mask,				XK_Return,	zoom,		{ 0 } },
+	{ Mod1Mask,				XK_k,		prevc,		{ 0 } },
+	{ Mod1Mask,				XK_j,		nextc,		{ 0 } }, 
+	{ Mod1Mask,				XK_m,		max,		{ 0 } }, 
+	{ 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_space,	tiling,		{ 0 } }, 
+	{ Mod1Mask|ShiftMask,	XK_space,	floating,	{ 0 } }, 
+	{ Mod1Mask|ShiftMask,	XK_0,		ttrunc,		{ .i = Tscratch } }, 
+	{ Mod1Mask|ShiftMask,	XK_1,		ttrunc,		{ .i = Tdev } }, 
+	{ Mod1Mask|ShiftMask,	XK_2,		ttrunc,		{ .i = Twww } }, 
+	{ Mod1Mask|ShiftMask,	XK_3,		ttrunc,		{ .i = Twork } }, 
+	{ Mod1Mask|ShiftMask,	XK_c,		ckill,		{ 0 } }, 
+	{ Mod1Mask|ShiftMask,	XK_q,		quit,		{ 0 } },
+	{ Mod1Mask|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
+	{ Mod1Mask|ShiftMask,	XK_w,		spawn,		{ .argv = browse } },
+	{ Mod1Mask|ShiftMask,	XK_l,		spawn,		{ .argv = xlock } },
+	{ ControlMask,			XK_0,		tappend,	{ .i = Tscratch } }, 
+	{ ControlMask,			XK_1,		tappend,	{ .i = Tdev } }, 
+	{ ControlMask,			XK_2,		tappend,	{ .i = Twww } }, 
+	{ ControlMask,			XK_3,		tappend,	{ .i = Twork } }, 
 };
 
 /********** CUSTOMIZE **********/
@@ -104,7 +107,7 @@ mresize(Client *c)
 			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;
-			resize(c);
+			resize(c, True);
 			break;
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
@@ -138,7 +141,7 @@ mmove(Client *c)
 			XFlush(dpy);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
-			resize(c);
+			resize(c, False);
 			break;
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);