implemented new color scheme accordingly to Sanders proposal
This commit is contained in:
parent
ceea528eff
commit
0045ad87df
|
@ -10,12 +10,12 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
|
||||||
#define TILESYMBOL "[]="
|
#define TILESYMBOL "[]="
|
||||||
|
|
||||||
#define FONT "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
|
#define FONT "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
|
||||||
|
#define NORMBORDERCOLOR "#333"
|
||||||
#define NORMBGCOLOR "#222"
|
#define NORMBGCOLOR "#222"
|
||||||
#define NORMFGCOLOR "#ccc"
|
#define NORMFGCOLOR "#ccc"
|
||||||
|
#define SELBORDERCOLOR "#9cf"
|
||||||
#define SELBGCOLOR "#444"
|
#define SELBGCOLOR "#444"
|
||||||
#define SELFGCOLOR "#fff"
|
#define SELFGCOLOR "#fff"
|
||||||
#define STATUSBGCOLOR "#333"
|
|
||||||
#define STATUSFGCOLOR "#9cf"
|
|
||||||
|
|
||||||
#define MASTER 600 /* per thousand */
|
#define MASTER 600 /* per thousand */
|
||||||
#define MODKEY Mod1Mask
|
#define MODKEY Mod1Mask
|
||||||
|
|
|
@ -10,12 +10,12 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
|
||||||
#define TILESYMBOL "[]="
|
#define TILESYMBOL "[]="
|
||||||
|
|
||||||
#define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
|
#define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
|
||||||
|
#define NORMBORDERCOLOR "#dddddd"
|
||||||
#define NORMBGCOLOR "#333366"
|
#define NORMBGCOLOR "#333366"
|
||||||
#define NORMFGCOLOR "#cccccc"
|
#define NORMFGCOLOR "#cccccc"
|
||||||
|
#define SELBORDERCOLOR "#222222"
|
||||||
#define SELBGCOLOR "#666699"
|
#define SELBGCOLOR "#666699"
|
||||||
#define SELFGCOLOR "#eeeeee"
|
#define SELFGCOLOR "#eeeeee"
|
||||||
#define STATUSBGCOLOR "#dddddd"
|
|
||||||
#define STATUSFGCOLOR "#222222"
|
|
||||||
|
|
||||||
#define MASTER 600 /* per thousand */
|
#define MASTER 600 /* per thousand */
|
||||||
#define MODKEY Mod1Mask
|
#define MODKEY Mod1Mask
|
||||||
|
|
8
draw.c
8
draw.c
|
@ -120,7 +120,7 @@ drawstatus(void) {
|
||||||
dc.x += dc.w;
|
dc.x += dc.w;
|
||||||
}
|
}
|
||||||
dc.w = bmw;
|
dc.w = bmw;
|
||||||
drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
|
drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
|
||||||
x = dc.x + dc.w;
|
x = dc.x + dc.w;
|
||||||
dc.w = textw(stext);
|
dc.w = textw(stext);
|
||||||
dc.x = bw - dc.w;
|
dc.x = bw - dc.w;
|
||||||
|
@ -128,7 +128,7 @@ drawstatus(void) {
|
||||||
dc.x = x;
|
dc.x = x;
|
||||||
dc.w = bw - x;
|
dc.w = bw - x;
|
||||||
}
|
}
|
||||||
drawtext(stext, dc.status, False, False);
|
drawtext(stext, dc.norm, False, False);
|
||||||
if((dc.w = dc.x - x) > bh) {
|
if((dc.w = dc.x - x) > bh) {
|
||||||
dc.x = x;
|
dc.x = x;
|
||||||
drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
|
drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
|
||||||
|
@ -141,10 +141,10 @@ void
|
||||||
drawclient(Client *c) {
|
drawclient(Client *c) {
|
||||||
if(c == sel && issel) {
|
if(c == sel && issel) {
|
||||||
drawstatus();
|
drawstatus();
|
||||||
XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
|
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
|
XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
|
||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
3
dwm.h
3
dwm.h
|
@ -43,7 +43,7 @@
|
||||||
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
|
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
|
||||||
enum { WMProtocols, WMDelete, WMLast }; /* default atoms */
|
enum { WMProtocols, WMDelete, WMLast }; /* default atoms */
|
||||||
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
||||||
enum { ColFG, ColBG, ColLast }; /* color */
|
enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
TopLeft, TopRight, BotLeft, BotRight
|
TopLeft, TopRight, BotLeft, BotRight
|
||||||
|
@ -66,7 +66,6 @@ typedef struct {
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
unsigned long norm[ColLast];
|
unsigned long norm[ColLast];
|
||||||
unsigned long sel[ColLast];
|
unsigned long sel[ColLast];
|
||||||
unsigned long status[ColLast];
|
|
||||||
Drawable drawable;
|
Drawable drawable;
|
||||||
Fnt font;
|
Fnt font;
|
||||||
GC gc;
|
GC gc;
|
||||||
|
|
4
main.c
4
main.c
|
@ -121,12 +121,12 @@ setup(void) {
|
||||||
seltag = emallocz(sizeof(Bool) * ntags);
|
seltag = emallocz(sizeof(Bool) * ntags);
|
||||||
seltag[0] = True;
|
seltag[0] = True;
|
||||||
/* style */
|
/* style */
|
||||||
|
dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
|
||||||
dc.norm[ColBG] = getcolor(NORMBGCOLOR);
|
dc.norm[ColBG] = getcolor(NORMBGCOLOR);
|
||||||
dc.norm[ColFG] = getcolor(NORMFGCOLOR);
|
dc.norm[ColFG] = getcolor(NORMFGCOLOR);
|
||||||
|
dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
|
||||||
dc.sel[ColBG] = getcolor(SELBGCOLOR);
|
dc.sel[ColBG] = getcolor(SELBGCOLOR);
|
||||||
dc.sel[ColFG] = getcolor(SELFGCOLOR);
|
dc.sel[ColFG] = getcolor(SELFGCOLOR);
|
||||||
dc.status[ColBG] = getcolor(STATUSBGCOLOR);
|
|
||||||
dc.status[ColFG] = getcolor(STATUSFGCOLOR);
|
|
||||||
setfont(FONT);
|
setfont(FONT);
|
||||||
/* geometry */
|
/* geometry */
|
||||||
sx = sy = 0;
|
sx = sy = 0;
|
||||||
|
|
Loading…
Reference in a new issue