X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=95b94cc36f85151dde5b650a8550f1d2771600f6;hb=0464e42231199d7a6ea45e46cf7798f2b6cf972c;hp=5d7c8a7175f13341471505ec8a92d4c42e2145f2;hpb=4688ad181da14be36e034918580ec0ce5968ffdb;p=dwm.git

diff --git a/event.c b/event.c
index 5d7c8a7..95b94cc 100644
--- a/event.c
+++ b/event.c
@@ -23,34 +23,33 @@ typedef struct {
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
 const char *term[] = { 
-	"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
+	"urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
 	"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
 };
 const char *xlock[] = { "xlock", NULL };
 
 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 } }, 
-	{ MODKEY,		XK_0,		view,		{ .i = Tscratch } }, 
+	{ MODKEY,		XK_0,		view,		{ .i = Tfnord } }, 
 	{ MODKEY,		XK_1,		view,		{ .i = Tdev } }, 
-	{ MODKEY,		XK_2,		view,		{ .i = Twww } }, 
+	{ MODKEY,		XK_2,		view,		{ .i = Tnet } }, 
 	{ MODKEY,		XK_3,		view,		{ .i = Twork } }, 
+	{ MODKEY,		XK_4,		view,		{ .i = Tmisc} }, 
 	{ MODKEY,		XK_j,		focusnext,	{ 0 } }, 
 	{ MODKEY,		XK_k,		focusprev,	{ 0 } },
 	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, 
 	{ MODKEY,		XK_space,	togglemode,	{ 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 } }, 
-	{ MODKEY|ShiftMask,	XK_0,		replacetag,	{ .i = Tscratch } }, 
+	{ MODKEY|ControlMask,	XK_0,		appendtag,	{ .i = Tfnord } }, 
+	{ MODKEY|ControlMask,	XK_1,		appendtag,	{ .i = Tdev } }, 
+	{ MODKEY|ControlMask,	XK_2,		appendtag,	{ .i = Tnet } }, 
+	{ MODKEY|ControlMask,	XK_3,		appendtag,	{ .i = Twork } }, 
+	{ MODKEY|ControlMask,	XK_4,		appendtag,	{ .i = Tmisc } }, 
+	{ MODKEY|ShiftMask,	XK_0,		replacetag,	{ .i = Tfnord } }, 
 	{ MODKEY|ShiftMask,	XK_1,		replacetag,	{ .i = Tdev } }, 
-	{ MODKEY|ShiftMask,	XK_2,		replacetag,	{ .i = Twww } }, 
+	{ MODKEY|ShiftMask,	XK_2,		replacetag,	{ .i = Tnet } }, 
 	{ MODKEY|ShiftMask,	XK_3,		replacetag,	{ .i = Twork } }, 
+	{ MODKEY|ShiftMask,	XK_4,		replacetag,	{ .i = Tmisc } }, 
 	{ MODKEY|ShiftMask,	XK_c,		killclient,	{ 0 } }, 
 	{ MODKEY|ShiftMask,	XK_g,		spawn,		{ .argv = gimp } },
 	{ MODKEY|ShiftMask,	XK_l,		spawn,		{ .argv = xlock } },
@@ -59,6 +58,8 @@ static Key key[] = {
 	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
 };
 
+/* END CUSTOMIZE */
+
 /* static */
 
 static void
@@ -169,7 +170,7 @@ buttonpress(XEvent *e)
 		default:
 			break;
 		case Button1:
-			if(arrange == dofloat || c->isfloat) {
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
 				higher(c);
 				movemouse(c);
 			}
@@ -178,7 +179,7 @@ buttonpress(XEvent *e)
 			lower(c);
 			break;
 		case Button3:
-			if(arrange == dofloat || c->isfloat) {
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
 				higher(c);
 				resizemouse(c);
 			}
@@ -266,7 +267,7 @@ expose(XEvent *e)
 static void
 keypress(XEvent *e)
 {
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
@@ -369,7 +370,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 void
 grabkeys()
 {
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeyCode code;