Kaydet (Commit) 8619d58e authored tarafından Caolán McNamara's avatar Caolán McNamara

there is no USE_XINERAMA define, but USE_XINERAMA_XSUN/USE_XINERAMA_XORG

üst a32662e1
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#ifdef USE_XINERAMA
#ifdef USE_XINERAMA_XORG #ifdef USE_XINERAMA_XORG
#include <X11/extensions/Xinerama.h> #include <X11/extensions/Xinerama.h>
#elif defined USE_XINERAMA_XSUN #elif defined USE_XINERAMA_XSUN
...@@ -69,9 +68,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); ...@@ -69,9 +68,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
#else #else
#include <X11/extensions/xinerama.h> #include <X11/extensions/xinerama.h>
#endif #endif
#else
#error USE_XINERAMA but no xinerama version
#endif
#endif #endif
#include <tools/postx.h> #include <tools/postx.h>
...@@ -2455,7 +2451,6 @@ void SalDisplay::InitXinerama() ...@@ -2455,7 +2451,6 @@ void SalDisplay::InitXinerama()
m_bXinerama = false; m_bXinerama = false;
return; // multiple screens mean no xinerama return; // multiple screens mean no xinerama
} }
#ifdef USE_XINERAMA
#if defined(USE_XINERAMA_XSUN) #if defined(USE_XINERAMA_XSUN)
int nFramebuffers = 1; int nFramebuffers = 1;
if( XineramaGetState( pDisp_, m_nDefaultScreen ) ) if( XineramaGetState( pDisp_, m_nDefaultScreen ) )
...@@ -2480,8 +2475,8 @@ void SalDisplay::InitXinerama() ...@@ -2480,8 +2475,8 @@ void SalDisplay::InitXinerama()
} }
} }
#elif defined(USE_XINERAMA_XORG) #elif defined(USE_XINERAMA_XORG)
if( XineramaIsActive( pDisp_ ) ) if( XineramaIsActive( pDisp_ ) )
{ {
int nFramebuffers = 1; int nFramebuffers = 1;
XineramaScreenInfo* pScreens = XineramaQueryScreens( pDisp_, &nFramebuffers ); XineramaScreenInfo* pScreens = XineramaQueryScreens( pDisp_, &nFramebuffers );
if( pScreens ) if( pScreens )
...@@ -2501,7 +2496,7 @@ if( XineramaIsActive( pDisp_ ) ) ...@@ -2501,7 +2496,7 @@ if( XineramaIsActive( pDisp_ ) )
} }
XFree( pScreens ); XFree( pScreens );
} }
} }
#endif #endif
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
if( m_bXinerama ) if( m_bXinerama )
...@@ -2510,7 +2505,6 @@ if( XineramaIsActive( pDisp_ ) ) ...@@ -2510,7 +2505,6 @@ if( XineramaIsActive( pDisp_ ) )
fprintf( stderr, "Xinerama screen: %ldx%ld+%ld+%ld\n", it->GetWidth(), it->GetHeight(), it->Left(), it->Top() ); fprintf( stderr, "Xinerama screen: %ldx%ld+%ld+%ld\n", it->GetWidth(), it->GetHeight(), it->Left(), it->Top() );
} }
#endif #endif
#endif // USE_XINERAMA
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment