|
@ -46,6 +46,7 @@ static void run(void); |
|
|
static void setup(Bool topbar); |
|
|
static void setup(Bool topbar); |
|
|
|
|
|
|
|
|
#include "config.h" |
|
|
#include "config.h" |
|
|
|
|
|
#include "draw.h" |
|
|
|
|
|
|
|
|
/* variables */ |
|
|
/* variables */ |
|
|
static char *maxname = NULL; |
|
|
static char *maxname = NULL; |
|
@ -54,25 +55,20 @@ 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 int screen; |
|
|
|
|
|
static unsigned int mw, mh; |
|
|
|
|
|
static unsigned int numlockmask = 0; |
|
|
static unsigned int numlockmask = 0; |
|
|
static Bool running = True; |
|
|
static Bool running = True; |
|
|
static Display *dpy; |
|
|
|
|
|
static Item *allitems = NULL; /* first of all items */ |
|
|
static Item *allitems = NULL; /* first of all items */ |
|
|
static Item *item = NULL; /* first of pattern matching items */ |
|
|
static Item *item = NULL; /* first of pattern matching items */ |
|
|
static Item *sel = NULL; |
|
|
static Item *sel = NULL; |
|
|
static Item *next = NULL; |
|
|
static Item *next = NULL; |
|
|
static Item *prev = NULL; |
|
|
static Item *prev = NULL; |
|
|
static Item *curr = NULL; |
|
|
static Item *curr = NULL; |
|
|
static Window parent, 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 unsigned int lines = 0; |
|
|
static void (*calcoffsets)(void) = calcoffsetsh; |
|
|
static void (*calcoffsets)(void) = calcoffsetsh; |
|
|
|
|
|
|
|
|
#include "draw.c" |
|
|
|
|
|
|
|
|
|
|
|
void |
|
|
void |
|
|
appenditem(Item *i, Item **list, Item **last) { |
|
|
appenditem(Item *i, Item **list, Item **last) { |
|
|
if(!(*last)) |
|
|
if(!(*last)) |
|
@ -136,7 +132,7 @@ cistrstr(const char *s, const char *sub) { |
|
|
|
|
|
|
|
|
void |
|
|
void |
|
|
cleanup(void) { |
|
|
cleanup(void) { |
|
|
dccleanup(); |
|
|
|
|
|
|
|
|
drawcleanup(); |
|
|
XDestroyWindow(dpy, win); |
|
|
XDestroyWindow(dpy, win); |
|
|
XUngrabKeyboard(dpy, CurrentTime); |
|
|
XUngrabKeyboard(dpy, CurrentTime); |
|
|
} |
|
|
} |
|
@ -202,16 +198,6 @@ drawmenuv(void) { |
|
|
drawtext(NULL, dc.norm); |
|
|
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 |
|
|
Bool |
|
|
grabkeyboard(void) { |
|
|
grabkeyboard(void) { |
|
|
unsigned int len; |
|
|
unsigned int len; |
|
@ -529,7 +515,7 @@ setup(Bool topbar) { |
|
|
DefaultVisual(dpy, screen), |
|
|
DefaultVisual(dpy, screen), |
|
|
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
|
|
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
|
|
|
|
|
|
|
|
dcsetup(); |
|
|
|
|
|
|
|
|
drawsetup(); |
|
|
if(maxname) |
|
|
if(maxname) |
|
|
cmdw = MIN(textw(maxname), mw / 3); |
|
|
cmdw = MIN(textw(maxname), mw / 3); |
|
|
if(prompt) |
|
|
if(prompt) |
|
|