#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
+#include <draw.h>
/* macros */
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
static void calcoffsetsv(void);
static char *cistrstr(const char *s, const char *sub);
static void cleanup(void);
+static void dinput(void);
static void drawmenu(void);
static void drawmenuh(void);
static void drawmenuv(void);
static Bool grabkeyboard(void);
-static void kpress(XKeyEvent * e);
+static void kpress(XKeyEvent *e);
static void match(char *pattern);
static void readstdin(void);
static void run(void);
-static void setup(Bool topbar);
+static void setup(void);
#include "config.h"
-#include "draw.h"
/* variables */
+static char **argp = NULL;
static char *maxname = NULL;
static char *prompt = NULL;
static char text[4096];
static int cmdw = 0;
static int promptw = 0;
static int ret = 0;
+static int screen;
+static unsigned int lines = 0;
static unsigned int numlockmask = 0;
+static unsigned int mw, mh;
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
static Bool running = True;
+static Bool topbar = True;
+static DC dc;
+static Display *dpy;
static Item *allitems = NULL; /* first of all items */
static Item *item = NULL; /* first of pattern matching items */
static Item *sel = NULL;
static Item *next = NULL;
static Item *prev = NULL;
static Item *curr = NULL;
-static Window win;
+static Window win, parent;
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;
void
calcoffsetsh(void) {
unsigned int w;
- if(!curr)
- return;
- w = promptw + cmdw + 2 * spaceitem;
- for(next = curr; next && w < mw; next=next->right)
- w += MIN(textw(next->text), mw / 3);
- w = promptw + cmdw + 2 * spaceitem;
- for(prev = curr; prev && prev->left && w < mw; prev=prev->left)
- w += MIN(textw(prev->left->text), mw / 3);
+ w = promptw + cmdw + (2 * spaceitem);
+ for(next = curr; next; next = next->right)
+ if((w += MIN(textw(&dc, next->text), mw / 3)) > mw)
+ break;
+ w = promptw + cmdw + (2 * spaceitem);
+ for(prev = curr; prev && prev->left; prev = prev->left)
+ if((w += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+ break;
}
void
calcoffsetsv(void) {
- unsigned int h;
+ unsigned int i;
- if(!curr)
- return;
- h = (dc.font.height + 2) * lines;
- for(next = curr; next && h > 0; next = next->right)
- h -= dc.font.height + 2;
- h = (dc.font.height + 2) * lines;
- for(prev = curr; prev && prev->left && h > 0; prev = prev->left)
- h -= dc.font.height + 2;
+ next = prev = curr;
+ for(i = 0; i < lines && next; i++)
+ next = next->right;
+ mh = (dc.font.height + 2) * (i + 1);
+ for(i = 0; i < lines && prev && prev->left; i++)
+ prev = prev->left;
}
char *
void
cleanup(void) {
- drawcleanup();
+ Item *itm;
+
+ while(allitems) {
+ itm = allitems->next;
+ free(allitems->text);
+ free(allitems);
+ allitems = itm;
+ }
+ cleanupdraw(&dc);
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
}
+void
+dinput(void) {
+ cleanup();
+ argp[0] = "dinput";
+ argp[1] = text;
+ execvp("dinput", argp);
+ eprint("cannot exec dinput\n");
+}
+
void
drawmenu(void) {
dc.x = 0;
dc.y = 0;
dc.w = mw;
dc.h = mh;
- drawtext(NULL, dc.norm);
+ drawtext(&dc, NULL, normcol, False);
+ dc.h = dc.font.height + 2;
+ dc.y = topbar ? 0 : mh - dc.h;
/* print prompt? */
if(prompt) {
dc.w = promptw;
- drawtext(prompt, dc.sel);
+ drawtext(&dc, prompt, selcol, False);
dc.x += dc.w;
}
dc.w = mw - dc.x;
/* print command */
if(cmdw && item && lines == 0)
dc.w = cmdw;
- drawtext(*text ? text : NULL, dc.norm);
- if(curr) {
- if(lines > 0)
- drawmenuv();
- else
- drawmenuh();
- }
+ drawtext(&dc, *text ? text : NULL, normcol, False);
+ if(lines > 0)
+ drawmenuv();
+ else
+ drawmenuh();
XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
XFlush(dpy);
}
dc.x += cmdw;
dc.w = spaceitem;
- drawtext(curr->left ? "<" : NULL, dc.norm);
+ drawtext(&dc, curr && curr->left ? "<" : NULL, normcol, False);
dc.x += dc.w;
- for(i = curr; i != next; i=i->right) {
- dc.w = MIN(textw(i->text), mw / 3);
- drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+ for(i = curr; i != next; i = i->right) {
+ dc.w = MIN(textw(&dc, i->text), mw / 3);
+ drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
dc.x += dc.w;
}
dc.w = spaceitem;
dc.x = mw - dc.w;
- drawtext(next ? ">" : NULL, dc.norm);
+ drawtext(&dc, next ? ">" : NULL, normcol, False);
}
void
drawmenuv(void) {
Item *i;
+ XWindowAttributes wa;
+ dc.y = topbar ? dc.h : 0;
dc.w = mw - dc.x;
- dc.h = dc.font.height + 2;
- dc.y = dc.h;
- for(i = curr; i != next; i=i->right) {
- drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+ for(i = curr; i != next; i = i->right) {
+ drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
dc.y += dc.h;
}
- dc.h = mh - dc.y;
- drawtext(NULL, dc.norm);
+ if(!XGetWindowAttributes(dpy, win, &wa))
+ eprint("cannot get window attributes");
+ XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
}
Bool
}
void
-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {
char buf[sizeof text];
int num;
unsigned int i, len;
ksym = XK_Tab;
break;
case XK_j:
+ case XK_m:
ksym = XK_Return;
break;
case XK_n:
text[++i] = '\0';
match(text);
break;
- case XK_x:
- execlp("dinput", "dinput", text, NULL); /* todo: argv */
- eprint("dmenu: cannot exec dinput:");
- break;
}
}
switch(ksym) {
calcoffsets();
break;
case XK_Return:
- if((e->state & ShiftMask) || !sel)
- fprintf(stdout, "%s", text);
- else
- fprintf(stdout, "%s", sel->text);
+ if(e->state & ShiftMask)
+ dinput();
+ fprintf(stdout, "%s", sel ? sel->text : text);
fflush(stdout);
running = False;
return;
}
break;
case XK_Tab:
- if(!sel)
- return;
- strncpy(text, sel->text, sizeof text);
- match(text);
+ if(sel)
+ strncpy(text, sel->text, sizeof text);
+ dinput();
break;
}
drawmenu();
if(buf[len-1] == '\n')
buf[--len] = '\0';
if(!(p = strdup(buf)))
- eprint("dmenu: cannot strdup %u bytes\n", len);
+ eprint("cannot strdup %u bytes\n", len);
if((max = MAX(max, len)) == len)
maxname = p;
if(!(new = malloc(sizeof *new)))
- eprint("dmenu: cannot malloc %u bytes\n", sizeof *new);
+ eprint("cannot malloc %u bytes\n", sizeof *new);
new->next = new->left = new->right = NULL;
new->text = p;
if(!i)
/* main event loop */
while(running && !XNextEvent(dpy, &ev))
- switch (ev.type) {
+ switch(ev.type) {
case KeyPress:
kpress(&ev.xkey);
break;
}
void
-setup(Bool topbar) {
+setup(void) {
int i, j, x, y;
#if XINERAMA
int n;
}
XFreeModifiermap(modmap);
- initfont(font);
+ dc.dpy = dpy;
+ normcol[ColBG] = getcolor(&dc, normbgcolor);
+ normcol[ColFG] = getcolor(&dc, normfgcolor);
+ selcol[ColBG] = getcolor(&dc, selbgcolor);
+ selcol[ColFG] = getcolor(&dc, selfgcolor);
+ initfont(&dc, font);
/* menu window */
wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
- wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+ wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
/* menu window geometry */
mh = (dc.font.height + 2) * (lines + 1);
else
#endif
{
- XGetWindowAttributes(dpy, parent, &pwa);
+ if(!XGetWindowAttributes(dpy, parent, &pwa))
+ eprint("cannot get window attributes");
x = 0;
y = topbar ? 0 : pwa.height - mh;
mw = pwa.width;
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- drawsetup();
+ setupdraw(&dc, win);
if(maxname)
- cmdw = MIN(textw(maxname), mw / 3);
+ cmdw = MIN(textw(&dc, maxname), mw / 3);
if(prompt)
- promptw = MIN(textw(prompt), mw / 5);
+ promptw = MIN(textw(&dc, prompt), mw / 5);
text[0] = '\0';
match(text);
XMapRaised(dpy, win);
int
main(int argc, char *argv[]) {
unsigned int i;
- Bool topbar = True;
/* command line args */
+ progname = argv[0];
for(i = 1; i < argc; i++)
if(!strcmp(argv[i], "-i")) {
fstrncmp = strncasecmp;
else if(!strcmp(argv[i], "-sf")) {
if(++i < argc) selfgcolor = argv[i];
}
- else if(!strcmp(argv[i], "-v"))
- eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
- else
- eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
- " [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+ else if(!strcmp(argv[i], "-v")) {
+ printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
+ exit(EXIT_SUCCESS);
+ }
+ else {
+ fputs("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
+ " [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
+ exit(EXIT_FAILURE);
+ }
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fprintf(stderr, "dmenu: warning: no locale support\n");
if(!(dpy = XOpenDisplay(NULL)))
- eprint("dmenu: cannot open display\n");
+ eprint("cannot open display\n");
screen = DefaultScreen(dpy);
if(!parent)
parent = RootWindow(dpy, screen);
+ if(!(argp = malloc(sizeof *argp * (argc+2))))
+ eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2));
+ memcpy(argp + 2, argv + 1, sizeof *argp * argc);
readstdin();
running = grabkeyboard();
- setup(topbar);
+ setup();
drawmenu();
XSync(dpy, False);
run();
