diff options
-rw-r--r-- | config.h | 5 | ||||
-rw-r--r-- | dmenu.c | 23 |
2 files changed, 17 insertions, 11 deletions
@@ -6,9 +6,4 @@ static const char *normbgcolor = "#cccccc"; | |||
6 | static const char *normfgcolor = "#000000"; | 6 | static const char *normfgcolor = "#000000"; |
7 | static const char *selbgcolor = "#0066ff"; | 7 | static const char *selbgcolor = "#0066ff"; |
8 | static const char *selfgcolor = "#ffffff"; | 8 | static const char *selfgcolor = "#ffffff"; |
9 | |||
10 | static unsigned int spaceitem = 30; /* px between menu items */ | 9 | static unsigned int spaceitem = 30; /* px between menu items */ |
11 | |||
12 | #ifdef XINERAMA | ||
13 | static unsigned int xidx = 0; /* Xinerama screen index to use */ | ||
14 | #endif | ||
@@ -16,7 +16,8 @@ | |||
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | /* macros */ | 18 | /* macros */ |
19 | #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) | 19 | #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) |
20 | #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH)) | ||
20 | 21 | ||
21 | /* enums */ | 22 | /* enums */ |
22 | enum { ColFG, ColBG, ColLast }; | 23 | enum { ColFG, ColBG, ColLast }; |
@@ -585,7 +586,7 @@ run(void) { | |||
585 | 586 | ||
586 | void | 587 | void |
587 | setup(Bool topbar) { | 588 | setup(Bool topbar) { |
588 | int i, j, x, y; | 589 | int i, j, n, x, y; |
589 | XModifierKeymap *modmap; | 590 | XModifierKeymap *modmap; |
590 | XSetWindowAttributes wa; | 591 | XSetWindowAttributes wa; |
591 | #if XINERAMA | 592 | #if XINERAMA |
@@ -618,10 +619,20 @@ setup(Bool topbar) { | |||
618 | mh = dc.font.height + 2; | 619 | mh = dc.font.height + 2; |
619 | #if XINERAMA | 620 | #if XINERAMA |
620 | if(XineramaIsActive(dpy)) { | 621 | if(XineramaIsActive(dpy)) { |
621 | info = XineramaQueryScreens(dpy, &i); | 622 | i = 0; |
622 | x = info[xidx].x_org; | 623 | info = XineramaQueryScreens(dpy, &n); |
623 | y = topbar ? info[xidx].y_org : info[xidx].y_org + info[xidx].height - mh; | 624 | if(n > 1) { |
624 | mw = info[xidx].width; | 625 | int di; |
626 | unsigned int dui; | ||
627 | Window dummy; | ||
628 | if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) | ||
629 | for(i = 0; i < n; i++) | ||
630 | if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) | ||
631 | break; | ||
632 | } | ||
633 | x = info[i].x_org; | ||
634 | y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh; | ||
635 | mw = info[i].width; | ||
625 | XFree(info); | 636 | XFree(info); |
626 | } | 637 | } |
627 | else | 638 | else |