all repos — dwm @ 1d4a24dae02cfb3a3241c3d293e96dba910317bd

my dwm build

implemented nmaster appearance in mode label (using %u)
Anselm R. Garbe arg@suckless.org
Mon, 08 Jan 2007 17:33:24 +0100
commit

1d4a24dae02cfb3a3241c3d293e96dba910317bd

parent

a768ea93fdb3adfa33b3ea7ccc7abfe86a2bfb2a

7 files changed, 18 insertions(+), 8 deletions(-)

jump to
M config.arg.hconfig.arg.h

@@ -7,7 +7,7 @@ const char *tags[] = { "home", "net", "www", "mon", "fnord", NULL };

#define DEFMODE dotile /* dofloat */ #define FLOATSYMBOL "><>" -#define TILESYMBOL "[]=" +#define TILESYMBOL "[%u]=" #define FONT "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*" #define NORMBGCOLOR "#111111"
M config.default.hconfig.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 "[]=" +#define TILESYMBOL "[%u]=" #define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*" #define NORMBGCOLOR "#333366"
M config.mkconfig.mk

@@ -1,5 +1,5 @@

# dwm version -VERSION = 2.9 +VERSION = 3.0 # Customize below to fit your system
M draw.cdraw.c

@@ -120,7 +120,7 @@ drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));

dc.x += dc.w; } dc.w = bmw; - drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False); + drawtext(mtext, dc.status, False, False); x = dc.x + dc.w; dc.w = textw(stext); dc.x = bw - dc.w;
M dwm.hdwm.h

@@ -93,6 +93,7 @@ };

extern const char *tags[]; /* all tags */ extern char stext[1024]; /* status text */ +extern char mtext[32]; /* mode 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 */
M main.cmain.c

@@ -17,7 +17,7 @@ #include <X11/Xproto.h>

/* extern */ -char stext[1024]; +char stext[1024], mtext[32]; Bool *seltag; int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah; unsigned int master, nmaster, ntags, numlockmask;

@@ -128,12 +128,13 @@ dc.status[ColBG] = getcolor(STATUSBGCOLOR);

dc.status[ColFG] = getcolor(STATUSFGCOLOR); setfont(FONT); /* geometry */ - bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); sx = sy = 0; sw = DisplayWidth(dpy, screen); sh = DisplayHeight(dpy, screen); master = MASTER; nmaster = NMASTER; + snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster); + bmw = textw(mtext); /* bar */ bx = sx; by = sy;
M view.cview.c

@@ -2,6 +2,7 @@ /* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

* See LICENSE file for license details. */ #include "dwm.h" +#include <stdio.h> /* static */

@@ -149,10 +150,15 @@ }

void incnmaster(Arg *arg) { - if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) + if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) return; nmaster += arg->i; - arrange(); + snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster); + bmw = textw(mtext); + if(sel) + arrange(); + else + drawstatus(); } Bool

@@ -218,6 +224,8 @@

void togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; + snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster); + bmw = textw(mtext); if(sel) arrange(); else