cleaned up
This commit is contained in:
parent
146bc23c11
commit
2ec16d9cb2
6
dinput.c
6
dinput.c
@ -43,6 +43,12 @@ static unsigned int numlockmask = 0;
|
|||||||
static Bool running = True;
|
static Bool running = True;
|
||||||
static Window win;
|
static Window win;
|
||||||
|
|
||||||
|
Display *dpy;
|
||||||
|
DC dc;
|
||||||
|
int screen;
|
||||||
|
unsigned int mw, mh;
|
||||||
|
Window parent;
|
||||||
|
|
||||||
void
|
void
|
||||||
cleanup(void) {
|
cleanup(void) {
|
||||||
drawcleanup();
|
drawcleanup();
|
||||||
|
16
dmenu.c
16
dmenu.c
@ -54,6 +54,7 @@ static char text[4096];
|
|||||||
static int cmdw = 0;
|
static int cmdw = 0;
|
||||||
static int promptw = 0;
|
static int promptw = 0;
|
||||||
static int ret = 0;
|
static int ret = 0;
|
||||||
|
static unsigned int lines = 0;
|
||||||
static unsigned int numlockmask = 0;
|
static unsigned int numlockmask = 0;
|
||||||
static Bool running = True;
|
static Bool running = True;
|
||||||
static Item *allitems = NULL; /* first of all items */
|
static Item *allitems = NULL; /* first of all items */
|
||||||
@ -65,9 +66,14 @@ static Item *curr = NULL;
|
|||||||
static Window win;
|
static Window win;
|
||||||
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
|
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
|
||||||
static char *(*fstrstr)(const char *, const char *) = strstr;
|
static char *(*fstrstr)(const char *, const char *) = strstr;
|
||||||
static unsigned int lines = 0;
|
|
||||||
static void (*calcoffsets)(void) = calcoffsetsh;
|
static void (*calcoffsets)(void) = calcoffsetsh;
|
||||||
|
|
||||||
|
Display *dpy;
|
||||||
|
DC dc;
|
||||||
|
int screen;
|
||||||
|
unsigned int mw, mh;
|
||||||
|
Window parent;
|
||||||
|
|
||||||
void
|
void
|
||||||
appenditem(Item *i, Item **list, Item **last) {
|
appenditem(Item *i, Item **list, Item **last) {
|
||||||
if(!(*last))
|
if(!(*last))
|
||||||
@ -131,6 +137,14 @@ cistrstr(const char *s, const char *sub) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
cleanup(void) {
|
cleanup(void) {
|
||||||
|
Item *itm;
|
||||||
|
|
||||||
|
while(allitems) {
|
||||||
|
itm = allitems->next;
|
||||||
|
free(allitems->text);
|
||||||
|
free(allitems);
|
||||||
|
allitems = itm;
|
||||||
|
}
|
||||||
drawcleanup();
|
drawcleanup();
|
||||||
XDestroyWindow(dpy, win);
|
XDestroyWindow(dpy, win);
|
||||||
XUngrabKeyboard(dpy, CurrentTime);
|
XUngrabKeyboard(dpy, CurrentTime);
|
||||||
|
21
draw.h
21
draw.h
@ -30,16 +30,15 @@ int textnw(const char *text, unsigned int len);
|
|||||||
int textw(const char *text);
|
int textw(const char *text);
|
||||||
|
|
||||||
/* variables */
|
/* variables */
|
||||||
Display *dpy;
|
extern Display *dpy;
|
||||||
DC dc;
|
extern DC dc;
|
||||||
int screen;
|
extern int screen;
|
||||||
unsigned int mw, mh;
|
extern unsigned int mw, mh;
|
||||||
unsigned int spaceitem;
|
extern Window parent;
|
||||||
Window parent;
|
|
||||||
|
|
||||||
/* style */
|
/* style */
|
||||||
const char *font;
|
extern const char *font;
|
||||||
const char *normbgcolor;
|
extern const char *normbgcolor;
|
||||||
const char *normfgcolor;
|
extern const char *normfgcolor;
|
||||||
const char *selbgcolor;
|
extern const char *selbgcolor;
|
||||||
const char *selfgcolor;
|
extern const char *selfgcolor;
|
||||||
|
Loading…
Reference in New Issue
Block a user