implemented new color scheme accordingly to Sanders proposal 0045ad87
Anselm R. Garbe · 2007-01-14 22:37 5 file(s) · +11 −12
config.arg.h +2 −2
10 10
#define TILESYMBOL		"[]="
11 11
12 12
#define FONT			"-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
13 +
#define NORMBORDERCOLOR		"#333"
13 14
#define NORMBGCOLOR		"#222"
14 15
#define NORMFGCOLOR		"#ccc"
16 +
#define SELBORDERCOLOR		"#9cf"
15 17
#define SELBGCOLOR		"#444"
16 18
#define SELFGCOLOR		"#fff"
17 -
#define STATUSBGCOLOR		"#333"
18 -
#define STATUSFGCOLOR		"#9cf"
19 19
20 20
#define MASTER			600		/* per thousand */
21 21
#define MODKEY			Mod1Mask
config.default.h +2 −2
10 10
#define TILESYMBOL		"[]="
11 11
12 12
#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
13 +
#define NORMBORDERCOLOR		"#dddddd"
13 14
#define NORMBGCOLOR		"#333366"
14 15
#define NORMFGCOLOR		"#cccccc"
16 +
#define SELBORDERCOLOR		"#222222"
15 17
#define SELBGCOLOR		"#666699"
16 18
#define SELFGCOLOR		"#eeeeee"
17 -
#define STATUSBGCOLOR		"#dddddd"
18 -
#define STATUSFGCOLOR		"#222222"
19 19
20 20
#define MASTER			600		/* per thousand */
21 21
#define MODKEY			Mod1Mask
draw.c +4 −4
120 120
		dc.x += dc.w;
121 121
	}
122 122
	dc.w = bmw;
123 -
	drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
123 +
	drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
124 124
	x = dc.x + dc.w;
125 125
	dc.w = textw(stext);
126 126
	dc.x = bw - dc.w;
128 128
		dc.x = x;
129 129
		dc.w = bw - x;
130 130
	}
131 -
	drawtext(stext, dc.status, False, False);
131 +
	drawtext(stext, dc.norm, False, False);
132 132
	if((dc.w = dc.x - x) > bh) {
133 133
		dc.x = x;
134 134
		drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
141 141
drawclient(Client *c) {
142 142
	if(c == sel && issel) {
143 143
		drawstatus();
144 -
		XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
144 +
		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
145 145
		return;
146 146
	}
147 -
	XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
147 +
	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
148 148
	XSync(dpy, False);
149 149
}
150 150
dwm.h +1 −2
43 43
enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
44 44
enum { WMProtocols, WMDelete, WMLast };			/* default atoms */
45 45
enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
46 -
enum { ColFG, ColBG, ColLast };				/* color */
46 +
enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
47 47
48 48
typedef enum {
49 49
	TopLeft, TopRight, BotLeft, BotRight
66 66
	int x, y, w, h;
67 67
	unsigned long norm[ColLast];
68 68
	unsigned long sel[ColLast];
69 -
	unsigned long status[ColLast];
70 69
	Drawable drawable;
71 70
	Fnt font;
72 71
	GC gc;
main.c +2 −2
121 121
	seltag = emallocz(sizeof(Bool) * ntags);
122 122
	seltag[0] = True;
123 123
	/* style */
124 +
	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
124 125
	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
125 126
	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
127 +
	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
126 128
	dc.sel[ColBG] = getcolor(SELBGCOLOR);
127 129
	dc.sel[ColFG] = getcolor(SELFGCOLOR);
128 -
	dc.status[ColBG] = getcolor(STATUSBGCOLOR);
129 -
	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
130 130
	setfont(FONT);
131 131
	/* geometry */
132 132
	sx = sy = 0;