remove the xinerama active boolean, just count the extension as not present if it is not active
Dana Jansens danakj@orodu.net
2 files changed,
4 insertions(+),
8 deletions(-)
M
openbox/extensions.c
→
openbox/extensions.c
@@ -9,7 +9,6 @@ gboolean extensions_shape = FALSE;
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;@@ -35,8 +34,7 @@
#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@@ -57,7 +55,7 @@ {
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);
M
openbox/extensions.h
→
openbox/extensions.h
@@ -33,8 +33,6 @@ /*! Does the display have the Xinerama extension? */
extern gboolean extensions_xinerama; /*! Base for events for the Xinerama extension */ extern int extensions_xinerama_event_basep; -/*! Is Xinerama enabled? */ -extern gboolean extensions_xinerama_active; /*! Does the display have the RandR extension? */ extern gboolean extensions_randr;@@ -48,6 +46,6 @@ extern int extensions_vidmode_event_basep;
void extensions_query_all(); -void extensions_xinerama_screens(Rect **xin_areas, guint *nxin); - +void extensions_xinerama_screens(Rect **areas, guint *nxin); + #endif