X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=2afcc4873aab202743b0694b691235d73ac72000;hb=8911aa10606b4fda9d766973b1c3e0e23bb2c266;hp=688fabf26a4aa39d5c912f7276d6e29b6911cb59;hpb=745c46d8fa810bbf45ef16e79a0f84c787f1a670;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 688fabf..2afcc48 100644 --- a/dmenu.c +++ b/dmenu.c @@ -2,13 +2,17 @@ #include #include #include -#include #include +#include #include +#include #include +#include #include #include -#include +#ifdef XINERAMA +#include +#endif /* macros */ #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) @@ -17,10 +21,12 @@ enum { ColFG, ColBG, ColLast }; /* typedefs */ +typedef unsigned int uint; +typedef unsigned long ulong; typedef struct { int x, y, w, h; - unsigned long norm[ColLast]; - unsigned long sel[ColLast]; + ulong norm[ColLast]; + ulong sel[ColLast]; Drawable drawable; GC gc; struct { @@ -35,83 +41,74 @@ typedef struct { typedef struct Item Item; struct Item { char *text; - Bool matched; Item *next; /* traverses all items */ Item *left, *right; /* traverses items matching current search pattern */ }; /* forward declarations */ -Item *appenditem(Item *i, Item *last); -void calcoffsets(void); -char *cistrstr(const char *s, const char *sub); -void cleanup(void); -void drawmenu(void); -void drawtext(const char *text, unsigned long col[ColLast]); -void *emalloc(unsigned int size); -void eprint(const char *errstr, ...); -char *estrdup(const char *str); -unsigned long getcolor(const char *colstr); -Bool grabkeyboard(void); -void initfont(const char *fontstr); -void kpress(XKeyEvent * e); -void match(char *pattern); -void readstdin(void); -void run(void); -void setup(int x, int y, int w); -unsigned int textnw(const char *text, unsigned int len); -unsigned int textw(const char *text); +static void appenditem(Item *i, Item **list, Item **last); +static void calcoffsets(void); +static char *cistrstr(const char *s, const char *sub); +static void cleanup(void); +static void drawmenu(void); +static void drawtext(const char *text, ulong col[ColLast]); +static void *emalloc(uint size); +static void eprint(const char *errstr, ...); +static ulong getcolor(const char *colstr); +static Bool grabkeyboard(void); +static void initfont(const char *fontstr); +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, uint len); +static int textw(const char *text); #include "config.h" /* variables */ -char *font = FONT; -char *maxname = NULL; -char *normbg = NORMBGCOLOR; -char *normfg = NORMFGCOLOR; -char *prompt = NULL; -char *selbg = SELBGCOLOR; -char *selfg = SELFGCOLOR; -char text[4096]; -int screen; -int ret = 0; -unsigned int cmdw = 0; -unsigned int mw, mh; -unsigned int promptw = 0; -unsigned int nitem = 0; -unsigned int numlockmask = 0; -Bool running = True; -Display *dpy; -DC dc = {0}; -Item *allitems = NULL; /* first of all items */ -Item *item = NULL; /* first of pattern matching items */ -Item *sel = NULL; -Item *next = NULL; -Item *prev = NULL; -Item *curr = NULL; -Window root, win; -int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; -char *(*fstrstr)(const char *, const char *) = strstr; - -Item * -appenditem(Item *i, Item *last) { - if(!last) - item = i; +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 screen; +static uint mw, mh; +static uint numlockmask = 0; +static Bool running = True; +static Display *dpy; +static DC dc = {0}; +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 root, win; +static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; +static char *(*fstrstr)(const char *, const char *) = strstr; + +void +appenditem(Item *i, Item **list, Item **last) { + if(!(*last)) + *list = i; else - last->right = i; - i->left = last; + (*last)->right = i; + i->left = *last; i->right = NULL; - last = i; - nitem++; - return last; + *last = i; } void calcoffsets(void) { - unsigned int tw, w; + int tw; + uint w; if(!curr) return; - w = promptw + cmdw + 2 * SPACE; + w = promptw + cmdw + 2 * spaceitem; for(next = curr; next; next=next->right) { tw = textw(next->text); if(tw > mw / 3) @@ -120,7 +117,7 @@ calcoffsets(void) { if(w > mw) break; } - w = promptw + cmdw + 2 * SPACE; + w = promptw + cmdw + 2 * spaceitem; for(prev = curr; prev && prev->left; prev=prev->left) { tw = textw(prev->left->text); if(tw > mw / 3) @@ -134,7 +131,7 @@ calcoffsets(void) { char * cistrstr(const char *s, const char *sub) { int c, csub; - unsigned int len; + uint len; if(!sub) return (char *)s; @@ -196,7 +193,7 @@ drawmenu(void) { drawtext(text[0] ? text : NULL, dc.norm); dc.x += cmdw; if(curr) { - dc.w = SPACE; + dc.w = spaceitem; drawtext((curr && curr->left) ? "<" : NULL, dc.norm); dc.x += dc.w; /* determine maximum items */ @@ -207,8 +204,8 @@ drawmenu(void) { drawtext(i->text, (sel == i) ? dc.sel : dc.norm); dc.x += dc.w; } - dc.x = mw - SPACE; - dc.w = SPACE; + dc.x = mw - spaceitem; + dc.w = spaceitem; drawtext(next ? ">" : NULL, dc.norm); } XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); @@ -216,10 +213,10 @@ drawmenu(void) { } void -drawtext(const char *text, unsigned long col[ColLast]) { +drawtext(const char *text, ulong col[ColLast]) { int x, y, w, h; static char buf[256]; - unsigned int len, olen; + uint len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XSetForeground(dpy, dc.gc, col[ColBG]); @@ -256,7 +253,7 @@ drawtext(const char *text, unsigned long col[ColLast]) { } void * -emalloc(unsigned int size) { +emalloc(uint size) { void *res = malloc(size); if(!res) @@ -274,16 +271,7 @@ eprint(const char *errstr, ...) { exit(EXIT_FAILURE); } -char * -estrdup(const char *str) { - void *res = strdup(str); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", strlen(str)); - return res; -} - -unsigned long +ulong getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color; @@ -295,11 +283,11 @@ getcolor(const char *colstr) { Bool grabkeyboard(void) { - unsigned int len; + uint len; for(len = 1000; len; len--) { if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) + == GrabSuccess) break; usleep(1000); } @@ -351,22 +339,21 @@ void kpress(XKeyEvent * e) { char buf[32]; int i, num; - unsigned int len; + uint len; KeySym ksym; len = strlen(text); buf[0] = 0; num = XLookupString(e, buf, sizeof buf, &ksym, 0); - if(IsKeypadKey(ksym)) { - if(ksym == XK_KP_Enter) { + if(IsKeypadKey(ksym)) { + if(ksym == XK_KP_Enter) ksym = XK_Return; - } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) { + 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)) + || IsMiscFunctionKey(ksym) || IsPFKey(ksym) + || IsPrivateKeypadKey(ksym)) return; /* first check if a control mask is omitted */ if(e->state & ControlMask) { @@ -520,20 +507,41 @@ kpress(XKeyEvent * e) { void match(char *pattern) { - unsigned int plen; - Item *i, *j; + uint plen; + Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; if(!pattern) return; plen = strlen(pattern); - item = j = NULL; - nitem = 0; - for(i = allitems; i; i = i->next) - if((i->matched = !fstrncmp(pattern, i->text, plen))) - j = appenditem(i, j); + item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; for(i = allitems; i; i = i->next) - if(!i->matched && fstrstr(i->text, pattern)) - j = appenditem(i, j); + if(!fstrncmp(pattern, i->text, plen + 1)) + appenditem(i, &lexact, &exactend); + else if(!fstrncmp(pattern, i->text, plen)) + appenditem(i, &lprefix, &prefixend); + else if(fstrstr(i->text, pattern)) + appenditem(i, &lsubstr, &substrend); + if(lexact) { + item = lexact; + itemend = exactend; + } + if(lprefix) { + if(itemend) { + itemend->right = lprefix; + lprefix->left = itemend; + } + else + item = lprefix; + itemend = prefixend; + } + if(lsubstr) { + if(itemend) { + itemend->right = lsubstr; + lsubstr->left = itemend; + } + else + item = lsubstr; + } curr = prev = next = sel = item; calcoffsets(); } @@ -541,7 +549,7 @@ match(char *pattern) { void readstdin(void) { char *p, buf[1024]; - unsigned int len = 0, max = 0; + uint len = 0, max = 0; Item *i, *new; i = 0; @@ -549,7 +557,8 @@ readstdin(void) { len = strlen(buf); if (buf[len - 1] == '\n') buf[len - 1] = 0; - p = estrdup(buf); + if(!(p = strdup(buf))) + eprint("fatal: could not strdup() %u bytes\n", strlen(buf)); if(max < len) { maxname = p; max = len; @@ -585,10 +594,13 @@ run(void) { } void -setup(int x, int y, int w) { - unsigned int i, j; +setup(Bool topbar) { + int i, j, x, y; XModifierKeymap *modmap; XSetWindowAttributes wa; +#if XINERAMA + XineramaScreenInfo *info = NULL; +#endif /* init modifier map */ modmap = XGetModifierMapping(dpy); @@ -601,24 +613,35 @@ setup(int x, int y, int w) { XFreeModifiermap(modmap); /* style */ - dc.norm[ColBG] = getcolor(normbg); - dc.norm[ColFG] = getcolor(normfg); - dc.sel[ColBG] = getcolor(selbg); - dc.sel[ColFG] = getcolor(selfg); + dc.norm[ColBG] = getcolor(normbgcolor); + dc.norm[ColFG] = getcolor(normfgcolor); + dc.sel[ColBG] = getcolor(selbgcolor); + dc.sel[ColFG] = getcolor(selfgcolor); initfont(font); /* menu window */ wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; - mw = w ? w : DisplayWidth(dpy, screen); + + /* menu window geometry */ mh = dc.font.height + 2; - if(y < 0) { - if(y == (int)(unsigned int)-1) - y = DisplayHeight(dpy, screen) - mh; - else - y = (-1 * y) - mh; +#if XINERAMA + if(XineramaIsActive(dpy)) { + info = XineramaQueryScreens(dpy, &i); + x = info[xidx].x_org; + y = topbar ? info[xidx].y_org : info[xidx].y_org + info[xidx].height - mh; + mw = info[xidx].width; + XFree(info); + } + else +#endif + { + x = 0; + y = topbar ? 0 : DisplayHeight(dpy, screen) - mh; + mw = DisplayWidth(dpy, screen); } + win = XCreateWindow(dpy, root, x, y, mw, mh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), @@ -643,8 +666,8 @@ setup(int x, int y, int w) { XMapRaised(dpy, win); } -unsigned int -textnw(const char *text, unsigned int len) { +int +textnw(const char *text, uint len) { XRectangle r; if(dc.font.set) { @@ -654,15 +677,15 @@ textnw(const char *text, unsigned int len) { return XTextWidth(dc.font.xfont, text, len); } -unsigned int +int textw(const char *text) { return textnw(text, strlen(text)) + dc.font.height; } int main(int argc, char *argv[]) { - int x = 0, y = 0, w = 0; - unsigned int i; + uint i; + Bool topbar = True; /* command line args */ for(i = 1; i < argc; i++) @@ -670,47 +693,33 @@ main(int argc, char *argv[]) { fstrncmp = strncasecmp; fstrstr = cistrstr; } + else if(!strcmp(argv[i], "-b")) + topbar = False; else if(!strcmp(argv[i], "-fn")) { if(++i < argc) font = argv[i]; } else if(!strcmp(argv[i], "-nb")) { - if(++i < argc) normbg = argv[i]; + if(++i < argc) normbgcolor = argv[i]; } else if(!strcmp(argv[i], "-nf")) { - if(++i < argc) normfg = argv[i]; + if(++i < argc) normfgcolor = argv[i]; } else if(!strcmp(argv[i], "-p")) { if(++i < argc) prompt = argv[i]; } else if(!strcmp(argv[i], "-sb")) { - if(++i < argc) selbg = argv[i]; + if(++i < argc) selbgcolor = argv[i]; } else if(!strcmp(argv[i], "-sf")) { - if(++i < argc) selfg = argv[i]; - } - else if(!strcmp(argv[i], "-x")) { - if(++i < argc) x = atoi(argv[i]); - } - else if(!strcmp(argv[i], "-y")) { - if(++i < argc) { - if(!strcmp(argv[i], "-0")) - y = (int)(unsigned int)-1; - else - y = atoi(argv[i]); - } - } - else if(!strcmp(argv[i], "-w")) { - if(++i < argc) w = atoi(argv[i]); + if(++i < argc) selfgcolor = argv[i]; } else if(!strcmp(argv[i], "-v")) eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n"); else - eprint("usage: dmenu [-i] [-fn ] [-nb ] [-nf ]\n" - " [-p ] [-sb ] [-sf ]\n" - " [-x ] [-y ] [-w ] [-v]\n"); + eprint("usage: dmenu [-i] [-b] [-fn ] [-nb ] [-nf ]\n" + " [-p ] [-sb ] [-sf ] [-v]\n"); setlocale(LC_CTYPE, ""); - dpy = XOpenDisplay(0); - if(!dpy) + if(!(dpy = XOpenDisplay(0))) eprint("dmenu: cannot open display\n"); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); @@ -724,7 +733,7 @@ main(int argc, char *argv[]) { readstdin(); } - setup(x, y, w); + setup(topbar); drawmenu(); XSync(dpy, False); run();