new colorscheme (16-bit compliant)
This commit is contained in:
parent
7e476fb86b
commit
2091200c95
13
bar.c
13
bar.c
@ -69,7 +69,8 @@ initfont(const char *fontstr) {
|
|||||||
if(dc.font.xfont)
|
if(dc.font.xfont)
|
||||||
XFreeFont(dpy, dc.font.xfont);
|
XFreeFont(dpy, dc.font.xfont);
|
||||||
dc.font.xfont = NULL;
|
dc.font.xfont = NULL;
|
||||||
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
|
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
|
||||||
|
|| !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
|
||||||
eprint("error, cannot load font: '%s'\n", fontstr);
|
eprint("error, cannot load font: '%s'\n", fontstr);
|
||||||
dc.font.ascent = dc.font.xfont->ascent;
|
dc.font.ascent = dc.font.xfont->ascent;
|
||||||
dc.font.descent = dc.font.xfont->descent;
|
dc.font.descent = dc.font.xfont->descent;
|
||||||
@ -186,9 +187,7 @@ drawbar(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
initbar(void) {
|
initstyle(void) {
|
||||||
XSetWindowAttributes wa;
|
|
||||||
|
|
||||||
dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
|
dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
|
||||||
dc.norm[ColBG] = initcolor(NORMBGCOLOR);
|
dc.norm[ColBG] = initcolor(NORMBGCOLOR);
|
||||||
dc.norm[ColFG] = initcolor(NORMFGCOLOR);
|
dc.norm[ColFG] = initcolor(NORMFGCOLOR);
|
||||||
@ -197,6 +196,12 @@ initbar(void) {
|
|||||||
dc.sel[ColFG] = initcolor(SELFGCOLOR);
|
dc.sel[ColFG] = initcolor(SELFGCOLOR);
|
||||||
initfont(FONT);
|
initfont(FONT);
|
||||||
dc.h = bh = dc.font.height + 2;
|
dc.h = bh = dc.font.height + 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
initbar(void) {
|
||||||
|
XSetWindowAttributes wa;
|
||||||
|
|
||||||
wa.override_redirect = 1;
|
wa.override_redirect = 1;
|
||||||
wa.background_pixmap = ParentRelative;
|
wa.background_pixmap = ParentRelative;
|
||||||
wa.event_mask = ButtonPressMask | ExposureMask;
|
wa.event_mask = ButtonPressMask | ExposureMask;
|
||||||
|
14
config.h
14
config.h
@ -4,19 +4,11 @@
|
|||||||
#define BARPOS BarTop /* BarBot, BarOff */
|
#define BARPOS BarTop /* BarBot, BarOff */
|
||||||
#define BORDERPX 1
|
#define BORDERPX 1
|
||||||
#define FONT "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
|
#define FONT "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
|
||||||
#define DARK /* LIGHT */
|
#define NORMBORDERCOLOR "#333"
|
||||||
#ifdef DARK
|
|
||||||
#define NORMBORDERCOLOR "#222"
|
|
||||||
#define NORMBGCOLOR "#000"
|
#define NORMBGCOLOR "#000"
|
||||||
#define NORMFGCOLOR "#ddd"
|
#define NORMFGCOLOR "#ccc"
|
||||||
#define SELBORDERCOLOR "#09f"
|
|
||||||
#else
|
|
||||||
#define NORMBORDERCOLOR "#666"
|
|
||||||
#define NORMBGCOLOR "#eee"
|
|
||||||
#define NORMFGCOLOR "#222"
|
|
||||||
#define SELBORDERCOLOR "#f00"
|
#define SELBORDERCOLOR "#f00"
|
||||||
#endif
|
#define SELBGCOLOR "#00f"
|
||||||
#define SELBGCOLOR "#369"
|
|
||||||
#define SELFGCOLOR "#fff"
|
#define SELFGCOLOR "#fff"
|
||||||
|
|
||||||
/* tagging */
|
/* tagging */
|
||||||
|
1
dwm.h
1
dwm.h
@ -91,6 +91,7 @@ extern Window root, barwin;
|
|||||||
/* bar.c */
|
/* bar.c */
|
||||||
void drawbar(void); /* draw the bar */
|
void drawbar(void); /* draw the bar */
|
||||||
void initbar(void); /* initializes the bar */
|
void initbar(void); /* initializes the bar */
|
||||||
|
void initstyle(void); /* initializes colors and font */
|
||||||
unsigned int textw(const char *text); /* return the width of text in px*/
|
unsigned int textw(const char *text); /* return the width of text in px*/
|
||||||
void togglebar(const char *arg); /* shows/hides the bar */
|
void togglebar(const char *arg); /* shows/hides the bar */
|
||||||
void updatebarpos(void); /* updates the bar position */
|
void updatebarpos(void); /* updates the bar position */
|
||||||
|
1
main.c
1
main.c
@ -148,6 +148,7 @@ setup(void) {
|
|||||||
sx = sy = 0;
|
sx = sy = 0;
|
||||||
sw = DisplayWidth(dpy, screen);
|
sw = DisplayWidth(dpy, screen);
|
||||||
sh = DisplayHeight(dpy, screen);
|
sh = DisplayHeight(dpy, screen);
|
||||||
|
initstyle();
|
||||||
initlayouts();
|
initlayouts();
|
||||||
initbar();
|
initbar();
|
||||||
/* multihead support */
|
/* multihead support */
|
||||||
|
Loading…
Reference in New Issue
Block a user