applied the fix inspired by a recent wmii commit

[dmenu.git] / dmenu.h

diff --git a/dmenu.h b/dmenu.h
index b58a32b..bb3b144 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,17 +1,15 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
 #include <X11/Xlib.h>
-#include <X11/Xlocale.h>
 
-#define FONT                   "fixed"
-#define NORMBGCOLOR            "#333366"
-#define NORMFGCOLOR            "#cccccc"
-#define SELBGCOLOR             "#666699"
-#define SELFGCOLOR             "#eeeeee"
-#define SPACE          30 /* px */
+#define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
+#define NORMBGCOLOR            "#eeeeee"
+#define NORMFGCOLOR            "#222222"
+#define SELBGCOLOR             "#006699"
+#define SELFGCOLOR             "#ffffff"
+#define SPACE                  30 /* px */
 
 /* color */
 enum { ColFG, ColBG, ColLast };
@@ -41,12 +39,9 @@ extern Display *dpy;
 extern DC dc;                  /* global drawing context */
 
 /* draw.c */
-extern void drawtext(const char *text,
-                       unsigned long col[ColLast]);    /* draws text with the defined color tuple */
-extern unsigned long getcolor(
-       const char *colstr, const char *alternate);     /* returns color of colstr */
-extern void setfont(const char *fontstr);              /* sets global font */
-extern unsigned int textw(const char *text);           /* returns width of text in px */
+extern void drawtext(const char *text, unsigned long col[ColLast]);
+extern unsigned int textw(const char *text);
+extern unsigned int textnw(const char *text, unsigned int len);
 
 /* util.c */
 extern void *emalloc(unsigned int size);               /* allocates memory, exits on error */