Close when the embedding window is destroyed

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 314256f..f803149 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <strings.h>
 #include <time.h>
 #include <string.h>
 #include <strings.h>
 #include <time.h>

+#include <unistd.h>

 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>


@@ -144,7 +145,7 @@ drawmenu(void)
        drw_setscheme(drw, scheme[SchemeNorm]);
        drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
 
        drw_setscheme(drw, scheme[SchemeNorm]);
        drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
 

-       drw_font_getexts(drw->fonts, text, cursor, &curpos, NULL);
+       curpos = TEXTW(text) - TEXTW(&text[cursor]);

        if ((curpos += lrpad / 2 - 1) < w) {
                drw_setscheme(drw, scheme[SchemeNorm]);
                drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
        if ((curpos += lrpad / 2 - 1) < w) {
                drw_setscheme(drw, scheme[SchemeNorm]);
                drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);


@@ -555,6 +556,11 @@ run(void)
                if (XFilterEvent(&ev, None))
                        continue;
                switch(ev.type) {
                if (XFilterEvent(&ev, None))
                        continue;
                switch(ev.type) {

+               case DestroyNotify:
+                       if (ev.xdestroywindow.window != win)
+                               break;
+                       cleanup();
+                       exit(1);

                case Expose:
                        if (ev.xexpose.count == 0)
                                drw_map(drw, win, 0, 0, mw, mh);
                case Expose:
                        if (ev.xexpose.count == 0)
                                drw_map(drw, win, 0, 0, mw, mh);


@@ -666,7 +672,7 @@ setup(void)
        XMapRaised(dpy, win);
        XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
        if (embed) {
        XMapRaised(dpy, win);
        XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
        if (embed) {

-               XSelectInput(dpy, parentwin, FocusChangeMask);
+               XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);

                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
                        for (i = 0; i < du && dws[i] != win; ++i)
                                XSelectInput(dpy, dws[i], FocusChangeMask);
                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
                        for (i = 0; i < du && dws[i] != win; ++i)
                                XSelectInput(dpy, dws[i], FocusChangeMask);


@@ -746,7 +752,12 @@ main(int argc, char *argv[])
                die("no fonts could be loaded.");
        lrpad = drw->fonts->h;
 
                die("no fonts could be loaded.");
        lrpad = drw->fonts->h;
 

-       if (fast) {
+#ifdef __OpenBSD__
+       if (pledge("stdio rpath", NULL) == -1)
+               die("pledge");
+#endif
+
+       if (fast && !isatty(0)) {

                grabkeyboard();
                readstdin();
        } else {
                grabkeyboard();
                readstdin();
        } else {