making copyright notice more compact

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 18263d5..c63ac08 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,103 +1,184 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */

 #include "dmenu.h"
 #include "dmenu.h"

-

 #include <ctype.h>
 #include <ctype.h>

+#include <locale.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

-#include <X11/cursorfont.h>

 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 

-typedef struct Item Item;
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))

 
 

+typedef struct Item Item;

 struct Item {
        Item *next;             /* traverses all items */
        Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
 };
 
 struct Item {
        Item *next;             /* traverses all items */
        Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
 };
 

-static Display *dpy;
-static Window root;
-static Window win;
-static Bool done = False;
-
-static Item *allitem = NULL;   /* first of all items */
-static Item *item = NULL;      /* first of pattern matching items */
-static Item *sel = NULL;
-static Item *nextoff = NULL;
-static Item *prevoff = NULL;
-static Item *curroff = NULL;
+/* static */

 
 

-static int screen, mx, my, mw, mh;
-static char *title = NULL;

 static char text[4096];
 static char text[4096];

+static char *prompt = NULL;
+static int mw, mh;

 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;

-static unsigned int tw = 0;
-static unsigned int cw = 0;
-static const int seek = 30;            /* 30px */
-
-static Brush brush = {0};
-
-static void draw_menu();
-static void kpress(XKeyEvent * e);
-
-static char version[] = "dmenu - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+static unsigned int promptw = 0;
+static unsigned int numlockmask = 0;
+static Bool running = True;
+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;
+static Window win;

 
 static void
 
 static void

-update_offsets()
-{
-       unsigned int tw, w = cmdw + 2 * seek;
+calcoffsets(void) {
+       unsigned int tw, w;

 
 

-       if(!curroff)
+       if(!curr)

                return;
                return;

-
-       for(nextoff = curroff; nextoff; nextoff=nextoff->right) {
-               tw = textw(&brush.font, nextoff->text);
+       w = promptw + cmdw + 2 * SPACE;
+       for(next = curr; next; next=next->right) {
+               tw = textw(next->text);

                if(tw > mw / 3)
                        tw = mw / 3;
                if(tw > mw / 3)
                        tw = mw / 3;

-               w += tw + brush.font.height;
+               w += tw;

                if(w > mw)
                        break;
        }
                if(w > mw)
                        break;
        }

-
-       w = cmdw + 2 * seek;
-       for(prevoff = curroff; prevoff && prevoff->left; prevoff=prevoff->left) {
-               tw = textw(&brush.font, prevoff->left->text);
+       w = promptw + cmdw + 2 * SPACE;
+       for(prev = curr; prev && prev->left; prev=prev->left) {
+               tw = textw(prev->left->text);

                if(tw > mw / 3)
                        tw = mw / 3;
                if(tw > mw / 3)
                        tw = mw / 3;

-               w += tw + brush.font.height;
+               w += tw;

                if(w > mw)
                        break;
        }
 }
 
 static void
                if(w > mw)
                        break;
        }
 }
 
 static void

