typedef struct Item Item;
struct Item {
+ char *text;
+ Bool matched;
Item *next; /* traverses all items */
Item *left, *right; /* traverses items matching current search pattern */
- char *text;
};
/* 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 match(char *pattern);
void readstdin(void);
void run(void);
-void setup(Bool bottom);
-int strido(const char *text, const char *pattern);
+void setup(int x, int y, int w);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
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;
+ else
+ last->right = i;
+ i->left = last;
+ i->right = NULL;
+ last = i;
+ nitem++;
+ return last;
+}
void
calcoffsets(void) {
}
}
+char *
+cistrstr(const char *s, const char *sub) {
+ int c, csub;
+ unsigned int len;
+
+ if(!sub)
+ return (char *)s;
+ if((c = *sub++) != 0) {
+ c = tolower(c);
+ len = strlen(sub);
+ do {
+ do {
+ if((csub = *s++) == 0)
+ return (NULL);
+ }
+ while(tolower(csub) != c);
+ }
+ while(strncasecmp(s, sub, len) != 0);
+ s--;
+ }
+ return (char *)s;
+}
+
void
cleanup(void) {
Item *itm;
plen = strlen(pattern);
item = j = NULL;
nitem = 0;
- for(i = allitems; i; i=i->next)
- if(!plen || !strncmp(pattern, i->text, plen)) {
- if(!j)
- item = i;
- else
- j->right = i;
- i->left = j;
- i->right = NULL;
- j = i;
- nitem++;
- }
- for(i = allitems; i; i=i->next)
- if(plen && strncmp(pattern, i->text, plen)
- && strstr(i->text, pattern)) {
- if(!j)
- item = i;
- else
- j->right = i;
- i->left = j;
- i->right = NULL;
- j = i;
- nitem++;
- }
- for(i = allitems; i; i=i->next)
- if(plen && strncmp(pattern, i->text, plen)
- && !strstr(i->text, pattern)
- && strido(i->text,pattern)) {
- if(!j)
- item = i;
- else
- j->right = i;
- i->left = j;
- i->right = NULL;
- j = i;
- nitem++;
- }
+ 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);
curr = prev = next = sel = item;
calcoffsets();
}
}
void
-setup(Bool bottom) {
+setup(int x, int y, int w) {
unsigned int i, j;
XModifierKeymap *modmap;
XSetWindowAttributes wa;
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
- mw = DisplayWidth(dpy, screen);
+ mw = w ? w : DisplayWidth(dpy, screen);
mh = dc.font.height + 2;
- win = XCreateWindow(dpy, root, 0,
- bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
+ if(y < 0) {
+ if(y == (int)(unsigned int)-1)
+ y = DisplayHeight(dpy, screen) - mh;
+ else
+ y = (-1 * y) - mh;
+ }
+ win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
XMapRaised(dpy, win);
}
-int
-strido(const char *text, const char *pattern) {
- for(; *text && *pattern; text++)
- if (*text == *pattern)
- pattern++;
- return !*pattern;
-}
-
unsigned int
textnw(const char *text, unsigned int len) {
XRectangle r;
int
main(int argc, char *argv[]) {
- Bool bottom = False;
+ int x = 0, y = 0, w = 0;
unsigned int i;
/* command line args */
for(i = 1; i < argc; i++)
- if(!strcmp(argv[i], "-b")) {
- bottom = True;
+ if(!strcmp(argv[i], "-i")) {
+ fstrncmp = strncasecmp;
+ fstrstr = cistrstr;
}
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-2007 Anselm R. Garbe, Sander van Dijk\n");
+ eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
else
- eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
- " [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+ 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");
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
readstdin();
}
- setup(bottom);
+ setup(x, y, w);
drawmenu();
XSync(dpy, False);
run();
