int extensions_shape_event_basep;
gboolean extensions_xinerama = FALSE;
int extensions_xinerama_event_basep;
-gboolean extensions_xinerama_active = FALSE;
gboolean extensions_randr = FALSE;
int extensions_randr_event_basep;
gboolean extensions_vidmode = FALSE;
#ifdef XINERAMA
extensions_xinerama =
XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
- &junk);
- extensions_xinerama_active = XineramaIsActive(ob_display);
+ &junk) && XineramaIsActive(ob_display);
#endif
#ifdef XRANDR
guint i;
gint l, r, t, b;
#ifdef XINERAMA
- if (extensions_xinerama_active) {
+ if (extensions_xinerama) {
guint i;
gint n;
XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n);
*nxin = 1;
*xin_areas = g_new(Rect, *nxin + 1);
RECT_SET((*xin_areas)[0], 0, 0,
- screen_physical_size.width, screen_physical_size.height);
+ WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)),
+ HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)));
}
/* returns one extra with the total area in it */
for (i = 1; i < *nxin; ++i) {
l = MIN(l, (*xin_areas)[i].x);
t = MIN(l, (*xin_areas)[i].y);
- r = MAX(r, (*xin_areas)[0].x + (*xin_areas)[0].width - 1);
- b = MAX(b, (*xin_areas)[0].y + (*xin_areas)[0].height - 1);
+ r = MAX(r, (*xin_areas)[i].x + (*xin_areas)[i].width - 1);
+ b = MAX(b, (*xin_areas)[i].y + (*xin_areas)[i].height - 1);
}
RECT_SET((*xin_areas)[*nxin], l, t, r - l + 1, b - t + 1);
}