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

diff --git a/dmenu.h b/dmenu.h
index 8d630ba..a739fa5 100644
--- a/dmenu.h
+++ b/dmenu.h
@@ -7,7 +7,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xlocale.h>
 
-typedef struct Brush Brush;
+#define SPACE		30 /* px */
+
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
@@ -21,38 +22,24 @@ struct Fnt {
 
 struct DC { /* draw context */
 	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
+	unsigned long bg[2];
+	unsigned long fg[2];
 	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;
-};
-
-
+extern int screen;
+extern Display *dpy;
+extern DC dc;
 
 /* 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);
+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 unsigned int textw(const char *text);
 
 /* 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);