X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.h;h=84e19e6c48965e69e2ce7b1072fb9cbe3228988c;hb=2772c51e79a5bfdf60103da02af63d972fecf9cf;hp=2a8796f23a7424f2ffcc3631bb142aa415e8b7fd;hpb=65be999a3f76ad51fb97e12f2fb481f5038f6817;p=dmenu.git

diff --git a/dmenu.h b/dmenu.h
index 2a8796f..84e19e6 100644
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,46 +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;
-	unsigned long fg;
-	unsigned long border;
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
 	Drawable drawable;
-	Fnt font;
 	GC gc;
-};
-
-extern int screen;
-extern Display *dpy;
-extern DC dc;
+	struct {
+		XFontStruct *xfont;
+		XFontSet set;
+		int ascent;
+		int descent;
+		int height;
+	} font;
+} DC; /* draw context */
+
+int screen;
+Display *dpy;
+DC dc;			/* global drawing context */
 
 /* draw.c */
-extern void drawtext(const char *text, Bool invert, Bool border);
-extern unsigned long getcolor(const char *colstr);
-extern void setfont(const char *fontstr);
-extern unsigned int textw(const char *text);
+void drawtext(const char *text, unsigned long col[ColLast]);
+unsigned int textw(const char *text);
+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);
+void *emalloc(unsigned int size);		/* allocates memory, exits on error */
+void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
+char *estrdup(const char *str);			/* duplicates str, exits on allocation error */