renamed char prop[] into buf[]

[dwm.git] / screen.c

diff --git a/screen.c b/screen.c
index 03387eb..ec8637f 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -28,7 +28,7 @@ typedef struct {
 TAGS
 RULES
 
-static char prop[512];
+static char buf[512];
 static unsigned int nrules = 0;
 static unsigned int nlayouts = 0;
 static unsigned int ltidx = 0; /* default */
@@ -57,13 +57,13 @@ 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';
+       for(i = 0; i < ntags && i < sizeof buf - 1; i++)
+               buf[i] = seltags[i] ? '1' : '0';
+       if(i < sizeof buf - 1)
+               buf[i++] = (char)ltidx + '0';
+       buf[i] = '\0';
        XChangeProperty(dpy, root, dwmprops, XA_STRING, 8,
-                       PropModeReplace, (unsigned char *)prop, i);
+                       PropModeReplace, (unsigned char *)buf, i);
 }
 
 LAYOUTS
@@ -81,11 +81,11 @@ applyrules(Client *c) {
 
        /* 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++)
-               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)) {
@@ -219,12 +219,12 @@ 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];
+       if(gettextprop(root, dwmprops, buf, sizeof buf)) {
+               for(i = 0; i < ntags && i < sizeof buf - 1 && buf[i] != '\0'; i++)
+                       seltags[i] = buf[i] == '1';
+               if(i < sizeof buf - 1 && buf[i] != '\0') {
+                       if((unsigned int)(buf[i] - '0') < nlayouts)
+                               ltidx = buf[i] - '0';
                }
        }
 }
@@ -370,6 +370,32 @@ 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;