[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/unx
Noel Grandin
noel.grandin at collabora.co.uk
Tue Sep 19 13:05:43 UTC 2017
vcl/inc/unx/gendata.hxx | 2 -
vcl/opengl/x11/salvd.cxx | 4 +--
vcl/unx/generic/app/i18n_ic.cxx | 12 ++++-----
vcl/unx/generic/app/i18n_status.cxx | 4 +--
vcl/unx/generic/app/saldata.cxx | 2 -
vcl/unx/generic/app/saldisp.cxx | 18 ++++++-------
vcl/unx/generic/app/salinst.cxx | 6 ++--
vcl/unx/generic/app/sm.cxx | 8 +++---
vcl/unx/generic/app/wmadaptor.cxx | 22 ++++++++---------
vcl/unx/generic/dtrans/X11_selection.cxx | 8 +++---
vcl/unx/generic/gdi/gcach_xpeer.cxx | 2 -
vcl/unx/generic/gdi/salbmp.cxx | 18 ++++++-------
vcl/unx/generic/gdi/salgdi.cxx | 4 +--
vcl/unx/generic/gdi/salgdi2.cxx | 6 ++--
vcl/unx/generic/gdi/salvd.cxx | 4 +--
vcl/unx/generic/gdi/xrender_peer.cxx | 2 -
vcl/unx/generic/window/salframe.cxx | 40 +++++++++++++++----------------
vcl/unx/generic/window/salobj.cxx | 24 +++++++++---------
vcl/unx/gtk/gtkdata.cxx | 4 +--
vcl/unx/gtk/gtkobject.cxx | 2 -
vcl/unx/gtk/gtksalframe.cxx | 36 +++++++++++++--------------
vcl/unx/gtk/salnativewidgets-gtk.cxx | 2 -
vcl/unx/gtk3/gtk3gtkdata.cxx | 4 +--
vcl/unx/gtk3/gtk3gtkframe.cxx | 22 ++++++++---------
vcl/unx/x11/x11sys.cxx | 8 +++---
25 files changed, 132 insertions(+), 132 deletions(-)
New commits:
commit a32c8b65ee1dce8d06b2a5b00d33327ba1bc445f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Sep 19 10:55:29 2017 +0200
rename GetGenericData to GetGenericUnixSalData
Change-Id: Id95334da347c8341d9d190307603218eedb9c1e6
Reviewed-on: https://gerrit.libreoffice.org/42457
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 94d3b7ac0cfb..db19b0cf0420 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -58,7 +58,7 @@ class VCL_DLLPUBLIC GenericUnixSalData : public SalData
virtual bool ErrorTrapPop( bool bIgnoreError = true ) = 0; // true on error
};
-inline GenericUnixSalData * GetGenericData()
+inline GenericUnixSalData * GetGenericUnixSalData()
{
return static_cast<GenericUnixSalData *>(ImplGetSVData()->mpSalData);
}
diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx
index 60614d8cee71..32d0076ac7c7 100644
--- a/vcl/opengl/x11/salvd.cxx
+++ b/vcl/opengl/x11/salvd.cxx
@@ -45,9 +45,9 @@ X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics const * pGraph
// TODO Check where a VirtualDevice is created from SystemGraphicsData
assert( pData == nullptr ); (void)pData;
- mpDisplay = vcl_sal::getSalDisplay(GetGenericData());
+ mpDisplay = vcl_sal::getSalDisplay(GetGenericUnixSalData());
mnXScreen = pGraphics ? static_cast<X11SalGraphics const *>(pGraphics)->GetScreenNumber() :
- vcl_sal::getSalDisplay(GetGenericData())->GetDefaultXScreen();
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDefaultXScreen();
mnWidth = nDX;
mnHeight = nDY;
mpGraphics->Init( this );
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 3def7932dbc7..52e47a91af93 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -162,7 +162,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
maClientData.aInputEv.mnCursorFlags = 0;
SalI18N_InputMethod *pInputMethod;
- pInputMethod = vcl_sal::getSalDisplay(GetGenericData())->GetInputMethod();
+ pInputMethod = vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetInputMethod();
mnSupportedPreeditStyle = XIMPreeditCallbacks | XIMPreeditPosition
| XIMPreeditNothing | XIMPreeditNone;
@@ -270,7 +270,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 = vcl_sal::getSalDisplay(GetGenericData())->GetDisplay();
+ Display* pDisplay = vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay();
XFontSet pFontSet = get_font_set(pDisplay);
if (pFontSet != nullptr)
@@ -387,7 +387,7 @@ SalI18N_InputContext::Map( SalFrame *pFrame )
if ( maContext == nullptr )
{
SalI18N_InputMethod *pInputMethod;
- pInputMethod = vcl_sal::getSalDisplay(GetGenericData())->GetInputMethod();
+ pInputMethod = vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetInputMethod();
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
@@ -582,7 +582,7 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
{
sendEmptyCommit(pFocusFrame);
// begin preedit again
- vcl_sal::getSalDisplay(GetGenericData())->SendInternalEvent( pFocusFrame, &maClientData.aInputEv, SalEvent::ExtTextInput );
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->SendInternalEvent( pFocusFrame, &maClientData.aInputEv, SalEvent::ExtTextInput );
}
XSetICFocus( maContext );
@@ -599,7 +599,7 @@ SalI18N_InputContext::UnsetICFocus( SalFrame const * pFrame )
if ( mbUseable && (maContext != nullptr) )
{
// cancel an eventual event posted to begin preedit again
- vcl_sal::getSalDisplay(GetGenericData())->CancelInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SalEvent::ExtTextInput );
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->CancelInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SalEvent::ExtTextInput );
maClientData.pFrame = nullptr;
XUnsetICFocus( maContext );
}
@@ -622,7 +622,7 @@ SalI18N_InputContext::EndExtTextInput()
if( static_cast<X11SalFrame*>(maClientData.pFrame)->hasFocus() )
{
// begin preedit again
- vcl_sal::getSalDisplay(GetGenericData())->SendInternalEvent( maClientData.pFrame, &maClientData.aInputEv, SalEvent::ExtTextInput );
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->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 cca11999e6b6..f2be4d7b47a2 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -170,7 +170,7 @@ bool XIMStatusWindow::checkLastParent() const
{
if( m_pLastParent )
{
- const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericData())->getFrames();
+ const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getFrames();
for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
{
if( *it == m_pLastParent )
@@ -199,7 +199,7 @@ Point XIMStatusWindow::updatePosition()
::Window aChild;
XTranslateCoordinates( static_cast<Display*>(pParentEnvData->pDisplay),
(::Window)pParentEnvData->aShellWindow,
- vcl_sal::getSalDisplay(GetGenericData())->GetRootWindow( vcl_sal::getSalDisplay(GetGenericData())->GetDefaultXScreen() ),
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetRootWindow( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDefaultXScreen() ),
0, 0,
&x, &y,
&aChild );
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index eeadf9d083ac..930356b76992 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -535,7 +535,7 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent )
)
return;
- if( pDisplay != vcl_sal::getSalDisplay(GetGenericData())->GetDisplay() )
+ if( pDisplay != vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay() )
return;
PrintXError( pDisplay, pEvent );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index c4250049a607..cd96818420ad 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -294,7 +294,7 @@ SalDisplay::SalDisplay( Display *display ) :
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "SalDisplay::SalDisplay()\n" );
#endif
- GenericUnixSalData *pData = GetGenericData();
+ GenericUnixSalData *pData = GetGenericUnixSalData();
SAL_WARN_IF( pData->GetDisplay(), "vcl", "Second SalDisplay created !!!" );
pData->SetDisplay( this );
@@ -322,7 +322,7 @@ SalDisplay::~SalDisplay()
void SalDisplay::doDestruct()
{
- GenericUnixSalData *pData = GetGenericData();
+ GenericUnixSalData *pData = GetGenericUnixSalData();
delete m_pWMAdaptor;
m_pWMAdaptor = nullptr;
@@ -645,14 +645,14 @@ void SalDisplay::Init()
void SalX11Display::SetupInput()
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
SalI18N_KeyboardExtension *pKbdExtension = new SalI18N_KeyboardExtension( pDisp_ );
XSync( pDisp_, False );
- bool bError = GetGenericData()->ErrorTrapPop( false );
- GetGenericData()->ErrorTrapPush();
+ bool bError = GetGenericUnixSalData()->ErrorTrapPop( false );
+ GetGenericUnixSalData()->ErrorTrapPush();
pKbdExtension->UseExtension( ! bError );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
SetKbdExtension( pKbdExtension );
}
@@ -2580,7 +2580,7 @@ SalColormap::SalColormap( const SalDisplay *pDisplay, Colormap hColormap,
// MonoChrome
SalColormap::SalColormap()
- : m_pDisplay( vcl_sal::getSalDisplay(GetGenericData()) ),
+ : m_pDisplay( vcl_sal::getSalDisplay(GetGenericUnixSalData()) ),
m_hColormap( None ),
m_nWhitePixel( 1 ),
m_nBlackPixel( 0 ),
@@ -2595,12 +2595,12 @@ SalColormap::SalColormap()
// TrueColor
SalColormap::SalColormap( sal_uInt16 nDepth )
- : m_pDisplay( vcl_sal::getSalDisplay(GetGenericData()) ),
+ : m_pDisplay( vcl_sal::getSalDisplay(GetGenericUnixSalData()) ),
m_hColormap( None ),
m_nWhitePixel( (1 << nDepth) - 1 ),
m_nBlackPixel( 0x00000000 ),
m_nUsed( 1 << nDepth ),
- m_nXScreen( vcl_sal::getSalDisplay(GetGenericData())->GetDefaultXScreen() )
+ m_nXScreen( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDefaultXScreen() )
{
const SalVisual *pVisual = &m_pDisplay->GetVisual( m_nXScreen );
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 3a98d3243e2b..98d56c6cd86e 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -83,7 +83,7 @@ X11SalInstance::~X11SalInstance()
// dispose SalDisplay list from SalData
// would be done in a static destructor else which is
// a little late
- GetGenericData()->Dispose();
+ GetGenericUnixSalData()->Dispose();
}
SalX11Display* X11SalInstance::CreateDisplay() const
@@ -141,7 +141,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData )
bool X11SalInstance::AnyInput(VclInputFlags nType)
{
- GenericUnixSalData *pData = GetGenericData();
+ GenericUnixSalData *pData = GetGenericUnixSalData();
Display *pDisplay = vcl_sal::getSalDisplay(pData)->GetDisplay();
bool bRet = false;
@@ -226,7 +226,7 @@ void X11SalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS
void X11SalInstance::PostPrintersChanged()
{
- SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
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 b86435fbaf73..e6da11244074 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -293,7 +293,7 @@ IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void
task of the quick-starter)
*/
*pSmRestartHint = SmRestartNever;
- const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericData())->getFrames();
+ const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getFrames();
for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
{
vcl::Window *pWindow = (*it)->GetWindow();
@@ -394,7 +394,7 @@ IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl, void*, void )
m_pSession->CallCallback( &aEvent );
}
- const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericData())->getFrames();
+ const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getFrames();
SAL_INFO("vcl.sm.debug", " rFrames.empty() = " << (rFrames.empty() ? "true" : "false"));
if( !rFrames.empty() )
@@ -516,7 +516,7 @@ void SessionManagerClient::open(SalSession * pSession)
pClientID = nullptr;
}
- SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
if( pDisp->GetDrawable(pDisp->GetDefaultXScreen()) && !m_aClientID.isEmpty() )
{
SAL_INFO("vcl.sm.debug", " SmcOpenConnection open: pDisp->GetDrawable = true");
@@ -851,7 +851,7 @@ void ICEWatchProc(
}
SAL_INFO( "vcl.sm.debug", " ICE connection on " << IceConnectionNumber( ice_conn ) );
- SAL_INFO( "vcl.sm.debug", " Display connection is " << ConnectionNumber( vcl_sal::getSalDisplay(GetGenericData())->GetDisplay() ) );
+ SAL_INFO( "vcl.sm.debug", " Display connection is " << ConnectionNumber( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay() ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 701c4ffbb3a4..9eaf1dca34fd 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -547,7 +547,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) :
XFree( pProperty );
pProperty = nullptr;
::Window aCheckWindow = None;
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
if( XGetWindowProperty( m_pDisplay,
aWMChild,
m_aWMAtoms[ WIN_SUPPORTING_WM_CHECK ],
@@ -563,9 +563,9 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) :
&& nFormat == 32
&& nItems != 0 )
{
- if (! GetGenericData()->ErrorTrapPop( false ) )
+ if (! GetGenericUnixSalData()->ErrorTrapPop( false ) )
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
aCheckWindow = *reinterpret_cast< ::Window* >(pProperty);
XFree( pProperty );
@@ -583,9 +583,9 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) :
}
}
else
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
}
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
else if( pProperty )
{
@@ -745,7 +745,7 @@ bool WMAdaptor::getNetWmName()
XFree( pProperty );
pProperty = nullptr;
::Window aCheckWindow = None;
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
if( XGetWindowProperty( m_pDisplay,
aWMChild,
m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ],
@@ -761,9 +761,9 @@ bool WMAdaptor::getNetWmName()
&& nFormat == 32
&& nItems != 0 )
{
- if ( ! GetGenericData()->ErrorTrapPop( false ) )
+ if ( ! GetGenericUnixSalData()->ErrorTrapPop( false ) )
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
aCheckWindow = *reinterpret_cast< ::Window* >(pProperty);
XFree( pProperty );
pProperty = nullptr;
@@ -843,11 +843,11 @@ bool WMAdaptor::getNetWmName()
XFree( pProperty );
pProperty = nullptr;
}
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
}
}
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
else if( pProperty )
{
@@ -2250,7 +2250,7 @@ void WMAdaptor::setPID( X11SalFrame const * i_pFrame ) const
*/
void WMAdaptor::setClientMachine( X11SalFrame const * i_pFrame ) const
{
- OString aWmClient( OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
+ OString aWmClient( OUStringToOString( GetGenericUnixSalData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
XTextProperty aClientProp = { reinterpret_cast<unsigned char *>(const_cast<char *>(aWmClient.getStr())), XA_STRING, 8, sal::static_int_cast<unsigned long>( 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 7c89186505e0..cbda1d98e6b7 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3216,10 +3216,10 @@ void SelectionManager::startDrag(
comphelper::SolarMutex& rSolarMutex( Application::GetSolarMutex() );
if( rSolarMutex.tryToAcquire() )
{
- pCaptureFrame = vcl_sal::getSalDisplay(GetGenericData())->GetCaptureFrame();
+ pCaptureFrame = vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetCaptureFrame();
if( pCaptureFrame )
{
- vcl_sal::getSalDisplay(GetGenericData())->CaptureMouse( nullptr );
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->CaptureMouse( nullptr );
nPointerGrabSuccess =
XGrabPointer( m_pDisplay, it->second.m_aRootWindow, True,
DRAG_EVENT_MASK,
@@ -3256,7 +3256,7 @@ void SelectionManager::startDrag(
{
comphelper::SolarMutex& rSolarMutex( Application::GetSolarMutex() );
if( rSolarMutex.tryToAcquire() )
- vcl_sal::getSalDisplay(GetGenericData())->CaptureMouse( pCaptureFrame );
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->CaptureMouse( pCaptureFrame );
#if OSL_DEBUG_LEVEL > 0
else
OSL_FAIL( "failed to acquire SolarMutex to reset capture frame" );
@@ -3345,7 +3345,7 @@ void SelectionManager::startDrag(
{
comphelper::SolarMutex& rSolarMutex( Application::GetSolarMutex() );
if( rSolarMutex.tryToAcquire() )
- vcl_sal::getSalDisplay(GetGenericData())->CaptureMouse( pCaptureFrame );
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->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 b72c6242dae6..8dde144a2ada 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -33,7 +33,7 @@ X11GlyphCache::~X11GlyphCache()
return;
//Why do this here, move into dtor/shutdown of display?
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
Display* const pX11Disp = pSalDisp->GetDisplay();
int nMaxScreens = pSalDisp->GetXScreenCount();
XRenderPeer& rRenderPeer = XRenderPeer::GetInstance();
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 760d03336849..69b9fd1ca3e9 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -247,7 +247,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
if( aDrawable && nWidth && nHeight && nDrawableDepth )
{
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
Display* pXDisp = pSalDisp->GetDisplay();
// do not die on XError here
@@ -255,9 +255,9 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
// but this call can actually work on servers with backing store
// defaults even if the rectangle is offscreen
// so better catch the XError
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
XImage* pImage = XGetImage( pXDisp, aDrawable, nX, nY, nWidth, nHeight, AllPlanes, ZPixmap );
- bool bWasError = GetGenericData()->ErrorTrapPop( false );
+ bool bWasError = GetGenericUnixSalData()->ErrorTrapPop( false );
if( ! bWasError && pImage && pImage->data )
{
@@ -680,7 +680,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB(
}
}
- XImage* pImage = ImplCreateXImage( vcl_sal::getSalDisplay(GetGenericData()), nXScreen,
+ XImage* pImage = ImplCreateXImage( vcl_sal::getSalDisplay(GetGenericUnixSalData()), nXScreen,
nDrawableDepth, aTwoRect );
if( pImage )
@@ -796,7 +796,7 @@ bool X11SalBitmap::Create(
);
bool bFreePixmap = false;
if( bSuccess && (args[0] >>= bFreePixmap) && bFreePixmap )
- XFreePixmap( vcl_sal::getSalDisplay(GetGenericData())->GetDisplay(), pixmapHandle );
+ XFreePixmap( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay(), pixmapHandle );
return bSuccess;
}
@@ -929,7 +929,7 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
, mnDepth ( pImage->depth )
, mnXScreen ( nXScreen )
{
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
Display* pXDisp = pSalDisp->GetDisplay();
if( (maPixmap = limitXCreatePixmap( pXDisp, aDrawable, ImplGetWidth(), ImplGetHeight(), ImplGetDepth() )) )
@@ -965,7 +965,7 @@ ImplSalDDB::ImplSalDDB(
, mnDepth( nDrawableDepth )
, mnXScreen( nXScreen )
{
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
Display* pXDisp = pSalDisp->GetDisplay();
if( (maPixmap = limitXCreatePixmap( pXDisp, aDrawable, nWidth, nHeight, nDrawableDepth )) )
@@ -998,7 +998,7 @@ ImplSalDDB::ImplSalDDB(
ImplSalDDB::~ImplSalDDB()
{
if( maPixmap && ImplGetSVData() )
- XFreePixmap( vcl_sal::getSalDisplay(GetGenericData())->GetDisplay(), maPixmap );
+ XFreePixmap( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay(), maPixmap );
}
bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const
@@ -1059,7 +1059,7 @@ void ImplSalDDB::ImplDraw(
long nDestY,
const GC& rGC
) {
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
Display* pXDisp = pSalDisp->GetDisplay();
if( 1 == nSrcDrawableDepth )
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 01f39b0a5ddc..8e86e1893e52 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -159,7 +159,7 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, SalX11Screen nXScreen )
if( nXScreen != m_nXScreen )
{
freeResources();
- m_pColormap = &vcl_sal::getSalDisplay(GetGenericData())->GetColormap( nXScreen );
+ m_pColormap = &vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetColormap( nXScreen );
m_nXScreen = nXScreen;
}
@@ -177,7 +177,7 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, SalX11Screen nXScreen )
void X11SalGraphics::Init( SalFrame *pFrame, Drawable aTarget,
SalX11Screen nXScreen )
{
- m_pColormap = &vcl_sal::getSalDisplay(GetGenericData())->GetColormap(nXScreen);
+ m_pColormap = &vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetColormap(nXScreen);
m_nXScreen = nXScreen;
m_pFrame = pFrame;
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 4e9219505069..6c4aba94f9d4 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -55,7 +55,7 @@ void X11SalGraphics::CopyScreenArea( Display* pDisplay,
src_x, src_y, w, h, dest_x, dest_y );
else
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
XImage* pImage = XGetImage( pDisplay, aSrc, src_x, src_y, w, h,
AllPlanes, ZPixmap );
if( pImage )
@@ -65,7 +65,7 @@ void X11SalGraphics::CopyScreenArea( Display* pDisplay,
0, 0, dest_x, dest_y, w, h );
XDestroyImage( pImage );
}
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
}
else
@@ -127,7 +127,7 @@ void X11SalGraphics::YieldGraphicsExpose()
::Window aWindow = GetDrawable();
if( ! pFrame )
{
- const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericData())->getFrames();
+ const std::list< SalFrame* >& rFrames = vcl_sal::getSalDisplay(GetGenericUnixSalData())->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 6ef9356ce0c5..e506cd8a0d23 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -110,7 +110,7 @@ X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics const * pGraphics, long &nD
}
- pDisplay_ = vcl_sal::getSalDisplay(GetGenericData());
+ pDisplay_ = vcl_sal::getSalDisplay(GetGenericUnixSalData());
nDepth_ = nBitCount;
if( pData && pData->hDrawable != None )
@@ -141,7 +141,7 @@ X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics const * pGraphics, long &nD
nDX_ = nDX;
nDY_ = nDY;
m_nXScreen = pGraphics ? static_cast<X11SalGraphics const *>(pGraphics)->GetScreenNumber() :
- vcl_sal::getSalDisplay(GetGenericData())->GetDefaultXScreen();
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDefaultXScreen();
hDrawable_ = limitXCreatePixmap( GetXDisplay(),
pDisplay_->GetDrawable( m_nXScreen ),
nDX_, nDY_,
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index e5124dbb44cf..d0f3ec04abe2 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -24,7 +24,7 @@
#include <xrender_peer.hxx>
XRenderPeer::XRenderPeer()
- : mpDisplay( vcl_sal::getSalDisplay(GetGenericData())->GetDisplay() )
+ : mpDisplay( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay() )
, mpStandardFormatA8( nullptr )
{
InitRenderLib();
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index ec179e8808f7..b89a736581d2 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -104,7 +104,7 @@ static int nVisibleFloats = 0;
static void doReparentPresentationDialogues( SalDisplay const * pDisplay )
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
while( !aPresentationReparentList.empty() )
{
int x, y;
@@ -129,7 +129,7 @@ static void doReparentPresentationDialogues( SalDisplay const * pDisplay )
if( hPresFocusWindow )
XSetInputFocus( pDisplay->GetDisplay(), hPresFocusWindow, PointerRoot, CurrentTime );
XSync( pDisplay->GetDisplay(), False );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
bool X11SalFrame::IsOverrideRedirect() const
@@ -188,12 +188,12 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
aEvent.xclient.data.l[3] = 0;
aEvent.xclient.data.l[4] = 0;
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
XSendEvent( pDisplay_->GetDisplay(),
mhForeignParent,
False, NoEventMask, &aEvent );
XSync( pDisplay_->GetDisplay(), False );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
typedef std::vector< unsigned long > NetWmIconData;
@@ -454,7 +454,7 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen
{
// plugin parent may be killed unexpectedly by plugging
// process; start permanantly ignoring X errors ...
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
nStyle_ |= SalFrameStyleFlags::PLUG;
Attributes.override_redirect = True;
@@ -812,7 +812,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle,
SystemParentData* pSystemParent ) :
m_nXScreen( 0 )
{
- GenericUnixSalData *pData = GetGenericData();
+ GenericUnixSalData *pData = GetGenericUnixSalData();
// initialize frame geometry
memset( &maGeometry, 0, sizeof(maGeometry) );
@@ -2571,12 +2571,12 @@ SalFrame::SalPointerState X11SalFrame::GetPointerState()
KeyIndicatorState X11SalFrame::GetIndicatorState()
{
- return vcl_sal::getSalDisplay(GetGenericData())->GetIndicatorState();
+ return vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetIndicatorState();
}
void X11SalFrame::SimulateKeyPress( sal_uInt16 nKeyCode )
{
- vcl_sal::getSalDisplay(GetGenericData())->SimulateKeyPress(nKeyCode);
+ vcl_sal::getSalDisplay(GetGenericUnixSalData())->SimulateKeyPress(nKeyCode);
}
namespace
@@ -2890,7 +2890,7 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode )
void X11SalFrame::beginUnicodeSequence()
{
- OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
+ OUString& rSeq( GetGenericUnixSalData()->GetUnicodeCommand() );
vcl::DeletionListener aDeleteWatch( this );
if( !rSeq.isEmpty() )
@@ -2914,7 +2914,7 @@ void X11SalFrame::beginUnicodeSequence()
bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
{
bool bRet = false;
- OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
+ OUString& rSeq( GetGenericUnixSalData()->GetUnicodeCommand() );
if( !rSeq.isEmpty() )
{
// range check
@@ -2947,7 +2947,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
bool X11SalFrame::endUnicodeSequence()
{
- OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
+ OUString& rSeq( GetGenericUnixSalData()->GetUnicodeCommand() );
vcl::DeletionListener aDeleteWatch( this );
if( rSeq.getLength() > 1 && rSeq.getLength() < 6 )
@@ -3608,7 +3608,7 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" );
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
/*
* don't rely on the new parent from the event.
@@ -3628,8 +3628,8 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
&Children,
&nChildren );
- bool bError = GetGenericData()->ErrorTrapPop( false );
- GetGenericData()->ErrorTrapPush();
+ bool bError = GetGenericUnixSalData()->ErrorTrapPop( false );
+ GetGenericUnixSalData()->ErrorTrapPush();
if( bError )
{
@@ -3665,7 +3665,7 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
// Reparenting before Destroy
aPresentationReparentList.remove( GetStackingWindow() );
mhStackingWindow = None;
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
return false;
}
@@ -3718,8 +3718,8 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
*/
// reset error occurred
- GetGenericData()->ErrorTrapPop();
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPush();
int xp, yp, x, y;
unsigned int wp, w, hp, h, bw, d;
@@ -3732,8 +3732,8 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
&hRoot,
&xp, &yp, &wp, &hp, &bw, &d );
bool bResized = false;
- bool bError = GetGenericData()->ErrorTrapPop( false );
- GetGenericData()->ErrorTrapPush();
+ bool bError = GetGenericUnixSalData()->ErrorTrapPop( false );
+ GetGenericUnixSalData()->ErrorTrapPush();
if( ! bError )
{
@@ -3778,7 +3778,7 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
if( bResized )
CallCallback( SalEvent::Resize, nullptr );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
return true;
}
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 333d8787c5f3..9d0833094c1d 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -59,7 +59,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
pObject->mpParent = pParent;
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
const SystemEnvData* pEnv = pParent->GetSystemData();
Display* pDisp = pSalDisp->GetDisplay();
::Window aObjectParent = (::Window)pEnv->aWindow;
@@ -118,7 +118,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
static_cast<unsigned int> (pSalDisp->GetVisual( nXScreen ).GetVisualId()),
static_cast<unsigned int> (aVisID) );
#endif
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
// create colormap for visual - there might not be one
pObject->maColormap = aAttribs.colormap = XCreateColormap(
@@ -136,7 +136,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
pVisual,
CWEventMask|CWColormap, &aAttribs );
XSync( pDisp, False );
- if( GetGenericData()->ErrorTrapPop( false ) )
+ if( GetGenericUnixSalData()->ErrorTrapPop( false ) )
{
pObject->maSecondary = None;
delete pObject;
@@ -145,7 +145,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
XReparentWindow( pDisp, pObject->maSecondary, pObject->maPrimary, 0, 0 );
}
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
if( bShow ) {
XMapWindow( pDisp, pObject->maSecondary );
XMapWindow( pDisp, pObject->maPrimary );
@@ -157,7 +157,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
pObjData->pVisual = pVisual;
XSync(pDisp, False);
- if( GetGenericData()->ErrorTrapPop( false ) )
+ if( GetGenericUnixSalData()->ErrorTrapPop( false ) )
{
delete pObject;
return nullptr;
@@ -218,23 +218,23 @@ X11SalObject::X11SalObject()
, mbVisible(false)
{
maSystemChildData.nSize = sizeof( SystemEnvData );
- maSystemChildData.pDisplay = vcl_sal::getSalDisplay(GetGenericData())->GetDisplay();
+ maSystemChildData.pDisplay = vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay();
maSystemChildData.aWindow = None;
maSystemChildData.pSalFrame = nullptr;
maSystemChildData.pWidget = nullptr;
maSystemChildData.pVisual = nullptr;
maSystemChildData.aShellWindow = 0;
- std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericData())->getSalObjects();
+ std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getSalObjects();
rObjects.push_back( this );
}
X11SalObject::~X11SalObject()
{
- std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericData())->getSalObjects();
+ std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getSalObjects();
rObjects.remove( this );
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
const SystemEnvData* pEnv = mpParent->GetSystemData();
::Window aObjectParent = (::Window)pEnv->aWindow;
XSetWindowBackgroundPixmap(static_cast<Display*>(maSystemChildData.pDisplay), aObjectParent, None);
@@ -245,7 +245,7 @@ X11SalObject::~X11SalObject()
if ( maColormap )
XFreeColormap(static_cast<Display*>(maSystemChildData.pDisplay), maColormap);
XSync( static_cast<Display*>(maSystemChildData.pDisplay), False );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
void
@@ -382,7 +382,7 @@ static sal_uInt16 sal_GetCode( int state )
bool X11SalObject::Dispatch( XEvent* pEvent )
{
- std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericData())->getSalObjects();
+ std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getSalObjects();
for( std::list< SalObject* >::iterator it = rObjects.begin(); it != rObjects.end(); ++it )
{
@@ -465,7 +465,7 @@ bool X11SalObject::Dispatch( XEvent* pEvent )
void X11SalObject::SetLeaveEnterBackgrounds(const css::uno::Sequence<css::uno::Any>& rLeaveArgs, const css::uno::Sequence<css::uno::Any>& rEnterArgs)
{
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
const SystemEnvData* pEnv = mpParent->GetSystemData();
Display* pDisp = pSalDisp->GetDisplay();
::Window aObjectParent = (::Window)pEnv->aWindow;
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 7a304a859825..e5cdd81daba0 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -78,7 +78,7 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
gdk_window_add_filter( nullptr, call_filterGdkEvent, this );
if ( getenv( "SAL_IGNOREXERRORS" ) )
- GetGenericData()->ErrorTrapPush(); // and leak the trap
+ GetGenericUnixSalData()->ErrorTrapPush(); // and leak the trap
m_bX11Display = true;
@@ -819,7 +819,7 @@ gboolean GtkSalData::userEventFn( gpointer data )
{
gboolean bContinue = FALSE;
GtkSalData *pThis = static_cast<GtkSalData *>(data);
- GenericUnixSalData *pData = GetGenericData();
+ GenericUnixSalData *pData = GetGenericUnixSalData();
SolarMutexGuard aGuard;
const SalGenericDisplay *pDisplay = pData->GetDisplay();
if (pDisplay)
diff --git a/vcl/unx/gtk/gtkobject.cxx b/vcl/unx/gtk/gtkobject.cxx
index 42be736bcd25..597a50af4dc6 100644
--- a/vcl/unx/gtk/gtkobject.cxx
+++ b/vcl/unx/gtk/gtkobject.cxx
@@ -51,7 +51,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
// system data
m_aSystemData.nSize = sizeof( SystemEnvData );
- SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
m_aSystemData.pDisplay = pDisp->GetDisplay();
m_aSystemData.pVisual = pDisp->GetVisual(pParent->getXScreenNumber()).GetVisual();
m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(widget_get_window(m_pSocket));
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 789556a7f76f..3ca2b4816ad8 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -468,7 +468,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
{
getDisplay()->registerFrame( this );
// permanently ignore errors from our unruly children ...
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
m_bDefaultPos = true;
m_bDefaultSize = true;
Init( pSysData );
@@ -1342,11 +1342,11 @@ void GtkSalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
aEvent.xclient.data.l[3] = 0;
aEvent.xclient.data.l[4] = 0;
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
XSendEvent( getDisplay()->GetDisplay(),
m_aForeignParentWindow,
False, NoEventMask, &aEvent );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
void GtkSalFrame::SetExtendedFrameStyle(SalExtStyle)
@@ -2134,11 +2134,11 @@ void GtkSalFrame::ToTop( SalFrameToTop nFlags )
{
// sad but true: this can cause an XError, we need to catch that
// to do this we need to synchronize with the XServer
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
XSetInputFocus( getDisplay()->GetDisplay(), widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
// fdo#46687 - an XSync should not be necessary - but for some reason it is.
XSync( getDisplay()->GetDisplay(), False );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
}
else
@@ -2576,7 +2576,7 @@ void GtkSalFrame::createNewWindow( ::Window aNewParent, bool bXEmbed, SalX11Scre
bool GtkSalFrame::SetPluginParent( SystemParentData* pSysParent )
{
- GetGenericData()->ErrorTrapPush(); // permanantly ignore unruly children's errors
+ GetGenericUnixSalData()->ErrorTrapPush(); // permanantly ignore unruly children's errors
createNewWindow( pSysParent->aWindow, (pSysParent->nSize > sizeof(long)) && pSysParent->bXEmbedSupport, m_nXScreen );
return true;
}
@@ -3044,12 +3044,12 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
if( bSetFocus )
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
XSetInputFocus( GtkSalFrame::getDisplay()->GetDisplay(),
widget_get_xid(pWidget),
RevertToParent, CurrentTime );
XSync( GtkSalFrame::getDisplay()->GetDisplay(), False );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
pThis->CallCallback( SalEvent::Resize, nullptr );
@@ -3318,10 +3318,10 @@ void GtkSalFrame::IMHandler::createIMContext()
g_signal_connect( m_pIMContext, "preedit_end",
G_CALLBACK (signalIMPreeditEnd), this );
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_set_client_window( m_pIMContext, widget_get_window(GTK_WIDGET(m_pFrame->m_pWindow)) );
gtk_im_context_focus_in( m_pIMContext );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
m_bFocused = true;
}
}
@@ -3331,9 +3331,9 @@ void GtkSalFrame::IMHandler::deleteIMContext()
if( m_pIMContext )
{
// first give IC a chance to deinitialize
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_set_client_window( m_pIMContext, nullptr );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
// destroy old IC
g_object_unref( m_pIMContext );
m_pIMContext = nullptr;
@@ -3355,9 +3355,9 @@ void GtkSalFrame::IMHandler::updateIMSpotLocation()
aArea.y = aPosEvent.mnY;
aArea.width = aPosEvent.mnWidth;
aArea.height = aPosEvent.mnHeight;
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_set_cursor_location( m_pIMContext, &aArea );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
void GtkSalFrame::IMHandler::sendEmptyCommit()
@@ -3401,9 +3401,9 @@ void GtkSalFrame::IMHandler::focusChanged( bool bFocusIn )
m_bFocused = bFocusIn;
if( bFocusIn )
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_focus_in( m_pIMContext );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
if( m_aInputEvent.mpTextAttr )
{
sendEmptyCommit();
@@ -3413,9 +3413,9 @@ void GtkSalFrame::IMHandler::focusChanged( bool bFocusIn )
}
else
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_focus_out( m_pIMContext );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
// cancel an eventual event posted to begin preedit again
GtkSalFrame::getDisplay()->CancelInternalEvent( m_pFrame, &m_aInputEvent, SalEvent::ExtTextInput );
}
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 161caedefabd..10169ca48385 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -4089,7 +4089,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
GdkX11Pixmap* GtkSalGraphics::NWGetPixmapFromScreen( tools::Rectangle srcRect, int nBgColor )
{
GdkX11Pixmap* pPixmap;
- int nDepth = vcl_sal::getSalDisplay(GetGenericData())->GetVisual( m_nXScreen ).GetDepth();
+ int nDepth = vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetVisual( m_nXScreen ).GetDepth();
pPixmap = new GdkX11Pixmap( srcRect.GetWidth(), srcRect.GetHeight(), nDepth );
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 88175a865003..4057b0e896c9 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -81,7 +81,7 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
gdk_window_add_filter( nullptr, call_filterGdkEvent, this );
if ( getenv( "SAL_IGNOREXERRORS" ) )
- GetGenericData()->ErrorTrapPush(); // and leak the trap
+ GetGenericUnixSalData()->ErrorTrapPush(); // and leak the trap
m_bX11Display = GDK_IS_X11_DISPLAY( m_pGdkDisplay );
@@ -781,7 +781,7 @@ gboolean GtkSalData::userEventFn( gpointer data )
{
gboolean bContinue = FALSE;
GtkSalData *pThis = static_cast<GtkSalData *>(data);
- GenericUnixSalData *pData = GetGenericData();
+ GenericUnixSalData *pData = GetGenericUnixSalData();
SolarMutexGuard aGuard;
const SalGenericDisplay *pDisplay = pData->GetDisplay();
if (pDisplay)
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 532fa5cc348d..bc0b41df5998 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -493,7 +493,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
{
getDisplay()->registerFrame( this );
// permanently ignore errors from our unruly children ...
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
m_bDefaultPos = true;
m_bDefaultSize = true;
Init( pSysData );
@@ -3634,10 +3634,10 @@ void GtkSalFrame::IMHandler::createIMContext()
g_signal_connect( m_pIMContext, "preedit_end",
G_CALLBACK (signalIMPreeditEnd), this );
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_set_client_window(m_pIMContext, widget_get_window(m_pFrame->getMouseEventWidget()));
gtk_im_context_focus_in( m_pIMContext );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
m_bFocused = true;
}
}
@@ -3647,9 +3647,9 @@ void GtkSalFrame::IMHandler::deleteIMContext()
if( m_pIMContext )
{
// first give IC a chance to deinitialize
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_set_client_window( m_pIMContext, nullptr );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
// destroy old IC
g_object_unref( m_pIMContext );
m_pIMContext = nullptr;
@@ -3671,9 +3671,9 @@ void GtkSalFrame::IMHandler::updateIMSpotLocation()
aArea.y = aPosEvent.mnY;
aArea.width = aPosEvent.mnWidth;
aArea.height = aPosEvent.mnHeight;
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_set_cursor_location( m_pIMContext, &aArea );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
}
void GtkSalFrame::IMHandler::sendEmptyCommit()
@@ -3717,9 +3717,9 @@ void GtkSalFrame::IMHandler::focusChanged( bool bFocusIn )
m_bFocused = bFocusIn;
if( bFocusIn )
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_focus_in( m_pIMContext );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
if( m_aInputEvent.mpTextAttr )
{
sendEmptyCommit();
@@ -3729,9 +3729,9 @@ void GtkSalFrame::IMHandler::focusChanged( bool bFocusIn )
}
else
{
- GetGenericData()->ErrorTrapPush();
+ GetGenericUnixSalData()->ErrorTrapPush();
gtk_im_context_focus_out( m_pIMContext );
- GetGenericData()->ErrorTrapPop();
+ GetGenericUnixSalData()->ErrorTrapPop();
// cancel an eventual event posted to begin preedit again
GtkSalFrame::getDisplay()->CancelInternalEvent( m_pFrame, &m_aInputEvent, SalEvent::ExtTextInput );
}
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index db8b237a7272..69e4a035c20c 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -42,28 +42,28 @@ X11SalSystem::~X11SalSystem()
// for the moment only handle xinerama case
unsigned int X11SalSystem::GetDisplayScreenCount()
{
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
return pSalDisp->IsXinerama() ? pSalDisp->GetXineramaScreens().size() :
pSalDisp->GetXScreenCount();
}
bool X11SalSystem::IsUnifiedDisplay()
{
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
unsigned int nScreenCount = pSalDisp->GetXScreenCount();
return pSalDisp->IsXinerama() || (nScreenCount == 1);
}
unsigned int X11SalSystem::GetDisplayBuiltInScreen()
{
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
return pSalDisp->GetDefaultXScreen().getXScreen();
}
tools::Rectangle X11SalSystem::GetDisplayScreenPosSizePixel( unsigned int nScreen )
{
tools::Rectangle aRet;
- SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData());
+ SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData());
if( pSalDisp->IsXinerama() )
{
const std::vector< tools::Rectangle >& rScreens = pSalDisp->GetXineramaScreens();
More information about the Libreoffice-commits
mailing list