get the right rects for the xinerama regions
Dana Jansens danakj@orodu.net
2 files changed,
16 insertions(+),
14 deletions(-)
M
src/BaseDisplay.cc
→
src/BaseDisplay.cc
@@ -493,20 +493,22 @@ in future versions we should be able, so the 'activeness' is checked
on a pre-screen basis anyways. */ xinerama_active = XineramaIsActive(d->getXDisplay()); - /* - If Xinerama is being used, there there is only going to be one screen - present. We still, of course, want to use the screen class, but that is - why no screen number is used in this function call. There should never - be more than one screen present with Xinerama active. - */ - int num; - XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num); - if (num > 0 && info) { - for (int i = 0; i < num; ++i) { - xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org, - info[i].width, info[i].height)); + if (xinerama_active) { + /* + If Xinerama is being used, there there is only going to be one screen + present. We still, of course, want to use the screen class, but that + is why no screen number is used in this function call. There should + never be more than one screen present with Xinerama active. + */ + int num; + XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num); + if (num > 0 && info) { + for (int i = 0; i < num; ++i) { + xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org, + info[i].width, info[i].height)); + } + XFree(info); } - XFree(info); } } }
M
src/Screen.cc
→
src/Screen.cc
@@ -2093,7 +2093,7 @@
#ifdef XINERAMA // reset to the full areas if (isXineramaActive()) - xineramaUsableArea = allAvailableAreas(); + xineramaUsableArea = getXineramaAreas(); #endif // XINERAMA /* these values represent offsets from the screen edge