generic: create shared display class and re-factor to use it

16 files changed, 88 insertions, 87 deletions

diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index bb9b92a8354b..1a67e2344922 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -186,7 +186,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
     maClientData.aInputEv.mbOnlyCursor      = sal_False;
 
     SalI18N_InputMethod *pInputMethod;
-    pInputMethod = GetX11SalData()->GetDisplay()->GetInputMethod();
+    pInputMethod = GetGenericData()->GetSalDisplay()->GetInputMethod();
 
     mnSupportedPreeditStyle =   XIMPreeditCallbacks | XIMPreeditPosition
         | XIMPreeditNothing   | XIMPreeditNone;
@@ -299,7 +299,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
                 // XCreateIC() fails on Redflag Linux 2.0 if there is no
                 // fontset though the data itself is not evaluated nor is
                 // it required according to the X specs.
-                Display* pDisplay = GetX11SalData()->GetDisplay()->GetDisplay();
+                Display* pDisplay = GetGenericData()->GetSalDisplay()->GetDisplay();
                 XFontSet pFontSet = get_font_set(pDisplay);
 
                 if (pFontSet != NULL)
@@ -420,7 +420,7 @@ SalI18N_InputContext::Map( SalFrame *pFrame )
             if ( maContext == NULL )
             {
                 SalI18N_InputMethod *pInputMethod;
-                pInputMethod = GetX11SalData()->GetDisplay()->GetInputMethod();
+                pInputMethod = GetGenericData()->GetSalDisplay()->GetInputMethod();
 
                 maContext = XCreateIC( pInputMethod->GetMethod(),
                                        XNVaNestedList, mpAttributes,
@@ -661,7 +661,7 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
         {
             sendEmptyCommit(pFocusFrame);
             // begin preedit again
-            GetX11SalData()->GetDisplay()->SendInternalEvent( pFocusFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT );
+            GetGenericData()->GetSalDisplay()->SendInternalEvent( pFocusFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT );
         }
 
         XSetICFocus( maContext );
@@ -678,7 +678,7 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
     if ( mbUseable && (maContext != NULL) )
     {
         // cancel an eventual event posted to begin preedit again
-        GetX11SalData()->GetDisplay()->CancelInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT );
+        GetGenericData()->GetSalDisplay()->CancelInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT );
         maClientData.pFrame = NULL;
         XUnsetICFocus( maContext );
     }
