nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only say xinerama is active if we can find some regions for it

Browse source
This commit is contained in:
Dana Jansens 2002-07-22 05:37:10 +00:00
parent c293fd65ca
commit e943c31bb0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/BaseDisplay.cc
View file

@ -483,6 +483,8 @@ ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num) {
itostring(static_cast<unsigned long>(screen_number)); itostring(static_cast<unsigned long>(screen_number));
#ifdef XINERAMA #ifdef XINERAMA
xinerama_active = False;
if (d->hasXineramaExtensions()) { if (d->hasXineramaExtensions()) {
if (d->getXineramaMajorVersion() == 1) { if (d->getXineramaMajorVersion() == 1) {
// we know the version 1(.1?) protocol // we know the version 1(.1?) protocol
@ -492,8 +494,7 @@ ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num) {
in future versions we should be able, so the 'activeness' is checked in future versions we should be able, so the 'activeness' is checked
on a pre-screen basis anyways. on a pre-screen basis anyways.
*/ */
xinerama_active = XineramaIsActive(d->getXDisplay()); if (XineramaIsActive(d->getXDisplay())) {
if (xinerama_active) {
/* /*
If Xinerama is being used, there there is only going to be one screen 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 present. We still, of course, want to use the screen class, but that
@ -503,11 +504,16 @@ ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num) {
int num; int num;
XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num); XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num);
if (num > 0 && info) { if (num > 0 && info) {
xinerama_areas.reserve(num);
for (int i = 0; i < num; ++i) { for (int i = 0; i < num; ++i) {
xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org, xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org,
info[i].width, info[i].height)); info[i].width, info[i].height));
} }
XFree(info); XFree(info);
// if we can't find any xinerama regions, then we act as if it is not
// active, even though it said it was
xinerama_active = True;
} }
} }
} }