aewl

changeset 689:cbec08a54a15

implemented new color scheme accordingly to Sanders proposal
author Anselm R. Garbe <arg@suckless.org>
date Sun, 14 Jan 2007 22:37:34 +0100
parents 39fa5308d73f
children 399f08187c27
files config.arg.h config.default.h draw.c dwm.h main.c
diffstat 5 files changed, 11 insertions(+), 12 deletions(-) [+]
line diff
     1.1 --- a/config.arg.h	Sun Jan 14 22:32:26 2007 +0100
     1.2 +++ b/config.arg.h	Sun Jan 14 22:37:34 2007 +0100
     1.3 @@ -10,12 +10,12 @@
     1.4  #define TILESYMBOL		"[]="
     1.5  
     1.6  #define FONT			"-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
     1.7 +#define NORMBORDERCOLOR		"#333"
     1.8  #define NORMBGCOLOR		"#222"
     1.9  #define NORMFGCOLOR		"#ccc"
    1.10 +#define SELBORDERCOLOR		"#9cf"
    1.11  #define SELBGCOLOR		"#444"
    1.12  #define SELFGCOLOR		"#fff"
    1.13 -#define STATUSBGCOLOR		"#333"
    1.14 -#define STATUSFGCOLOR		"#9cf"
    1.15  
    1.16  #define MASTER			600		/* per thousand */
    1.17  #define MODKEY			Mod1Mask
     2.1 --- a/config.default.h	Sun Jan 14 22:32:26 2007 +0100
     2.2 +++ b/config.default.h	Sun Jan 14 22:37:34 2007 +0100
     2.3 @@ -10,12 +10,12 @@
     2.4  #define TILESYMBOL		"[]="
     2.5  
     2.6  #define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
     2.7 +#define NORMBORDERCOLOR		"#dddddd"
     2.8  #define NORMBGCOLOR		"#333366"
     2.9  #define NORMFGCOLOR		"#cccccc"
    2.10 +#define SELBORDERCOLOR		"#222222"
    2.11  #define SELBGCOLOR		"#666699"
    2.12  #define SELFGCOLOR		"#eeeeee"
    2.13 -#define STATUSBGCOLOR		"#dddddd"
    2.14 -#define STATUSFGCOLOR		"#222222"
    2.15  
    2.16  #define MASTER			600		/* per thousand */
    2.17  #define MODKEY			Mod1Mask
     3.1 --- a/draw.c	Sun Jan 14 22:32:26 2007 +0100
     3.2 +++ b/draw.c	Sun Jan 14 22:37:34 2007 +0100
     3.3 @@ -120,7 +120,7 @@
     3.4  		dc.x += dc.w;
     3.5  	}
     3.6  	dc.w = bmw;
     3.7 -	drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
     3.8 +	drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
     3.9  	x = dc.x + dc.w;
    3.10  	dc.w = textw(stext);
    3.11  	dc.x = bw - dc.w;
    3.12 @@ -128,7 +128,7 @@
    3.13  		dc.x = x;
    3.14  		dc.w = bw - x;
    3.15  	}
    3.16 -	drawtext(stext, dc.status, False, False);
    3.17 +	drawtext(stext, dc.norm, False, False);
    3.18  	if((dc.w = dc.x - x) > bh) {
    3.19  		dc.x = x;
    3.20  		drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
    3.21 @@ -141,10 +141,10 @@
    3.22  drawclient(Client *c) {
    3.23  	if(c == sel && issel) {
    3.24  		drawstatus();
    3.25 -		XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
    3.26 +		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
    3.27  		return;
    3.28  	}
    3.29 -	XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
    3.30 +	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
    3.31  	XSync(dpy, False);
    3.32  }
    3.33  
     4.1 --- a/dwm.h	Sun Jan 14 22:32:26 2007 +0100
     4.2 +++ b/dwm.h	Sun Jan 14 22:37:34 2007 +0100
     4.3 @@ -43,7 +43,7 @@
     4.4  enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
     4.5  enum { WMProtocols, WMDelete, WMLast };			/* default atoms */
     4.6  enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
     4.7 -enum { ColFG, ColBG, ColLast };				/* color */
     4.8 +enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
     4.9  
    4.10  typedef enum {
    4.11  	TopLeft, TopRight, BotLeft, BotRight
    4.12 @@ -66,7 +66,6 @@
    4.13  	int x, y, w, h;
    4.14  	unsigned long norm[ColLast];
    4.15  	unsigned long sel[ColLast];
    4.16 -	unsigned long status[ColLast];
    4.17  	Drawable drawable;
    4.18  	Fnt font;
    4.19  	GC gc;
     5.1 --- a/main.c	Sun Jan 14 22:32:26 2007 +0100
     5.2 +++ b/main.c	Sun Jan 14 22:37:34 2007 +0100
     5.3 @@ -121,12 +121,12 @@
     5.4  	seltag = emallocz(sizeof(Bool) * ntags);
     5.5  	seltag[0] = True;
     5.6  	/* style */
     5.7 +	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
     5.8  	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
     5.9  	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
    5.10 +	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
    5.11  	dc.sel[ColBG] = getcolor(SELBGCOLOR);
    5.12  	dc.sel[ColFG] = getcolor(SELFGCOLOR);
    5.13 -	dc.status[ColBG] = getcolor(STATUSBGCOLOR);
    5.14 -	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
    5.15  	setfont(FONT);
    5.16  	/* geometry */
    5.17  	sx = sy = 0;