Move KeyList & InputHandler from game.h to client/inputhandler.h (#5752)

[minetest.git] / src / mainmenumanager.h

diff --git a/src/mainmenumanager.h b/src/mainmenumanager.h
index 56ba4012908ef909f226ed82104ae6989ef8399a..fb715ca9b65e169237b7c0db585b04414f4a70e3 100644 (file)
--- a/src/mainmenumanager.h
+++ b/src/mainmenumanager.h
@@ -35,9 +35,11 @@ class IGameCallback
        virtual void disconnect() = 0;
        virtual void changePassword() = 0;
        virtual void changeVolume() = 0;
+
+       virtual void signalKeyConfigChange() = 0;
 };
 
-extern gui::IGUIEnvironment* guienv;
+extern gui::IGUIEnvironment *guienv;
 extern gui::IGUIStaticText *guiroot;
 
 // Handler for the modal menus
@@ -45,27 +47,27 @@ extern gui::IGUIStaticText *guiroot;
 class MainMenuManager : public IMenuManager
 {
 public:
-       virtual void createdMenu(GUIModalMenu *menu)
+       virtual void createdMenu(gui::IGUIElement *menu)
        {
-               for(std::list<GUIModalMenu*>::iterator
+               for(std::list<gui::IGUIElement*>::iterator
                                i = m_stack.begin();
                                i != m_stack.end(); ++i)
                {
                        assert(*i != menu);
                }
 
-               if(m_stack.size() != 0)
+               if(!m_stack.empty())
                        m_stack.back()->setVisible(false);
                m_stack.push_back(menu);
        }
 
-       virtual void deletingMenu(GUIModalMenu *menu)
+       virtual void deletingMenu(gui::IGUIElement *menu)
        {
                // Remove all entries if there are duplicates
                bool removed_entry;
                do{
                        removed_entry = false;
-                       for(std::list<GUIModalMenu*>::iterator
+                       for(std::list<gui::IGUIElement*>::iterator
                                        i = m_stack.begin();
                                        i != m_stack.end(); ++i)
                        {
@@ -81,18 +83,18 @@ class MainMenuManager : public IMenuManager
                /*core::list<GUIModalMenu*>::Iterator i = m_stack.getLast();
                assert(*i == menu);
                m_stack.erase(i);*/
-               
-               if(m_stack.size() != 0)
+
+               if(!m_stack.empty())
                        m_stack.back()->setVisible(true);
        }
 
        // Returns true to prevent further processing
        virtual bool preprocessEvent(const SEvent& event)
        {
-               if(m_stack.size() != 0)
-                       return m_stack.back()->preprocessEvent(event);
-               else
+               if (m_stack.empty())
                        return false;
+               GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(m_stack.back());
+               return mm && mm->preprocessEvent(event);
        }
 
        u32 menuCount()
@@ -102,21 +104,22 @@ class MainMenuManager : public IMenuManager
 
        bool pausesGame()
        {
-               for(std::list<GUIModalMenu*>::iterator
+               for(std::list<gui::IGUIElement*>::iterator
                                i = m_stack.begin(); i != m_stack.end(); ++i)
                {
-                       if((*i)->pausesGame())
+                       GUIModalMenu *mm = dynamic_cast<GUIModalMenu*>(*i);
+                       if (mm && mm->pausesGame())
                                return true;
                }
                return false;
        }
 
-       std::list<GUIModalMenu*> m_stack;
+       std::list<gui::IGUIElement*> m_stack;
 };
 
 extern MainMenuManager g_menumgr;
 
-extern bool noMenuActive();
+extern bool isMenuActive();
 
 class MainGameCallback : public IGameCallback
 {
@@ -127,6 +130,7 @@ class MainGameCallback : public IGameCallback
                changevolume_requested(false),
                keyconfig_requested(false),
                shutdown_requested(false),
+               keyconfig_changed(false),
                device(a_device)
        {
        }
@@ -159,12 +163,20 @@ class MainGameCallback : public IGameCallback
                keyconfig_requested = true;
        }
 
-       
+       virtual void signalKeyConfigChange()
+       {
+               keyconfig_changed = true;
+       }
+
+
        bool disconnect_requested;
        bool changepassword_requested;
        bool changevolume_requested;
        bool keyconfig_requested;
        bool shutdown_requested;
+
+       bool keyconfig_changed;
+
        IrrlichtDevice *device;
 };