skins2: use new input-item variable for callbacks on input variables and some cleanup

[vlc] / modules / gui / skins2 / commands / cmd_show_window.hpp

diff --git a/modules/gui/skins2/commands/cmd_show_window.hpp b/modules/gui/skins2/commands/cmd_show_window.hpp
old mode 100755 (executable)
new mode 100644 (file)
index 1696340..18edc42
--- a/modules/gui/skins2/commands/cmd_show_window.hpp
+++ b/modules/gui/skins2/commands/cmd_show_window.hpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * cmd_show_window.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: cmd_show_window.hpp,v 1.1 2004/01/03 23:31:33 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
@@ -19,40 +19,108 @@
  *
  * 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.
  *****************************************************************************/
 
 #ifndef CMD_SHOW_WINDOW_HPP
 #define CMD_SHOW_WINDOW_HPP
 
 #include "cmd_generic.hpp"
-#include "../utils/var_bool.hpp"
+#include "../src/os_factory.hpp"
+#include "../src/top_window.hpp"
+#include "../src/window_manager.hpp"
+#include "../src/popup.hpp"
 
 
-template<bool newValue> class CmdShowHideWindow;
+/// Command to show a window
+class CmdShowWindow: public CmdGeneric
+{
+    public:
+        CmdShowWindow( intf_thread_t *pIntf, WindowManager &rWinManager,
+                       TopWindow &rWin ):
+            CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) {}
+        virtual ~CmdShowWindow() {}
+
+        /// This method does the real job of the command
+        virtual void execute() { m_rWinManager.show( m_rWin ); }
 
-typedef CmdShowHideWindow<true> CmdShowWindow;
-typedef CmdShowHideWindow<false> CmdHideWindow;
+        /// Return the type of the command
+        virtual string getType() const { return "show window"; }
+
+    private:
+        /// Reference to the window manager
+        WindowManager &m_rWinManager;
+        /// Reference to the window
+        TopWindow &m_rWin;
+};
 
 
-/// "Show/Hide window" command
-template<bool newValue>
-class CmdShowHideWindow: public CmdGeneric
+/// Command to hide a window
+class CmdHideWindow: public CmdGeneric
 {
     public:
-        CmdShowHideWindow( intf_thread_t *pIntf, VarBool &rVariable ):
-            CmdGeneric( pIntf ), m_rVariable( rVariable ) {}
-        virtual ~CmdShowHideWindow() {}
+        CmdHideWindow( intf_thread_t *pIntf, WindowManager &rWinManager,
+                       TopWindow &rWin ):
+            CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) {}
+        virtual ~CmdHideWindow() {}
 
         /// This method does the real job of the command
-        virtual void execute() { m_rVariable.set( newValue ); }
+        virtual void execute() { m_rWinManager.hide( m_rWin ); }
 
         /// Return the type of the command
-        virtual string getType() const { return "show/hide window"; }
+        virtual string getType() const { return "hide window"; }
 
     private:
-        /// Reference to the observed variable
-        VarBool &m_rVariable;
+        /// Reference to the window manager
+        WindowManager &m_rWinManager;
+        /// Reference to the window
+        TopWindow &m_rWin;
 };
 
+
+/// Command to raise all windows
+class CmdRaiseAll: public CmdGeneric
+{
+    public:
+        CmdRaiseAll( intf_thread_t *pIntf, WindowManager &rWinManager ):
+            CmdGeneric( pIntf ), m_rWinManager( rWinManager ) {}
+        virtual ~CmdRaiseAll() {}
+
+        /// This method does the real job of the command
+        virtual void execute() { m_rWinManager.raiseAll(); }
+
+        /// Return the type of the command
+        virtual string getType() const { return "raise all windows"; }
+
+    private:
+        /// Reference to the window manager
+        WindowManager &m_rWinManager;
+};
+
+
+/// Command to show a popup menu
+class CmdShowPopup: public CmdGeneric
+{
+    public:
+        CmdShowPopup( intf_thread_t *pIntf, Popup &rPopup ):
+            CmdGeneric( pIntf ), m_rPopup( rPopup ) {}
+        virtual ~CmdShowPopup() {}
+
+        /// This method does the real job of the command
+        virtual void execute()
+        {
+            int x, y;
+            OSFactory::instance( getIntf() )->getMousePos( x, y );
+            m_rPopup.show( x, y );
+        }
+
+        /// Return the type of the command
+        virtual string getType() const { return "show popup"; }
+
+    private:
+        /// Reference to the popup
+        Popup &m_rPopup;
+};
+
+
 #endif