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

remove the xinerama active boolean, just count the extension as not present if it is not active

Browse source
This commit is contained in:
Dana Jansens 2003-07-10 04:36:17 +00:00
parent 0719843c68
commit 9cc08630ca
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openbox/extensions.c
View file

@ -9,7 +9,6 @@ gboolean extensions_shape = FALSE;
int extensions_shape_event_basep; int extensions_shape_event_basep;
gboolean extensions_xinerama = FALSE; gboolean extensions_xinerama = FALSE;
int extensions_xinerama_event_basep; int extensions_xinerama_event_basep;
gboolean extensions_xinerama_active = FALSE;
gboolean extensions_randr = FALSE; gboolean extensions_randr = FALSE;
int extensions_randr_event_basep; int extensions_randr_event_basep;
gboolean extensions_vidmode = FALSE; gboolean extensions_vidmode = FALSE;
@ -35,8 +34,7 @@ void extensions_query_all()
#ifdef XINERAMA #ifdef XINERAMA
extensions_xinerama = extensions_xinerama =
XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep, XineramaQueryExtension(ob_display, &extensions_xinerama_event_basep,
&junk); &junk) && XineramaIsActive(ob_display);
extensions_xinerama_active = XineramaIsActive(ob_display);
#endif #endif
#ifdef XRANDR #ifdef XRANDR
@ -57,7 +55,7 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
guint i; guint i;
gint l, r, t, b; gint l, r, t, b;
#ifdef XINERAMA #ifdef XINERAMA
if (extensions_xinerama_active) { if (extensions_xinerama) {
guint i; guint i;
gint n; gint n;
XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n); XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n);

4
openbox/extensions.h
View file

@ -33,8 +33,6 @@ extern int extensions_shape_event_basep;
extern gboolean extensions_xinerama; extern gboolean extensions_xinerama;
/*! Base for events for the Xinerama extension */ /*! Base for events for the Xinerama extension */
extern int extensions_xinerama_event_basep; extern int extensions_xinerama_event_basep;
/*! Is Xinerama enabled? */
extern gboolean extensions_xinerama_active;
/*! Does the display have the RandR extension? */ /*! Does the display have the RandR extension? */
extern gboolean extensions_randr; extern gboolean extensions_randr;
@ -48,6 +46,6 @@ extern int extensions_vidmode_event_basep;
void extensions_query_all(); void extensions_query_all();
void extensions_xinerama_screens(Rect **xin_areas, guint *nxin); void extensions_xinerama_screens(Rect **areas, guint *nxin);
#endif #endif