pbentes/dmenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added draw.h

Browse Source
This commit is contained in:
Connor Lane Smith
2010-06-23 13:29:15 +01:00
parent bba30e2686
commit 595e797660
5 changed files with 80 additions and 71 deletions

23
dinput.c

@ -25,32 +25,27 @@
static void cleanup(void);
static void drawcursor(void);
static void drawinput(void);
static void eprint(const char *errstr, ...);
static Bool grabkeyboard(void);
static void kpress(XKeyEvent * e);
static void run(void);
static void setup(Bool topbar);
#include "config.h"
#include "draw.h"
/* variables */
static char *prompt = NULL;
static char text[4096];
static int promptw = 0;
static int ret = 0;
static int screen;
static unsigned int mw, mh;
static unsigned int cursor = 0;
static unsigned int numlockmask = 0;
static Bool running = True;
static Display *dpy;
static Window parent, win;
#include "draw.c"
static Window win;
void
cleanup(void) {
dccleanup();
drawcleanup();
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
}
@ -86,16 +81,6 @@ drawinput(void)
XFlush(dpy);
}
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;
@ -318,7 +303,7 @@ setup(Bool topbar) {
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
dcsetup();
drawsetup();
if(prompt)
promptw = MIN(textw(prompt), mw / 5);
cursor = strlen(text);