cleaned up

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 5434eab..8b40aa7 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -37,7 +37,6 @@ static void cleanup(void);
 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
-static void eprint(const char *errstr, ...);
 static Bool grabkeyboard(void);
 static void kpress(XKeyEvent * e);
 static void match(char *pattern);
@@ -46,6 +45,7 @@ static void run(void);
 static void setup(Bool topbar);
 
 #include "config.h"
+#include "draw.h"
 
 /* variables */
 static char *maxname = NULL;
@@ -54,24 +54,25 @@ static char text[4096];
 static int cmdw = 0;
 static int promptw = 0;
 static int ret = 0;
-static int screen;
-static unsigned int mw, mh;
+static unsigned int lines = 0;
 static unsigned int numlockmask = 0;
 static Bool running = True;
-static Display *dpy;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;
-static Window parent, win;
+static Window win;
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
-static unsigned int lines = 0;
 static void (*calcoffsets)(void) = calcoffsetsh;
 
-#include "draw.c"
+Display *dpy;
+DC dc;
+int screen;
+unsigned int mw, mh;
+Window parent;
 
 void
 appenditem(Item *i, Item **list, Item **last) {
@@ -136,7 +137,15 @@ cistrstr(const char *s, const char *sub) {
 
 void
 cleanup(void) {
-       dccleanup();
+       Item *itm;
+
+       while(allitems) {
+               itm = allitems->next;
+               free(allitems->text);
+               free(allitems);
+               allitems = itm;
+       }
+       drawcleanup();
        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);
 }
@@ -202,16 +211,6 @@ drawmenuv(void) {
        drawtext(NULL, dc.norm);
 }
 
-void
-eprint(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
-}
-
 Bool
 grabkeyboard(void) {
        unsigned int len;
@@ -489,11 +488,6 @@ setup(Bool topbar) {
                }
        XFreeModifiermap(modmap);
 
-       /* style */
-       dc.norm[ColBG] = getcolor(normbgcolor);
-       dc.norm[ColFG] = getcolor(normfgcolor);
-       dc.sel[ColBG] = getcolor(selbgcolor);
-       dc.sel[ColFG] = getcolor(selfgcolor);
        initfont(font);
 
        /* menu window */
@@ -534,8 +528,7 @@ setup(Bool topbar) {
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-       /* pixmap */
-       dcsetup();
+       drawsetup();
        if(maxname)
                cmdw = MIN(textw(maxname), mw / 3);
        if(prompt)