diff options
| -rw-r--r-- | config.arg.h | 2 | ||||
| -rw-r--r-- | config.default.h | 2 | ||||
| -rw-r--r-- | draw.c | 2 | ||||
| -rw-r--r-- | dwm.h | 4 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | view.c | 8 |
6 files changed, 6 insertions, 16 deletions
diff --git a/config.arg.h b/config.arg.h index 180395a..92f01b7 100644 --- a/config.arg.h +++ b/config.arg.h @@ -7,7 +7,7 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL }; #define DEFMODE dotile /* dofloat */ #define FLOATSYMBOL "><>" -#define TILESYMBOL "[%u]=" /* %u is replaced with nmaster */ +#define TILESYMBOL "[]=" #define FONT "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*" #define NORMBGCOLOR "#222" diff --git a/config.default.h b/config.default.h index 73dc489..afd8e85 100644 --- a/config.default.h +++ b/config.default.h @@ -7,7 +7,7 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL }; #define DEFMODE dotile /* dofloat */ #define FLOATSYMBOL "><>" -#define TILESYMBOL "[%u]=" /* %u is replaced with nmaster */ +#define TILESYMBOL "[]=" #define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*" #define NORMBGCOLOR "#333366" @@ -120,7 +120,7 @@ drawstatus(void) { dc.x += dc.w; } dc.w = bmw; - drawtext(mtext, dc.status, False, False); + drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False); x = dc.x + dc.w; dc.w = textw(stext); dc.x = bw - dc.w; @@ -90,8 +90,7 @@ struct Client { }; extern const char *tags[]; /* all tags */ -extern char stext[1024]; /* status text */ -extern char mtext[32]; /* mode text */ +extern char stext[256]; /* status text */ extern int bx, by, bw, bh, bmw; /* bar geometry, bar mode label width */ extern int screen, sx, sy, sw, sh; /* screen geometry */ extern int wax, way, wah, waw; /* windowarea geometry */ @@ -163,6 +162,5 @@ extern void restack(void); /* restores z layers of all clients */ extern void togglefloat(Arg *arg); /* toggles focusesd client between floating/non-floating state */ extern void togglemode(Arg *arg); /* toggles global arrange function (dotile/dofloat) */ extern void toggleview(Arg *arg); /* toggles the tag with arg's index (in)visible */ -extern void updatemodetext(void); /* updates mtext */ extern void view(Arg *arg); /* views the tag with arg's index */ extern void zoom(Arg *arg); /* zooms the focused client to master area, arg is ignored */ @@ -17,7 +17,7 @@ /* extern */ -char stext[1024], mtext[32]; +char stext[256]; Bool *seltag; int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah; unsigned int master, nmaster, ntags, numlockmask; @@ -134,7 +134,7 @@ setup(void) { sh = DisplayHeight(dpy, screen); master = MASTER; nmaster = NMASTER; - updatemodetext(); + bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); /* bar */ bx = sx; by = sy; @@ -152,7 +152,6 @@ incnmaster(Arg *arg) { if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) return; nmaster += arg->i; - updatemodetext(); if(sel) arrange(); else @@ -217,7 +216,6 @@ togglefloat(Arg *arg) { void togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; - updatemodetext(); if(sel) arrange(); else @@ -236,12 +234,6 @@ toggleview(Arg *arg) { } void -updatemodetext() { - snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster); - bmw = textw(mtext); -} - -void view(Arg *arg) { unsigned int i; |