Wait for an Expose and draw the menu immediately after mapping the window.

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index beb8411..29b313b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -479,6 +479,8 @@ main(int argc, char *argv[]) {
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        drawmenu();
        XMapRaised(dpy, win);
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        drawmenu();
        XMapRaised(dpy, win);

+       XMaskEvent(dpy, ExposureMask, &ev);
+       drawmenu();

        if(isatty(STDIN_FILENO)) {
                maxname = readstdin();
                grabkeyboard();
        if(isatty(STDIN_FILENO)) {
                maxname = readstdin();
                grabkeyboard();


@@ -506,6 +508,7 @@ main(int argc, char *argv[]) {
                promptw = mw / 5;
        text[0] = 0;
        match(text);
                promptw = mw / 5;
        text[0] = 0;
        match(text);

+       drawmenu();

        XSync(dpy, False);
 
        /* main event loop */
        XSync(dpy, False);
 
        /* main event loop */


@@ -516,10 +519,6 @@ main(int argc, char *argv[]) {
                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case KeyPress:
                        kpress(&ev.xkey);
                        break;

-               case Expose:
-                       if(ev.xexpose.count == 0)
-                               drawmenu();
-                       break;

                }
 
        /* cleanup */
                }
 
        /* cleanup */