X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/5bc288b2b1270957baab2142e1e8b20b796fed11..f2abaf8b308bc25d9c5f26d3ea3818516dd477d9:/dmenu.c?ds=sidebyside
diff --git a/dmenu.c b/dmenu.c
index bebc206..9e30add 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -19,31 +19,13 @@
#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))
-
-/* enums */
-enum { ColFG, ColBG, ColLast };
-
-/* typedefs */
-typedef struct {
- int x, y, w, h;
- unsigned long norm[ColLast];
- unsigned long sel[ColLast];
- Drawable drawable;
- GC gc;
- struct {
- XFontStruct *xfont;
- XFontSet set;
- int ascent;
- int descent;
- int height;
- } font;
-} DC; /* draw context */
+#define IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) || !((c) & 0x80))
typedef struct Item Item;
struct Item {
char *text;
- Item *next; /* traverses all items */
- Item *left, *right; /* traverses items matching current search pattern */
+ Item *next; /* traverses all items */
+ Item *left, *right; /* traverses items matching current search pattern */
};
/* forward declarations */
@@ -52,49 +34,46 @@ static void calcoffsetsh(void);
static void calcoffsetsv(void);
static char *cistrstr(const char *s, const char *sub);
static void cleanup(void);
-static void drawcursor(void);
+static void dinput(void);
static void drawmenu(void);
static void drawmenuh(void);
static void drawmenuv(void);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-static void eprint(const char *errstr, ...);
-static unsigned long getcolor(const char *colstr);
static Bool grabkeyboard(void);
-static void initfont(const char *fontstr);
-static void kpress(XKeyEvent * e);
+static void kpress(XKeyEvent *e);
static void match(char *pattern);
static void readstdin(void);
static void run(void);
static void setup(Bool topbar);
-static int textnw(const char *text, unsigned int len);
-static int textw(const char *text);
#include "config.h"
+#include "draw.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 cursor = 0;
static int screen;
-static unsigned int mw, mh;
+static unsigned int lines = 0;
static unsigned int numlockmask = 0;
+static unsigned int mw, mh;
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
static Bool running = True;
-static Display *dpy;
static DC dc;
-static Item *allitems = NULL; /* first of all items */
-static Item *item = NULL; /* first of pattern matching items */
+static Display *dpy;
+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 n) = strncmp;
+static Window win, parent;
+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;
void
@@ -110,45 +89,27 @@ appenditem(Item *i, Item **list, Item **last) {
void
calcoffsetsh(void) {
- int tw;
unsigned int w;
- if(!curr)
- return;
- w = promptw + cmdw + 2 * spaceitem;
- for(next = curr; next; next=next->right) {
- tw = MIN(textw(next->text), mw / 3);
- w += tw;
- if(w > mw)
+ w = promptw + cmdw + (2 * spaceitem);
+ for(next = curr; next; next = next->right)
+ if((w += MIN(textw(&dc, next->text), mw / 3)) > mw)
break;
- }
- w = promptw + cmdw + 2 * spaceitem;
- for(prev = curr; prev && prev->left; prev=prev->left) {
- tw = MIN(textw(prev->left->text), mw / 3);
- w += tw;
- if(w > mw)
+ w = promptw + cmdw + (2 * spaceitem);
+ for(prev = curr; prev && prev->left; prev = prev->left)
+ if((w += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
break;
- }
}
void
calcoffsetsv(void) {
- static unsigned int h;
+ unsigned int i;
- if(!curr)
- return;
- h = (dc.font.height + 2) * (lines + 1);
- for(next = curr; next; next=next->right) {
- h -= dc.font.height + 2;
- if(h <= 0)
- break;
- }
- h = (dc.font.height + 2) * (lines + 1);
- for(prev = curr; prev && prev->left; prev=prev->left) {
- h -= dc.font.height + 2;
- if(h <= 0)
- break;
- }
+ 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 *
@@ -158,8 +119,7 @@ cistrstr(const char *s, const char *sub) {
if(!sub)
return (char *)s;
- if((c = *sub++) != '\0') {
- c = tolower(c);
+ if((c = tolower(*sub++)) != '\0') {
len = strlen(sub);
do {
do {
@@ -184,24 +144,18 @@ cleanup(void) {
free(allitems);
allitems = itm;
}
- if(dc.font.set)
- XFreeFontSet(dpy, dc.font.set);
- else
- XFreeFont(dpy, dc.font.xfont);
- XFreePixmap(dpy, dc.drawable);
- XFreeGC(dpy, dc.gc);
+ cleanupdraw(&dc);
XDestroyWindow(dpy, win);
XUngrabKeyboard(dpy, CurrentTime);
}
void
-drawcursor(void) {
- XRectangle r = { dc.x, dc.y + 2, 1, dc.font.height - 2 };
-
- r.x += textnw(text, cursor) + dc.font.height / 2;
-
- XSetForeground(dpy, dc.gc, dc.norm[ColFG]);
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+dinput(void) {
+ cleanup();
+ argp[0] = "dinput";
+ argp[1] = text;
+ execvp("dinput", argp);
+ eprint("cannot exec dinput\n");
}
void
@@ -210,19 +164,18 @@ drawmenu(void) {
dc.y = 0;
dc.w = mw;
dc.h = mh;
- drawtext(NULL, dc.norm);
+ drawtext(&dc, NULL, normcol, False);
/* print prompt? */
if(prompt) {
dc.w = promptw;
- drawtext(prompt, dc.sel);
+ drawtext(&dc, prompt, selcol, False);
dc.x += dc.w;
}
dc.w = mw - dc.x;
/* print command */
if(cmdw && item && lines == 0)
dc.w = cmdw;
- drawtext(text[0] ? text : NULL, dc.norm);
- drawcursor();
+ drawtext(&dc, *text ? text : NULL, normcol, False);
if(curr) {
if(lines > 0)
drawmenuv();
@@ -239,16 +192,16 @@ drawmenuh(void) {
dc.x += cmdw;
dc.w = spaceitem;
- drawtext(curr->left ? "<" : NULL, dc.norm);
+ drawtext(&dc, curr->left ? "<" : NULL, normcol, False);
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, False);
dc.x += dc.w;
}
dc.w = spaceitem;
dc.x = mw - dc.w;
- drawtext(next ? ">" : NULL, dc.norm);
+ drawtext(&dc, next ? ">" : NULL, normcol, False);
}
void
@@ -256,60 +209,14 @@ drawmenuv(void) {
Item *i;
dc.w = mw - dc.x;
- dc.y += dc.font.height + 2;
- for(i = curr; i != next; i=i->right) {
- drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
- dc.y += dc.font.height + 2;
+ dc.h = dc.font.height + 2;
+ dc.y = dc.h;
+ for(i = curr; i != next; i = i->right) {
+ drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
+ dc.y += dc.h;
}
- drawtext(NULL, dc.norm);
-}
-
-void
-drawtext(const char *text, unsigned long col[ColLast]) {
- char buf[256];
- int i, x, y, h, len, olen;
- XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
- XSetForeground(dpy, dc.gc, col[ColBG]);
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- if(!text)
- return;
- olen = strlen(text);
- h = dc.font.height;
- y = dc.y + ((h+2) / 2) - (h / 2) + dc.font.ascent;
- x = dc.x + (h / 2);
- /* shorten text if necessary */
- for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
- if(!len)
- return;
- memcpy(buf, text, len);
- if(len < olen)
- for(i = len; i && i > len - 3; buf[--i] = '.');
- XSetForeground(dpy, dc.gc, col[ColFG]);
- if(dc.font.set)
- XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
- else
- XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-}
-
-void
-eprint(const char *errstr, ...) {
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
-}
-
-unsigned long
-getcolor(const char *colstr) {
- Colormap cmap = DefaultColormap(dpy, screen);
- XColor color;
-
- if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
- eprint("error, cannot allocate color '%s'\n", colstr);
- return color.pixel;
+ dc.h = mh - dc.y;
+ drawtext(&dc, NULL, normcol, False);
}
Bool
@@ -326,169 +233,94 @@ grabkeyboard(void) {
}
void
-initfont(const char *fontstr) {
- char *def, **missing;
- int i, n;
-
- if(!fontstr || fontstr[0] == '\0')
- eprint("error, cannot load font: '%s'\n", fontstr);
- missing = NULL;
- dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
- if(missing)
- XFreeStringList(missing);
- if(dc.font.set) {
- XFontStruct **xfonts;
- char **font_names;
- dc.font.ascent = dc.font.descent = 0;
- n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
- for(i = 0; i < n; i++) {
- dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
- dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent);
- xfonts++;
- }
- }
- else {
- if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
- && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
- eprint("error, cannot load font: '%s'\n", fontstr);
- dc.font.ascent = dc.font.xfont->ascent;
- dc.font.descent = dc.font.xfont->descent;
- }
- dc.font.height = dc.font.ascent + dc.font.descent;
-}
-
-void
-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {
char buf[sizeof text];
- int i, num;
- unsigned int len;
+ int num;
+ unsigned int i, len;
KeySym ksym;
len = strlen(text);
- buf[0] = '\0';
num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
- if(IsKeypadKey(ksym)) {
- if(ksym == XK_KP_Enter)
- ksym = XK_Return;
- else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
- ksym = (ksym - XK_KP_0) + XK_0;
- }
- if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
- || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
- || IsPrivateKeypadKey(ksym))
+ if(ksym == XK_KP_Enter)
+ ksym = XK_Return;
+ else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
+ ksym = (ksym - XK_KP_0) + XK_0;
+ else if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
+ || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
+ || IsPrivateKeypadKey(ksym))
return;
/* first check if a control mask is omitted */
if(e->state & ControlMask) {
- switch (ksym) {
- default: /* ignore other control sequences */
+ switch(tolower(ksym)) {
+ default:
return;
case XK_a:
- case XK_A:
ksym = XK_Home;
break;
+ case XK_b:
+ ksym = XK_Left;
+ break;
case XK_c:
- case XK_C:
ksym = XK_Escape;
break;
case XK_e:
- case XK_E:
ksym = XK_End;
break;
+ case XK_f:
+ ksym = XK_Right;
+ break;
case XK_h:
- case XK_H:
ksym = XK_BackSpace;
break;
case XK_i:
- case XK_I:
ksym = XK_Tab;
break;
case XK_j:
- case XK_J:
+ case XK_m:
ksym = XK_Return;
break;
+ case XK_n:
+ ksym = XK_Down;
+ break;
+ case XK_p:
+ ksym = XK_Up;
+ break;
case XK_u:
- case XK_U:
- memmove(text, text + cursor, sizeof text - cursor + 1);
- cursor = 0;
+ text[0] = '\0';
match(text);
break;
case XK_w:
- case XK_W:
- if(cursor > 0) {
- i = cursor;
- while(i-- > 0 && text[i] == ' ');
- while(i-- > 0 && text[i] != ' ');
- memmove(text + i + 1, text + cursor, sizeof text - cursor + 1);
- cursor = i + 1;
- match(text);
- }
- break;
- }
- }
- if(CLEANMASK(e->state) & Mod1Mask) {
- switch(ksym) {
- default: return;
- case XK_h:
- ksym = XK_Left;
- break;
- case XK_l:
- ksym = XK_Right;
- break;
- case XK_j:
- ksym = XK_Next;
- break;
- case XK_k:
- ksym = XK_Prior;
- break;
- case XK_g:
- ksym = XK_Home;
- break;
- case XK_G:
- ksym = XK_End;
+ if(len == 0)
+ return;
+ i = len;
+ while(i-- > 0 && text[i] == ' ');
+ while(i-- > 0 && text[i] != ' ');
+ text[++i] = '\0';
+ match(text);
break;
- case XK_p:
- {
- FILE *fp;
- char *s;
- if(!(fp = (FILE*)popen("sselp", "r")))
- eprint("dmenu: Could not popen sselp\n");
- s = fgets(buf, sizeof buf, fp);
- pclose(fp);
- if(s == NULL)
- return;
- }
- num = strlen(buf);
- if(num && buf[num-1] == '\n')
- buf[--num] = '\0';
+ case XK_x:
+ dinput();
break;
}
}
switch(ksym) {
default:
- num = MIN(num, sizeof text - cursor);
+ num = MIN(num, sizeof text);
if(num && !iscntrl((int) buf[0])) {
- memmove(text + cursor + num, text + cursor, sizeof text - cursor - num);
- memcpy(text + cursor, buf, num);
- cursor+=num;
+ memcpy(text + len, buf, num + 1);
+ len += num;
match(text);
}
break;
case XK_BackSpace:
- if(cursor > 0) {
- memmove(text + cursor - 1, text + cursor, sizeof text - cursor + 1);
- cursor--;
- match(text);
- }
- break;
- case XK_Delete:
- memmove(text + cursor, text + cursor + 1, sizeof text - cursor);
+ if(len == 0)
+ return;
+ for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
+ len -= i;
+ text[len] = '\0';
match(text);
break;
case XK_End:
- if(cursor < len) {
- cursor = len;
- break;
- }
while(next) {
sel = curr = next;
calcoffsets();
@@ -499,28 +331,20 @@ kpress(XKeyEvent * e) {
case XK_Escape:
ret = 1;
running = False;
- break;
+ return;
case XK_Home:
- if(sel == item) {
- cursor = 0;
- break;
- }
sel = curr = item;
calcoffsets();
break;
case XK_Left:
case XK_Up:
- if(sel && sel->left){
- sel=sel->left;
- if(sel->right == curr) {
- curr = prev;
- calcoffsets();
- }
- }
- else if(cursor > 0)
- cursor--;
- else
+ if(!sel || !sel->left)
return;
+ sel = sel->left;
+ if(sel->right == curr) {
+ curr = prev;
+ calcoffsets();
+ }
break;
case XK_Next:
if(!next)
@@ -541,27 +365,21 @@ kpress(XKeyEvent * e) {
fprintf(stdout, "%s", sel->text);
fflush(stdout);
running = False;
- break;
+ return;
case XK_Right:
case XK_Down:
- if(cursor < len)
- cursor++;
- else if(sel && sel->right) {
- sel=sel->right;
- if(sel == next) {
- curr = next;
- calcoffsets();
- }
- }
- else
+ if(!sel || !sel->right)
return;
+ sel = sel->right;
+ if(sel == next) {
+ curr = next;
+ calcoffsets();
+ }
break;
case XK_Tab:
- if(!sel)
- return;
- strncpy(text, sel->text, sizeof text);
- cursor = strlen(text);
- match(text);
+ if(sel)
+ strncpy(text, sel->text, sizeof text);
+ dinput();
break;
}
drawmenu();
@@ -620,13 +438,11 @@ readstdin(void) {
if(buf[len-1] == '\n')
buf[--len] = '\0';
if(!(p = strdup(buf)))
- eprint("fatal: could not strdup() %u bytes\n", len);
- if(max < len || !maxname) {
+ eprint("cannot strdup %u bytes\n", len);
+ if((max = MAX(max, len)) == len)
maxname = p;
- max = len;
- }
- if(!(new = (Item *)malloc(sizeof(Item))))
- eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
+ if(!(new = malloc(sizeof *new)))
+ eprint("cannot malloc %u bytes\n", sizeof *new);
new->next = new->left = new->right = NULL;
new->text = p;
if(!i)
@@ -643,9 +459,7 @@ run(void) {
/* main event loop */
while(running && !XNextEvent(dpy, &ev))
- switch (ev.type) {
- default: /* ignore all crap */
- break;
+ switch(ev.type) {
case KeyPress:
kpress(&ev.xkey);
break;
@@ -681,17 +495,17 @@ setup(Bool topbar) {
}
XFreeModifiermap(modmap);
- /* style */
- dc.norm[ColBG] = getcolor(normbgcolor);
- dc.norm[ColFG] = getcolor(normfgcolor);
- dc.sel[ColBG] = getcolor(selbgcolor);
- dc.sel[ColFG] = getcolor(selfgcolor);
- initfont(font);
+ dc.dpy = dpy;
+ normcol[ColBG] = getcolor(&dc, normbgcolor);
+ normcol[ColFG] = getcolor(&dc, normfgcolor);
+ selcol[ColBG] = getcolor(&dc, selbgcolor);
+ selcol[ColFG] = getcolor(&dc, selfgcolor);
+ initfont(&dc, font);
/* menu window */
wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
- wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+ wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
/* menu window geometry */
mh = (dc.font.height + 2) * (lines + 1);
@@ -726,43 +540,23 @@ setup(Bool topbar) {
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- /* pixmap */
- dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, parent, 0, NULL);
- XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
- if(!dc.font.set)
- XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+ setupdraw(&dc, win);
if(maxname)
- cmdw = MIN(textw(maxname), mw / 3);
+ cmdw = MIN(textw(&dc, maxname), mw / 3);
if(prompt)
- promptw = MIN(textw(prompt), mw / 5);
+ promptw = MIN(textw(&dc, prompt), mw / 5);
text[0] = '\0';
match(text);
XMapRaised(dpy, win);
}
-int
-textnw(const char *text, unsigned int len) {
- XRectangle r;
-
- if(dc.font.set) {
- XmbTextExtents(dc.font.set, text, len, NULL, &r);
- return r.width;
- }
- return XTextWidth(dc.font.xfont, text, len);
-}
-
-int
-textw(const char *text) {
- return textnw(text, strlen(text)) + dc.font.height;
-}
-
int
main(int argc, char *argv[]) {
unsigned int i;
Bool topbar = True;
/* command line args */
+ progname = argv[0];
for(i = 1; i < argc; i++)
if(!strcmp(argv[i], "-i")) {
fstrncmp = strncasecmp;
@@ -774,8 +568,9 @@ main(int argc, char *argv[]) {
if(++i < argc) parent = atoi(argv[i]);
}
else if(!strcmp(argv[i], "-l")) {
- calcoffsets = calcoffsetsv;
if(++i < argc) lines = atoi(argv[i]);
+ if(lines > 0)
+ calcoffsets = calcoffsetsv;
}
else if(!strcmp(argv[i], "-fn")) {
if(++i < argc) font = argv[i];
@@ -795,18 +590,25 @@ 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] [-e <xid>] [-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, "warning: no locale support\n");
+ fprintf(stderr, "dmenu: warning: no locale support\n");
if(!(dpy = XOpenDisplay(NULL)))
- eprint("dmenu: cannot open display\n");
+ eprint("cannot open display\n");
screen = DefaultScreen(dpy);
if(!parent)
parent = 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();