X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=29af1bd29499d67dbf7b212b822fef51a54ddc70;hp=7a6c591e2e3347a66e13d52975343ab822e1ccb6;hb=016dca4f694cb51c7db77aeeefcb55b8869f3842;hpb=e5a965a27480c8b27cfb4884cc8f4988924d1087

diff --git a/dwm.c b/dwm.c
index 7a6c591..29af1bd 100644
--- a/dwm.c
+++ b/dwm.c
@@ -51,7 +51,6 @@
 #define LENGTH(x)       (sizeof x / sizeof x[0])
 #define MAXTAGLEN       16
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
-#define SHCMD(cmd)      { .v = (char*[]){ "/bin/sh", "-c", cmd, NULL } }
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
 #define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
 
@@ -225,13 +224,11 @@ static Client *stack = NULL;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc = {0};
+static Layout *lt = NULL;
 static Window root, barwin;
-
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-static Layout *lt = layouts;
-
 /* compile-time check if all tags fit into an uint bit array. */
 struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 
@@ -327,9 +324,9 @@ buttonpress(XEvent *e) {
 			}
 		}
 		if(ev->x < x + blw) {
-			if(ev->button == Button1) 
+			if(ev->button == Button1)
 				togglelayout(NULL);
-			else if(ev->button == Button3) 
+			else if(ev->button == Button3)
 				togglemax(NULL);
 		}
 	}
@@ -665,7 +662,7 @@ focusstack(const Arg *arg) {
 		for(i = clients; i != sel; i = i->next)
 			if (!i->isbanned)
 				c = i;
-		if(!c) 
+		if(!c)
 			for(; i; i = i->next)
 				if (!i->isbanned)
 					c = i;
@@ -1326,6 +1323,7 @@ setup(void) {
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	bh = dc.font.height + 2;
+	lt = layouts;
 	updategeom();
 
 	/* init atoms */
@@ -1480,7 +1478,7 @@ togglefloating(const Arg *arg) {
 
 void
 togglelayout(const Arg *arg) {
-	if(arg->v)
+	if(arg && arg->v)
 		lt = (Layout *)arg->v;
 	else if(++lt == &layouts[LENGTH(layouts)])
 		lt = &layouts[0];