git.stevedylan.dev

config.arg.h +1 −1


#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"

config.default.h +1 −1


#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"

draw.c +1 −1

		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;

dwm.h +1 −3

};

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 */

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 */

main.c +2 −2


/* 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;

	sh = DisplayHeight(dpy, screen);
	master = MASTER;
	nmaster = NMASTER;
	updatemodetext();
	bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
	/* bar */
	bx = sx;
	by = sy;

view.c +0 −8

	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
		return;
	nmaster += arg->i;
	updatemodetext();
	if(sel)
		arrange();
	else

void
togglemode(Arg *arg) {
	arrange = (arrange == dofloat) ? dotile : dofloat;
	updatemodetext();
	if(sel)
		arrange();
	else

	if(i == ntags)
		seltag[arg->i] = True; /* cannot toggle last view */
	arrange();
}

void
updatemodetext() {
	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
	bmw = textw(mtext);
}

void

120	120		dc.x += dc.w;
121	121		}
122	122		dc.w = bmw;
123		-	drawtext(mtext, dc.status, False, False);
	123	+	drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
124	124		x = dc.x + dc.w;
125	125		dc.w = textw(stext);
126	126		dc.x = bw - dc.w;

90	90		};
91	91
92	92		extern const char tags[]; / all tags */
93		-	extern char stext[1024]; /* status text */
94		-	extern char mtext[32]; /* mode text */
	93	+	extern char stext[256]; /* status text */
95	94		extern int bx, by, bw, bh, bmw; /* bar geometry, bar mode label width */
96	95		extern int screen, sx, sy, sw, sh; /* screen geometry */
97	96		extern int wax, way, wah, waw; /* windowarea geometry */

163	162		extern void togglefloat(Arg arg); / toggles focusesd client between floating/non-floating state */
164	163		extern void togglemode(Arg arg); / toggles global arrange function (dotile/dofloat) */
165	164		extern void toggleview(Arg arg); / toggles the tag with arg's index (in)visible */
166		-	extern void updatemodetext(void); /* updates mtext */
167	165		extern void view(Arg arg); / views the tag with arg's index */
168	166		extern void zoom(Arg arg); / zooms the focused client to master area, arg is ignored */

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

134	134		sh = DisplayHeight(dpy, screen);
135	135		master = MASTER;
136	136		nmaster = NMASTER;
137		-	updatemodetext();
	137	+	bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
138	138		/* bar */
139	139		bx = sx;
140	140		by = sy;

152	152		if((arrange == dofloat) \|\| (nmaster + arg->i < 1) \|\| (wah / (nmaster + arg->i) < bh))
153	153		return;
154	154		nmaster += arg->i;
155		-	updatemodetext();
156	155		if(sel)
157	156		arrange();
158	157		else

217	216		void
218	217		togglemode(Arg *arg) {
219	218		arrange = (arrange == dofloat) ? dotile : dofloat;
220		-	updatemodetext();
221	219		if(sel)
222	220		arrange();
223	221		else

233	231		if(i == ntags)
234	232		seltag[arg->i] = True; /* cannot toggle last view */
235	233		arrange();
236		-	}
237		-
238		-	void
239		-	updatemodetext() {
240		-	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
241		-	bmw = textw(mtext);
242	234		}
243	235
244	236		void

7	7
8	8		#define DEFMODE dotile /* dofloat */
9	9		#define FLOATSYMBOL "><>"
10		-	#define TILESYMBOL "[%u]=" /* %u is replaced with nmaster */
	10	+	#define TILESYMBOL "[]="
11	11
12	12		#define FONT "--terminus-medium-r---14-------"
13	13		#define NORMBGCOLOR "#222"