X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FScreen.cc;h=fc6979d814668d599405030f0c24c8a86a672d85;hb=e18ff901fc7236e3008266f0a09048e6905de724;hp=92dd4a7074f89b7d12386f8c5328460e6d0ce12f;hpb=bcb14a3ce94ee4b4cba07de7a297470719390331;p=chaz%2Fopenbox diff --git a/src/Screen.cc b/src/Screen.cc index 92dd4a70..fc6979d8 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -2074,16 +2074,12 @@ const Rect& BScreen::availableArea(void) const { } -RectList BScreen::allAvailableAreas(void) const { #ifdef XINERAMA - if (isXineramaActive()) - return xineramaUsableArea; -#endif // XINERAMA - - RectList list; - list.push_back(availableArea()); - return list; +RectList BScreen::allAvailableAreas(void) const { + assert(isXineramaActive()); + return xineramaUsableArea; } +#endif // XINERAMA void BScreen::updateAvailableArea(void) { @@ -2093,7 +2089,7 @@ void BScreen::updateAvailableArea(void) { #ifdef XINERAMA // reset to the full areas if (isXineramaActive()) - xineramaUsableArea = allAvailableAreas(); + xineramaUsableArea = getXineramaAreas(); #endif // XINERAMA /* these values represent offsets from the screen edge