Kaydet (Commit) b118d56c authored tarafından Thomas Arnhold's avatar Thomas Arnhold

Remove Olwm support and Windowmaker gravity handling

WindowMaker works out of the box.
üst 078a23a7
...@@ -918,9 +918,6 @@ void SalDisplay::Init() ...@@ -918,9 +918,6 @@ void SalDisplay::Init()
if (VendorRelease ( GetDisplay() ) < 3600) if (VendorRelease ( GetDisplay() ) < 3600)
nProperties_ |= PROPERTY_BUG_FillPolygon_Tile; nProperties_ |= PROPERTY_BUG_FillPolygon_Tile;
} }
if( otherwm == eWindowManager_ )
eWindowManager_ = olwm;
} }
else else
if( GetServerVendor() == vendor_sco ) if( GetServerVendor() == vendor_sco )
...@@ -944,13 +941,6 @@ void SalDisplay::Init() ...@@ -944,13 +941,6 @@ void SalDisplay::Init()
nProperties_ |= PROPERTY_BUG_CopyArea_OnlySmallSlices; nProperties_ |= PROPERTY_BUG_CopyArea_OnlySmallSlices;
} }
if( otherwm == eWindowManager_ )
{
if( !XInternAtom( pDisp_, "_MOTIF_WM_INFO", True ) )
eWindowManager_ = olwm;
// ???
}
if( winmgr == eWindowManager_ ) if( winmgr == eWindowManager_ )
{ {
nProperties_ &= ~PROPERTY_SUPPORT_WM_SetPos; nProperties_ &= ~PROPERTY_SUPPORT_WM_SetPos;
......
...@@ -266,42 +266,6 @@ WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) : ...@@ -266,42 +266,6 @@ WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) :
initAtoms(); initAtoms();
getNetWmName(); // try to discover e.g. Sawfish getNetWmName(); // try to discover e.g. Sawfish
if( m_aWMName.Len() == 0 )
{
// check for window maker - needs different gravity
Atom aWMakerRunning = XInternAtom( m_pDisplay, "_WINDOWMAKER_WM_PROTOCOLS", True );
if( aWMakerRunning != None &&
XGetWindowProperty( m_pDisplay,
m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() ),
aWMakerRunning,
0, 32,
False,
XA_ATOM,
&aRealType,
&nFormat,
&nItems,
&nBytesLeft,
&pProperty ) == 0 )
{
if( aRealType == XA_ATOM )
m_aWMName = String( RTL_CONSTASCII_USTRINGPARAM("Windowmaker" ) );
XFree( pProperty );
m_nInitWinGravity = NorthWestGravity;
}
else if( pProperty )
{
XFree( pProperty );
pProperty = NULL;
}
}
if( m_aWMName.Len() == 0 )
{
if( XInternAtom( m_pDisplay, "_OL_WIN_ATTR", True ) )
{
m_aWMName = String( RTL_CONSTASCII_USTRINGPARAM( "Olwm" ) );
m_nInitWinGravity = NorthWestGravity;
}
}
if( m_aWMName.Len() == 0 ) if( m_aWMName.Len() == 0 )
{ {
// check for ReflectionX wm (as it needs a workaround in Windows mode // check for ReflectionX wm (as it needs a workaround in Windows mode
......
...@@ -1016,9 +1016,6 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon ) ...@@ -1016,9 +1016,6 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon )
// better icon size default value, in case our window manager // better icon size default value, in case our window manager
// is olwm/olvwm. // is olwm/olvwm.
const String& rWM( pDisplay_->getWMAdaptor()->getWindowManagerName() ); const String& rWM( pDisplay_->getWMAdaptor()->getWindowManagerName() );
if ( rWM.EqualsAscii( "Olwm" ) )
iconSize = 48;
} }
XFree( pIconSize ); XFree( pIconSize );
......
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