X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.h;h=015e808aa312fc13580328794b416bc18c6a62d8;hb=b97783b07feae30f9df12c1a720d17a2dc877018;hp=8d630baaac260889d884ebf1f7bbcee0c492dc3d;hpb=7817523a685f0dbba2e074a448099558a54b1b9c;p=dmenu.git

diff --git a/dmenu.h b/dmenu.h
index 8d630ba..015e808 100644
--- a/dmenu.h
+++ b/dmenu.h
@@ -1,58 +1,41 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#include "config.h"
+/* See LICENSE file for copyright and license details. */
 #include <X11/Xlib.h>
-#include <X11/Xlocale.h>
 
-typedef struct Brush Brush;
-typedef struct DC DC;
-typedef struct Fnt Fnt;
+#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
+#define NORMBGCOLOR		"#eeeeee"
+#define NORMFGCOLOR		"#222222"
+#define SELBGCOLOR		"#006699"
+#define SELFGCOLOR		"#ffffff"
+#define SPACE			30 /* px */
 
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
-	int ascent;
-	int descent;
-	int height;
-};
+/* color */
+enum { ColFG, ColBG, ColLast };
 
-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;
-};
-
-struct Brush {
 	GC gc;
-	Drawable drawable;
-	int x, y, w, h;
-	Fnt font;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
-};
-
-
+	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 draw(Display *dpy, Brush *b, Bool border, const char *text);
-extern void loadcolors(Display *dpy, int screen, Brush *b,
-		const char *bg, const char *fg, const char *bo);
-extern void loadfont(Display *dpy, Fnt *font, const char *fontstr);
-extern unsigned int textnw(Fnt *font, char *text, unsigned int len);
-extern unsigned int textw(Fnt *font, char *text);
-extern unsigned int texth(Fnt *font);
+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 *emallocz(unsigned int size);
-extern void eprint(const char *errstr, ...);
-extern char *estrdup(const char *str);
-extern void swap(void **p1, void **p2);
+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 */