removed CONFIG

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 0c920e5..dffb490 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>


@@ -31,7 +30,7 @@ drawborder(void)
 }
 
 static unsigned int
 }
 
 static unsigned int

-textnw(char *text, unsigned int len)
+textnw(const char *text, unsigned int len)

 {
        XRectangle r;
 
 {
        XRectangle r;
 


@@ -99,7 +98,7 @@ drawall()
 {
        Client *c;
 
 {
        Client *c;
 

-       for(c = clients; c; c = getnext(c->next, tsel))
+       for(c = clients; c; c = getnext(c->next))

                drawtitle(c);
        drawstatus();
 }
                drawtitle(c);
        drawstatus();
 }


@@ -115,7 +114,7 @@ drawstatus()
        drawtext(NULL, !istile, False);
 
        dc.w = 0;
        drawtext(NULL, !istile, False);
 
        dc.w = 0;

-       for(i = 0; i < TLast; i++) {
+       for(i = 0; i < ntags; i++) {

                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)
                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)


@@ -154,11 +153,11 @@ drawtitle(Client *c)
        dc.x = dc.y = 0;
 
        dc.w = 0;
        dc.x = dc.y = 0;
 
        dc.w = 0;

-       for(i = 0; i < TLast; i++) {
+       for(i = 0; i < ntags; i++) {

                if(c->tags[i]) {
                        dc.x += dc.w;
                if(c->tags[i]) {
                        dc.x += dc.w;

-                       dc.w = textw(c->tags[i]);
-                       drawtext(c->tags[i], !istile, True);
+                       dc.w = textw(tags[i]);
+                       drawtext(tags[i], !istile, True);

                }
        }
        dc.x += dc.w;
                }
        }
        dc.x += dc.w;


@@ -230,7 +229,7 @@ setfont(const char *fontstr)
 }
 
 unsigned int
 }
 
 unsigned int

-textw(char *text)
+textw(const char *text)

 {
        return textnw(text, strlen(text)) + dc.font.height;
 }
 {
        return textnw(text, strlen(text)) + dc.font.height;
 }