git.stevedylan.dev

config.arg.h +2 −2

#define NORMFGCOLOR		"#cccccc"
#define STATUSBGCOLOR		"#dddddd"
#define STATUSFGCOLOR		"#222222"
#define FLOATSYMBOL		"><"
#define TILESYMBOL		"|="
#define FLOATSYMBOL		"><>"
#define TILESYMBOL		"[]="

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

draw.c +6 −3

	dc.x = dc.y = 0;
	dc.w = bw;

	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
	dc.w = modew;
	drawtext(NULL, dc.status, False);
	for(i = 0; i < ntags; i++) {
		dc.x += dc.w;
		dc.w = textw(tags[i]);
		if(seltag[i])
			drawtext(tags[i], dc.sel, sel && sel->tags[i]);
		else
			drawtext(tags[i], dc.norm, sel && sel->tags[i]);
		dc.x += dc.w;
	}

	dc.w = bmw;
	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);

	x = dc.x + dc.w;
	dc.w = textw(stext);
	dc.x = bx + bw - dc.w;

dwm.h +2 −2


extern const char *tags[];
extern char stext[1024];
extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
extern unsigned int ntags, numlockmask, modew;
extern int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
extern unsigned int ntags, numlockmask;
extern void (*handler[LASTEvent])(XEvent *);
extern void (*arrange)(Arg *);
extern Atom wmatom[WMLast], netatom[NetLast];

event.c +11 −13

	XButtonPressedEvent *ev = &e->xbutton;

	if(barwin == ev->window) {
		if(ev->x < modew)
			togglemode(NULL);
		else {
			x = modew;
			for(a.i = 0; a.i < ntags; a.i++) {
				x += textw(tags[a.i]);
				if(ev->x < x) {
					if(ev->button == Button1)
						view(&a);
					else if(ev->button == Button3)
						toggleview(&a);
					return;
				}
		x = 0;
		for(a.i = 0; a.i < ntags; a.i++) {
			x += textw(tags[a.i]);
			if(ev->x < x) {
				if(ev->button == Button1)
					view(&a);
				else if(ev->button == Button3)
					toggleview(&a);
				return;
			}
		}
		if(ev->x < x + bmw)
			togglemode(NULL);
	}
	else if((c = getclient(ev->window))) {
		focus(c);

main.c +3 −3


char stext[1024];
Bool *seltag;
int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
unsigned int ntags, numlockmask, modew;
int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
unsigned int ntags, numlockmask;
Atom wmatom[WMLast], netatom[NetLast];
Bool running = True;
Bool issel = True;

	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
	setfont(FONT);

	modew = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
	bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
	sx = sy = 0;
	sw = DisplayWidth(dpy, screen);
	sh = DisplayHeight(dpy, screen);

15	15		#define NORMFGCOLOR "#cccccc"
16	16		#define STATUSBGCOLOR "#dddddd"
17	17		#define STATUSFGCOLOR "#222222"
18		-	#define FLOATSYMBOL "><"
19		-	#define TILESYMBOL "\|="
	18	+	#define FLOATSYMBOL "><>"
	19	+	#define TILESYMBOL "[]="
20	20
21	21		#define MODKEY Mod1Mask
22	22		#define MASTERW 60 /* percent */

99	99		dc.x = dc.y = 0;
100	100		dc.w = bw;
101	101
102		-	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
103		-	dc.w = modew;
	102	+	drawtext(NULL, dc.status, False);
104	103		for(i = 0; i < ntags; i++) {
105		-	dc.x += dc.w;
106	104		dc.w = textw(tags[i]);
107	105		if(seltag[i])
108	106		drawtext(tags[i], dc.sel, sel && sel->tags[i]);
109	107		else
110	108		drawtext(tags[i], dc.norm, sel && sel->tags[i]);
	109	+	dc.x += dc.w;
111	110		}
	111	+
	112	+	dc.w = bmw;
	113	+	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
	114	+
112	115		x = dc.x + dc.w;
113	116		dc.w = textw(stext);
114	117		dc.x = bx + bw - dc.w;

68	68
69	69		extern const char *tags[];
70	70		extern char stext[1024];
71		-	extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
72		-	extern unsigned int ntags, numlockmask, modew;
	71	+	extern int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
	72	+	extern unsigned int ntags, numlockmask;
73	73		extern void (handler[LASTEvent])(XEvent );
74	74		extern void (arrange)(Arg );
75	75		extern Atom wmatom[WMLast], netatom[NetLast];

105	105		XButtonPressedEvent *ev = &e->xbutton;
106	106
107	107		if(barwin == ev->window) {
108		-	if(ev->x < modew)
109		-	togglemode(NULL);
110		-	else {
111		-	x = modew;
112		-	for(a.i = 0; a.i < ntags; a.i++) {
113		-	x += textw(tags[a.i]);
114		-	if(ev->x < x) {
115		-	if(ev->button == Button1)
116		-	view(&a);
117		-	else if(ev->button == Button3)
118		-	toggleview(&a);
119		-	return;
120		-	}
	108	+	x = 0;
	109	+	for(a.i = 0; a.i < ntags; a.i++) {
	110	+	x += textw(tags[a.i]);
	111	+	if(ev->x < x) {
	112	+	if(ev->button == Button1)
	113	+	view(&a);
	114	+	else if(ev->button == Button3)
	115	+	toggleview(&a);
	116	+	return;
121	117		}
122	118		}
	119	+	if(ev->x < x + bmw)
	120	+	togglemode(NULL);
123	121		}
124	122		else if((c = getclient(ev->window))) {
125	123		focus(c);

19	19
20	20		char stext[1024];
21	21		Bool *seltag;
22		-	int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
23		-	unsigned int ntags, numlockmask, modew;
	22	+	int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
	23	+	unsigned int ntags, numlockmask;
24	24		Atom wmatom[WMLast], netatom[NetLast];
25	25		Bool running = True;
26	26		Bool issel = True;

129	129		dc.status[ColFG] = getcolor(STATUSFGCOLOR);
130	130		setfont(FONT);
131	131
132		-	modew = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
	132	+	bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
133	133		sx = sy = 0;
134	134		sw = DisplayWidth(dpy, screen);
135	135		sh = DisplayHeight(dpy, screen);