summaryrefslogtreecommitdiff
path: root/dmenu.c
diff options
context:
space:
mode:
authorConnor Lane Smith <cls@lubutu.com>2010-06-23 13:49:24 +0100
committerConnor Lane Smith <cls@lubutu.com>2010-06-23 13:49:24 +0100
commit2ec16d9cb2661c834e346b4cdef29449ddc2f29c (patch)
treebdb51334d4e2302489bc719e0ea584f49acdf815 /dmenu.c
parent146bc23c118c40c26df7f2e96b46100649673fc7 (diff)
cleaned up
Diffstat (limited to 'dmenu.c')
-rw-r--r--dmenu.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/dmenu.c b/dmenu.c
index 339f949..8b40aa7 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -54,6 +54,7 @@ static char text[4096];
static int cmdw = 0;
static int promptw = 0;
static int ret = 0;
+static unsigned int lines = 0;
static unsigned int numlockmask = 0;
static Bool running = True;
static Item *allitems = NULL; /* first of all items */
@@ -65,9 +66,14 @@ static Item *curr = NULL;
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;
+Display *dpy;
+DC dc;
+int screen;
+unsigned int mw, mh;
+Window parent;
+
void
appenditem(Item *i, Item **list, Item **last) {
if(!(*last))
@@ -131,6 +137,14 @@ cistrstr(const char *s, const char *sub) {
void
cleanup(void) {
+ Item *itm;
+
+ while(allitems) {
+ itm = allitems->next;
+ free(allitems->text);
+ free(allitems);
+ allitems = itm;
+ }
drawcleanup();
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);