X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=95b94cc36f85151dde5b650a8550f1d2771600f6;hb=0464e42231199d7a6ea45e46cf7798f2b6cf972c;hp=0f0382371f9ed65584fecbd2d689a511a3530ae3;hpb=11737233a7ce6bc656bc7bc061c68eeda824ee9b;p=dwm.git

diff --git a/event.c b/event.c
index 0f03823..95b94cc 100644
--- a/event.c
+++ b/event.c
@@ -23,57 +23,57 @@ 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_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 } }, 
-	{ 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 } },
+	/* modifier		key		function	arguments */
+	{ MODKEY,		XK_0,		view,		{ .i = Tfnord } }, 
+	{ MODKEY,		XK_1,		view,		{ .i = Tdev } }, 
+	{ 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 } },
+	{ 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 = 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 } },
+	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } },
+	{ MODKEY|ShiftMask,	XK_w,		spawn,		{ .argv = browse } },
+	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
 };
 
+/* END CUSTOMIZE */
+
 /* static */
 
 static void
 movemouse(Client *c)
 {
-	XEvent ev;
 	int x1, y1, ocx, ocy, di;
 	unsigned int dui;
 	Window dummy;
+	XEvent ev;
 
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
-				None, cursor[CurMove], CurrentTime) != GrabSuccess)
+			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
@@ -99,9 +99,9 @@ movemouse(Client *c)
 static void
 resizemouse(Client *c)
 {
-	XEvent ev;
 	int ocx, ocy;
 	Corner sticky;
+	XEvent ev;
 
 	ocx = c->x;
 	ocy = c->y;
@@ -140,8 +140,8 @@ buttonpress(XEvent *e)
 {
 	int x;
 	Arg a;
-	XButtonPressedEvent *ev = &e->xbutton;
 	Client *c;
+	XButtonPressedEvent *ev = &e->xbutton;
 
 	if(barwin == ev->window) {
 		switch(ev->button) {
@@ -170,11 +170,7 @@ buttonpress(XEvent *e)
 		default:
 			break;
 		case Button1:
-			if(arrange == dotile && !c->isfloat) {
-				if((ev->state & ControlMask) && (ev->button == Button1))
-					zoom(NULL);
-			}
-			else {
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
 				higher(c);
 				movemouse(c);
 			}
@@ -183,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);
 			}
@@ -195,9 +191,9 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
+	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
-	Client *c;
 
 	ev->value_mask &= ~CWSibling;
 	if((c = getclient(ev->window))) {
@@ -242,8 +238,8 @@ destroynotify(XEvent *e)
 static void
 enternotify(XEvent *e)
 {
-	XCrossingEvent *ev = &e->xcrossing;
 	Client *c;
+	XCrossingEvent *ev = &e->xcrossing;
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
@@ -257,8 +253,8 @@ enternotify(XEvent *e)
 static void
 expose(XEvent *e)
 {
-	XExposeEvent *ev = &e->xexpose;
 	Client *c;
+	XExposeEvent *ev = &e->xexpose;
 
 	if(ev->count == 0) {
 		if(barwin == ev->window)
@@ -271,10 +267,10 @@ expose(XEvent *e)
 static void
 keypress(XEvent *e)
 {
-	XKeyEvent *ev = &e->xkey;
-	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;
 
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < len; i++)
@@ -297,8 +293,8 @@ leavenotify(XEvent *e)
 static void
 maprequest(XEvent *e)
 {
-	XMapRequestEvent *ev = &e->xmaprequest;
 	static XWindowAttributes wa;
+	XMapRequestEvent *ev = &e->xmaprequest;
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
@@ -316,9 +312,9 @@ maprequest(XEvent *e)
 static void
 propertynotify(XEvent *e)
 {
-	XPropertyEvent *ev = &e->xproperty;
-	Window trans;
 	Client *c;
+	Window trans;
+	XPropertyEvent *ev = &e->xproperty;
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
@@ -374,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;