-update_items(char *pattern)
-{
-       unsigned int plen = strlen(pattern);
+drawmenu(void) {
+       Item *i;
+
+       dc.x = 0;
+       dc.y = 0;
+       dc.w = mw;
+       dc.h = mh;
+       drawtext(NULL, dc.norm);
+       /* print prompt? */
+       if(promptw) {
+               dc.w = promptw;
+               drawtext(prompt, dc.sel);
+       }
+       dc.x += promptw;
+       dc.w = mw - promptw;
+       /* print command */
+       if(cmdw && item)
+               dc.w = cmdw;
+       drawtext(text[0] ? text : NULL, dc.norm);
+       dc.x += cmdw;
+       if(curr) {
+               dc.w = SPACE;
+               drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
+               dc.x += dc.w;
+               /* determine maximum items */
+               for(i = curr; i != next; i=i->right) {
+                       dc.w = textw(i->text);
+                       if(dc.w > mw / 3)
+                               dc.w = mw / 3;
+                       drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+                       dc.x += dc.w;
+               }
+               dc.x = mw - SPACE;
+               dc.w = SPACE;
+               drawtext(next ? ">" : NULL, dc.norm);
+       }
+       XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
+       XFlush(dpy);
+}
+
+static Bool
+grabkeyboard(void) {
+       unsigned int len;
+
+       for(len = 1000; len; len--) {
+               if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+                       == GrabSuccess)
+                       break;
+               usleep(1000);
+       }
+       return len > 0;
+}
+
+static unsigned long
+initcolor(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;
+}
+
+static void
+initfont(const char *fontstr) {
+       char *def, **missing;
+       int i, n;
+
+       missing = NULL;
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+       if(missing)
+               XFreeStringList(missing);
+       if(dc.font.set) {
+               XFontSetExtents *font_extents;
+               XFontStruct **xfonts;
+               char **font_names;
+               dc.font.ascent = dc.font.descent = 0;
+               font_extents = XExtentsOfFontSet(dc.font.set);
+               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+                       if(dc.font.ascent < (*xfonts)->ascent)
+                               dc.font.ascent = (*xfonts)->ascent;
+                       if(dc.font.descent < (*xfonts)->descent)
+                               dc.font.descent = (*xfonts)->descent;
+                       xfonts++;
+               }
+       }
+       else {
+               if(dc.font.xfont)
+                       XFreeFont(dpy, dc.font.xfont);
+               dc.font.xfont = NULL;
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+                       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;
+}
+
+static void
+match(char *pattern) {
+       unsigned int plen;

        Item *i, *j;
 
        if(!pattern)
                return;
        Item *i, *j;
 
        if(!pattern)
                return;

-
-       if(!title || *pattern)
-               cmdw = cw;
-       else
-               cmdw = tw;
-
+       plen = strlen(pattern);

        item = j = NULL;
        nitem = 0;
        item = j = NULL;
        nitem = 0;

-
-       for(i = allitem; i; i=i->next)
+       for(i = allitems; i; i=i->next)

                if(!plen || !strncmp(pattern, i->text, plen)) {
                        if(!j)
                                item = i;
                if(!plen || !strncmp(pattern, i->text, plen)) {
                        if(!j)
                                item = i;


@@ -108,7 +189,7 @@ update_items(char *pattern)
                        j = i;
                        nitem++;
                }
                        j = i;
                        nitem++;
                }

-       for(i = allitem; i; i=i->next)
+       for(i = allitems; i; i=i->next)

                if(plen && strncmp(pattern, i->text, plen)
                                && strstr(i->text, pattern)) {
                        if(!j)
                if(plen && strncmp(pattern, i->text, plen)
                                && strstr(i->text, pattern)) {
                        if(!j)


@@ -120,179 +201,190 @@ update_items(char *pattern)
                        j = i;
                        nitem++;
                }
                        j = i;
                        nitem++;
                }

-
-       curroff = prevoff = nextoff = sel = item;
-
-       update_offsets();
-}
-
-/* creates brush structs for brush mode drawing */
-static void
-draw_menu()
-{
-       Item *i;
-
-       brush.x = 0;
-       brush.y = 0;
-       brush.w = mw;
-       brush.h = mh;
-       draw(dpy, &brush, False, 0);
-
-       /* print command */
-       if(!title || text[0]) {
-               cmdw = cw;
-               if(cmdw && item)
-                       brush.w = cmdw;
-               draw(dpy, &brush, False, text);
-       }
-       else {
-               cmdw = tw;
-               brush.w = cmdw;
-               draw(dpy, &brush, False, title);
-       }
-       brush.x += brush.w;
-
-       if(curroff) {
-               brush.w = seek;
-               draw(dpy, &brush, False, (curroff && curroff->left) ? "<" : 0);
-               brush.x += brush.w;
-
-               /* determine maximum items */
-               for(i = curroff; i != nextoff; i=i->right) {
-                       brush.border = False;
-                       brush.w = textw(&brush.font, i->text);
-                       if(brush.w > mw / 3)
-                               brush.w = mw / 3;
-                       brush.w += brush.font.height;
-                       if(sel == i) {
-                               swap((void **)&brush.fg, (void **)&brush.bg);
-                               draw(dpy, &brush, True, i->text);
-                               swap((void **)&brush.fg, (void **)&brush.bg);
-                       }
-                       else
-                               draw(dpy, &brush, False, i->text);
-                       brush.x += brush.w;
-               }
-
-               brush.x = mw - seek;
-               brush.w = seek;
-               draw(dpy, &brush, False, nextoff ? ">" : 0);
-       }
-       XCopyArea(dpy, brush.drawable, win, brush.gc, 0, 0, mw, mh, 0, 0);
-       XFlush(dpy);
+       curr = prev = next = sel = item;
+       calcoffsets();

 }
 
 static void
 }
 
 static void

