* skin_main.cpp,x11_theme.cpp: better way to fix the "open skin bug" !

* share/Makefile.am: install skins at make install (closes bug #856)

diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp
index db37831a60f98657fd82131eaf0a63facd88e9c2..0fa4c0f10163805d1b670bfefbb5a84f830c0fcd 100644 (file)
--- a/modules/gui/skins/src/skin_main.cpp
+++ b/modules/gui/skins/src/skin_main.cpp
@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.37 2003/06/11 10:42:34 gbazin Exp $
+ * $Id: skin_main.cpp,v 1.38 2003/06/11 21:46:57 asmax Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -131,6 +131,11 @@ static int Open ( vlc_object_t *p_this )
     // Initialize X11
     p_intf->p_sys->display = XOpenDisplay( NULL );
     vlc_mutex_init( p_intf, &p_intf->p_sys->xlock );
+    // Fake window to receive broadcast events
+    Window root = DefaultRootWindow( p_intf->p_sys->display );
+    p_intf->p_sys->mainWin = XCreateSimpleWindow( p_intf->p_sys->display, root, 0, 0, 
+                                                  1, 1, 0, 0, 0 );
+    XStoreName( p_intf->p_sys->display, p_intf->p_sys->mainWin, "VLC Media Player" );
 
 #elif defined WIN32
     // Interface thread id used to post broadcast messages
@@ -189,6 +194,7 @@ static void Close ( vlc_object_t *p_this )
     delete (OSTheme *)p_intf->p_sys->p_theme;
 
 #if defined X11_SKINS
+    XDestroyWindow( p_intf->p_sys->display, p_intf->p_sys->mainWin );
     XCloseDisplay( p_intf->p_sys->display );
 #endif
 

diff --git a/modules/gui/skins/x11/x11_theme.cpp b/modules/gui/skins/x11/x11_theme.cpp
index 8a4941ecb2458f15e9fae321158facd0e87acadf..4065690f6e0aa95b615474047c845c7da8e335ca 100644 (file)
--- a/modules/gui/skins/x11/x11_theme.cpp
+++ b/modules/gui/skins/x11/x11_theme.cpp
@@ -2,7 +2,7 @@
  * x11_theme.cpp: X11 implementation of the Theme class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: x11_theme.cpp,v 1.12 2003/06/10 11:43:41 gbazin Exp $
+ * $Id: x11_theme.cpp,v 1.13 2003/06/11 21:46:57 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -60,9 +60,6 @@ X11Theme::X11Theme( intf_thread_t *_p_intf ) : Theme( _p_intf )
 //---------------------------------------------------------------------------
 X11Theme::~X11Theme()
 {
-    XLOCK;
-    //XDestroyWindow( display, p_intf->p_sys->mainWin );
-    XUNLOCK;
 }
 //---------------------------------------------------------------------------
 void X11Theme::OnLoadTheme()
@@ -70,12 +67,6 @@ void X11Theme::OnLoadTheme()
 /*    // The create menu
     CreateSystemMenu();
 */
-    Window root = DefaultRootWindow( display );
-    XLOCK;
-    p_intf->p_sys->mainWin = XCreateSimpleWindow( display, root, 0, 0, 
-                                                  1, 1, 0, 0, 0 );
-    XStoreName( display, p_intf->p_sys->mainWin, "VLC Media Player" );
-    XUNLOCK;
 }
 //---------------------------------------------------------------------------
 void X11Theme::AddSystemMenu( string name, Event *event )

diff --git a/share/Makefile.am b/share/Makefile.am
index e391160070ea96a96bc965724b6636ad30f4df49..9e2932b7ee3e1e759110054f59a32784e41e9b03 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -13,6 +13,9 @@ dist_pkgdata_DATA = \
        $(DIST_icons48) \
        $(NULL)
 
+nobase_pkgdata_DATA = \
+       $(DIST_skins)
+       
 DIST_fonts = \
        default8x16.psf \
        default8x9.psf \
@@ -69,3 +72,48 @@ DIST_icons48 = \
        vlc48x48.png \
        $(NULL)
 
+DIST_skins = \
+       skins/default/add1.bmp \
+       skins/default/del2.bmp \
+       skins/default/open1.bmp \
+       skins/default/play1.bmp \
+       skins/default/playlist_body.bmp \
+       skins/default/prev4.bmp \
+       skins/default/stop2.bmp \
+       skins/default/add2.bmp \
+       skins/default/del3.bmp \
+       skins/default/open2.bmp  \
+       skins/default/play2.bmp  \
+       skins/default/prefs1.bmp \
+       skins/default/quit1.bmp \
+       skins/default/stop3.bmp \
+       skins/default/add3.bmp \
+       skins/default/open3.bmp \
+       skins/default/play3.bmp \
+       skins/default/prefs2.bmp \
+       skins/default/quit2.bmp \
+       skins/default/stop4.bmp \
+       skins/default/body.bmp \
+       skins/default/next1.bmp \
+       skins/default/pause1.bmp \
+       skins/default/play4.bmp \
+       skins/default/prefs3.bmp \
+       skins/default/quit3.bmp \
+       skins/default/theme.xml \
+       skins/default/next2.bmp \
+       skins/default/pause2.bmp \
+       skins/default/playlist1.bmp \
+       skins/default/prev1.bmp \
+       skins/default/slider1.bmp \
+       skins/default/next3.bmp \
+       skins/default/pause3.bmp \
+       skins/default/playlist2.bmp \
+       skins/default/prev2.bmp \
+       skins/default/slider2.bmp \
+       skins/default/del1.bmp \
+       skins/default/next4.bmp \
+       skins/default/pause4.bmp \
+       skins/default/playlist3.bmp \
+       skins/default/prev3.bmp \
+       skins/default/stop1.bmp
+