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 cb1a2c4..cf983b8 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -40,6 +40,16 @@ persistconfig(Client *c) {
                        PropModeReplace, (unsigned char *)prop, i);
 }
 
                        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
 /* extern */
 
 void


@@ -135,17 +145,16 @@ settags(Client *c, Client *trans) {
 
 void
 tag(const char *arg) {
 
 void
 tag(const char *arg) {

-       int i;
+       unsigned int i;

 
        if(!sel)
                return;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = arg == NULL;
 
        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(i >= 0 && i < ntags)
                sel->tags[i] = True;

-       if(sel)
-               persistconfig(sel);
+       persistconfig(sel);

        arrange();
 }
 
        arrange();
 }
 


@@ -154,32 +163,33 @@ 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);

+               persistconfig(sel);
+       }

        arrange();
 }
 
 void
 toggletag(const char *arg) {
        arrange();
 }
 
 void
 toggletag(const char *arg) {

-       int i, j;
+       unsigned int i, j;

 
        if(!sel)
                return;
 
        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;
        sel->tags[i] = !sel->tags[i];
        for(j = 0; j < ntags && !sel->tags[j]; j++);
        if(j == ntags)
                sel->tags[i] = True;

-       if(sel)
-               persistconfig(sel);
+       persistconfig(sel);

        arrange();
 }
 
 void
 toggleview(const char *arg) {
        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)
        seltag[i] = !seltag[i];
        for(j = 0; j < ntags && !seltag[j]; j++);
        if(j == ntags)


@@ -189,11 +199,11 @@ toggleview(const char *arg) {
 
 void
 view(const char *arg) {
 
 void
 view(const char *arg) {

-       int i;
+       unsigned int i;

 
        for(i = 0; i < ntags; i++)
                seltag[i] = arg == NULL;
 
        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();
        if(i >= 0 && i < ntags)
                seltag[i] = True;
        arrange();