fixed minor bug

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 3458fd5..c3cad1d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -29,7 +29,7 @@ static int mx, my, 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 Bool done = False;
+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 *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;


@@ -77,17 +77,17 @@ drawmenu()
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;

-       drawtext(NULL, False, False);
+       drawtext(NULL, 0, False);

 
        /* print command */
        if(cmdw && item)
                dc.w = cmdw;
 
        /* print command */
        if(cmdw && item)
                dc.w = cmdw;

-       drawtext(text[0] ? text : NULL, False, False);
+       drawtext(text[0] ? text : NULL, 0, False);

        dc.x += cmdw;
 
        if(curr) {
                dc.w = SPACE;
        dc.x += cmdw;
 
        if(curr) {
                dc.w = SPACE;

-               drawtext((curr && curr->left) ? "<" : NULL, False, False);
+               drawtext((curr && curr->left) ? "<" : NULL, 0, False);

                dc.x += dc.w;
 
                /* determine maximum items */
                dc.x += dc.w;
 
                /* determine maximum items */


@@ -95,13 +95,13 @@ drawmenu()
                        dc.w = textw(i->text);
                        if(dc.w > mw / 3)
                                dc.w = mw / 3;
                        dc.w = textw(i->text);
                        if(dc.w > mw / 3)
                                dc.w = mw / 3;

-                       drawtext(i->text, sel == i, sel == i);
+                       drawtext(i->text, sel == i ? 1 : 0, sel == i);

                        dc.x += dc.w;
                }
 
                dc.x = mw - SPACE;
                dc.w = SPACE;
                        dc.x += dc.w;
                }
 
                dc.x = mw - SPACE;
                dc.w = SPACE;

-               drawtext(next ? ">" : NULL, False, False);
+               drawtext(next ? ">" : NULL, 0, False);

        }
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
        }
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);


@@ -172,9 +172,11 @@ kpress(XKeyEvent * e)
                        return;
                        break;
                case XK_h:
                        return;
                        break;
                case XK_h:

+               case XK_H:

                        ksym = XK_BackSpace;
                        break;
                case XK_u:
                        ksym = XK_BackSpace;
                        break;
                case XK_u:

+               case XK_U:

                        text[0] = 0;
                        match(text);
                        drawmenu();
                        text[0] = 0;
                        match(text);
                        drawmenu();


@@ -217,11 +219,11 @@ kpress(XKeyEvent * e)
                else if(text)
                        fprintf(stdout, "%s", text);
                fflush(stdout);
                else if(text)
                        fprintf(stdout, "%s", text);
                fflush(stdout);

-               done = True;
+               running = False;

                break;
        case XK_Escape:
                ret = 1;
                break;
        case XK_Escape:
                ret = 1;

-               done = True;
+               running = False;

                break;
        case XK_BackSpace:
                if((i = len)) {
                break;
        case XK_BackSpace:
                if((i = len)) {


@@ -288,6 +290,7 @@ int
 main(int argc, char *argv[])
 {
        char *maxname;
 main(int argc, char *argv[])
 {
        char *maxname;

+       Item *i;

        XEvent ev;
        XSetWindowAttributes wa;
 
        XEvent ev;
        XSetWindowAttributes wa;
 


@@ -312,9 +315,10 @@ main(int argc, char *argv[])
                usleep(1000);
 
        /* style */
                usleep(1000);
 
        /* style */

-       dc.bg = getcolor(BGCOLOR);
-       dc.fg = getcolor(FGCOLOR);
-       dc.border = getcolor(BORDERCOLOR);
+       dc.bg[0] = getcolor(NORMBGCOLOR);
+       dc.fg[0] = getcolor(NORMFGCOLOR);
+       dc.bg[1] = getcolor(SELBGCOLOR);
+       dc.fg[1] = getcolor(SELFGCOLOR);

        setfont(FONT);
 
        wa.override_redirect = 1;
        setfont(FONT);
 
        wa.override_redirect = 1;


@@ -334,6 +338,7 @@ main(int argc, char *argv[])
        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        /* pixmap */
        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(maxname)
                cmdw = textw(maxname);
 
        if(maxname)
                cmdw = textw(maxname);


@@ -347,7 +352,7 @@ main(int argc, char *argv[])
        XSync(dpy, False);
 
        /* main event loop */
        XSync(dpy, False);
 
        /* main event loop */

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

                switch (ev.type) {
                case KeyPress:
                        kpress(&ev.xkey);
                switch (ev.type) {
                case KeyPress:
                        kpress(&ev.xkey);


@@ -362,6 +367,16 @@ main(int argc, char *argv[])
        }
 
        XUngrabKeyboard(dpy, CurrentTime);
        }
 
        XUngrabKeyboard(dpy, CurrentTime);

+       while(allitems) {
+               i = allitems->next;
+               free(allitems->text);
+               free(allitems);
+               allitems = i;
+       }
+       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);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XDestroyWindow(dpy, win);