removed a bunch of lines, made mode symbols configurable

diff --git a/config.arg.h b/config.arg.h
index 9423833..76f5fcc 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -15,6 +15,8 @@ const char *tags[] = { "work", "net", "fnord", NULL };
 #define NORMFGCOLOR            "#cccccc"
 #define STATUSBGCOLOR          "#dddddd"
 #define STATUSFGCOLOR          "#222222"
 #define NORMFGCOLOR            "#cccccc"
 #define STATUSBGCOLOR          "#dddddd"
 #define STATUSFGCOLOR          "#222222"

+#define FLOATSYMBOL            "><"
+#define TILEDSYMBOL            "|="

 
 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */
 
 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */

diff --git a/config.default.h b/config.default.h
index 7716916..ed09158 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -15,6 +15,8 @@ const char *tags[] = { "1", "2", "3", "4", "5", NULL };
 #define NORMFGCOLOR            "#cccccc"
 #define STATUSBGCOLOR          "#dddddd"
 #define STATUSFGCOLOR          "#222222"
 #define NORMFGCOLOR            "#cccccc"
 #define STATUSBGCOLOR          "#dddddd"
 #define STATUSFGCOLOR          "#222222"

+#define FLOATSYMBOL            "~"
+#define TILEDSYMBOL            "#"

 
 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */
 
 #define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */

diff --git a/draw.c b/draw.c
index fb4ba2e..d32e888 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -94,18 +94,13 @@ drawall()
 void
 drawstatus()
 {
 void
 drawstatus()
 {

-       static const char *mode[] = { "><", "|=" };

        int i, x;
 
        dc.x = dc.y = 0;
        dc.w = bw;
 
        int i, x;
 
        dc.x = dc.y = 0;
        dc.w = bw;
 

-       if(!modew)
-               modew = textw(mode[0]) > textw(mode[1]) ? textw(mode[0]) : textw(mode[1]);
-       drawtext(mode[arrange == dotile ? 1 : 0], dc.status, False);
-
-       dc.w = 0;
-       dc.x = modew;
+       drawtext(arrange == dotile ? TILEDSYMBOL : FLOATSYMBOL, dc.status, False);
+       dc.w = modew;

        for(i = 0; i < ntags; i++) {
                dc.x += dc.w;
                dc.w = textw(tags[i]);
        for(i = 0; i < ntags; i++) {
                dc.x += dc.w;
                dc.w = textw(tags[i]);

diff --git a/main.c b/main.c
index 0727c2a..7ada114 100644 (file)
--- a/main.c
+++ b/main.c
@@ -129,7 +129,7 @@ setup()
        dc.status[ColFG] = getcolor(STATUSFGCOLOR);
        setfont(FONT);
 
        dc.status[ColFG] = getcolor(STATUSFGCOLOR);
        setfont(FONT);
 

-       modew = 0;
+       modew = textw(FLOATSYMBOL) > textw(TILEDSYMBOL) ? textw(FLOATSYMBOL) : textw(TILEDSYMBOL);

        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);