kske
/
dmenu
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleaned up

This commit is contained in:
Connor Lane Smith 2010-06-30 00:05:32 +01:00
parent f2abaf8b30
commit cc8b3b999b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dmenu.c
View File

@ -43,7 +43,7 @@ static void kpress(XKeyEvent *e);
static void match(char *pattern); static void match(char *pattern);
static void readstdin(void); static void readstdin(void);
static void run(void); static void run(void);
static void setup(Bool topbar); static void setup(void);
#include "config.h" #include "config.h"
#include "draw.h" #include "draw.h"
@ -63,6 +63,7 @@ static unsigned int mw, mh;
static unsigned long normcol[ColLast]; static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast]; static unsigned long selcol[ColLast];
static Bool running = True; static Bool running = True;
static Bool topbar = True;
static DC dc; static DC dc;
static Display *dpy; static Display *dpy;
static Item *allitems = NULL; /* first of all items */ static Item *allitems = NULL; /* first of all items */
@ -475,7 +476,7 @@ run(void) {
} }
void void
setup(Bool topbar) { setup(void) {
int i, j, x, y; int i, j, x, y;
#if XINERAMA #if XINERAMA
int n; int n;
@ -529,7 +530,8 @@ setup(Bool topbar) {
else else
#endif #endif
{ {
XGetWindowAttributes(dpy, parent, &pwa); if(!XGetWindowAttributes(dpy, parent, &pwa))
eprint("cannot get window attributes");
x = 0; x = 0;
y = topbar ? 0 : pwa.height - mh; y = topbar ? 0 : pwa.height - mh;
mw = pwa.width; mw = pwa.width;
@ -553,7 +555,6 @@ setup(Bool topbar) {
int int
main(int argc, char *argv[]) { main(int argc, char *argv[]) {
unsigned int i; unsigned int i;
Bool topbar = True;
/* command line args */ /* command line args */
progname = argv[0]; progname = argv[0];
@ -613,7 +614,7 @@ main(int argc, char *argv[]) {
readstdin(); readstdin();
running = grabkeyboard(); running = grabkeyboard();
setup(topbar); setup();
drawmenu(); drawmenu();
XSync(dpy, False); XSync(dpy, False);
run(); run();