remove the xinerama active boolean, just count the extension as not present if it is not active
This commit is contained in:
parent
0719843c68
commit
9cc08630ca
2 changed files with 4 additions and 8 deletions
|
@ -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 @@ void extensions_query_all()
|
|||
#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 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
|
|||
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);
|
||||
|
|
|
@ -33,8 +33,6 @@ extern int extensions_shape_event_basep;
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue