renamed seltag into seltags

diff --git a/draw.c b/draw.c
index ced0dfd..f7135d7 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -55,7 +55,7 @@ drawstatus(void) {
        dc.x = dc.y = 0;
        for(i = 0; i < ntags; i++) {
                dc.w = textw(tags[i]);
        dc.x = dc.y = 0;
        for(i = 0; i < ntags; i++) {
                dc.w = textw(tags[i]);

-               if(seltag[i]) {
+               if(seltags[i]) {

                        drawtext(tags[i], dc.sel);
                        drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
                }
                        drawtext(tags[i], dc.sel);
                        drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
                }

diff --git a/dwm.h b/dwm.h
index 0786dab..f527a3f 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -82,7 +82,7 @@ extern unsigned int bh, blw, bpos;            /* bar height, bar layout label width, bar p
 extern unsigned int ntags, numlockmask;                /* number of tags, numlock mask */
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
 extern Atom dwmconfig, wmatom[WMLast], netatom[NetLast];
 extern unsigned int ntags, numlockmask;                /* number of tags, numlock mask */
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
 extern Atom dwmconfig, wmatom[WMLast], netatom[NetLast];

-extern Bool selscreen, *seltag;                        /* seltag is array of Bool */
+extern Bool selscreen, *seltags;               /* seltags is array of Bool */

 extern Client *clients, *sel, *stack;          /* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */
 extern Client *clients, *sel, *stack;          /* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */

diff --git a/main.c b/main.c
index 6d84a77..0ae288c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -21,7 +21,7 @@ unsigned int bh, ntags;
 unsigned int bpos = BARPOS;
 unsigned int numlockmask = 0;
 Atom dwmconfig, wmatom[WMLast], netatom[NetLast];
 unsigned int bpos = BARPOS;
 unsigned int numlockmask = 0;
 Atom dwmconfig, wmatom[WMLast], netatom[NetLast];

-Bool *seltag;
+Bool *seltags;

 Bool selscreen = True;
 Client *clients = NULL;
 Client *sel = NULL;
 Bool selscreen = True;
 Client *clients = NULL;
 Client *sel = NULL;


@@ -57,7 +57,7 @@ cleanup(void) {
        XFreeCursor(dpy, cursor[CurMove]);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
        XFreeCursor(dpy, cursor[CurMove]);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);

-       free(seltag);
+       free(seltags);

 }
 
 static unsigned long
 }
 
 static unsigned long


@@ -170,8 +170,8 @@ setup(void) {
        grabkeys();
        compileregs();
        for(ntags = 0; tags[ntags]; ntags++);
        grabkeys();
        compileregs();
        for(ntags = 0; tags[ntags]; ntags++);

-       seltag = emallocz(sizeof(Bool) * ntags);
-       seltag[0] = True;
+       seltags = emallocz(sizeof(Bool) * ntags);
+       seltags[0] = True;

        /* style */
        dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
        dc.norm[ColBG] = initcolor(NORMBGCOLOR);
        /* style */
        dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
        dc.norm[ColBG] = initcolor(NORMBGCOLOR);

diff --git a/tag.c b/tag.c
index a0ddb0d..0b155c0 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -84,7 +84,7 @@ isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               if(c->tags[i] && seltag[i])
+               if(c->tags[i] && seltags[i])

                        return True;
        return False;
 }
                        return True;
        return False;
 }


@@ -139,7 +139,7 @@ settags(Client *c, Client *trans) {
        }
        if(!matched)
                for(i = 0; i < ntags; i++)
        }
        if(!matched)
                for(i = 0; i < ntags; i++)

-                       c->tags[i] = seltag[i];
+                       c->tags[i] = seltags[i];

        persistconfig(c);
 }
 
        persistconfig(c);
 }
 


@@ -190,10 +190,10 @@ toggleview(const char *arg) {
        unsigned int i, j;
 
        i = idxoftag(arg);
        unsigned int i, j;
 
        i = idxoftag(arg);

-       seltag[i] = !seltag[i];
-       for(j = 0; j < ntags && !seltag[j]; j++);
+       seltags[i] = !seltags[i];
+       for(j = 0; j < ntags && !seltags[j]; j++);

        if(j == ntags)
        if(j == ntags)

-               seltag[i] = True; /* cannot toggle last view */
+               seltags[i] = True; /* cannot toggle last view */

        arrange();
 }
 
        arrange();
 }
 


@@ -202,9 +202,9 @@ view(const char *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               seltag[i] = arg == NULL;
+               seltags[i] = arg == NULL;

        i = idxoftag(arg);
        if(i >= 0 && i < ntags)
        i = idxoftag(arg);
        if(i >= 0 && i < ntags)

-               seltag[i] = True;
+               seltags[i] = True;

        arrange();
 }
        arrange();
 }