die() on calloc failure

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index e926eca..9278e91 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -34,8 +34,8 @@ struct item {
 };
 
 static char text[BUFSIZ] = "";
 };
 
 static char text[BUFSIZ] = "";

+static char *embed;

 static int bh, mw, mh;
 static int bh, mw, mh;

-static int sw, sh; /* X display screen geometry width, height */

 static int inputw = 0, promptw;
 static int lrpad; /* sum of left and right padding */
 static size_t cursor;
 static int inputw = 0, promptw;
 static int lrpad; /* sum of left and right padding */
 static size_t cursor;


@@ -46,7 +46,7 @@ static int mon = -1, screen;
 
 static Atom clip, utf8;
 static Display *dpy;
 
 static Atom clip, utf8;
 static Display *dpy;

-static Window root, win;
+static Window root, parentwin, win;

 static XIC xic;
 
 static Drw *drw;
 static XIC xic;
 
 static Drw *drw;


@@ -81,10 +81,10 @@ calcoffsets(void)
                n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
        /* calculate which items will begin the next page and previous page */
        for (i = 0, next = curr; next; next = next->right)
                n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
        /* calculate which items will begin the next page and previous page */
        for (i = 0, next = curr; next; next = next->right)

-               if ((i += (lines > 0) ? bh : TEXTW(next->text)) > n)
+               if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)

                        break;
        for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
                        break;
        for (i = 0, prev = curr; prev && prev->left; prev = prev->left)

-               if ((i += (lines > 0) ? bh : TEXTW(prev->left->text)) > n)
+               if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)

                        break;
 }
 
                        break;
 }
 


@@ -174,12 +174,31 @@ drawmenu(void)
        drw_map(drw, win, 0, 0, mw, mh);
 }
 
        drw_map(drw, win, 0, 0, mw, mh);
 }
 

+static void
+grabfocus(void)
+{
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000  };
+       Window focuswin;
+       int i, revertwin;
+
+       for (i = 0; i < 100; ++i) {
+               XGetInputFocus(dpy, &focuswin, &revertwin);
+               if (focuswin == win)
+                       return;
+               XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
+               nanosleep(&ts, NULL);
+       }
+       die("cannot grab focus");
+}
+

 static void
 grabkeyboard(void)
 {
        struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
        int i;
 
 static void
 grabkeyboard(void)
 {
        struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
        int i;
 

+       if (embed)
+               return;

        /* try to grab keyboard, we may have to wait for another process to ungrab */
        for (i = 0; i < 1000; i++) {
                if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
        /* try to grab keyboard, we may have to wait for another process to ungrab */
        for (i = 0; i < 1000; i++) {
                if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,


@@ -187,7 +206,7 @@ grabkeyboard(void)
                        return;
                nanosleep(&ts, NULL);
        }
                        return;
                nanosleep(&ts, NULL);
        }

-       die("cannot grab keyboard\n");
+       die("cannot grab keyboard");

 }
 
 static void
 }
 
 static void


@@ -205,7 +224,7 @@ match(void)
        /* separate input text into tokens to be matched individually */
        for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
                if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
        /* separate input text into tokens to be matched individually */
        for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
                if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))

-                       die("cannot realloc %u bytes\n", tokn * sizeof *tokv);
+                       die("cannot realloc %u bytes:", tokn * sizeof *tokv);

        len = tokc ? strlen(tokv[0]) : 0;
 
        matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
        len = tokc ? strlen(tokv[0]) : 0;
 
        matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;


@@ -497,6 +516,11 @@ run(void)
                        if (ev.xexpose.count == 0)
                                drw_map(drw, win, 0, 0, mw, mh);
                        break;
                        if (ev.xexpose.count == 0)
                                drw_map(drw, win, 0, 0, mw, mh);
                        break;

+               case FocusIn:
+                       /* regrab focus from parent window */
+                       if (ev.xfocus.window != win)
+                               grabfocus();
+                       break;

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


