* skin-main.cpp: skins plugin for VLC
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.9 2003/04/14 10:18:25 asmax Exp $
+ * $Id: skin_main.cpp,v 1.28 2003/05/26 19:06:47 gbazin Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
* USA.
*****************************************************************************/
-
//--- VLC -------------------------------------------------------------------
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/aout.h>
+//--- GENERAL ---------------------------------------------------------------
+#ifndef BASIC_SKINS
+#ifdef WIN32 /* mingw32 hack */
+# undef Yield
+# undef CreateDialog
+#endif
+/* Let vlc take care of the i18n stuff */
+#define WXINTL_NO_GETTEXT_MACRO
+#include <wx/wx.h>
+#endif
+
//--- SKIN ------------------------------------------------------------------
-#include "os_api.h"
+#include "../os_api.h"
#include "event.h"
-#include "dialog.h"
-#include "os_dialog.h"
#include "banks.h"
#include "window.h"
#include "theme.h"
-#include "os_theme.h"
+#include "../os_theme.h"
#include "themeloader.h"
#include "vlcproc.h"
#include "skin_common.h"
+#ifndef BASIC_SKINS
+#include "../../wxwindows/wxwindows.h"
+#endif
+#ifdef X11_SKINS
+#include <X11/Xlib.h>
+#endif
//---------------------------------------------------------------------------
// Interface thread
// Set no new theme when opening file
p_intf->p_sys->p_new_theme_file = NULL;
- // Initialize Win32 thread
+ // Initialize info on playlist
p_intf->p_sys->i_index = -1;
p_intf->p_sys->i_size = 0;
-
p_intf->p_sys->i_close_status = VLC_NOTHING;
p_intf->p_sys->p_input = NULL;
p_intf->p_sys->p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+#ifdef GTK2_SKINS
+ // Initialize GDK
+ int i_args = 3;
+ char *p_args[] = { "", "", "--sync", NULL };
+ char **pp_args = p_args;
+
+ gdk_init( &i_args, &pp_args );
+
+#elif defined X11_SKINS
+ // Initialize X11
+ p_intf->p_sys->display = XOpenDisplay( NULL );
+
+#elif defined WIN32
+ // We dynamically load msimg32.dll to get a pointer to TransparentBlt()
+ p_intf->p_sys->h_msimg32_dll = LoadLibrary("msimg32.dll");
+ if( !p_intf->p_sys->h_msimg32_dll ||
+ !( p_intf->p_sys->TransparentBlt =
+ (BOOL (WINAPI*)(HDC,int,int,int,int,HDC,
+ int,int,int,int,unsigned int))
+ GetProcAddress( p_intf->p_sys->h_msimg32_dll, "TransparentBlt" ) ) )
+ {
+ p_intf->p_sys->TransparentBlt = NULL;
+ msg_Dbg( p_intf, "Couldn't find TransparentBlt(), "
+ "falling back to BitBlt()" );
+ }
+
+ // idem for user32.dll and SetLayeredWindowAttributes()
+ p_intf->p_sys->h_user32_dll = LoadLibrary("user32.dll");
+ if( !p_intf->p_sys->h_user32_dll ||
+ !( p_intf->p_sys->SetLayeredWindowAttributes =
+ (BOOL (WINAPI *)(HWND,COLORREF,BYTE,DWORD))
+ GetProcAddress( p_intf->p_sys->h_user32_dll,
+ "SetLayeredWindowAttributes" ) ) )
+ {
+ p_intf->p_sys->SetLayeredWindowAttributes = NULL;
+ msg_Dbg( p_intf, "Couldn't find SetLayeredWindowAttributes()" );
+ }
+
+#endif
+
p_intf->p_sys->p_theme = (Theme *)new OSTheme( p_intf );
return( 0 );
// Unsuscribe to messages bank
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-
+#ifdef WIN32
+ // Unload msimg32.dll and user32.dll
+ if( p_intf->p_sys->h_msimg32_dll )
+ FreeLibrary( p_intf->p_sys->h_msimg32_dll );
+ if( p_intf->p_sys->h_user32_dll )
+ FreeLibrary( p_intf->p_sys->h_user32_dll );
+#endif
// Destroy structure
free( p_intf->p_sys );
static void Run( intf_thread_t *p_intf )
{
-#if !defined WIN32
-/* FIXME: should be elsewhere ? */
- // Initialize GDK
- int i_args = 1;
- char *p_args[] = { "", NULL };
- char **pp_args = p_args;
-
- gdk_init( &i_args, &pp_args );
-#endif
-
int a = OSAPI_GetTime();
// Load a theme
#endif
{
// Last chance: the user can select a new theme file
+// FIXME: wxWindows isn't initialized yet !!!
+#if 0
+#ifndef BASIC_SKINS
+ wxFileDialog dialog( NULL, _("Open a skin file"), "", "",
+ "Skin files (*.vlt)|*.vlt|Skin files (*.xml)|*.xml|"
+ "All files|*.*", wxOPEN );
- // Initialize file structure
- OpenFileDialog *OpenFile;
- OpenFile = (OpenFileDialog *)new OSOpenFileDialog( NULL,
- _("Open skin"), false );
- OpenFile->AddFilter( _("Skin files"), "*.vlt" );
- OpenFile->AddFilter( _("Skin files"), "*.xml" );
- OpenFile->AddFilter( _("All files"), "*.*" );
-
- // Open dialog box
- if( OpenFile->Open() )
+ if( dialog.ShowModal() == wxID_OK )
{
// try to load selected file
- if( ! Loader->Load( OpenFile->FileList.front() ) )
+ if( ! Loader->Load( dialog.GetPath().c_str() ) )
{
// He, he, what the hell is he doing ?
- delete OpenFile;
delete Loader;
return;
}
}
else
+#endif
+#endif
{
- delete OpenFile;
delete Loader;
return;
}
-
- delete OpenFile;
}
}
// Refresh the whole interface
OSAPI_PostMessage( NULL, VLC_INTF_REFRESH, 0, (int)true );
- // Run interface message loop
OSRun( p_intf );
}
set_description( _("Skinnable Interface") );
set_capability( "interface", 30 );
set_callbacks( Open, Close );
- add_shortcut( "skins" );
vlc_module_end();
OSAPI_PostMessage( NULL, VLC_INTF_REFRESH, 0, (long)false );
+#ifndef BASIC_SKINS
// Update the log window
- //p_intf->p_sys->p_theme->UpdateLog( p_intf->p_sys->p_sub );
+ p_intf->p_sys->MessagesDlg->UpdateLog();
+
+ // Update the file info window
+ p_intf->p_sys->InfoDlg->UpdateFileInfo();
+#endif
//-------------------------------------------------------------------------
if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die )
// Refresh slider
- //if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
- //{
+ // if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
+ if( p_input->stream.b_seekable )
+ {
#define p_area p_input->stream.p_selected_area
// Set value of sliders
delete[] text;
#undef p_area
- //}
+ }
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
//-------------------------------------------------------------------------
return( VLC_TRUE );
}
-//---------------------------------------------------------------------------
projects / vlc / blobdiff