new colorscheme (16-bit compliant)

[dwm.git] / screen.c

diff --git a/screen.c b/screen.c
index b534766..142ed56 100644 (file)
--- 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
@@ -271,19 +272,9 @@ tag(const char *arg) {
        arrange();
 }
 
-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));
 }
 
@@ -336,32 +327,6 @@ toggleview(const char *arg) {
        arrange();
 }
 
-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;