#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <unistd.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
static void drawmenu(void);
static char *fstrstr(const char *s, const char *sub);
static void grabkeyboard(void);
-static void insert(const char *s, ssize_t n);
+static void insert(const char *str, ssize_t n);
static void keypress(XKeyEvent *ev);
-static void match(void);
+static void match(Bool sub);
static size_t nextrune(int incr);
static void paste(void);
static void readstdin(void);
static char text[BUFSIZ] = "";
static int bh, mw, mh;
-static int inputw = 0;
+static int inputw;
static int lines = 0;
static int monitor = -1;
static int promptw;
static Bool topbar = True;
static DC *dc;
static Item *items = NULL;
-static Item *matches, *sel;
-static Item *prev, *curr, *next;
-static Window root, win;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
+static Window win;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
Bool fast = False;
int i;
- progname = "dmenu";
for(i = 1; i < argc; i++)
/* single flags */
if(!strcmp(argv[i], "-v")) {
fast = True;
else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp;
- else if(i == argc-1)
+ else if(i+1 == argc)
goto usage;
/* double flags */
else if(!strcmp(argv[i], "-l"))
initfont(dc, font);
if(fast) {
- setup();
+ grabkeyboard();
readstdin();
}
else {
readstdin();
- setup();
+ grabkeyboard();
}
- match();
+ setup();
run();
return EXIT_FAILURE;
int i;
for(i = 0; i < 1000; i++) {
- if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+ if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+ GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
return;
usleep(1000);
}
}
void
-insert(const char *s, ssize_t n) {
+insert(const char *str, ssize_t n) {
if(strlen(text) + n > sizeof text - 1)
return;
- memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
+ memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
if(n > 0)
- memcpy(text + cursor, s, n);
+ memcpy(&text[cursor], str, n);
cursor += n;
- match();
+ match(n > 0);
}
void
keypress(XKeyEvent *ev) {
char buf[32];
- size_t len;
KeySym ksym;
- len = strlen(text);
XLookupString(ev, buf, sizeof buf, &ksym, NULL);
- if(ev->state & ControlMask)
- switch(tolower(ksym)) {
+ if(ev->state & ControlMask) {
+ KeySym lower, upper;
+
+ XConvertCase(ksym, &lower, &upper);
+ switch(lower) {
default:
return;
case XK_a:
break;
case XK_k: /* delete right */
text[cursor] = '\0';
- match();
+ match(False);
break;
case XK_n:
ksym = XK_Down;
XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
return;
}
+ }
switch(ksym) {
default:
if(!iscntrl(*buf))
insert(buf, strlen(buf));
break;
case XK_Delete:
- if(cursor == len)
+ if(text[cursor] == '\0')
return;
cursor = nextrune(+1);
case XK_BackSpace:
insert(NULL, nextrune(-1) - cursor);
break;
case XK_End:
- if(cursor < len) {
- cursor = len;
+ if(text[cursor] != '\0') {
+ cursor = strlen(text);
break;
}
- while(next) {
- sel = curr = next;
+ if(next) {
+ curr = matchend;
calcoffsets();
+ curr = prev;
+ calcoffsets();
+ while(next && (curr = curr->right))
+ calcoffsets();
}
- while(sel && sel->right)
- sel = sel->right;
+ sel = matchend;
break;
case XK_Escape:
exit(EXIT_FAILURE);
fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
exit(EXIT_SUCCESS);
case XK_Right:
- if(cursor < len) {
+ if(text[cursor] != '\0') {
cursor = nextrune(+1);
break;
}
return;
strncpy(text, sel->text, sizeof text);
cursor = strlen(text);
- match();
+ match(True);
break;
}
drawmenu();
}
void
-match(void) {
- size_t len;
- Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
-
- len = strlen(text);
- matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
- for(item = items; item && item->text; item++)
+match(Bool sub) {
+ size_t len = strlen(text);
+ Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+ Item *item, *next;
+
+ lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
+ for(item = sub ? matches : items; item && item->text; item = next) {
+ next = sub ? item->right : item + 1;
if(!fstrncmp(text, item->text, len + 1))
appenditem(item, &lexact, &exactend);
else if(!fstrncmp(text, item->text, len))
appenditem(item, &lprefix, &prefixend);
else if(fstrstr(item->text, text))
appenditem(item, &lsubstr, &substrend);
-
- if(lexact) {
- matches = lexact;
- itemend = exactend;
}
+ matches = lexact;
+ matchend = exactend;
+
if(lprefix) {
- if(itemend) {
- itemend->right = lprefix;
- lprefix->left = itemend;
+ if(matchend) {
+ matchend->right = lprefix;
+ lprefix->left = matchend;
}
else
matches = lprefix;
- itemend = prefixend;
+ matchend = prefixend;
}
if(lsubstr) {
- if(itemend) {
- itemend->right = lsubstr;
- lsubstr->left = itemend;
+ if(matchend) {
+ matchend->right = lsubstr;
+ lsubstr->left = matchend;
}
else
matches = lsubstr;
+ matchend = substrend;
}
curr = sel = matches;
calcoffsets();
size_t
nextrune(int incr) {
- size_t n, len;
+ size_t n, len = strlen(text);
- len = strlen(text);
for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
return n;
}
void
readstdin(void) {
- char buf[sizeof text], *p;
- size_t i, size = 0;
+ char buf[sizeof text], *p, *maxstr = NULL;
+ size_t i, max = 0, size = 0;
for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
- if(i+1 == size / sizeof *items || !items)
+ if(i+1 >= size / sizeof *items)
if(!(items = realloc(items, (size += BUFSIZ))))
eprintf("cannot realloc %u bytes:", size);
if((p = strchr(buf, '\n')))
*p = '\0';
if(!(items[i].text = strdup(buf)))
eprintf("cannot strdup %u bytes:", strlen(buf)+1);
- inputw = MAX(inputw, textw(dc, items[i].text));
+ if(strlen(items[i].text) > max)
+ max = strlen(maxstr = items[i].text);
}
+ inputw = maxstr ? textw(dc, maxstr) : 0;
}
void
void
setup(void) {
- int x, y, screen;
+ int x, y, screen = DefaultScreen(dc->dpy);
+ Window root = RootWindow(dc->dpy, screen);
XSetWindowAttributes wa;
#ifdef XINERAMA
int n;
XineramaScreenInfo *info;
#endif
- screen = DefaultScreen(dc->dpy);
- root = RootWindow(dc->dpy, screen);
- utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
-
normcol[ColBG] = getcolor(dc, normbgcolor);
normcol[ColFG] = getcolor(dc, normfgcolor);
- selcol[ColBG] = getcolor(dc, selbgcolor);
- selcol[ColFG] = getcolor(dc, selfgcolor);
+ selcol[ColBG] = getcolor(dc, selbgcolor);
+ selcol[ColFG] = getcolor(dc, selfgcolor);
+
+ utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
/* menu geometry */
bh = dc->font.height + 2;
y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
mw = DisplayWidth(dc->dpy, screen);
}
+ inputw = MIN(inputw, mw/3);
+ promptw = prompt ? textw(dc, prompt) : 0;
+ match(False);
+
/* menu window */
wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
DefaultVisual(dc->dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- grabkeyboard();
- resizedc(dc, mw, mh);
- inputw = MIN(inputw, mw/3);
- promptw = prompt ? textw(dc, prompt) : 0;
XMapRaised(dc->dpy, win);
+ resizedc(dc, mw, mh);
+ drawmenu();
}