diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-08-04 15:52:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-06 12:47:54 +0000 |
| commit | 4a2280e4a2bbc936625dc9816e5491da6ba770ac (patch) | |
| tree | b3d7cd162cc16b0ebcf4c2039068f5a57c820535 | |
| parent | 7b10285665605a659dd901634b3d4010a0f0b2c4 (diff) | |
Kill XSUN Xinerama support
XSun is a relic from Solaris 10 / SPARC.
Change-Id: I5c379a496ee5953d71fe51b86cf9992c92943126
Reviewed-on: https://gerrit.libreoffice.org/10756
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 7 | ||||
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 33 |
2 files changed, 1 insertions, 39 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 23900200491c..c3f00aa4eef2 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -116,8 +116,6 @@ endif ## handle Xinerama ifneq ($(USE_XINERAMA),) -ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun) -# not Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) @@ -130,11 +128,6 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl$(COMMA)-Bstatic -lXinerama -Wl$(COMMA)-Bdynamic \ )) endif -else # Solaris/Xsun -$(eval $(call gb_Library_add_defs,vclplug_gen,\ - -DUSE_XINERAMA_XSUN \ -)) -endif endif # USE_XINERAMA ifeq ($(OS),LINUX) diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 73c7b1fd4c5e..91c57069ca54 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -44,14 +44,6 @@ #ifdef USE_XINERAMA_XORG #include <X11/extensions/Xinerama.h> -#elif defined USE_XINERAMA_XSUN -#if defined(SOLARIS) && defined(INTEL) // missing extension header in standard installation -#define MAXFRAMEBUFFERS 16 -Bool XineramaGetState(Display*, int); -Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); -#else -#include <X11/extensions/xinerama.h> -#endif #endif #include <postx.h> @@ -2228,30 +2220,7 @@ void SalDisplay::InitXinerama() m_bXinerama = false; return; // multiple screens mean no xinerama } -#if defined(USE_XINERAMA_XSUN) - int nFramebuffers = 1; - if( XineramaGetState( pDisp_, m_nDefaultScreen ) ) - { - XRectangle pFramebuffers[MAXFRAMEBUFFERS]; - unsigned char hints[MAXFRAMEBUFFERS]; - int result = XineramaGetInfo( pDisp_, - m_nDefaultScreen, - pFramebuffers, - hints, - &nFramebuffers ); - if( result > 0 && nFramebuffers > 1 ) - { - m_bXinerama = true; - m_aXineramaScreens = std::vector<Rectangle>(); - m_aXineramaScreenIndexMap = std::vector<int>(nFramebuffers); - for( int i = 0; i < nFramebuffers; i++ ) - addXineramaScreenUnique( i, pFramebuffers[i].x, - pFramebuffers[i].y, - pFramebuffers[i].width, - pFramebuffers[i].height ); - } - } -#elif defined(USE_XINERAMA_XORG) +#if defined(USE_XINERAMA_XORG) if( XineramaIsActive( pDisp_ ) ) { int nFramebuffers = 1; |