#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
/* macros */
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
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);
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);
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;
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
for(len = 1000; len; len--) {
if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
- == GrabSuccess)
+ == GrabSuccess)
break;
usleep(1000);
}
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) {
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();
}
}
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);
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),
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++)
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], "-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 <font>] [-nb <color>] [-nf <color>]\n"
- " [-p <prompt>] [-sb <color>] [-sf <color>]\n"
- " [-x <x>] [-y <y>] [-w <w>] [-v]\n");
+ eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+ " [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
readstdin();
}
- setup(x, y, w);
+ setup(topbar);
drawmenu();
XSync(dpy, False);
run();
