X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/eeba6221b1f2863800dc3490eb80f3b7adb14675..a662fc6e0abeacb64b5b37cedccaeee782f9454e:/dmenu.c
diff --git a/dmenu.c b/dmenu.c
index 5c77560..40b220c 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -19,8 +19,7 @@
typedef struct Item Item;
struct Item {
char *text;
- Item *next; /* traverses all items */
- Item *left, *right; /* traverses matching items */
+ Item *left, *right;
};
static void appenditem(Item *item, Item **list, Item **last);
@@ -36,9 +35,8 @@ static void paste(void);
static void readstdin(void);
static void run(void);
static void setup(void);
-static void usage(void);
-static char text[BUFSIZ];
+static char text[BUFSIZ] = "";
static int bh, mw, mh;
static int inputw = 0;
static int lines = 0;
@@ -57,12 +55,72 @@ static Atom utf8;
static Bool topbar = True;
static DC *dc;
static Item *items = NULL;
-static Item *matches, *sel;
-static Item *prev, *curr, *next;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
static Window root, win;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+int
+main(int argc, char *argv[]) {
+ Bool fast = False;
+ int i;
+
+ for(i = 1; i < argc; i++)
+ /* single flags */
+ if(!strcmp(argv[i], "-v")) {
+ fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout);
+ exit(EXIT_SUCCESS);
+ }
+ else if(!strcmp(argv[i], "-b"))
+ topbar = False;
+ else if(!strcmp(argv[i], "-f"))
+ fast = True;
+ else if(!strcmp(argv[i], "-i"))
+ fstrncmp = strncasecmp;
+ else if(i == argc-1)
+ goto usage;
+ /* double flags */
+ else if(!strcmp(argv[i], "-l"))
+ lines = atoi(argv[++i]);
+ else if(!strcmp(argv[i], "-m"))
+ monitor = atoi(argv[++i]);
+ else if(!strcmp(argv[i], "-p"))
+ prompt = argv[++i];
+ else if(!strcmp(argv[i], "-fn"))
+ font = argv[++i];
+ else if(!strcmp(argv[i], "-nb"))
+ normbgcolor = argv[++i];
+ else if(!strcmp(argv[i], "-nf"))
+ normfgcolor = argv[++i];
+ else if(!strcmp(argv[i], "-sb"))
+ selbgcolor = argv[++i];
+ else if(!strcmp(argv[i], "-sf"))
+ selfgcolor = argv[++i];
+ else
+ goto usage;
+
+ dc = initdc();
+ initfont(dc, font);
+
+ if(fast) {
+ setup();
+ readstdin();
+ }
+ else {
+ readstdin();
+ setup();
+ }
+ match();
+ run();
+ return EXIT_FAILURE;
+
+usage:
+ fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+ " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+ return EXIT_FAILURE;
+}
+
void
appenditem(Item *item, Item **list, Item **last) {
if(!*last)
@@ -177,7 +235,7 @@ keypress(XKeyEvent *ev) {
len = strlen(text);
XLookupString(ev, buf, sizeof buf, &ksym, NULL);
- if(ev->state & ControlMask) {
+ if(ev->state & ControlMask)
switch(tolower(ksym)) {
default:
return;
@@ -231,7 +289,6 @@ keypress(XKeyEvent *ev) {
XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
return;
}
- }
switch(ksym) {
default:
if(!iscntrl(*buf))
@@ -250,12 +307,15 @@ keypress(XKeyEvent *ev) {
cursor = len;
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);
@@ -295,7 +355,6 @@ keypress(XKeyEvent *ev) {
case XK_Return:
case XK_KP_Enter:
fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
- fflush(stdout);
exit(EXIT_SUCCESS);
case XK_Right:
if(cursor < len) {
@@ -323,12 +382,11 @@ keypress(XKeyEvent *ev) {
void
match(void) {
- size_t len;
- Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+ size_t len = strlen(text);
+ Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
- len = strlen(text);
- matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
- for(item = items; item; item = item->next)
+ matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
+ for(item = items; item && item->text; item++)
if(!fstrncmp(text, item->text, len + 1))
appenditem(item, &lexact, &exactend);
else if(!fstrncmp(text, item->text, len))
@@ -338,34 +396,34 @@ match(void) {
if(lexact) {
matches = lexact;
- itemend = exactend;
+ 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 = prev = next = sel = matches;
+ 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;
}
@@ -387,17 +445,17 @@ paste(void) {
void
readstdin(void) {
char buf[sizeof text], *p;
- Item *item, **end;
+ size_t i, size = 0;
- for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+ for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
+ if(i+1 == size / sizeof *items || !items)
+ if(!(items = realloc(items, (size += BUFSIZ))))
+ eprintf("cannot realloc %u bytes:", size);
if((p = strchr(buf, '\n')))
*p = '\0';
- if(!(item = malloc(sizeof *item)))
- eprintf("cannot malloc %u bytes\n", sizeof *item);
- if(!(item->text = strdup(buf)))
- eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
- item->next = item->left = item->right = NULL;
- inputw = MAX(inputw, textw(dc, item->text));
+ if(!(items[i].text = strdup(buf)))
+ eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+ inputw = MAX(inputw, textw(dc, items[i].text));
}
}
@@ -454,7 +512,7 @@ setup(void) {
Window dw;
XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
- for(i = 0; i < n; i++)
+ for(i = 0; i < n-1; i++)
if((monitor == info[i].screen_number)
|| (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
break;
@@ -484,59 +542,4 @@ setup(void) {
inputw = MIN(inputw, mw/3);
promptw = prompt ? textw(dc, prompt) : 0;
XMapRaised(dc->dpy, win);
- text[0] = '\0';
- match();
-}
-
-void
-usage(void) {
- fputs("usage: dmenu [-b] [-i] [-l lines] [-p prompt] [-fn font] [-nb color]\n"
- " [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
- exit(EXIT_FAILURE);
-}
-
-int
-main(int argc, char *argv[]) {
- int i;
-
- progname = "dmenu";
- for(i = 1; i < argc; i++)
- /* single flags */
- if(!strcmp(argv[i], "-v")) {
- fputs("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n", stdout);
- exit(EXIT_SUCCESS);
- }
- else if(!strcmp(argv[i], "-b"))
- topbar = False;
- else if(!strcmp(argv[i], "-i"))
- fstrncmp = strncasecmp;
- else if(i == argc-1)
- usage();
- /* double flags */
- else if(!strcmp(argv[i], "-l"))
- lines = atoi(argv[++i]);
- else if(!strcmp(argv[i], "-m"))
- monitor = atoi(argv[++i]);
- else if(!strcmp(argv[i], "-p"))
- prompt = argv[++i];
- else if(!strcmp(argv[i], "-fn"))
- font = argv[++i];
- else if(!strcmp(argv[i], "-nb"))
- normbgcolor = argv[++i];
- else if(!strcmp(argv[i], "-nf"))
- normfgcolor = argv[++i];
- else if(!strcmp(argv[i], "-sb"))
- selbgcolor = argv[++i];
- else if(!strcmp(argv[i], "-sf"))
- selfgcolor = argv[++i];
- else
- usage();
-
- dc = initdc();
- initfont(dc, font);
- readstdin();
- setup();
- run();
-
- return EXIT_FAILURE; /* should not reach */
}