fixed the issue observed by various people, that clients appeared on empty tags

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 5161ae2..cf983b8 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -27,6 +27,29 @@ static Regs *regs = NULL;
 static unsigned int nrules = 0;
 static char prop[512];
 
+static void
+persistconfig(Client *c) {
+       unsigned int i;
+
+       for(i = 0; i < ntags && i < sizeof prop - 1; i++)
+               prop[i] = c->tags[i] ? '1' : '0';
+       if(i < sizeof prop - 1)
+               prop[i++] = c->isfloating ? '1' : '0';
+       prop[i] = '\0';
+       XChangeProperty(dpy, c->win, dwmconfig, XA_STRING, 8,
+                       PropModeReplace, (unsigned char *)prop, i);
+}
+
+static unsigned int
+idxoftag(const char *tag) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(tags[i] == tag)
+                       return i;
+       return 0;
+}
+
 /* extern */
 
 void
@@ -77,22 +100,23 @@ settags(Client *c, Client *trans) {
        if(matched) {
                for(i = 0; i < ntags; i++)
                        c->tags[i] = trans->tags[i];
-               return;
        }
        else {
                /* check if window has set a property */
                name.nitems = 0;
-               XGetTextProperty(dpy, c->win, &name, dwmtags);
+               XGetTextProperty(dpy, c->win, &name, dwmconfig);
                if(name.nitems && name.encoding == XA_STRING) {
                        strncpy(prop, (char *)name.value, sizeof prop - 1);
                        prop[sizeof prop - 1] = '\0';
                        XFree(name.value);
                        for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
-                               if((c->tags[i] = prop[i] == '+'))
+                               if((c->tags[i] = prop[i] == '1'))
                                        matched = True;
+                       if(i < sizeof prop - 1 && prop[i] != '\0')
+                               c->isfloating = prop[i] == '1';
                }
-               if(matched)
-                       return;
+       }
+       if(!matched) {
                /* rule matching */
                XGetClassHint(dpy, c->win, &ch);
                snprintf(prop, sizeof prop, "%s:%s:%s",
@@ -116,47 +140,56 @@ settags(Client *c, Client *trans) {
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
+       persistconfig(c);
 }
 
 void
 tag(const char *arg) {
-       int i;
+       unsigned int i;
 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = arg == NULL;
-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                sel->tags[i] = True;
-       if(sel) {
-               for(i = 0; i < ntags && i < sizeof prop - 1; i++)
-                       prop[i] = sel->tags[i] ? '+' : '-';
-               prop[i] = '\0';
-               XChangeProperty(dpy, sel->win, dwmtags, XA_STRING, 8, PropModeReplace, (unsigned char *)prop, i);
+       persistconfig(sel);
+       arrange();
+}
+
+void
+togglefloating(const char *arg) {
+       if(!sel || isfloating())
+               return;
+       sel->isfloating = !sel->isfloating;
+       if(sel->isfloating) {
+               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+               persistconfig(sel);
        }
        arrange();
 }
 
 void
 toggletag(const char *arg) {
-       int i, j;
+       unsigned int i, j;
 
        if(!sel)
                return;
-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);
        sel->tags[i] = !sel->tags[i];
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;
+       persistconfig(sel);
        arrange();
 }
 
 void
 toggleview(const char *arg) {
-       int i, j;
+       unsigned int i, j;
 
-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);
        seltag[i] = !seltag[i];
        for(j = 0; j < ntags && !seltag[j]; j++);
        if(j == ntags)
@@ -166,11 +199,11 @@ toggleview(const char *arg) {
 
 void
 view(const char *arg) {
-       int i;
+       unsigned int i;
 
        for(i = 0; i < ntags; i++)
                seltag[i] = arg == NULL;
-       i = arg ? atoi(arg) : 0;
+       i = idxoftag(arg);
        if(i >= 0 && i < ntags)
                seltag[i] = True;
        arrange();