@@ -739,7 +739,7 @@ SalI18N_InputContext::EndExtTextInput( sal_uInt16 /*nFlags*/ )
             if( static_cast<X11SalFrame*>(maClientData.pFrame)->hasFocus() )
             {
                 // begin preedit again
-                GetX11SalData()->GetDisplay()->SendInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT );
+                GetGenericData()->GetSalDisplay()->SendInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SALEVENT_EXTTEXTINPUT );
             }
         }
     }
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index f818f04b1ac7..e2fcdae113c7 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -185,7 +185,7 @@ bool XIMStatusWindow::checkLastParent() const
 {
     if( m_pLastParent )
     {
-        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        const std::list< SalFrame* >& rFrames = GetGenericData()->GetSalDisplay()->getFrames();
         for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
         {
             if( *it == m_pLastParent )
@@ -214,7 +214,7 @@ Point XIMStatusWindow::updatePosition()
         XLIB_Window aChild;
         XTranslateCoordinates( (Display*)pParentEnvData->pDisplay,
                                (XLIB_Window)pParentEnvData->aShellWindow,
-                               GetX11SalData()->GetDisplay()->GetRootWindow( GetX11SalData()->GetDisplay()->GetDefaultScreenNumber() ),
+                               GetGenericData()->GetSalDisplay()->GetRootWindow( GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() ),
                                0, 0,
                                &x, &y,
                                &aChild );
@@ -461,14 +461,14 @@ void IIIMPStatusWindow::GetFocus()
          *  since reset focus really is an internal hack there should
          *  not be a method to be called in SalFrame destructor
          */
-        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        const std::list< SalFrame* >& rFrames = GetGenericData()->GetSalDisplay()->getFrames();
         std::list< SalFrame* >::const_iterator it;
         for( it = rFrames.begin(); it != rFrames.end() && *it != m_pResetFocus; ++it )
             ;
         if( it != rFrames.end() )
         {
             const SystemEnvData* pParentEnvData = m_pResetFocus->GetSystemData();
-            SalXLib* pXLib = GetX11SalData()->GetDisplay()->GetXLib();
+            SalXLib* pXLib = GetGenericData()->GetSalDisplay()->GetXLib();
             pXLib->PushXErrorLevel( true );
             XSetInputFocus( (Display*)pParentEnvData->pDisplay,
                             (XLIB_Window)pParentEnvData->aShellWindow,
@@ -501,7 +501,7 @@ IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn )
             if( pParent && pParent->isMapped() )
             {
                 const SystemEnvData* pEnv = pParent->GetSystemData();
-                SalXLib* pXLib = GetX11SalData()->GetDisplay()->GetXLib();
+                SalXLib* pXLib = GetGenericData()->GetSalDisplay()->GetXLib();
                 pXLib->PushXErrorLevel( true );
                 XSetInputFocus( (Display*)pEnv->pDisplay,
                                 (XLIB_Window)pEnv->aShellWindow,
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 978199ddf73d..99136ad76d75 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -232,12 +232,16 @@ static const char* XRequest[] = {
 
 int X11SalData::XErrorHdl( Display *pDisplay, XErrorEvent *pEvent )
 {
+    OSL_ASSERT( GetX11SalData()->GetType() == SAL_DATA_UNX );
+
     GetX11SalData()->XError( pDisplay, pEvent );
     return 0;
 }
 
 int X11SalData::XIOErrorHdl( Display * )
 {
+    OSL_ASSERT( GetX11SalData()->GetType() == SAL_DATA_UNX );
+
     /*  #106197# hack: until a real shutdown procedure exists
      *  _exit ASAP
      */
@@ -264,34 +268,34 @@ int X11SalData::XIOErrorHdl( Display * )
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <pthread.h>
 
-X11SalData::X11SalData()
+X11SalData::X11SalData( SalGenericDataType t )
+    : SalGenericData( t )
 {
     pXLib_          = NULL;
-    m_pSalDisplay   = NULL;
     m_pInstance     = NULL;
     m_pPlugin       = NULL;
 
     hMainThread_    = pthread_self();
 }
 
-const rtl::OUString& X11SalData::GetLocalHostName()
+X11SalData::~X11SalData()
 {
-    if (!maLocalHostName.getLength())
-            osl_getLocalHostname( &maLocalHostName.pData );
-    return maLocalHostName;
+    DeleteDisplay();
 }
 
-X11SalData::~X11SalData()
+void X11SalData::Dispose()
 {
-    DeleteDisplay();
+    deInitNWF();
+    delete GetDisplay();
+    SetSalData( NULL );
 }
 
 void X11SalData::DeleteDisplay()
 {
-    delete m_pSalDisplay;
-    m_pSalDisplay   = NULL;
+    delete GetDisplay();
+    SetDisplay( NULL );
     delete pXLib_;
-    pXLib_      = NULL;
+    pXLib_ = NULL;
 }
 
 void X11SalData::Init()
@@ -558,7 +562,7 @@ void SalXLib::XError( Display *pDisplay, XErrorEvent *pEvent )
             return;
 
 
-        if( pDisplay != GetX11SalData()->GetDisplay()->GetDisplay() )
+        if( pDisplay != GetGenericData()->GetSalDisplay()->GetDisplay() )
             return;
 
         PrintXError( pDisplay, pEvent );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d1b1e5637496..4e30e1afe4ed 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -319,7 +319,7 @@ sal_IsLocalDisplay( Display *pDisplay )
 
     if( pPtr != NULL )
     {
-        const OUString& rLocalHostname( GetX11SalData()->GetLocalHostName() );
+        const OUString& rLocalHostname( GetGenericData()->GetHostname() );
         if( rLocalHostname.getLength() )
         {
             *pPtr = '\0';
@@ -497,11 +497,10 @@ SalDisplay::SalDisplay( Display *display ) :
     X11SalData *pSalData  = GetX11SalData();
 
     DBG_ASSERT( ! pSalData->GetDisplay(), "Second SalDisplay created !!!\n" );
-    pSalData->SetSalDisplay( this );
+    pSalData->SetDisplay( this );
 
-    pXLib_    = pSalData->GetLib();
+    pXLib_ = pSalData->GetLib();
     m_nDefaultScreen = DefaultScreen( pDisp_ );
-
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -567,7 +566,7 @@ void SalDisplay::doDestruct()
     }
 
     if( pSalData->GetDisplay() == this )
-        pSalData->SetSalDisplay( NULL );
+        pSalData->SetDisplay( NULL );
 }
 
 static int DisplayHasEvent( int fd, SalX11Display *pDisplay  )
@@ -2763,12 +2762,12 @@ SalColormap::SalColormap( const SalDisplay *pDisplay, Colormap hColormap, int nS
 
 // PseudoColor
 SalColormap::SalColormap( const BitmapPalette &rPalette )
-    : m_pDisplay( GetX11SalData()->GetDisplay() ),
+    : m_pDisplay( GetGenericData()->GetSalDisplay() ),
       m_hColormap( None ),
       m_nWhitePixel( SALCOLOR_NONE ),
       m_nBlackPixel( SALCOLOR_NONE ),
       m_nUsed( rPalette.GetEntryCount() ),
-      m_nScreen( GetX11SalData()->GetDisplay()->GetDefaultScreenNumber() )
+      m_nScreen( GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() )
 {
     m_aPalette = std::vector<SalColor>(m_nUsed);
 
@@ -2787,7 +2786,7 @@ SalColormap::SalColormap( const BitmapPalette &rPalette )
 
 // MonoChrome
 SalColormap::SalColormap()
-    : m_pDisplay( GetX11SalData()->GetDisplay() ),
+    : m_pDisplay( GetGenericData()->GetSalDisplay() ),
       m_hColormap( None ),
       m_nWhitePixel( 1 ),
       m_nBlackPixel( 0 ),
@@ -2804,12 +2803,12 @@ SalColormap::SalColormap()
 
 // TrueColor
 SalColormap::SalColormap( sal_uInt16 nDepth )
-    : m_pDisplay( GetX11SalData()->GetDisplay() ),
+    : m_pDisplay( GetGenericData()->GetSalDisplay() ),
       m_hColormap( None ),
       m_nWhitePixel( (1 << nDepth) - 1 ),
       m_nBlackPixel( 0x00000000 ),
       m_nUsed( 1 << nDepth ),
-      m_nScreen( GetX11SalData()->GetDisplay()->GetDefaultScreenNumber() )
+      m_nScreen( GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() )
 {
     const SalVisual *pVisual  = &m_pDisplay->GetVisual( m_nScreen );
 
@@ -2900,7 +2899,7 @@ SalColormap::~SalColormap()
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 void SalColormap::SetPalette( const BitmapPalette &rPalette )
 {
-    if( this != &GetX11SalData()->GetDisplay()->GetColormap(m_nScreen) )
+    if( this != &GetGenericData()->GetSalDisplay()->GetColormap(m_nScreen) )
     {
         m_nBlackPixel = SALCOLOR_NONE;
         m_nWhitePixel = SALCOLOR_NONE;
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 05e50061102e..7e70faae177f 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -73,7 +73,7 @@ extern "C"
         X11SalInstance* pInstance = new X11SalInstance( new SalYieldMutex() );
 
         // initialize SalData
-        X11SalData *pSalData = new X11SalData;
+        X11SalData *pSalData = new X11SalData( SAL_DATA_UNX );
         SetSalData( pSalData );
         pSalData->m_pInstance = pInstance;
         pSalData->Init();
@@ -90,11 +90,7 @@ X11SalInstance::~X11SalInstance()
     // dispose SalDisplay list from SalData
     // would be done in a static destructor else which is
     // a little late
-
-    X11SalData *pSalData = GetX11SalData();
-    pSalData->deInitNWF();
-    delete pSalData;
-    SetSalData( NULL );
+    GetGenericData()->Dispose();
 }
 
 
@@ -150,11 +146,13 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData )
 bool X11SalInstance::AnyInput(sal_uInt16 nType)
 {
     X11SalData *pSalData = GetX11SalData();
-    Display *pDisplay  = pSalData->GetDisplay()->GetDisplay();
+
+    SalGenericData *pData = GetGenericData();
+    Display *pDisplay  = pData->GetSalDisplay()->GetDisplay();
     sal_Bool bRet = sal_False;
 
     if( (nType & INPUT_TIMER) &&
-        pSalData->GetDisplay()->GetXLib()->CheckTimeout( false ) )
+        pSalData->GetSalDisplay()->GetXLib()->CheckTimeout( false ) )
     {
         bRet = sal_True;
     }
@@ -258,7 +256,7 @@ static void getServerDirectories( std::list< rtl::OString >& o_rFontPaths )
 
 void X11SalInstance::FillFontPathList( std::list< rtl::OString >& o_rFontPaths )
 {
-    Display *pDisplay = GetX11SalData()->GetDisplay()->GetDisplay();
+    Display *pDisplay = GetGenericData()->GetSalDisplay()->GetDisplay();
 
     DBG_ASSERT( pDisplay, "No Display !" );
     if( pDisplay )
@@ -351,7 +349,7 @@ void X11SalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, cons
 
 void X11SalInstance::PostPrintersChanged()
 {
-    SalDisplay* pDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pDisp = GetGenericData()->GetSalDisplay();
     const std::list< SalFrame* >& rList = pDisp->getFrames();
     for( std::list< SalFrame* >::const_iterator it = rList.begin();
          it != rList.end(); ++it )
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 77b2e6f7b060..7bb084b64fc2 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -288,7 +288,7 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, EMPTYARG )
           task of the quick-starter)
         */
         *pSmRestartHint = SmRestartNever;
-        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        const std::list< SalFrame* >& rFrames = GetGenericData()->GetSalDisplay()->getFrames();
         for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
         {
             Window *pWindow = (*it)->GetWindow();
@@ -382,7 +382,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, ShutDownHdl, void*, EMPTYARG
         pOneInstance->CallCallback( &aEvent );
     }
 
-    const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+    const std::list< SalFrame* >& rFrames = GetGenericData()->GetSalDisplay()->getFrames();
     SMprintf( rFrames.begin() != rFrames.end() ? "shutdown on first frame\n" : "shutdown event but no frame\n" );
     if( rFrames.begin() != rFrames.end() )
         rFrames.front()->CallCallback( SALEVENT_SHUTDOWN, 0 );
@@ -487,7 +487,7 @@ void SessionManagerClient::open()
         pClientID = NULL;
         ICEConnectionObserver::unlock();
 
-        SalDisplay* pDisp = GetX11SalData()->GetDisplay();
+        SalDisplay* pDisp = GetGenericData()->GetSalDisplay();
         if( pDisp->GetDrawable(pDisp->GetDefaultScreenNumber()) && !m_aClientID.isEmpty() )
         {
             XChangeProperty( pDisp->GetDisplay(),
@@ -794,7 +794,7 @@ void ICEConnectionObserver::ICEWatchProc(
     SMprintf( "ICE connection on %d %s\n",
               IceConnectionNumber( connection ),
               opening ? "inserted" : "removed" );
-    SMprintf( "Display connection is %d\n", ConnectionNumber( GetX11SalData()->GetDisplay()->GetDisplay() ) );
+    SMprintf( "Display connection is %d\n", ConnectionNumber( GetGenericData()->GetSalDisplay()->GetDisplay() ) );
 #endif
 }
 
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 5dfc236bde7c..89e9d5b486e9 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -2397,7 +2397,7 @@ void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const
 */
 void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const
 {
-    rtl::OString aWmClient( rtl::OUStringToOString( GetX11SalData()->GetLocalHostName(), RTL_TEXTENCODING_ASCII_US ) );
+    rtl::OString aWmClient( rtl::OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
     XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, aWmClient.getLength() };
     XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp );
 }
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 2de2993905f1..f8f88ad7d374 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3332,10 +3332,10 @@ void SelectionManager::startDrag(
             osl::SolarMutex& rSolarMutex( Application::GetSolarMutex() );
             if( rSolarMutex.tryToAcquire() )
             {
-                pCaptureFrame = GetX11SalData()->GetDisplay()->GetCaptureFrame();
+                pCaptureFrame = GetGenericData()->GetSalDisplay()->GetCaptureFrame();
                 if( pCaptureFrame )
                 {
-                    GetX11SalData()->GetDisplay()->CaptureMouse( NULL );
+                    GetGenericData()->GetSalDisplay()->CaptureMouse( NULL );
                     nPointerGrabSuccess =
                                 XGrabPointer( m_pDisplay, it->second.m_aRootWindow, True,
                                               DRAG_EVENT_MASK,
@@ -3372,7 +3372,7 @@ void SelectionManager::startDrag(
             {
                 osl::SolarMutex& rSolarMutex( Application::GetSolarMutex() );
                 if( rSolarMutex.tryToAcquire() )
-                    GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+                    GetGenericData()->GetSalDisplay()->CaptureMouse( pCaptureFrame );
 #if OSL_DEBUG_LEVEL > 0
                 else
                     OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" );
@@ -3461,7 +3461,7 @@ void SelectionManager::startDrag(
         {
             osl::SolarMutex& rSolarMutex( Application::GetSolarMutex() );
             if( rSolarMutex.tryToAcquire() )
-                GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+                GetGenericData()->GetSalDisplay()->CaptureMouse( pCaptureFrame );
 #if OSL_DEBUG_LEVEL > 0
             else
                 OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" );
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 14191c738ab3..fdf01a2833b9 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -55,7 +55,7 @@ struct MultiScreenGlyph
 // ===========================================================================
 
 X11GlyphPeer::X11GlyphPeer()
-:   mpDisplay( GetX11SalData()->GetDisplay()->GetDisplay() )
+:   mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() )
 ,   mnMaxScreens(0)
 ,   mnDefaultScreen(0)
 ,   mnExtByteCount(0)
@@ -67,7 +67,7 @@ X11GlyphPeer::X11GlyphPeer()
     if( !mpDisplay )
         return;
 
-    SalDisplay& rSalDisplay = *GetX11SalData()->GetDisplay();
+    SalDisplay& rSalDisplay = *GetGenericData()->GetSalDisplay();
     mpDisplay    = rSalDisplay.GetDisplay();
     mnMaxScreens = rSalDisplay.GetScreenCount();
     if( mnMaxScreens > MAX_GCACH_SCREENS )
@@ -85,7 +85,7 @@ X11GlyphPeer::X11GlyphPeer()
 
 X11GlyphPeer::~X11GlyphPeer()
 {
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     Display* const pX11Disp = pSalDisp->GetDisplay();
     XRenderPeer& rRenderPeer = XRenderPeer::GetInstance();
     for( int i = 0; i < mnMaxScreens; i++ )
@@ -131,7 +131,7 @@ void X11GlyphPeer::InitAntialiasing()
     // enable client side antialiasing for screen visuals that are suitable
     // mnForcedAA is a bitmask of screens enabled for client side antialiasing
     mnForcedAA = (~(~0U << mnMaxScreens)) ^ mnUsingXRender;
-    SalDisplay& rSalDisplay = *GetX11SalData()->GetDisplay();
+    SalDisplay& rSalDisplay = *GetGenericData()->GetSalDisplay();
     for( int nScreen = 0; nScreen < mnMaxScreens; ++nScreen)
     {
         Visual* pVisual = rSalDisplay.GetVisual( nScreen ).GetVisual();
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 22a5d1eddb26..c2057e79fb9b 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -217,7 +217,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
 
     if( aDrawable && nWidth && nHeight && nDrawableDepth )
     {
-        SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+        SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
         SalXLib*    pXLib = pSalDisp->GetXLib();
         Display*    pXDisp = pSalDisp->GetDisplay();
 
@@ -743,7 +743,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB(
             }
         }
 
-        XImage* pImage = ImplCreateXImage( GetX11SalData()->GetDisplay(), nScreen,
+        XImage* pImage = ImplCreateXImage( GetGenericData()->GetSalDisplay(), nScreen,
                                            nDrawableDepth, aTwoRect );
 
         if( pImage )
@@ -866,7 +866,7 @@ bool X11SalBitmap::Create(
                                 );
                 bool bFreePixmap = false;
                 if( bSuccess && (args[0] >>= bFreePixmap) && bFreePixmap )
-                    XFreePixmap( GetX11SalData()->GetDisplay()->GetDisplay(), pixmapHandle );
+                    XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), pixmapHandle );
 
                 return bSuccess;
             }
@@ -985,7 +985,7 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, int nScreen, const S
     , mnDepth     ( pImage->depth )
     , mnScreen    ( nScreen )
 {
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     Display*    pXDisp = pSalDisp->GetDisplay();
 
     if( (maPixmap = XCreatePixmap( pXDisp, aDrawable, ImplGetWidth(), ImplGetHeight(), ImplGetDepth() )) )
@@ -1060,7 +1060,7 @@ ImplSalDDB::ImplSalDDB(
 )   : mnDepth( nDrawableDepth )
     , mnScreen( nScreen )
 {
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     Display*    pXDisp = pSalDisp->GetDisplay();
 
     if( (maPixmap = XCreatePixmap( pXDisp, aDrawable, nWidth, nHeight, nDrawableDepth )) )
@@ -1093,7 +1093,7 @@ ImplSalDDB::ImplSalDDB(
 ImplSalDDB::~ImplSalDDB()
 {
     if( maPixmap && ImplGetSVData() )
-        XFreePixmap( GetX11SalData()->GetDisplay()->GetDisplay(), maPixmap );
+        XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap );
 }
 
 // -----------------------------------------------------------------------------
@@ -1162,7 +1162,7 @@ void ImplSalDDB::ImplDraw(
     long nDestY,
     const GC& rGC
 ) {
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     Display*    pXDisp = pSalDisp->GetDisplay();
 
     if( 1 == nSrcDrawableDepth )
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 1eb14c5d3192..13ca6032a375 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -201,7 +201,7 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, int nScreen )
     if( nScreen != m_nScreen )
     {
         freeResources();
-        m_pColormap = &GetX11SalData()->GetDisplay()->GetColormap( nScreen );
+        m_pColormap = &GetGenericData()->GetSalDisplay()->GetColormap( nScreen );
         m_nScreen = nScreen;
     }
 
@@ -224,7 +224,7 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, int nScreen )
 void X11SalGraphics::Init( SalFrame *pFrame, Drawable aTarget, int nScreen )
 {
 
-    m_pColormap     = &GetX11SalData()->GetDisplay()->GetColormap(nScreen);
+    m_pColormap     = &GetGenericData()->GetSalDisplay()->GetColormap(nScreen);
     m_nScreen = nScreen;
     SetDrawable( aTarget, nScreen );
 
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index a73a3caaf9e1..1669ab6f2662 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -84,7 +84,7 @@ void X11SalGraphics::CopyScreenArea( Display* pDisplay,
                        src_x, src_y, w, h, dest_x, dest_y );
         else
         {
-            SalXLib* pLib = GetX11SalData()->GetDisplay()->GetXLib();
+            SalXLib* pLib = GetGenericData()->GetSalDisplay()->GetXLib();
             pLib->PushXErrorLevel( true );
             XImage* pImage = XGetImage( pDisplay, aSrc, src_x, src_y, w, h,
                                         AllPlanes, ZPixmap );
@@ -413,7 +413,7 @@ void X11SalGraphics::YieldGraphicsExpose()
     XLIB_Window aWindow = GetDrawable();
     if( ! pFrame )
     {
-        const std::list< SalFrame* >& rFrames = GetX11SalData()->GetDisplay()->getFrames();
+        const std::list< SalFrame* >& rFrames = GetGenericData()->GetSalDisplay()->getFrames();
         for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end() && ! pFrame; ++it )
         {
             const SystemEnvData* pEnvData = (*it)->GetSystemData();
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 0bb34519bd8f..b02f8af6a823 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -58,7 +58,7 @@ SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
         XLIB_Window aRoot;
         int x, y;
         unsigned int w = 0, h = 0, bw, d;
-        Display* pDisp = GetX11SalData()->GetDisplay()->GetDisplay();
+        Display* pDisp = GetGenericData()->GetSalDisplay()->GetDisplay();
         XGetGeometry( pDisp, pData->hDrawable,
                       &aRoot, &x, &y, &w, &h, &bw, &d );
         int nScreen = 0;
@@ -70,16 +70,16 @@ SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
         }
         nDX = (long)w;
         nDY = (long)h;
-        if( !pVDev->Init( GetX11SalData()->GetDisplay(), nDX, nDY, nBitCount, nScreen, pData->hDrawable,
+        if( !pVDev->Init( GetGenericData()->GetSalDisplay(), nDX, nDY, nBitCount, nScreen, pData->hDrawable,
                 static_cast< XRenderPictFormat* >( pData->pXRenderFormat )) )
         {
             delete pVDev;
             return NULL;
         }
     }
-    else if( !pVDev->Init( GetX11SalData()->GetDisplay(), nDX, nDY, nBitCount,
+    else if( !pVDev->Init( GetGenericData()->GetSalDisplay(), nDX, nDY, nBitCount,
                            pGraphics ? static_cast<X11SalGraphics*>(pGraphics)->GetScreenNumber() :
-                                       GetX11SalData()->GetDisplay()->GetDefaultScreenNumber() ) )
+                                       GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() ) )
     {
         delete pVDev;
         return NULL;
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index eda3254958f0..52611e7afac2 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -47,7 +47,7 @@ using namespace rtl;
 // ---------------------------------------------------------------------------
 
 XRenderPeer::XRenderPeer()
-:   mpDisplay( GetX11SalData()->GetDisplay()->GetDisplay() ),
+:   mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() ),
     mpStandardFormatA8( NULL ),
     mnRenderVersion( 0 ),
     mpRenderLib( NULL )
@@ -216,7 +216,7 @@ sal_uInt32 XRenderPeer::InitRenderText()
 
     // and the visual must be supported too on at least one screen
     sal_uInt32 nRetMask = 0;
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     const int nScreenCount = pSalDisp->GetScreenCount();
     XRenderPictFormat* pVisualFormat = NULL;
     int nMaxDepth = 0;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 305d01566210..6d821bdee88a 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -650,7 +650,7 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, int nScreen, SystemParentData*
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, SystemParentData* pSystemParent )
 {
-    X11SalData* pSalData = GetX11SalData();
+    SalGenericData *pData = GetGenericData();
 
     // initialize frame geometry
     memset( &maGeometry, 0, sizeof(maGeometry) );
@@ -659,7 +659,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, SystemPar
 
     mbTransientForRoot          = false;
 
-    pDisplay_                   = pSalData->GetDisplay();
+    pDisplay_                   = pData->GetSalDisplay();
     // insert frame in framelist
     pDisplay_->registerFrame( this );
 
@@ -2796,13 +2796,13 @@ SalFrame::SalPointerState X11SalFrame::GetPointerState()
 SalFrame::SalIndicatorState X11SalFrame::GetIndicatorState()
 {
     SalIndicatorState aState;
-    aState.mnState = GetX11SalData()->GetDisplay()->GetIndicatorState();
+    aState.mnState = GetGenericData()->GetSalDisplay()->GetIndicatorState();
     return aState;
 }
 
 void X11SalFrame::SimulateKeyPress( sal_uInt16 nKeyCode )
 {
-    GetX11SalData()->GetDisplay()->SimulateKeyPress(nKeyCode);
+    GetGenericData()->GetSalDisplay()->SimulateKeyPress(nKeyCode);
 }
 
 long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
@@ -3099,7 +3099,7 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode )
 
 void X11SalFrame::beginUnicodeSequence()
 {
-    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
     DeletionListener aDeleteWatch( this );
 
     if( rSeq.getLength() )
@@ -3126,7 +3126,7 @@ void X11SalFrame::beginUnicodeSequence()
 bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
 {
     bool bRet = false;
-    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
     if( rSeq.getLength() > 0 )
     {
         // range check
@@ -3162,7 +3162,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
 
 bool X11SalFrame::endUnicodeSequence()
 {
-    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
 
     DeletionListener aDeleteWatch( this );
     if( rSeq.getLength() > 1 && rSeq.getLength() < 6 )
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 0164d27ba185..cc9487fda4be 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -75,7 +75,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
 
     pObject->mpParent = pParent;
 
-    SalDisplay* pSalDisp        = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp        = GetGenericData()->GetSalDisplay();
     const SystemEnvData* pEnv   = pParent->GetSystemData();
     Display* pDisp              = pSalDisp->GetDisplay();
     XLIB_Window aObjectParent   = (XLIB_Window)pEnv->aWindow;
@@ -254,7 +254,7 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 X11SalObject::X11SalObject()
 {
     maSystemChildData.nSize     = sizeof( SystemChildData );
-    maSystemChildData.pDisplay  = GetX11SalData()->GetDisplay()->GetDisplay();
+    maSystemChildData.pDisplay  = GetGenericData()->GetSalDisplay()->GetDisplay();
     maSystemChildData.aWindow       = None;
     maSystemChildData.pSalFrame = 0;
     maSystemChildData.pWidget       = 0;
@@ -268,16 +268,16 @@ X11SalObject::X11SalObject()
     maSecondary                     = 0;
     maColormap                      = 0;
 
-    std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects();
+    std::list< SalObject* >& rObjects = GetGenericData()->GetSalDisplay()->getSalObjects();
     rObjects.push_back( this );
 }
 
 
 X11SalObject::~X11SalObject()
 {
-    std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects();
+    std::list< SalObject* >& rObjects = GetGenericData()->GetSalDisplay()->getSalObjects();
     rObjects.remove( this );
-    SalDisplay* pSalDisp = GetX11SalData()->GetDisplay();
+    SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     pSalDisp->GetXLib()->PushXErrorLevel( true );
     if ( maSecondary )
         XDestroyWindow( (Display*)maSystemChildData.pDisplay, maSecondary );
@@ -479,7 +479,7 @@ static sal_uInt16 sal_GetCode( int state )
 
 long X11SalObject::Dispatch( XEvent* pEvent )
 {
-    std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects();
+    std::list< SalObject* >& rObjects = GetGenericData()->GetSalDisplay()->getSalObjects();
 
     for( std::list< SalObject* >::iterator it = rObjects.begin(); it != rObjects.end(); ++it )
     {