X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/bba30e26863c75e66678f9d028d394883d86150a..855a56631916bdff1438e11c232b88450f973648:/dmenu.c
diff --git a/dmenu.c b/dmenu.c
index 7672eac..6fc414c 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,25 +1,14 @@
/* 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>
#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
-
-/* 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))
-#define IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) || !((c) & 0x80))
+#include "dmenu.h"
typedef struct Item Item;
struct Item {
@@ -34,45 +23,27 @@ static void calcoffsetsh(void);
static void calcoffsetsv(void);
static char *cistrstr(const char *s, const char *sub);
static void cleanup(void);
-static void drawmenu(void);
+static void dinput(void);
static void drawmenuh(void);
static void drawmenuv(void);
-static void eprint(const char *errstr, ...);
-static Bool grabkeyboard(void);
-static void kpress(XKeyEvent * e);
-static void match(char *pattern);
+static void match(void);
static void readstdin(void);
-static void run(void);
-static void setup(Bool topbar);
-
-#include "config.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 mw, mh;
-static unsigned int numlockmask = 0;
-static Bool running = True;
-static Display *dpy;
+static unsigned int cmdw = 0;
+static unsigned int lines = 0;
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 parent, win;
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;
-#include "draw.c"
-
void
appenditem(Item *i, Item **list, Item **last) {
if(!(*last))
@@ -86,30 +57,27 @@ appenditem(Item *i, Item **list, Item **last) {
void
calcoffsetsh(void) {
- unsigned int w;
+ unsigned int w, x;
- 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 + textw(&dc, "<") + textw(&dc, ">");
+ for(x = w, next = curr; next; next = next->right)
+ if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
+ break;
+ for(x = w, prev = curr; prev && prev->left; prev = prev->left)
+ if((x += 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 *
@@ -136,37 +104,54 @@ cistrstr(const char *s, const char *sub) {
void
cleanup(void) {
- dccleanup();
+ Item *itm;
+
+ while(allitems) {
+ itm = allitems->next;
+ free(allitems->text);
+ free(allitems);
+ allitems = itm;
+ }
+ cleanupdraw(&dc);
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
+ XCloseDisplay(dpy);
}
void
-drawmenu(void) {
+dinput(void) {
+ cleanup();
+ argp[0] = "dinput";
+ argp[1] = text;
+ execvp("dinput", argp);
+ eprint("cannot exec dinput\n");
+}
+
+void
+drawbar(void) {
dc.x = 0;
dc.y = 0;
dc.w = mw;
dc.h = mh;
- drawtext(NULL, dc.norm);
+ drawtext(&dc, NULL, normcol);
+ 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);
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();
- }
- XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
- XFlush(dpy);
+ drawtext(&dc, text, normcol);
+ if(lines > 0)
+ drawmenuv();
+ else if(curr)
+ drawmenuh();
+ commitdraw(&dc, win);
}
void
@@ -174,59 +159,37 @@ drawmenuh(void) {
Item *i;
dc.x += cmdw;
- dc.w = spaceitem;
- drawtext(curr->left ? "<" : NULL, dc.norm);
+ dc.w = textw(&dc, "<");
+ drawtext(&dc, curr->left ? "<" : NULL, normcol);
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);
dc.x += dc.w;
}
- dc.w = spaceitem;
+ dc.w = textw(&dc, ">");
dc.x = mw - dc.w;
- drawtext(next ? ">" : NULL, dc.norm);
+ drawtext(&dc, next ? ">" : NULL, normcol);
}
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);
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);
}
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;
-
- for(len = 1000; len; len--) {
- if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime)
- == GrabSuccess)
- break;
- usleep(1000);
- }
- return len > 0;
-}
-
-void
-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {
char buf[sizeof text];
int num;
unsigned int i, len;
@@ -269,6 +232,7 @@ kpress(XKeyEvent * e) {
ksym = XK_Tab;
break;
case XK_j:
+ case XK_m:
ksym = XK_Return;
break;
case XK_n:
@@ -279,7 +243,7 @@ kpress(XKeyEvent * e) {
break;
case XK_u:
text[0] = '\0';
- match(text);
+ match();
break;
case XK_w:
if(len == 0)
@@ -288,11 +252,7 @@ kpress(XKeyEvent * e) {
while(i-- > 0 && text[i] == ' ');
while(i-- > 0 && text[i] != ' ');
text[++i] = '\0';
- match(text);
- break;
- case XK_x:
- execlp("dinput", "dinput", text, NULL); /* todo: argv */
- eprint("dmenu: cannot exec dinput:");
+ match();
break;
}
}
@@ -302,7 +262,7 @@ kpress(XKeyEvent * e) {
if(num && !iscntrl((int) buf[0])) {
memcpy(text + len, buf, num + 1);
len += num;
- match(text);
+ match();
}
break;
case XK_BackSpace:
@@ -311,7 +271,7 @@ kpress(XKeyEvent * e) {
for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
len -= i;
text[len] = '\0';
- match(text);
+ match();
break;
case XK_End:
while(next) {
@@ -322,9 +282,7 @@ kpress(XKeyEvent * e) {
sel = sel->right;
break;
case XK_Escape:
- ret = 1;
- running = False;
- return;
+ exit(EXIT_FAILURE);
case XK_Home:
sel = curr = item;
calcoffsets();
@@ -352,13 +310,11 @@ kpress(XKeyEvent * e) {
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)
@@ -370,30 +326,27 @@ kpress(XKeyEvent * e) {
}
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();
+ drawbar();
}
void
-match(char *pattern) {
- unsigned int plen;
+match(void) {
+ unsigned int len;
Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
- if(!pattern)
- return;
- plen = strlen(pattern);
+ len = strlen(text);
item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
for(i = allitems; i; i = i->next)
- if(!fstrncmp(pattern, i->text, plen + 1))
+ if(!fstrncmp(text, i->text, len + 1))
appenditem(i, &lexact, &exactend);
- else if(!fstrncmp(pattern, i->text, plen))
+ else if(!fstrncmp(text, i->text, len))
appenditem(i, &lprefix, &prefixend);
- else if(fstrstr(i->text, pattern))
+ else if(fstrstr(i->text, text))
appenditem(i, &lsubstr, &substrend);
if(lexact) {
item = lexact;
@@ -432,11 +385,11 @@ readstdin(void) {
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)
@@ -447,104 +400,12 @@ readstdin(void) {
}
}
-void
-run(void) {
- XEvent ev;
-
- /* main event loop */
- while(running && !XNextEvent(dpy, &ev))
- switch (ev.type) {
- case KeyPress:
- kpress(&ev.xkey);
- break;
- case Expose:
- if(ev.xexpose.count == 0)
- drawmenu();
- break;
- case VisibilityNotify:
- if (ev.xvisibility.state != VisibilityUnobscured)
- XRaiseWindow(dpy, win);
- break;
- }
-}
-
-void
-setup(Bool topbar) {
- int i, j, x, y;
-#if XINERAMA
- int n;
- XineramaScreenInfo *info = NULL;
-#endif
- XModifierKeymap *modmap;
- XSetWindowAttributes wa;
- XWindowAttributes pwa;
-
- /* init modifier map */
- modmap = XGetModifierMapping(dpy);
- for(i = 0; i < 8; i++)
- for(j = 0; j < modmap->max_keypermod; j++) {
- if(modmap->modifiermap[i * modmap->max_keypermod + j]
- == XKeysymToKeycode(dpy, XK_Num_Lock))
- numlockmask = (1 << i);
- }
- XFreeModifiermap(modmap);
-
- initfont(font);
-
- /* menu window */
- wa.override_redirect = True;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
-
- /* menu window geometry */
- mh = (dc.font.height + 2) * (lines + 1);
-#if XINERAMA
- if(parent == RootWindow(dpy, screen) && 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))
- 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;
- }
- x = info[i].x_org;
- y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
- mw = info[i].width;
- XFree(info);
- }
- else
-#endif
- {
- XGetWindowAttributes(dpy, parent, &pwa);
- x = 0;
- y = topbar ? 0 : pwa.height - mh;
- mw = pwa.width;
- }
-
- win = XCreateWindow(dpy, parent, x, y, mw, mh, 0,
- DefaultDepth(dpy, screen), CopyFromParent,
- DefaultVisual(dpy, screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-
- dcsetup();
- if(maxname)
- cmdw = MIN(textw(maxname), mw / 3);
- if(prompt)
- promptw = MIN(textw(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 = "dmenu";
for(i = 1; i < argc; i++)
if(!strcmp(argv[i], "-i")) {
fstrncmp = strncasecmp;
@@ -552,9 +413,6 @@ main(int argc, char *argv[]) {
}
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)
@@ -578,27 +436,33 @@ main(int argc, char *argv[]) {
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("dmenu: cannot open display\n");
+ 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(lines);
+ if(maxname)
+ cmdw = MIN(textw(&dc, maxname), mw / 3);
+ match();
run();
- cleanup();
- XCloseDisplay(dpy);
- return ret;
+ return 0;
}