X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwm.c;h=dfc452a5606d7896edc328d11647792aba4450ef;hb=e3838e85855d051190bde6c77265bc72b53a9d04;hp=ec37588b1316baa359101196890fcbdeec2e7644;hpb=9463d5354bc57d0c0086b7328196d7af60ed706d;p=dwm.git

diff --git a/dwm.c b/dwm.c
index ec37588..dfc452a 100644
--- a/dwm.c
+++ b/dwm.c
@@ -324,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);
 		}
 	}
@@ -662,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;
@@ -1478,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];
@@ -1554,10 +1554,10 @@ updategeom(void) {
 	/* window area geometry */
 	if(XineramaIsActive(dpy)) {
 		info = XineramaQueryScreens(dpy, &i);
-		wx = info[0].x_org;
-		wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
-		ww = info[0].width;
-		wh = showbar ? info[0].height - bh : info[0].height;
+		wx = info[xidx].x_org;
+		wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
+		ww = info[xidx].width;
+		wh = showbar ? info[xidx].height - bh : info[xidx].height;
 		XFree(info);
 	}
 	else