t* dwm + patches
URI git clone git://git.codevoid.de/dwm-sdk
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit ceea528eff5ccd1bbd11696209fdc60a5383cc41
DIR parent 6c5dc7017cff322b6402b3849c07529f5ab916fe
URI Author: Anselm R. Garbe <arg@suckless.org>
Date: Sun, 14 Jan 2007 22:32:26 +0100
removed mode label stuff
Diffstat:
M config.arg.h | 2 +-
M config.default.h | 2 +-
M draw.c | 2 +-
M dwm.h | 4 +---
M main.c | 4 ++--
M view.c | 8 --------
6 files changed, 6 insertions(+), 16 deletions(-)
---
DIR diff --git a/config.arg.h b/config.arg.h
t@@ -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"
DIR diff --git a/config.default.h b/config.default.h
t@@ -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"
DIR diff --git a/draw.c b/draw.c
t@@ -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;
DIR diff --git a/dwm.h b/dwm.h
t@@ -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 */
t@@ -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 */
DIR diff --git a/main.c b/main.c
t@@ -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;
t@@ -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;
DIR diff --git a/view.c b/view.c
t@@ -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
t@@ -217,7 +216,6 @@ togglefloat(Arg *arg) {
void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
- updatemodetext();
if(sel)
arrange();
else
t@@ -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;