/* See LICENSE file for copyright and license details. */
#include <ctype.h>
#include <locale.h>
-#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <strings.h>
#include <unistd.h>
#include <X11/keysym.h>
#include <X11/Xlib.h>
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
+#include <draw.h>
/* macros */
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
static void drawmenu(void);
static void drawmenuh(void);
static void drawmenuv(void);
-static Bool grabkeyboard(void);
+static void grabkeyboard(void);
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 *next = NULL;
static Item *prev = NULL;
static Item *curr = NULL;
-static Window win, parent;
+static Window win, root;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
static char *(*fstrstr)(const char *, const char *) = strstr;
static void (*calcoffsets)(void) = calcoffsetsh;
void
calcoffsetsh(void) {
- unsigned int w;
+ unsigned int x;
- w = promptw + cmdw + (2 * spaceitem);
+ x = promptw + cmdw + (2 * spaceitem);
for(next = curr; next; next = next->right)
- if((w += MIN(textw(&dc, next->text), mw / 3)) > mw)
+ if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
break;
- w = promptw + cmdw + (2 * spaceitem);
+ x = promptw + cmdw + (2 * spaceitem);
for(prev = curr; prev && prev->left; prev = prev->left)
- if((w += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+ if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
break;
}
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;
}
cleanupdraw(&dc);
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
+ XCloseDisplay(dpy);
}
void
dinput(void) {
cleanup();
- execlp("dinput", "dinput", text, NULL); /* todo: argv */
+ argp[0] = "dinput";
+ argp[1] = text;
+ execvp("dinput", argp);
eprint("cannot exec dinput\n");
}
dc.w = mw;
dc.h = mh;
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;
if(cmdw && item && lines == 0)
dc.w = cmdw;
drawtext(&dc, *text ? text : NULL, normcol, False);
- if(curr) {
- if(lines > 0)
- drawmenuv();
- else
- drawmenuh();
- }
+ if(lines > 0)
+ drawmenuv();
+ else if(curr)
+ drawmenuh();
XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
- XFlush(dpy);
}
void
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(&dc, i->text, (sel == i) ? selcol : normcol, False);
dc.y += dc.h;
}
- dc.h = mh - dc.y;
- drawtext(&dc, NULL, normcol, False);
+ 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
grabkeyboard(void) {
unsigned int len;
for(len = 1000; len; len--) {
- if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+ if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
== GrabSuccess)
break;
usleep(1000);
}
- return len > 0;
+ if(!len)
+ exit(EXIT_FAILURE);
}
void
text[++i] = '\0';
match(text);
break;
- case XK_x:
- dinput();
- break;
}
}
switch(ksym) {
sel = sel->right;
break;
case XK_Escape:
- ret = 1;
- running = False;
- return;
+ exit(EXIT_FAILURE);
case XK_Home:
sel = curr = item;
calcoffsets();
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;
+ exit(EXIT_SUCCESS);
case XK_Right:
case XK_Down:
if(!sel || !sel->right)
XEvent ev;
/* main event loop */
- while(running && !XNextEvent(dpy, &ev))
+ XSync(dpy, False);
+ while(!XNextEvent(dpy, &ev))
switch(ev.type) {
case KeyPress:
kpress(&ev.xkey);
drawmenu();
break;
case VisibilityNotify:
- if (ev.xvisibility.state != VisibilityUnobscured)
+ if(ev.xvisibility.state != VisibilityUnobscured)
XRaiseWindow(dpy, win);
break;
}
+ exit(EXIT_FAILURE);
}
void
-setup(Bool topbar) {
+setup(void) {
int i, j, x, y;
#if XINERAMA
int n;
#endif
XModifierKeymap *modmap;
XSetWindowAttributes wa;
- XWindowAttributes pwa;
/* init modifier map */
modmap = XGetModifierMapping(dpy);
/* menu window geometry */
mh = (dc.font.height + 2) * (lines + 1);
#if XINERAMA
- if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+ if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
i = 0;
if(n > 1) {
int di;
unsigned int dui;
Window dummy;
- if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui))
+ if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
for(i = 0; i < n; i++)
if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
break;
else
#endif
{
- XGetWindowAttributes(dpy, parent, &pwa);
x = 0;
- y = topbar ? 0 : pwa.height - mh;
- mw = pwa.width;
+ y = topbar ? 0 : mh - DisplayHeight(dpy, screen);
+ mw = DisplayWidth(dpy, screen);
}
- win = XCreateWindow(dpy, parent, x, y, mw, mh, 0,
+ win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
int
main(int argc, char *argv[]) {
unsigned int i;
- Bool topbar = True;
/* command line args */
- progname = argv[0];
+ progname = "dmenu";
for(i = 1; i < argc; i++)
if(!strcmp(argv[i], "-i")) {
fstrncmp = strncasecmp;
}
else if(!strcmp(argv[i], "-b"))
topbar = False;
- else if(!strcmp(argv[i], "-e")) {
- if(++i < argc) parent = atoi(argv[i]);
- }
else if(!strcmp(argv[i], "-l")) {
if(++i < argc) lines = atoi(argv[i]);
if(lines > 0)
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] [-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("cannot open display\n");
+ if(atexit(&cleanup) != 0)
+ eprint("cannot register cleanup\n");
screen = DefaultScreen(dpy);
- if(!parent)
- parent = RootWindow(dpy, screen);
+ root = 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);
- drawmenu();
- XSync(dpy, False);
+ grabkeyboard();
+ setup();
run();
- cleanup();
- XCloseDisplay(dpy);
- return ret;
+ return 0;
}