-kpress(XKeyEvent * e)
-{
-       KeySym ksym;
+kpress(XKeyEvent * e) {

        char buf[32];
        char buf[32];

-       int num, prev_nitem;
-       unsigned int i, len = strlen(text);
+       int i, num;
+       unsigned int len;
+       KeySym ksym;

 
 

+       len = strlen(text);

        buf[0] = 0;
        buf[0] = 0;

-       num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
-
+       num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+       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))
                return;
        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 */
                        return;
        /* first check if a control mask is omitted */
        if(e->state & ControlMask) {
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;

+               case XK_bracketleft:
+                       ksym = XK_Escape;

                        break;
                case XK_h:
                        break;
                case XK_h:

+               case XK_H:

                        ksym = XK_BackSpace;
                        break;
                        ksym = XK_BackSpace;
                        break;

-               case XK_U:
+               case XK_i:
+               case XK_I:
+                       ksym = XK_Tab;
+                       break;
+               case XK_j:
+               case XK_J:
+                       ksym = XK_Return;
+                       break;

                case XK_u:
                case XK_u:

+               case XK_U:

                        text[0] = 0;
                        text[0] = 0;

-                       update_items(text);
-                       draw_menu();
+                       match(text);
+                       drawmenu();

                        return;
                        return;

+               case XK_w:
+               case XK_W:
+                       if(len) {
+                               i = len - 1;
+                               while(i >= 0 && text[i] == ' ')
+                                       text[i--] = 0;
+                               while(i >= 0 && text[i] != ' ')
+                                       text[i--] = 0;
+                               match(text);
+                               drawmenu();
+                       }
+                       return;
+               }
+       }
+       if(CLEANMASK(e->state) & Mod1Mask) {
+               switch(ksym) {
+               default: return;
+               case XK_h:
+                       ksym = XK_Left;

                        break;
                        break;

-               case XK_bracketleft:
-                       ksym = XK_Escape;
+               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;

                        break;
                }
        }
        switch(ksym) {
                        break;
                }
        }
        switch(ksym) {

+       default:
+               if(num && !iscntrl((int) buf[0])) {
+                       buf[num] = 0;
+                       if(len > 0)
+                               strncat(text, buf, sizeof text);
+                       else
+                               strncpy(text, buf, sizeof text);
+                       match(text);
+               }
+               break;
+       case XK_BackSpace:
+               if(len) {
+                       text[--len] = 0;
+                       match(text);
+               }
+               break;
+       case XK_End:
+               if(!item)
+                       return;
+               while(next) {
+                       sel = curr = next;
+                       calcoffsets();
+               }
+               while(sel && sel->right)
+                       sel = sel->right;
+               break;
+       case XK_Escape:
+               ret = 1;
+               running = False;
+               break;
+       case XK_Home:
+               if(!item)
+                       return;
+               sel = curr = item;
+               calcoffsets();
+               break;

        case XK_Left:
                if(!(sel && sel->left))
                        return;
                sel=sel->left;
        case XK_Left:
                if(!(sel && sel->left))
                        return;
                sel=sel->left;

-               if(sel->right == curroff) {
-                       curroff = prevoff;
-                       update_offsets();
+               if(sel->right == curr) {
+                       curr = prev;
+                       calcoffsets();

                }
                break;
                }
                break;

-       case XK_Tab:
-               if(!sel)
+       case XK_Next:
+               if(!next)

                        return;
                        return;

-               strncpy(text, sel->text, sizeof(text));
-               update_items(text);
+               sel = curr = next;
+               calcoffsets();

                break;
                break;

-       case XK_Right:
-               if(!(sel && sel->right))
+       case XK_Prior:
+               if(!prev)

                        return;
                        return;

-               sel=sel->right;
-               if(sel == nextoff) {
-                       curroff = nextoff;
-                       update_offsets();
-               }
+               sel = curr = prev;
+               calcoffsets();

                break;
        case XK_Return:
                break;
        case XK_Return:

-               if(e->state & ShiftMask) {
-                       if(text)
-                               fprintf(stdout, "%s", text);
-               }
+               if((e->state & ShiftMask) && text)
+                       fprintf(stdout, "%s", text);

                else if(sel)
                        fprintf(stdout, "%s", sel->text);
                else if(text)
                        fprintf(stdout, "%s", text);
                fflush(stdout);
                else if(sel)
                        fprintf(stdout, "%s", sel->text);
                else if(text)
                        fprintf(stdout, "%s", text);
                fflush(stdout);

-               done = True;
-               break;
-       case XK_Escape:
-               ret = 1;
-               done = True;
+               running = False;

                break;
                break;

-       case XK_BackSpace:
-               if((i = len)) {
-                       prev_nitem = nitem;
-                       do {
-                               text[--i] = 0;
-                               update_items(text);
-                       } while(i && nitem && prev_nitem == nitem);
-                       update_items(text);
+       case XK_Right:
+               if(!(sel && sel->right))
+                       return;
+               sel=sel->right;
+               if(sel == next) {
+                       curr = next;
+                       calcoffsets();

                }
                break;
                }
                break;

-       default:
-               if(num && !iscntrl((int) buf[0])) {
-                       buf[num] = 0;
-                       if(len > 0)
-                               strncat(text, buf, sizeof(text));
-                       else
-                               strncpy(text, buf, sizeof(text));
-                       update_items(text);
-               }
+       case XK_Tab:
+               if(!sel)
+                       return;
+               strncpy(text, sel->text, sizeof text);
+               match(text);
+               break;

        }
        }

