X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=0faa02ee3bca66d3acf7007e0a8ea3ebd92304eb;hb=1f6af5e78f74c80fcb9853dcc2fc7940538808b0;hp=688fabf26a4aa39d5c912f7276d6e29b6911cb59;hpb=745c46d8fa810bbf45ef16e79a0f84c787f1a670;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 688fabf..0faa02e 100644 --- a/dmenu.c +++ b/dmenu.c @@ -9,6 +9,9 @@ #include #include #include +#ifdef XINERAMA +#include +#endif /* macros */ #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) @@ -35,13 +38,12 @@ 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 appenditem(Item *i, Item **list, Item **last); void calcoffsets(void); char *cistrstr(const char *s, const char *sub); void cleanup(void); @@ -57,7 +59,7 @@ void kpress(XKeyEvent * e); void match(char *pattern); void readstdin(void); void run(void); -void setup(int x, int y, int w); +void setup(Bool topbar); unsigned int textnw(const char *text, unsigned int len); unsigned int textw(const char *text); @@ -77,7 +79,6 @@ 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; @@ -92,17 +93,15 @@ 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; +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 @@ -299,7 +298,7 @@ grabkeyboard(void) { for(len = 1000; len; len--) { if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) + == GrabSuccess) break; usleep(1000); } @@ -357,16 +356,14 @@ kpress(XKeyEvent * e) { 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) { @@ -521,19 +518,40 @@ kpress(XKeyEvent * e) { void match(char *pattern) { unsigned int plen; - Item *i, *j; + Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; if(!pattern) return; plen = strlen(pattern); - item = j = NULL; - nitem = 0; + item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; for(i = allitems; i; i = i->next) - if((i->matched = !fstrncmp(pattern, i->text, plen))) - j = appenditem(i, j); - 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(); } @@ -585,10 +603,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); @@ -611,14 +632,25 @@ setup(int x, int y, int w) { 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[0].x_org; + y = topbar ? info[0].y_org : info[0].y_org + info[0].height - mh; + mw = info[0].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), @@ -661,8 +693,8 @@ textw(const char *text) { int main(int argc, char *argv[]) { - int x = 0, y = 0, w = 0; unsigned int i; + Bool topbar = True; /* command line args */ for(i = 1; i < argc; i++) @@ -670,6 +702,8 @@ 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]; } @@ -688,26 +722,11 @@ main(int argc, char *argv[]) { 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]); - } 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) @@ -724,7 +743,7 @@ main(int argc, char *argv[]) { readstdin(); } - setup(x, y, w); + setup(topbar); drawmenu(); XSync(dpy, False); run();