From 5077207088b08e6b21601cb19925d20e9d5af573 Mon Sep 17 00:00:00 2001 From: "arg@10ksloc.org" Date: Fri, 4 Aug 2006 10:23:36 +0200 Subject: rearranged several stuff --- dmenu.h | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'dmenu.h') diff --git a/dmenu.h b/dmenu.h index 8d630ba..75b6266 100644 --- a/dmenu.h +++ b/dmenu.h @@ -7,6 +7,8 @@ #include #include +#define SPACE 30 /* px */ + typedef struct Brush Brush; typedef struct DC DC; typedef struct Fnt Fnt; @@ -29,30 +31,17 @@ struct DC { /* draw context */ 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, Bool invert, 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); -- cgit v1.2.3