X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.h;h=21746885bde8e173d9e837b6f1cf3baa9a6d9d69;hb=de3463988319271f504b5e3deb13f598470acd0d;hp=b58a32b120e24cbe80f850856cc2b53882597450;hpb=3b590beda2fb23400f74394badd7a5231d4d7920;p=dmenu.git

diff --git a/dmenu.h b/dmenu.h
index b58a32b..2174688 100644
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,52 +1,42 @@
-/*
- * (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 };
 
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
-	int ascent;
-	int descent;
-	int height;
-};
-
-struct DC {
+typedef struct {
 	int x, y, w, h;
 	unsigned long norm[ColLast];
 	unsigned long sel[ColLast];
 	Drawable drawable;
-	Fnt font;
 	GC gc;
-}; /* draw context */
+	struct {
+		XFontStruct *xfont;
+		XFontSet set;
+		int ascent;
+		int descent;
+		int height;
+	} font;
+} DC; /* draw context */
 
 extern int screen;
 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 */