/*****************************************************************************
* theme.cpp
*****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: theme.cpp,v 1.2 2004/01/25 23:04:06 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
- * Olivier Teulière <ipkiss@via.ecp.fr>
+ * Olivier Teulière <ipkiss@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "theme.hpp"
+#include "top_window.hpp"
+#include <sstream>
Theme::~Theme()
{
- saveConfig();
-
// Be sure things are destroyed in the right order (XXX check)
m_layouts.clear();
m_controls.clear();
m_fonts.clear();
m_commands.clear();
m_vars.clear();
+ m_curves.clear();
}
void Theme::loadConfig()
{
- msg_Dbg( getIntf(), "Loading theme configuration");
+ msg_Dbg( getIntf(), "loading theme configuration");
// Get config from vlcrc file
- char *save = config_GetPsz( getIntf(), "skin_config" );
- if( save == NULL )
+ char *save = config_GetPsz( getIntf(), "skins2-config" );
+ if( !save ) return;
+
+ // Is there an existing config?
+ if( !strcmp( save, "" ) )
+ {
+ // Show the windows as indicated by the XML file
+ m_windowManager.showAll( true );
return;
+ }
- // Initialization
- map<string, GenericWindowPtr>::const_iterator it;
- int i = 0;
- int x, y, v, scan;
+ istringstream inStream(save);
+ free( save );
- // Get config for each window
- for( it = m_windows.begin(); it != m_windows.end(); it++ )
+ char sep;
+ string winId, layId;
+ int x, y, width, height, visible;
+ bool somethingVisible = false;
+ while( !inStream.eof() )
{
- GenericWindow *pWin = (*it).second.get();
- // Get config
- scan = sscanf( &save[i * 13], "(%4d,%4d,%1d)", &x, &y, &v );
+ inStream >> sep;
+ if( sep != '[' ) goto invalid;
+ inStream >> winId >> layId >> x >> y >> width >> height >> visible >> sep >> ws;
+ if( sep != ']' ) goto invalid;
+
+ // Try to find the window and the layout
+ map<string, TopWindowPtr>::const_iterator itWin;
+ map<string, GenericLayoutPtr>::const_iterator itLay;
+ itWin = m_windows.find( winId );
+ itLay = m_layouts.find( layId );
+ if( itWin == m_windows.end() || itLay == m_layouts.end() )
+ {
+ goto invalid;
+ }
+ TopWindow *pWin = itWin->second.get();
+ GenericLayout *pLayout = itLay->second.get();
- // If config has the correct number of arguments
- if( scan > 2 )
+ // Restore the layout
+ m_windowManager.setActiveLayout( *pWin, *pLayout );
+ if( pLayout->getWidth() != width ||
+ pLayout->getHeight() != height )
{
- pWin->move( x, y );
- if( v ) pWin->show();
+ // XXX FIXME XXX: big kludge
+ // As resizing a hidden window causes some trouble (at least on
+ // Windows), first show the window off screen, resize it, and
+ // hide it again.
+ // This has to be investigated more deeply!
+ m_windowManager.startMove( *pWin );
+ m_windowManager.move( *pWin, -width - pLayout->getWidth(), 0);
+ m_windowManager.stopMove();
+ m_windowManager.show( *pWin );
+ m_windowManager.startResize( *pLayout, WindowManager::kResizeSE );
+ m_windowManager.resize( *pLayout, width, height );
+ m_windowManager.stopResize();
+ m_windowManager.hide( *pWin );
}
+ // Move the window (which incidentally takes care of the anchoring)
+ m_windowManager.startMove( *pWin );
+ m_windowManager.move( *pWin, x, y );
+ m_windowManager.stopMove();
+ if( visible )
+ {
+ somethingVisible = true;
+ m_windowManager.show( *pWin );
+ }
+ }
- // Next window
- i++;
+ if( !somethingVisible )
+ {
+ goto invalid;
}
+ return;
+
+invalid:
+ msg_Warn( getIntf(), "invalid config: %s", inStream.str().c_str() );
+ // Restore the visibility defined in the theme
+ m_windowManager.showAll( true );
}
void Theme::saveConfig()
{
- msg_Dbg( getIntf(), "Saving theme configuration");
-
- // Initialize char where config is stored
- char *save = new char[400];
- map<string, GenericWindowPtr>::const_iterator it;
- int i = 0;
- int x, y;
+ msg_Dbg( getIntf(), "saving theme configuration");
- // Save config of every window
- for( it = m_windows.begin(); it != m_windows.end(); it++ )
+ map<string, TopWindowPtr>::const_iterator itWin;
+ map<string, GenericLayoutPtr>::const_iterator itLay;
+ ostringstream outStream;
+ for( itWin = m_windows.begin(); itWin != m_windows.end(); itWin++ )
{
- GenericWindow *pWin = (*it).second.get();
- // Print config
- x = pWin->getLeft();
- y = pWin->getTop();
- sprintf( &save[i * 13], "(%4d,%4d,%1d)", x, y,
- pWin->getVisibleVar().get() );
- i++;
+ TopWindow *pWin = itWin->second.get();
+
+ // Find the layout id for this window
+ string layoutId;
+ const GenericLayout *pLayout = &pWin->getActiveLayout();
+ for( itLay = m_layouts.begin(); itLay != m_layouts.end(); itLay++ )
+ {
+ if( itLay->second.get() == pLayout )
+ {
+ layoutId = itLay->first;
+ }
+ }
+
+ outStream << '[' << itWin->first << ' ' << layoutId << ' '
+ << pWin->getLeft() << ' ' << pWin->getTop() << ' '
+ << pLayout->getWidth() << ' ' << pLayout->getHeight() << ' '
+ << (pWin->getVisibleVar().get() ? 1 : 0) << ']';
}
// Save config to file
- config_PutPsz( getIntf(), "skin_config", save );
- config_SaveConfigFile( getIntf(), "skins" );
-
- // Free memory
- delete[] save;
+ config_PutPsz( getIntf(), "skins2-config", outStream.str().c_str() );
}
} \
return (*it).second.get();
-GenericBitmap *Theme::getBitmapById( const string &id )
+// This macro takes an ID of the form "id1;id2;id3", and returns the object
+// corresponding to the first valid ID. If no ID is valid, it returns NULL.
+// XXX: should we use a template method instead?
+#define FIND_FIRST_OBJECT( mapDataPtr, mapName ) \
+ string rightPart = id; \
+ string::size_type pos; \
+ do \
+ { \
+ pos = rightPart.find( ";" ); \
+ string leftPart = rightPart.substr( 0, pos ); \
+ map<string, mapDataPtr>::const_iterator it = mapName.find( leftPart ); \
+ if( it != mapName.end() ) \
+ { \
+ return (*it).second.get(); \
+ break; \
+ } \
+ \
+ if( pos != string::npos ) \
+ { \
+ rightPart = rightPart.substr( pos, rightPart.size() ); \
+ rightPart = \
+ rightPart.substr( rightPart.find_first_not_of( " \t;" ), \
+ rightPart.size() ); \
+ } \
+ } \
+ while( pos != string::npos ); \
+ return NULL;
+
+GenericBitmap *Theme::getBitmapById( const string &id ) const
+{
+ FIND_FIRST_OBJECT( GenericBitmapPtr, m_bitmaps );
+}
+
+GenericFont *Theme::getFontById( const string &id ) const
{
- FIND_OBJECT( GenericBitmapPtr, m_bitmaps );
+ FIND_FIRST_OBJECT( GenericFontPtr, m_fonts );
}
-GenericFont *Theme::getFontById( const string &id )
+Popup *Theme::getPopupById( const string &id ) const
{
- FIND_OBJECT( GenericFontPtr, m_fonts );
+ FIND_OBJECT( PopupPtr, m_popups );
}
-GenericWindow *Theme::getWindowById( const string &id )
+TopWindow *Theme::getWindowById( const string &id ) const
{
- FIND_OBJECT( GenericWindowPtr, m_windows );
+ FIND_OBJECT( TopWindowPtr, m_windows );
}
-GenericLayout *Theme::getLayoutById( const string &id )
+GenericLayout *Theme::getLayoutById( const string &id ) const
{
FIND_OBJECT( GenericLayoutPtr, m_layouts );
}
-CtrlGeneric *Theme::getControlById( const string &id )
+CtrlGeneric *Theme::getControlById( const string &id ) const
{
FIND_OBJECT( CtrlGenericPtr, m_controls );
}
+Position *Theme::getPositionById( const string &id ) const
+{
+ FIND_OBJECT( PositionPtr, m_positions );
+}
projects / vlc / blobdiff