mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-12-14 04:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* share/Makefile.am: install skins at make install (closes bug #856)
This commit is contained in:
Cyril Deguet 2003-06-11 21:46:57 +00:00
parent 173915c6f0
commit 0a9aea66b5
3 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gui/skins/src/skin_main.cpp
View File

@ -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

11
modules/gui/skins/x11/x11_theme.cpp
View File

@ -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 )

48
share/Makefile.am
View File

@ -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