@@ -539,9 +563,9 @@ setup(void)
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA

-       if ((info = XineramaQueryScreens(dpy, &n))) {
+       if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {

                XGetInputFocus(dpy, &w, &di);
                XGetInputFocus(dpy, &w, &di);

-               if (mon != -1 && mon < n)
+               if (mon >= 0 && mon < n)

                        i = mon;
                else if (w != root && w != PointerRoot && w != None) {
                        /* find top-level window containing current input focus */
                        i = mon;
                else if (w != root && w != PointerRoot && w != None) {
                        /* find top-level window containing current input focus */


@@ -558,7 +582,7 @@ setup(void)
                                        }
                }
                /* no focused window is on screen, so use pointer location instead */
                                        }
                }
                /* no focused window is on screen, so use pointer location instead */

-               if (mon == -1 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+               if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))

                        for (i = 0; i < n; i++)
                                if (INTERSECT(x, y, 1, 1, info[i]))
                                        break;
                        for (i = 0; i < n; i++)
                                if (INTERSECT(x, y, 1, 1, info[i]))
                                        break;


@@ -570,9 +594,12 @@ setup(void)
        } else
 #endif
        {
        } else
 #endif
        {

+               if (!XGetWindowAttributes(dpy, parentwin, &wa))
+                       die("could not get embedding window attributes: 0x%lx",
+                           parentwin);

                x = 0;
                x = 0;

-               y = topbar ? 0 : sh - mh;
-               mw = sw;
+               y = topbar ? 0 : wa.height - mh;
+               mw = wa.width;

        }
        promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
        inputw = MIN(inputw, mw/3);
        }
        promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
        inputw = MIN(inputw, mw/3);


@@ -582,9 +609,8 @@ setup(void)
        swa.override_redirect = True;
        swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        swa.override_redirect = True;
        swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

-       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-                           DefaultDepth(dpy, screen), CopyFromParent,
-                           DefaultVisual(dpy, screen),
+       win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
+                           CopyFromParent, CopyFromParent, CopyFromParent,

                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 
        /* open input methods */
                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 
        /* open input methods */


@@ -593,6 +619,15 @@ setup(void)
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);

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

        drw_resize(drw, mw, mh);
        drawmenu();
 }
        drw_resize(drw, mw, mh);
        drawmenu();
 }


@@ -600,14 +635,15 @@ setup(void)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+       fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+             "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);

        exit(1);
 }
 
 int
 main(int argc, char *argv[])
 {
        exit(1);
 }
 
 int
 main(int argc, char *argv[])
 {

+       XWindowAttributes wa;

        int i, fast = 0;
 
        for (i = 1; i < argc; i++)
        int i, fast = 0;
 
        for (i = 1; i < argc; i++)


@@ -641,20 +677,25 @@ main(int argc, char *argv[])
                        colors[SchemeSel][ColBg] = argv[++i];
                else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
                        colors[SchemeSel][ColFg] = argv[++i];
                        colors[SchemeSel][ColBg] = argv[++i];
                else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
                        colors[SchemeSel][ColFg] = argv[++i];

+               else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+                       embed = argv[++i];

                else
                        usage();
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))
                else
                        usage();
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))

-               die("cannot open display\n");
+               die("cannot open display");

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

-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-       drw = drw_create(dpy, screen, root, sw, sh);
+       if (!embed || !(parentwin = strtol(embed, NULL, 0)))
+               parentwin = root;
+       if (!XGetWindowAttributes(dpy, parentwin, &wa))
+               die("could not get embedding window attributes: 0x%lx",
+                   parentwin);
+       drw = drw_create(dpy, screen, root, wa.width, wa.height);

        if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
        if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))

-               die("no fonts could be loaded.\n");
+               die("no fonts could be loaded.");

        lrpad = drw->fonts->h;
 
        if (fast) {
        lrpad = drw->fonts->h;
 
        if (fast) {