X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/06c18808b6f23bc5120533559e70fbcbff753e84..b81c1e88cdf637e184c5733c87a728df8471fe4e:/dmenu.c
diff --git a/dmenu.c b/dmenu.c
index 608023d..2596b56 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -4,8 +4,8 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <X11/Xatom.h>
#include <X11/Xlib.h>
+#include <X11/Xatom.h>
#include <X11/Xutil.h>
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
@@ -15,7 +15,6 @@
#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 UTF8_CODEPOINT(c) (((c) & 0xc0) != 0x80)
typedef struct Item Item;
struct Item {
@@ -25,45 +24,43 @@ struct Item {
};
static void appenditem(Item *item, Item **list, Item **last);
-static void calcoffsetsh(void);
-static void calcoffsetsv(void);
-static char *cistrstr(const char *s, const char *sub);
+static void calcoffsets(void);
static void drawmenu(void);
-static void drawmenuh(void);
-static void drawmenuv(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 keypress(XKeyEvent *e);
+static void keypress(XKeyEvent *ev);
static void match(void);
+static size_t nextrune(int incr);
static void paste(void);
static void readstdin(void);
static void run(void);
static void setup(void);
static void usage(void);
-static char text[4096];
+static char text[BUFSIZ];
+static int bh, mw, mh;
+static int inputw = 0;
+static int lines = 0;
static int promptw;
static size_t cursor = 0;
+static const char *font = NULL;
static const char *prompt = NULL;
static const char *normbgcolor = "#cccccc";
static const char *normfgcolor = "#000000";
static const char *selbgcolor = "#0066ff";
static const char *selfgcolor = "#ffffff";
-static unsigned int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int mw, mh;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
static Atom utf8;
static Bool topbar = True;
static DC *dc;
-static Item *allitems, *matches;
-static Item *curr, *prev, *next, *sel;
+static Item *items = NULL;
+static Item *matches, *sel;
+static Item *prev, *curr, *next;
static Window root, win;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
-static char *(*fstrstr)(const char *, const char *) = strstr;
-static void (*calcoffsets)(void) = calcoffsetsh;
void
appenditem(Item *item, Item **list, Item **last) {
@@ -77,94 +74,75 @@ appenditem(Item *item, Item **list, Item **last) {
}
void
-calcoffsetsh(void) {
- unsigned int w, x;
+calcoffsets(void) {
+ unsigned int i, n;
- w = promptw + inputw + textw(dc, "<") + textw(dc, ">");
- for(x = w, next = curr; next; next = next->right)
- if((x += MIN(textw(dc, next->text), mw / 3)) > mw)
+ if(lines > 0)
+ n = lines * bh;
+ else
+ n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
+
+ for(i = 0, next = curr; next; next = next->right)
+ if((i += (lines > 0) ? bh : dc_textw(dc, next->text)) > n)
break;
- for(x = w, prev = curr; prev && prev->left; prev = prev->left)
- if((x += MIN(textw(dc, prev->left->text), mw / 3)) > mw)
+ for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
+ if((i += (lines > 0) ? bh : dc_textw(dc, prev->left->text)) > n)
break;
}
-void
-calcoffsetsv(void) {
- unsigned int i;
-
- next = prev = curr;
- for(i = 0; i < lines && next; i++)
- next = next->right;
- for(i = 0; i < lines && prev && prev->left; i++)
- prev = prev->left;
-}
-
-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;
+ Item *item;
+
dc->x = 0;
dc->y = 0;
- drawrect(dc, 0, 0, mw, mh, BG(dc, normcol));
- dc->h = dc->font.height + 2;
- dc->y = topbar ? 0 : mh - dc->h;
- /* print prompt? */
+ dc->h = bh;
+ dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+
if(prompt) {
dc->w = promptw;
- drawtext(dc, prompt, selcol);
+ dc_drawtext(dc, prompt, selcol);
dc->x = dc->w;
}
- dc->w = mw - dc->x;
- /* print input area */
- if(matches && lines == 0 && textw(dc, text) <= inputw)
- dc->w = inputw;
- drawtext(dc, text, normcol);
- drawrect(dc, textnw(dc, text, cursor) + dc->h/2 - 2, 2, 1, dc->h - 4, FG(dc, normcol));
- if(lines > 0)
- drawmenuv();
- else if(curr && (dc->w == inputw || curr->next))
- drawmenuh();
- commitdraw(dc, win);
-}
-
-void
-drawmenuh(void) {
- Item *item;
-
- dc->x += inputw;
- dc->w = textw(dc, "<");
- if(curr->left)
- drawtext(dc, "<", normcol);
- for(item = curr; item != next; item = item->right) {
- dc->x += dc->w;
- dc->w = MIN(textw(dc, item->text), mw / 3);
- drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+ dc_drawtext(dc, text, normcol);
+ if((curpos = dc_textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+ dc_drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+
+ if(lines > 0) {
+ dc->w = mw - dc->x;
+ for(item = curr; item != next; item = item->right) {
+ dc->y += dc->h;
+ dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ }
+ }
+ else if(matches) {
+ dc->x += inputw;
+ dc->w = dc_textw(dc, "<");
+ if(curr->left)
+ dc_drawtext(dc, "<", normcol);
+ for(item = curr; item != next; item = item->right) {
+ dc->x += dc->w;
+ dc->w = dc_textw(dc, item->text);
+ dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ }
+ dc->w = dc_textw(dc, ">");
+ dc->x = mw - dc->w;
+ if(next)
+ dc_drawtext(dc, ">", normcol);
}
- dc->w = textw(dc, ">");
- dc->x = mw - dc->w;
- if(next)
- drawtext(dc, ">", normcol);
+ dc_map(dc, win, mw, mh);
}
-void
-drawmenuv(void) {
- Item *item;
+char *
+fstrstr(const char *s, const char *sub) {
+ size_t len;
- dc->y = topbar ? dc->h : 0;
- dc->w = mw - dc->x;
- for(item = curr; item != next; item = item->right) {
- drawtext(dc, item->text, (item == sel) ? selcol : normcol);
- dc->y += dc->h;
- }
+ for(len = strlen(sub); *s; s++)
+ if(!fstrncmp(s, sub, len))
+ return (char *)s;
+ return NULL;
}
void
@@ -181,7 +159,9 @@ grabkeyboard(void) {
void
insert(const char *s, ssize_t n) {
- memmove(text + cursor + n, text + cursor, sizeof text - cursor - n);
+ if(strlen(text) + n > sizeof text - 1)
+ return;
+ memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
if(n > 0)
memcpy(text + cursor, s, n);
cursor += n;
@@ -189,15 +169,14 @@ insert(const char *s, ssize_t n) {
}
void
-keypress(XKeyEvent *e) {
- char buf[sizeof text];
- int n;
+keypress(XKeyEvent *ev) {
+ char buf[32];
size_t len;
KeySym ksym;
len = strlen(text);
- XLookupString(e, buf, sizeof buf, &ksym, NULL);
- if(e->state & ControlMask) {
+ XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+ if(ev->state & ControlMask) {
switch(tolower(ksym)) {
default:
return;
@@ -210,6 +189,9 @@ keypress(XKeyEvent *e) {
case XK_c:
ksym = XK_Escape;
break;
+ case XK_d:
+ ksym = XK_Delete;
+ break;
case XK_e:
ksym = XK_End;
break;
@@ -223,7 +205,6 @@ keypress(XKeyEvent *e) {
ksym = XK_Tab;
break;
case XK_j:
- case XK_m:
ksym = XK_Return;
break;
case XK_k: /* delete right */
@@ -237,39 +218,28 @@ keypress(XKeyEvent *e) {
ksym = XK_Up;
break;
case XK_u: /* delete left */
- insert(NULL, -cursor);
+ insert(NULL, 0 - cursor);
break;
case XK_w: /* delete word */
- if(cursor == 0)
- return;
- n = 0;
- while(cursor - n++ > 0 && text[cursor - n] == ' ');
- while(cursor - n++ > 0 && text[cursor - n] != ' ');
- insert(NULL, 1-n);
+ 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 */
- XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime);
- /* causes SelectionNotify event */
- return;
}
}
switch(ksym) {
default:
- if(!iscntrl((int)*buf))
- insert(buf, MIN(strlen(buf), sizeof text - cursor));
- break;
- case XK_BackSpace:
- if(cursor == 0)
- return;
- for(n = 1; cursor - n > 0 && !UTF8_CODEPOINT(text[cursor - n]); n++);
- insert(NULL, -n);
+ if(isprint(*buf))
+ insert(buf, strlen(buf));
break;
case XK_Delete:
if(cursor == len)
return;
- for(n = 1; cursor + n < len && !UTF8_CODEPOINT(text[cursor + n]); n++);
- cursor += n;
- insert(NULL, -n);
+ cursor = nextrune(+1);
+ case XK_BackSpace:
+ if(cursor > 0)
+ insert(NULL, nextrune(-1) - cursor);
break;
case XK_End:
if(cursor < len) {
@@ -293,18 +263,19 @@ keypress(XKeyEvent *e) {
sel = curr = matches;
calcoffsets();
break;
+ case XK_Insert: /* paste selection */
+ if(ev->state & ShiftMask)
+ XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+ return;
case XK_Left:
if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
- while(cursor-- > 0 && !UTF8_CODEPOINT(text[cursor]));
+ cursor = nextrune(-1);
break;
}
else if(lines > 0)
return;
case XK_Up:
- if(!sel || !sel->left)
- return;
- sel = sel->left;
- if(sel->right == curr) {
+ if(sel && sel->left && (sel = sel->left)->right == curr) {
curr = prev;
calcoffsets();
}
@@ -323,21 +294,18 @@ keypress(XKeyEvent *e) {
break;
case XK_Return:
case XK_KP_Enter:
- fputs((sel && !(e->state & ShiftMask)) ? sel->text : text, stdout);
+ fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
fflush(stdout);
exit(EXIT_SUCCESS);
case XK_Right:
if(cursor < len) {
- while(cursor++ < len && !UTF8_CODEPOINT(text[cursor]));
+ cursor = nextrune(+1);
break;
}
else if(lines > 0)
return;
case XK_Down:
- if(!sel || !sel->right)
- return;
- sel = sel->right;
- if(sel == next) {
+ if(sel && sel->right && (sel = sel->right) == next) {
curr = next;
calcoffsets();
}
@@ -355,18 +323,19 @@ keypress(XKeyEvent *e) {
void
match(void) {
- unsigned int len;
+ 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 = allitems; item; item = item->next)
+ for(item = items; item; item = item->next)
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;
@@ -392,6 +361,15 @@ match(void) {
calcoffsets();
}
+size_t
+nextrune(int incr) {
+ size_t n, len;
+
+ len = strlen(text);
+ for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+ return n;
+}
+
void
paste(void) {
char *p, *q;
@@ -399,7 +377,7 @@ paste(void) {
unsigned long dl;
Atom da;
- XGetWindowProperty(dc->dpy, win, utf8, 0, sizeof text - cursor, True,
+ 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));
XFree(p);
@@ -409,22 +387,17 @@ paste(void) {
void
readstdin(void) {
char buf[sizeof text], *p;
- Item *item, *new;
+ Item *item, **end;
- allitems = NULL;
- for(item = NULL; fgets(buf, sizeof buf, stdin); item = new) {
+ for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
if((p = strchr(buf, '\n')))
*p = '\0';
- if(!(new = malloc(sizeof *new)))
- eprintf("cannot malloc %u bytes\n", sizeof *new);
- if(!(new->text = strdup(buf)))
- eprintf("cannot strdup %u bytes\n", strlen(buf));
- inputw = MAX(inputw, textw(dc, new->text));
- new->next = new->left = new->right = NULL;
- if(item)
- item->next = new;
- else
- allitems = new;
+ 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, dc_textw(dc, item->text));
}
}
@@ -465,13 +438,15 @@ setup(void) {
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);
+ normcol[ColBG] = dc_color(dc, normbgcolor);
+ normcol[ColFG] = dc_color(dc, normfgcolor);
+ selcol[ColBG] = dc_color(dc, selbgcolor);
+ selcol[ColFG] = dc_color(dc, selfgcolor);
- /* input window geometry */
- mh = (dc->font.height + 2) * (lines + 1);
+ /* menu geometry */
+ bh = dc->font.height + 2;
+ lines = MAX(lines, 0);
+ mh = (lines + 1) * bh;
#ifdef XINERAMA
if((info = XineramaQueryScreens(dc->dpy, &n))) {
int i, di;
@@ -494,20 +469,19 @@ setup(void) {
y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
mw = DisplayWidth(dc->dpy, screen);
}
-
- /* input window */
+ /* menu window */
wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
- DefaultDepth(dc->dpy, screen), CopyFromParent,
- DefaultVisual(dc->dpy, screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+ DefaultDepth(dc->dpy, screen), CopyFromParent,
+ DefaultVisual(dc->dpy, screen),
+ CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
grabkeyboard();
- setcanvas(dc, win, mw, mh);
+ dc_resize(dc, mw, mh);
inputw = MIN(inputw, mw/3);
- promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+ promptw = prompt ? dc_textw(dc, prompt) : 0;
XMapRaised(dc->dpy, win);
text[0] = '\0';
match();
@@ -525,8 +499,6 @@ main(int argc, char *argv[]) {
int i;
progname = "dmenu";
- dc = initdraw();
-
for(i = 1; i < argc; i++)
/* single flags */
if(!strcmp(argv[i], "-v")) {
@@ -535,21 +507,17 @@ main(int argc, char *argv[]) {
}
else if(!strcmp(argv[i], "-b"))
topbar = False;
- else if(!strcmp(argv[i], "-i")) {
+ else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp;
- fstrstr = cistrstr;
- }
else if(i == argc-1)
usage();
/* double flags */
- else if(!strcmp(argv[i], "-l")) {
- if((lines = atoi(argv[++i])) > 0)
- calcoffsets = calcoffsetsv;
- }
+ else if(!strcmp(argv[i], "-l"))
+ lines = atoi(argv[++i]);
else if(!strcmp(argv[i], "-p"))
prompt = argv[++i];
else if(!strcmp(argv[i], "-fn"))
- initfont(dc, argv[i++]);
+ font = argv[++i];
else if(!strcmp(argv[i], "-nb"))
normbgcolor = argv[++i];
else if(!strcmp(argv[i], "-nf"))
@@ -561,6 +529,8 @@ main(int argc, char *argv[]) {
else
usage();
+ dc = dc_init();
+ dc_font(dc, font);
readstdin();
setup();
run();