Merge remote-tracking branch 'upstream/master'

Conflicts:
	bar.c
This commit is contained in:
Georg Reinke
2012-08-17 13:35:32 +02:00
3 changed files with 50 additions and 39 deletions

View File

@@ -1,12 +1,13 @@
/* The height of the bar (in pixels) */
#define BAR_HEIGHT 18
/* The thickness of the underline (in pixels) */
/* Choose between an underline or an overline */
#define BAR_UNDERLINE 1
/* The thickness of the underline (in pixels). Set to 0 to disable. */
#define BAR_UNDERLINE_HEIGHT 2
/* Default bar position, overwritten by '-b' switch */
#define BAR_BOTTOM 0
/* The font used for the bar */
#define BAR_MAIN_FONT "-*-terminus-medium-r-normal-*-12-*-*-*-c-*-*-1"
#define BAR_FALLBACK_FONT "fixed"
/* The fonts used for the bar, comma separated. Only the first 2 will be used. */
#define BAR_FONT "-*-terminus-medium-r-normal-*-12-*-*-*-c-*-*-1","fixed"
/* Color palette */
#define COLOR0 0x1A1A1A /* background */
#define COLOR1 0xA9A9A9 /* foreground */