setlayout should perform strcmp's if arg != NULL, because Layout is local to screen.o

[dwm.git] / screen.c

diff --git a/screen.c b/screen.c
index 03387eb..8d04911 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <X11/Xatom.h>

 #include <X11/Xutil.h>
 
 /* static */
 #include <X11/Xutil.h>
 
 /* static */


@@ -28,7 +27,6 @@ typedef struct {
 TAGS
 RULES
 
 TAGS
 RULES
 

-static char prop[512];

 static unsigned int nrules = 0;
 static unsigned int nlayouts = 0;
 static unsigned int ltidx = 0; /* default */
 static unsigned int nrules = 0;
 static unsigned int nlayouts = 0;
 static unsigned int ltidx = 0; /* default */


@@ -53,19 +51,6 @@ floating(void) { /* default floating layout */
                        resize(c, c->x, c->y, c->w, c->h, True);
 }
 
                        resize(c, c->x, c->y, c->w, c->h, True);
 }
 

-static void
-setdwmprops(void) {
-       unsigned int i;
-
-       for(i = 0; i < ntags && i < sizeof prop - 1; i++)
-               prop[i] = seltags[i] ? '1' : '0';
-       if(i < sizeof prop - 1)
-               prop[i++] = (char)ltidx;
-       prop[i] = '\0';
-       XChangeProperty(dpy, root, dwmprops, XA_STRING, 8,
-                       PropModeReplace, (unsigned char *)prop, i);
-}
-

 LAYOUTS
 
 /* extern */
 LAYOUTS
 
 /* extern */


@@ -74,6 +59,7 @@ unsigned int blw = 0;
 
 void
 applyrules(Client *c) {
 
 void
 applyrules(Client *c) {

+       static char buf[512];

        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = False;
        unsigned int i, j;
        regmatch_t tmp;
        Bool matched = False;


@@ -81,11 +67,11 @@ applyrules(Client *c) {
 
        /* rule matching */
        XGetClassHint(dpy, c->win, &ch);
 
        /* rule matching */
        XGetClassHint(dpy, c->win, &ch);

-       snprintf(prop, sizeof prop, "%s:%s:%s",
+       snprintf(buf, sizeof buf, "%s:%s:%s",

                        ch.res_class ? ch.res_class : "",
                        ch.res_name ? ch.res_name : "", c->name);
        for(i = 0; i < nrules; i++)
                        ch.res_class ? ch.res_class : "",
                        ch.res_name ? ch.res_name : "", c->name);
        for(i = 0; i < nrules; i++)

-               if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
+               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {

                        c->isfloating = rules[i].isfloating;
                        for(j = 0; regs[i].tagregex && j < ntags; j++) {
                                if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                        c->isfloating = rules[i].isfloating;
                        for(j = 0; regs[i].tagregex && j < ntags; j++) {
                                if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {


@@ -215,20 +201,6 @@ isvisible(Client *c) {
        return False;
 }
 
        return False;
 }
 

-void
-getdwmprops(void) {
-       unsigned int i;
-
-       if(gettextprop(root, dwmprops, prop, sizeof prop)) {
-               for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
-                       seltags[i] = prop[i] == '1';
-               if(i < sizeof prop - 1 && prop[i] != '\0') {
-                       if(prop[i] < nlayouts)
-                               ltidx = prop[i];
-               }
-       }
-}
-

 Client *
 nexttiled(Client *c) {
        for(; c && (c->isfloating || !isvisible(c)); c = c->next);
 Client *
 nexttiled(Client *c) {
        for(; c && (c->isfloating || !isvisible(c)); c = c->next);


@@ -266,15 +238,17 @@ restack(void) {
 
 void
 setlayout(const char *arg) {
 
 void
 setlayout(const char *arg) {

-       int i;
+       unsigned int i;

 
        if(!arg) {
                if(++ltidx == nlayouts)
                        ltidx = 0;;
        }
        else {
 
        if(!arg) {
                if(++ltidx == nlayouts)
                        ltidx = 0;;
        }
        else {

-               i = atoi(arg);
-               if(i < 0 || i >= nlayouts)
+               for(i = 0; i < nlayouts; i++)
+                       if(!strcmp(arg, layouts[i].symbol))
+                               break;
+               if(i == nlayouts)

                        return;
                ltidx = i;
        }
                        return;
                ltidx = i;
        }


@@ -282,7 +256,6 @@ setlayout(const char *arg) {
                arrange();
        else
                drawstatus();
                arrange();
        else
                drawstatus();

-       setdwmprops();

 }
 
 void
 }
 
 void


@@ -296,7 +269,6 @@ tag(const char *arg) {
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;

-       setprops(sel);

        arrange();
 }
 
        arrange();
 }
 


@@ -315,10 +287,8 @@ togglefloating(const char *arg) {
        if(!sel || isfloating())
                return;
        sel->isfloating = !sel->isfloating;
        if(!sel || isfloating())
                return;
        sel->isfloating = !sel->isfloating;

-       if(sel->isfloating) {
+       if(sel->isfloating)

                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);

-               setprops(sel);
-       }

        arrange();
 }
 
        arrange();
 }
 


@@ -352,7 +322,6 @@ toggletag(const char *arg) {
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;

-       setprops(sel);

        arrange();
 }
 
        arrange();
 }
 


@@ -365,10 +334,35 @@ toggleview(const char *arg) {
        for(j = 0; j < ntags && !seltags[j]; j++);
        if(j == ntags)
                seltags[i] = True; /* cannot toggle last view */
        for(j = 0; j < ntags && !seltags[j]; j++);
        if(j == ntags)
                seltags[i] = True; /* cannot toggle last view */

-       setdwmprops();

        arrange();
 }
 
        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;
 void
 view(const char *arg) {
        unsigned int i;


@@ -378,6 +372,5 @@ view(const char *arg) {
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                seltags[i] = True;
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                seltags[i] = True;

-       setdwmprops();

        arrange();
 }
        arrange();
 }