X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/43540746077d4fd8ef963b5939934d32d59c9417..4692f84ff01e2187e2e3c642bcc68a15a77a6d9f:/dmenu.c?ds=inline
diff --git a/dmenu.c b/dmenu.c
index a8a6290..fd98d54 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -3,6 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <unistd.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -24,24 +25,23 @@ struct Item {
static void appenditem(Item *item, Item **list, Item **last);
static void calcoffsets(void);
+static char *cistrstr(const char *s, const char *sub);
static void drawmenu(void);
-static char *fstrstr(const char *s, const char *sub);
static void grabkeyboard(void);
static void insert(const char *str, ssize_t n);
static void keypress(XKeyEvent *ev);
static void match(Bool sub);
-static size_t nextrune(int incr);
+static size_t nextrune(int inc);
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 int bh, mw, mh;
-static int inputw;
+static int inputw, promptw;
static int lines = 0;
-static int monitor = -1;
-static int promptw;
static size_t cursor = 0;
static const char *font = NULL;
static const char *prompt = NULL;
@@ -60,6 +60,7 @@ static Item *prev, *curr, *next, *sel;
static Window win;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+static char *(*fstrstr)(const char *, const char *) = strstr;
int
main(int argc, char *argv[]) {
@@ -69,22 +70,22 @@ main(int argc, char *argv[]) {
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);
+ puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
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"))
+ else if(!strcmp(argv[i], "-i")) {
fstrncmp = strncasecmp;
+ fstrstr = cistrstr;
+ }
else if(i+1 == argc)
- goto usage;
+ 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"))
@@ -98,7 +99,7 @@ main(int argc, char *argv[]) {
else if(!strcmp(argv[i], "-sf"))
selfgcolor = argv[++i];
else
- goto usage;
+ usage();
dc = initdc();
initfont(dc, font);
@@ -113,12 +114,8 @@ main(int argc, char *argv[]) {
}
setup();
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;
+ return EXIT_FAILURE; /* unreachable */
}
void
@@ -127,6 +124,7 @@ appenditem(Item *item, Item **list, Item **last) {
*list = item;
else
(*last)->right = item;
+
item->left = *last;
item->right = NULL;
*last = item;
@@ -134,7 +132,7 @@ appenditem(Item *item, Item **list, Item **last) {
void
calcoffsets(void) {
- unsigned int i, n;
+ int i, n;
if(lines > 0)
n = lines * bh;
@@ -149,6 +147,16 @@ calcoffsets(void) {
break;
}
+char *
+cistrstr(const char *s, const char *sub) {
+ size_t len;
+
+ for(len = strlen(sub); *s; s++)
+ if(!strncasecmp(s, sub, len))
+ return (char *)s;
+ return NULL;
+}
+
void
drawmenu(void) {
int curpos;
@@ -194,16 +202,6 @@ drawmenu(void) {
mapdc(dc, win, mw, mh);
}
-char *
-fstrstr(const char *s, const char *sub) {
- size_t len;
-
- for(len = strlen(sub); *s; s++)
- if(!fstrncmp(s, sub, len))
- return (char *)s;
- return NULL;
-}
-
void
grabkeyboard(void) {
int i;
@@ -225,87 +223,71 @@ insert(const char *str, ssize_t n) {
if(n > 0)
memcpy(&text[cursor], str, n);
cursor += n;
- match(n > 0);
+ match(n > 0 && text[cursor] == '\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)) {
- default:
- return;
- case XK_a:
- ksym = XK_Home;
- break;
- case XK_b:
- ksym = XK_Left;
- break;
- case XK_c:
- ksym = XK_Escape;
- break;
- case XK_d:
- ksym = XK_Delete;
- break;
- case XK_e:
- ksym = XK_End;
- break;
- case XK_f:
- ksym = XK_Right;
- break;
- case XK_h:
- ksym = XK_BackSpace;
- break;
- case XK_i:
- ksym = XK_Tab;
- break;
- case XK_j:
- ksym = XK_Return;
- break;
- case XK_k: /* delete right */
+ if(ev->state & ControlMask) {
+ KeySym lower, upper;
+
+ XConvertCase(ksym, &lower, &upper);
+ switch(lower) {
+ case XK_a: ksym = XK_Home; break;
+ case XK_b: ksym = XK_Left; break;
+ case XK_c: ksym = XK_Escape; break;
+ case XK_d: ksym = XK_Delete; break;
+ case XK_e: ksym = XK_End; break;
+ case XK_f: ksym = XK_Right; break;
+ case XK_h: ksym = XK_BackSpace; break;
+ case XK_i: ksym = XK_Tab; break;
+ case XK_j: ksym = XK_Return; break;
+ case XK_m: ksym = XK_Return; break;
+ case XK_n: ksym = XK_Up; break;
+ case XK_p: ksym = XK_Down; break;
+
+ case XK_k: /* delete right */
text[cursor] = '\0';
match(False);
break;
- case XK_n:
- ksym = XK_Down;
- break;
- case XK_p:
- ksym = XK_Up;
- break;
- case XK_u: /* delete left */
+ case XK_u: /* delete left */
insert(NULL, 0 - cursor);
break;
- case XK_w: /* delete word */
+ case XK_w: /* delete word */
while(cursor > 0 && text[nextrune(-1)] == ' ')
insert(NULL, nextrune(-1) - cursor);
while(cursor > 0 && text[nextrune(-1)] != ' ')
insert(NULL, nextrune(-1) - cursor);
break;
- case XK_y: /* paste selection */
+ case XK_y: /* paste selection */
XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
return;
+ default:
+ 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);
+ /* fallthrough */
case XK_BackSpace:
- if(cursor > 0)
- insert(NULL, nextrune(-1) - cursor);
+ if(cursor == 0)
+ return;
+ insert(NULL, nextrune(-1) - cursor);
break;
case XK_End:
- if(cursor < len) {
- cursor = len;
+ if(text[cursor] != '\0') {
+ cursor = strlen(text);
break;
}
if(next) {
@@ -333,8 +315,7 @@ keypress(XKeyEvent *ev) {
cursor = nextrune(-1);
break;
}
- else if(lines > 0)
- return;
+ /* fallthrough */
case XK_Up:
if(sel && sel->left && (sel = sel->left)->right == curr) {
curr = prev;
@@ -355,15 +336,14 @@ keypress(XKeyEvent *ev) {
break;
case XK_Return:
case XK_KP_Enter:
- fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
+ puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
exit(EXIT_SUCCESS);
case XK_Right:
- if(cursor < len) {
+ if(text[cursor] != '\0') {
cursor = nextrune(+1);
break;
}
- else if(lines > 0)
- return;
+ /* fallthrough */
case XK_Down:
if(sel && sel->right && (sel = sel->right) == next) {
curr = next;
@@ -385,11 +365,11 @@ void
match(Bool sub) {
size_t len = strlen(text);
Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
- Item *item, *next = NULL;
+ Item *item, *lnext;
lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
- for(item = sub ? matches : items; item && item->text; item = next) {
- next = sub ? item->right : item + 1;
+ for(item = sub ? matches : items; item && item->text; item = lnext) {
+ lnext = sub ? item->right : item + 1;
if(!fstrncmp(text, item->text, len + 1))
appenditem(item, &lexact, &exactend);
else if(!fstrncmp(text, item->text, len))
@@ -423,10 +403,10 @@ match(Bool sub) {
}
size_t
-nextrune(int incr) {
- size_t n, len = strlen(text);
+nextrune(int inc) {
+ ssize_t n;
- for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+ for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
return n;
}
@@ -439,7 +419,7 @@ paste(void) {
XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
- insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
+ insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
XFree(p);
drawmenu();
}
@@ -449,7 +429,7 @@ readstdin(void) {
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) {
+ for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
if(i+1 >= size / sizeof *items)
if(!(items = realloc(items, (size += BUFSIZ))))
eprintf("cannot realloc %u bytes:", size);
@@ -460,6 +440,8 @@ readstdin(void) {
if(strlen(items[i].text) > max)
max = strlen(maxstr = items[i].text);
}
+ if(items)
+ items[i].text = NULL;
inputw = maxstr ? textw(dc, maxstr) : 0;
}
@@ -471,7 +453,7 @@ run(void) {
switch(ev.type) {
case Expose:
if(ev.xexpose.count == 0)
- drawmenu();
+ mapdc(dc, win, mw, mh);
break;
case KeyPress:
keypress(&ev.xkey);
@@ -516,8 +498,7 @@ setup(void) {
XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
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)))
+ 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 = info[i].y_org + (topbar ? 0 : info[i].height - mh);
@@ -531,8 +512,8 @@ setup(void) {
y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
mw = DisplayWidth(dc->dpy, screen);
}
- inputw = MIN(inputw, mw/3);
promptw = prompt ? textw(dc, prompt) : 0;
+ inputw = MIN(inputw, mw/3);
match(False);
/* menu window */
@@ -548,3 +529,10 @@ setup(void) {
resizedc(dc, mw, mh);
drawmenu();
}
+
+void
+usage(void) {
+ fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
+ " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+ exit(EXIT_FAILURE);
+}