merge lsx -> default

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 2bad8d6..dc1f236 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -41,7 +41,6 @@ static void usage(void);
 static char text[BUFSIZ] = "";
 static int bh, mw, mh;
 static int inputw, promptw;
-static int lines = 0;
 static size_t cursor = 0;
 static const char *font = NULL;
 static const char *prompt = NULL;
@@ -49,6 +48,7 @@ static const char *normbgcolor = "#cccccc";
 static const char *normfgcolor = "#000000";
 static const char *selbgcolor  = "#0066ff";
 static const char *selfgcolor  = "#ffffff";
+static unsigned int lines = 0;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Atom utf8;
@@ -392,7 +392,7 @@ match(void) {
                        appenditem(item, &lsubstr, &substrend);
        }
        if(lprefix) {
-               if(matchend) {
+               if(matches) {
                        matchend->right = lprefix;
                        lprefix->left = matchend;
                }
@@ -401,7 +401,7 @@ match(void) {
                matchend = prefixend;
        }
        if(lsubstr) {
-               if(matchend) {
+               if(matches) {
                        matchend->right = lsubstr;
                        lsubstr->left = matchend;
                }
@@ -454,6 +454,7 @@ readstdin(void) {
        if(items)
                items[i].text = NULL;
        inputw = maxstr ? textw(dc, maxstr) : 0;
+       lines = MIN(lines, i);
 }
 
 void
@@ -484,7 +485,7 @@ void
 setup(void) {
        int x, y, screen = DefaultScreen(dc->dpy);
        Window root = RootWindow(dc->dpy, screen);
-       XSetWindowAttributes wa;
+       XSetWindowAttributes swa;
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
@@ -505,9 +506,14 @@ setup(void) {
        if((info = XineramaQueryScreens(dc->dpy, &n))) {
                int i, di;
                unsigned int du;
-               Window dw;
+               Window w, dw;
+               XWindowAttributes wa;
 
-               XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
+               XGetInputFocus(dc->dpy, &w, &di);
+               if(w != root && w != PointerRoot && w != None && XGetWindowAttributes(dc->dpy, w, &wa))
+                       XTranslateCoordinates(dc->dpy, w, root, wa.x, wa.y, &x, &y, &dw);
+               else
+                       XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                for(i = 0; i < n-1; i++)
                        if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
                                break;
@@ -528,13 +534,13 @@ setup(void) {
        match();
 
        /* menu window */
-       wa.override_redirect = True;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+       swa.override_redirect = True;
+       swa.background_pixmap = ParentRelative;
+       swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dc->dpy, screen), CopyFromParent,
                            DefaultVisual(dc->dpy, screen),
-                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
 
        XMapRaised(dc->dpy, win);
        resizedc(dc, mw, mh);