-       draw_menu();
+       drawmenu();

 }
 
 static char *
 }
 
 static char *

-read_allitems()
-{
+readstdin(void) {

        static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;
        Item *i, *new;
 
        i = 0;
        static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;
        Item *i, *new;
 
        i = 0;

-       while(fgets(buf, sizeof(buf), stdin)) {
+       while(fgets(buf, sizeof buf, stdin)) {

                len = strlen(buf);
                if (buf[len - 1] == '\n')
                        buf[len - 1] = 0;
                len = strlen(buf);
                if (buf[len - 1] == '\n')
                        buf[len - 1] = 0;


@@ -301,12 +393,11 @@ read_allitems()
                        maxname = p;
                        max = len;
                }
                        maxname = p;
                        max = len;
                }

-

                new = emalloc(sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;
                if(!i)
                new = emalloc(sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;
                if(!i)

-                       allitem = new;
+                       allitems = new;

                else 
                        i->next = new;
                i = new;
                else 
                        i->next = new;
                i = new;


@@ -315,112 +406,150 @@ read_allitems()
        return maxname;
 }
 
        return maxname;
 }
 

+static void
+usage(void) {
+       eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+               "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+}
+
+/* extern */
+
+int screen;
+Display *dpy;
+DC dc = {0};
+

 int
 int

-main(int argc, char *argv[])
-{
-       int i;
-       XSetWindowAttributes wa;
+main(int argc, char *argv[]) {
+       Bool bottom = False;
+       char *font = FONT;

        char *maxname;
        char *maxname;

+       char *normbg = NORMBGCOLOR;
+       char *normfg = NORMFGCOLOR;
+       char *selbg = SELBGCOLOR;
+       char *selfg = SELFGCOLOR;
+       int i, j;
+       Item *itm;

        XEvent ev;
        XEvent ev;

+       XModifierKeymap *modmap;
+       XSetWindowAttributes wa;

 
        /* command line args */
 
        /* command line args */

-       for(i = 1; i < argc; i++) {
-               if (argv[i][0] == '-')
-                       switch (argv[i][1]) {
-                       case 'v':
-                               fprintf(stdout, "%s", version);
-                               exit(0);
-                               break;
-                       case 't':
-                               if(++i < argc) {
-                                       title = argv[i];
-                                       break;
-                               }
-                       default:
-                               eprint("usage: dmenu [-v] [-t <title>]\n");
-                               break;
-                       }
+       for(i = 1; i < argc; i++)
+               if(!strncmp(argv[i], "-b", 3)) {
+                       bottom = True;
+               }
+               else if(!strncmp(argv[i], "-fn", 4)) {
+                       if(++i < argc) font = argv[i];
+               }
+               else if(!strncmp(argv[i], "-nb", 4)) {
+                       if(++i < argc) normbg = argv[i];
+               }
+               else if(!strncmp(argv[i], "-nf", 4)) {
+                       if(++i < argc) normfg = argv[i];
+               }
+               else if(!strncmp(argv[i], "-p", 3)) {
+                       if(++i < argc) prompt = argv[i];
+               }
+               else if(!strncmp(argv[i], "-sb", 4)) {
+                       if(++i < argc) selbg = argv[i];
+               }
+               else if(!strncmp(argv[i], "-sf", 4)) {
+                       if(++i < argc) selfg = argv[i];
+               }
+               else if(!strncmp(argv[i], "-v", 3))
+                       eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");

                else
                else

-                       eprint("usage: dmenu [-v] [-t <title>]\n");
-       }
-
+                       usage();
+       setlocale(LC_CTYPE, "");

        dpy = XOpenDisplay(0);
        if(!dpy)
        dpy = XOpenDisplay(0);
        if(!dpy)

-               eprint("dmenu: cannot open dpy\n");
+               eprint("dmenu: cannot open display\n");

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);

-
-       maxname = read_allitems();
-
-       /* grab as early as possible, but after reading all items!!! */
-       while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
-                        GrabModeAsync, CurrentTime) != GrabSuccess)
-               usleep(1000);
-
+       if(isatty(STDIN_FILENO)) {
+               maxname = readstdin();
+               running = grabkeyboard();
+       }
+       else { /* prevent keypress loss */
+               running = grabkeyboard();
+               maxname = readstdin();
+       }
+       /* init modifier map */
+       modmap = XGetModifierMapping(dpy);
+       for (i = 0; i < 8; i++) {
+               for (j = 0; j < modmap->max_keypermod; j++) {
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
+                       == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+               }
+       }
+       XFreeModifiermap(modmap);

        /* style */
        /* style */

-       loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
-       loadfont(dpy, &brush.font, FONT);
-
+       dc.norm[ColBG] = initcolor(normbg);
+       dc.norm[ColFG] = initcolor(normfg);
+       dc.sel[ColBG] = initcolor(selbg);
+       dc.sel[ColFG] = initcolor(selfg);
+       initfont(font);
+       /* menu window */

        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;

-
-       mx = my = 0;

        mw = DisplayWidth(dpy, screen);
        mw = DisplayWidth(dpy, screen);

-       mh = texth(&brush.font);
-
-       win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
+       mh = dc.font.height + 2;
+       win = XCreateWindow(dpy, root, 0,
+                       bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,

                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);

-       XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
-       XFlush(dpy);
-

        /* pixmap */
        /* pixmap */

-       brush.gc = XCreateGC(dpy, root, 0, 0);
-       brush.drawable = XCreatePixmap(dpy, win, mw, mh,
-                       DefaultDepth(dpy, screen));
-       XFlush(dpy);
-
+       dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
+       dc.gc = XCreateGC(dpy, root, 0, 0);
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       if(!dc.font.set)
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);

        if(maxname)
        if(maxname)

-               cw = textw(&brush.font, maxname) + brush.font.height;
-       if(cw > mw / 3)
-               cw = mw / 3;
-
-       if(title) {
-               tw = textw(&brush.font, title) + brush.font.height;
-               if(tw > mw / 3)
-                       tw = mw / 3;
-       }
-
-       cmdw = title ? tw : cw;
-
+               cmdw = textw(maxname);
+       if(cmdw > mw / 3)
+               cmdw = mw / 3;
+       if(prompt)
+               promptw = textw(prompt);
+       if(promptw > mw / 5)
+               promptw = mw / 5;

        text[0] = 0;
        text[0] = 0;

-       update_items(text);
+       match(text);

        XMapRaised(dpy, win);
        XMapRaised(dpy, win);

-       draw_menu();
-       XFlush(dpy);
+       drawmenu();
+       XSync(dpy, False);

 
        /* main event loop */
 
        /* main event loop */

-       while(!done && !XNextEvent(dpy, &ev)) {
+       while(running && !XNextEvent(dpy, &ev))

                switch (ev.type) {
                switch (ev.type) {

+               default:        /* ignore all crap */
+                       break;

                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case Expose:
                        if(ev.xexpose.count == 0)
                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case Expose:
                        if(ev.xexpose.count == 0)

-                               draw_menu();
-                       break;
-               default:
+                               drawmenu();

                        break;
                }
                        break;
                }

-       }

 
 

-       XUngrabKeyboard(dpy, CurrentTime);
-       XFreePixmap(dpy, brush.drawable);
-       XFreeGC(dpy, brush.gc);
+       /* cleanup */
+       while(allitems) {
+               itm = allitems->next;
+               free(allitems->text);
+               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);

        XDestroyWindow(dpy, win);
        XDestroyWindow(dpy, win);

+       XUngrabKeyboard(dpy, CurrentTime);

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

-

        return ret;
 }
        return ret;
 }