#include <dirent.h>
#include <sys/stat.h>
#include <X11/Xlib.h>
+#include <limits.h>
#include "x11_factory.hpp"
#include "x11_display.hpp"
#include "x11_window.hpp"
#include "x11_tooltip.hpp"
+#include "../src/generic_window.hpp"
+
+#include <vlc_common.h>
+#include <vlc_xlib.h>
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() )
+ if( !vlc_xlib_init( VLC_OBJECT( getIntf() ) ) )
+ {
msg_Err( getIntf(), "initializing xlib for multi-threading failed" );
+ return false;
+ }
// Create the X11 display
m_pDisplay = new X11Display( getIntf() );
m_resourcePath.push_back( (string)datadir + "/skins2" );
free( datadir );
m_resourcePath.push_back( (string)"share/skins2" );
- m_resourcePath.push_back( (string)config_GetDataDir () + "/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 );
}