X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=screen.c;h=142ed56ee79471e2811517591da0ee2872930340;hb=2091200c957783deed032380d56c4199a23c6b81;hp=b534766cdb9ab57397705d21188461a81bf5108e;hpb=36672d0401299a5230b516ca4575365d9f45dd35;p=dwm.git

diff --git a/screen.c b/screen.c
index b534766..142ed56 100644
--- a/screen.c
+++ b/screen.c
@@ -3,6 +3,7 @@
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <X11/Xutil.h>
 
 /* static */
@@ -212,7 +213,7 @@ restack(void) {
 	XEvent ev;
 	XWindowChanges wc;
 
-	drawstatus();
+	drawbar();
 	if(!sel)
 		return;
 	if(sel->isfloating || isfloating())
@@ -245,7 +246,7 @@ setlayout(const char *arg) {
 	}
 	else {
 		for(i = 0; i < nlayouts; i++)
-			if(arg == layouts[i].symbol)
+			if(!strcmp(arg, layouts[i].symbol))
 				break;
 		if(i == nlayouts)
 			return;
@@ -254,7 +255,7 @@ setlayout(const char *arg) {
 	if(sel)
 		arrange();
 	else
-		drawstatus();
+		drawbar();
 }
 
 void
@@ -272,18 +273,8 @@ tag(const char *arg) {
 }
 
 void
-togglebar(const char *arg) {
-	if(bpos == BarOff)
-		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-	else
-		bpos = BarOff;
-	updatebarpos();
-	arrange();
-}
-
-void
 togglefloating(const char *arg) {
-	if(!sel || isfloating())
+	if(!sel)
 		return;
 	sel->isfloating = !sel->isfloating;
 	if(sel->isfloating)
@@ -306,7 +297,7 @@ togglemax(const char *arg) {
 	}
 	else
 		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-	drawstatus();
+	drawbar();
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
@@ -337,32 +328,6 @@ toggleview(const char *arg) {
 }
 
 void
-updatebarpos(void) {
-	XEvent ev;
-
-	wax = sx;
-	way = sy;
-	wah = sh;
-	waw = sw;
-	switch(bpos) {
-	default:
-		wah -= bh;
-		way += bh;
-		XMoveWindow(dpy, barwin, sx, sy);
-		break;
-	case BarBot:
-		wah -= bh;
-		XMoveWindow(dpy, barwin, sx, sy + wah);
-		break;
-	case BarOff:
-		XMoveWindow(dpy, barwin, sx, sy - bh);
-		break;
-	}
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
 view(const char *arg) {
 	unsigned int i;