aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Lane Smith <cls@lubutu.com>2011-09-19 18:15:03 +0100
committerConnor Lane Smith <cls@lubutu.com>2011-09-19 18:15:03 +0100
commitf1848a3ef0d5e230761b6b9b5b7490d7be945154 (patch)
tree4258fb41752757637406fb8da1aaef56c97f96b2
parent3af80cd7d8ebc6dd72d4d756fc2767c17d1caa0a (diff)
downloaddmenu-f1848a3ef0d5e230761b6b9b5b7490d7be945154.tar.gz
dmenu-f1848a3ef0d5e230761b6b9b5b7490d7be945154.tar.bz2
dmenu-f1848a3ef0d5e230761b6b9b5b7490d7be945154.zip
detect active monitor using input focus
-rw-r--r--dmenu.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/dmenu.c b/dmenu.c
index fd98d54..6c1407d 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -473,7 +473,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;
@@ -494,9 +494,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 && XGetWindowAttributes(dc->dpy, w, &wa))
+ XTranslateCoordinates(dc->dpy, root, 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;
@@ -517,13 +522,13 @@ setup(void) {
match(False);
/* 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);