#include "x11_window.hpp"
#include "x11_tooltip.hpp"
+#include "../src/generic_window.hpp"
X11Factory::X11Factory( intf_thread_t *pIntf ): OSFactory( pIntf ),
m_pDisplay( NULL ), m_pTimerLoop( NULL ), m_dirSep( "/" )
bool X11Factory::init()
{
+ // make sure xlib is safe-thread
+ if( !XInitThreads() )
+ msg_Err( getIntf(), "initializing xlib for multi-threading failed" );
+
// Create the X11 display
m_pDisplay = new X11Display( getIntf() );
ConnectionNumber( pDisplay ) );
// Initialize the resource path
- m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_homedir +
- m_dirSep + CONFIG_DIR + "/skins2" );
+ char *datadir = config_GetUserDir( VLC_DATA_DIR );
+ m_resourcePath.push_back( (string)datadir + "/skins2" );
+ free( datadir );
m_resourcePath.push_back( (string)"share/skins2" );
- m_resourcePath.push_back( (string)DATA_PATH + "/skins2" );
+ datadir = config_GetDataDir( getIntf() );
+ m_resourcePath.push_back( (string)datadir + "/skins2" );
+ free( datadir );
return true;
}
OSWindow *X11Factory::createOSWindow( GenericWindow &rWindow, bool dragDrop,
- bool playOnDrop, OSWindow *pParent )
+ bool playOnDrop, OSWindow *pParent,
+ GenericWindow::WindowType_t type )
{
return new X11Window( getIntf(), rWindow, *m_pDisplay, dragDrop,
- playOnDrop, (X11Window*)pParent );
+ playOnDrop, (X11Window*)pParent, type );
}
}
-Rect X11Factory::getWorkArea() const
+SkinsRect X11Factory::getWorkArea() const
{
// XXX
- return Rect( 0, 0, getScreenWidth(), getScreenHeight() );
+ return SkinsRect( 0, 0, getScreenWidth(), getScreenHeight() );
}