* parser/xmlparser.cpp: abort parsing when an error is detected

 (avoid segfaults in element handlers...)
* all: tried to have the popup window disappear with a click on
 a skin window (not working at least with wxgtk)

modules/gui/skins2/commands/cmd_dialogs.hpp

@@ -2,7 +2,7 @@
  * cmd_dialogs.hpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: cmd_dialogs.hpp,v 1.1 2004/01/03 23:31:33 asmax Exp $
+ * $Id: cmd_dialogs.hpp,v 1.2 2004/02/01 14:44:11 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulire <ipkiss@via.ecp.fr>
@@ -41,8 +41,9 @@ typedef CmdDialogs<5> CmdDlgNet;
 typedef CmdDialogs<6> CmdDlgMessages;
 typedef CmdDialogs<7> CmdDlgPrefs;
 typedef CmdDialogs<8> CmdDlgFileInfo;
-typedef CmdDialogs<9> CmdDlgPopupMenu;
-typedef CmdDialogs<10> CmdDlgAdd;
+typedef CmdDialogs<9> CmdDlgShowPopupMenu;
+typedef CmdDialogs<10> CmdDlgHidePopupMenu;
+typedef CmdDialogs<11> CmdDlgAdd;
 
 
 /// Generic "Open dialog" command
@@ -93,6 +94,9 @@ class CmdDialogs: public CmdGeneric
                     pDialogs->showPopupMenu( true );
                     break;
                 case 10:
+                    pDialogs->showPopupMenu( false );
+                    break;
+                case 11:
                     pDialogs->showFile( false );
                     break;
                 default:

modules/gui/skins2/controls/ctrl_image.cpp

@@ -2,7 +2,7 @@
  * ctrl_image.cpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: ctrl_image.cpp,v 1.1 2004/01/03 23:31:33 asmax Exp $
+ * $Id: ctrl_image.cpp,v 1.2 2004/02/01 14:44:11 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulire <ipkiss@via.ecp.fr>
@@ -54,9 +54,15 @@ void CtrlImage::handleEvent( EvtGeneric &rEvent )
     // No FSM for this simple transition
     if( rEvent.getAsString() == "mouse:right:down:none" )
     {
-        CmdDlgPopupMenu cmd( getIntf() );
+        CmdDlgShowPopupMenu cmd( getIntf() );
         cmd.execute();
     }
+    else if( rEvent.getAsString() == "mouse:left:up:none" )
+    {
+        CmdDlgHidePopupMenu cmd( getIntf() );
+        cmd.execute();
+    }
+
 }
 
 

modules/gui/skins2/parser/interpreter.cpp

@@ -2,7 +2,7 @@
  * interpreter.cpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: interpreter.cpp,v 1.4 2004/01/18 19:54:46 asmax Exp $
+ * $Id: interpreter.cpp,v 1.5 2004/02/01 14:44:11 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulire <ipkiss@via.ecp.fr>
@@ -51,7 +51,7 @@ Interpreter::Interpreter( intf_thread_t *pIntf ): SkinObject( pIntf )
     REGISTER_CMD( "dialogs.messages()", CmdDlgMessages )
     REGISTER_CMD( "dialogs.prefs()", CmdDlgPrefs )
     REGISTER_CMD( "dialogs.fileInfo()", CmdDlgFileInfo )
-    REGISTER_CMD( "dialogs.popup()", CmdDlgPopupMenu )
+    REGISTER_CMD( "dialogs.popup()", CmdDlgShowPopupMenu )
     REGISTER_CMD( "playlist.add()", CmdDlgAdd )
     VarList &rVar = VlcProc::instance( getIntf() )->getPlaylistVar();
     m_commandMap["playlist.del()"] =

modules/gui/skins2/parser/xmlparser.cpp

@@ -2,7 +2,7 @@
  * xmlparser.cpp
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: xmlparser.cpp,v 1.4 2004/01/25 23:04:01 asmax Exp $
+ * $Id: xmlparser.cpp,v 1.5 2004/02/01 14:44:11 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *
@@ -64,6 +64,10 @@ bool XMLParser::parse()
     int ret = xmlTextReaderRead( m_pReader );
     while (ret == 1)
     {
+        if( m_errors )
+        {
+            return false;
+        }
         // Get the node type
         int type = xmlTextReaderNodeType( m_pReader );
         switch (type )

modules/gui/skins2/theme/theme.xml

@@ -64,21 +64,9 @@
   <Font id="default_font" font="FreeSansBold.ttf" size="15"/> 
   <Font id="playlist_font" font="FreeSansBold.ttf" size="12"/> 
 
-<!--
-  <Event id="mouseoverclose" event="CTRL_ID_VISIBLE(mouseimg,TRUE)"/>
-  <Event id="mouseoutclose" event="CTRL_ID_VISIBLE(mouseimg,FALSE)"/>
-  <Event id="move" event="WINDOW_MOVE(mainwindow)"/>
-  <Event id="move_playlist" event="WINDOW_MOVE(playlist_window)"/>
-  <Event id="hide_playlist" event="WINDOW_CLOSE(playlist_window)"/>
-  <Event id="show_playlist" event="WINDOW_OPEN(playlist_window)"/>
-
-
-  <Event id="item_add" event="VLC_PLAYLIST_ADD_FILE"/>
-  <Event id="item_del" event="PLAYLIST_ID_DEL(playlist)"/>
--->
   <Window id="mainwindow" x="230" y="250" dragdrop="true">
 
-   <Layout id="testlayout" width="424" height="152">
+    <Layout id="testlayout" width="424" height="152">
     <Group x="0" y="0">
       <Image x="0" y="0" image="mainbody" onclick="move"/>
       <Button x="8" y="5" up="close" down="close_onclick" over="close_mouseover" action="vlc.quit()" tooltiptext="Quit VLC"/>