shape.extensions = False;
#endif // SHAPE
- xinerama.extensions = False;
#ifdef XINERAMA
if (XineramaQueryExtension(display, &xinerama.event_basep,
- &xinerama.error_basep)) {
- if (XineramaQueryVersion(display, &xinerama.major,
- &xinerama.minor)) {
+ &xinerama.error_basep) &&
+ XineramaQueryVersion(display, &xinerama.major, &xinerama.minor)) {
#ifdef DEBUG
- fprintf(stderr,
- "BaseDisplay::BaseDisplay: Found Xinerama version %d.%d\n",
- xinerama.major, xinerama.minor);
+ fprintf(stderr,
+ "BaseDisplay::BaseDisplay: Found Xinerama version %d.%d\n",
+ xinerama.major, xinerama.minor);
#endif // DEBUG
- xinerama.extensions = True;
- }
+ xinerama.extensions = True;
+ } else {
+ xinerama.extensions = False;
}
#endif // XINERAMA
BGCCache* BaseDisplay::gcCache(void) const {
if (! gccache)
- gccache = new BGCCache(this);
+ gccache = new BGCCache(this, screenInfoList.size());
return gccache;
}
itostring(static_cast<unsigned long>(screen_number));
#ifdef XINERAMA
+ xinerama_active = False;
+
if (d->hasXineramaExtensions()) {
if (d->getXineramaMajorVersion() == 1) {
// we know the version 1(.1?) protocol
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 (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) {
+ xinerama_areas.reserve(num);
+ 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);
+
+ // 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;
}
- XFree(info);
}
}
}