new version of dmenu

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 2f20efb..6ca043d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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, dc.norm);

 
        /* 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, dc.norm);

        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, dc.norm);

                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) ? dc.sel : dc.norm);

                        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, dc.norm);

        }
        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);


@@ -315,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.sel[ColBG] = getcolor(SELBGCOLOR);
+       dc.sel[ColFG] = getcolor(SELFGCOLOR);
+       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+       dc.norm[ColFG] = getcolor(NORMFGCOLOR);

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


@@ -326,7 +327,7 @@ main(int argc, char *argv[])
 
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);
 
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);

-       mh = dc.font.height + 4;
+       mh = dc.font.height + 2;

 
        win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
 
        win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,


@@ -337,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);


@@ -352,6 +354,8 @@ main(int argc, char *argv[])
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev)) {
                switch (ev.type) {
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev)) {
                switch (ev.type) {

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

                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case KeyPress:
                        kpress(&ev.xkey);
                        break;


@@ -359,8 +363,6 @@ main(int argc, char *argv[])
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;

-               default:
-                       break;

                }
        }
 
                }
        }