treusing config.h's color values, note we have to use const char *, instead of const char [] here, because the pointer might change - dmenu - Dmenu fork with xft fonts.
(HTM) git clone git://r-36.net/dmenu
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit d2305e4b136b3bdfccf7de897a9f14583a1ca35a
(DIR) parent fcf26a38f1ad291cd794daa52e44af252b728b6a
(HTM) Author: Anselm R Garbe <garbeam@gmail.com>
Date: Sat, 14 Jun 2008 10:55:13 +0100
reusing config.h's color values, note we have to use const char *, instead of const char [] here, because the pointer might change
Diffstat:
config.h | 14 +++++++-------
dmenu.c | 21 ++++++++-------------
2 files changed, 15 insertions(+), 20 deletions(-)
---
(DIR) diff --git a/config.h b/config.h
t@@ -1,14 +1,14 @@
/* See LICENSE file for copyright and license details. */
/* appearance */
-#define FONT "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
-#define NORMBGCOLOR "#cccccc"
-#define NORMFGCOLOR "#000000"
-#define SELBGCOLOR "#0066ff"
-#define SELFGCOLOR "#ffffff"
+static const char *font = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
+static const char *normbgcolor = "#cccccc";
+static const char *normfgcolor = "#000000";
+static const char *selbgcolor = "#0066ff";
+static const char *selfgcolor = "#ffffff";
-static uint spaceitem = 30; /* px between menu items */
+static uint spaceitem = 30; /* px between menu items */
#ifdef XINERAMA
-static uint xidx = 0; /* Xinerama screen index to use */
+static uint xidx = 0; /* Xinerama screen index to use */
#endif
(DIR) diff --git a/dmenu.c b/dmenu.c
t@@ -68,13 +68,8 @@ static int textw(const char *text);
#include "config.h"
/* variables */
-static char *font = FONT;
static char *maxname = NULL;
-static char *normbg = NORMBGCOLOR;
-static char *normfg = NORMFGCOLOR;
static char *prompt = NULL;
-static char *selbg = SELBGCOLOR;
-static char *selfg = SELFGCOLOR;
static char text[4096];
static int cmdw = 0;
static int promptw = 0;
t@@ -618,10 +613,10 @@ setup(Bool topbar) {
XFreeModifiermap(modmap);
/* style */
- dc.norm[ColBG] = getcolor(normbg);
- dc.norm[ColFG] = getcolor(normfg);
- dc.sel[ColBG] = getcolor(selbg);
- dc.sel[ColFG] = getcolor(selfg);
+ dc.norm[ColBG] = getcolor(normbgcolor);
+ dc.norm[ColFG] = getcolor(normfgcolor);
+ dc.sel[ColBG] = getcolor(selbgcolor);
+ dc.sel[ColFG] = getcolor(selfgcolor);
initfont(font);
/* menu window */
t@@ -704,19 +699,19 @@ main(int argc, char *argv[]) {
if(++i < argc) font = argv[i];
}
else if(!strcmp(argv[i], "-nb")) {
- if(++i < argc) normbg = argv[i];
+ if(++i < argc) normbgcolor = argv[i];
}
else if(!strcmp(argv[i], "-nf")) {
- if(++i < argc) normfg = argv[i];
+ if(++i < argc) normfgcolor = argv[i];
}
else if(!strcmp(argv[i], "-p")) {
if(++i < argc) prompt = argv[i];
}
else if(!strcmp(argv[i], "-sb")) {
- if(++i < argc) selbg = argv[i];
+ if(++i < argc) selbgcolor = argv[i];
}
else if(!strcmp(argv[i], "-sf")) {
- if(++i < argc) selfg = argv[i];
+ if(++i < argc) selfgcolor = argv[i];
}
else if(!strcmp(argv[i], "-v"))
eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");