X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.h;h=21746885bde8e173d9e837b6f1cf3baa9a6d9d69;hb=d8b48d64e168d515ade6631e75ce202f26e00f2d;hp=a739fa53764dcd354653eeff4099d3b3d0049545;hpb=e980c7ff1814b533f674eec535af6c5658b1bc62;p=dmenu.git

diff --git a/dmenu.h b/dmenu.h
index a739fa5..2174688 100644
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,45 +1,44 @@
-/*
- * (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 "config.h"
 #include <X11/Xlib.h>
-#include <X11/Xlocale.h>
 
-#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 */
 
-typedef struct DC DC;
-typedef struct Fnt Fnt;
+/* color */
+enum { ColFG, ColBG, ColLast };
 
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
-	int ascent;
-	int descent;
-	int height;
-};
-
-struct DC { /* draw context */
+typedef struct {
 	int x, y, w, h;
-	unsigned long bg[2];
-	unsigned long fg[2];
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
 	Drawable drawable;
-	Fnt font;
 	GC gc;
-};
+	struct {
+		XFontStruct *xfont;
+		XFontSet set;
+		int ascent;
+		int descent;
+		int height;
+	} font;
+} DC; /* draw context */
 
 extern int screen;
 extern Display *dpy;
-extern DC dc;
+extern DC dc;			/* global drawing context */
 
 /* draw.c */
-extern void drawtext(const char *text, unsigned int colidx, Bool border);
-extern unsigned long getcolor(const char *colstr);
-extern void setfont(const char *fontstr);
+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);
-extern void eprint(const char *errstr, ...);
-extern char *estrdup(const char *str);
+extern void *emalloc(unsigned int size);		/* allocates memory, exits on error */
+extern void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
+extern char *estrdup(const char *str);			/* duplicates str, exits on allocation error */