Changeset 5388 in orxonox.OLD for trunk/src/lib/event

Timestamp:

Oct 16, 2005, 2:05:26 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented a t-Stack, for dynamic stacks, and integrated it into the Shell.

Location:

trunk/src/lib/event

Files:

• event_def.h (modified) (1 diff)
• event_handler.cc (modified) (4 diffs)
• event_handler.h (modified) (3 diffs)

trunk/src/lib/event/event_def.h

@@ -40 +40 @@
 typedef enum elState
   {
-    ES_GAME,           //!< the state during the game plays
-    ES_GAME_MENU,      //!< state when the menu is called during game
-    ES_MENU,           //!< orxonox menu state
-    ES_SHELL,          //!< if we are in shell Modus
+    ES_NULL         = -1,
+    ES_GAME         = 0,       //!< the state during the game plays
+    ES_GAME_MENU    = 1,       //!< state when the menu is called during game
+    ES_MENU         = 2,       //!< orxonox menu state
+    ES_SHELL        = 3,       //!< if we are in shell Modus
 
-    ES_ALL,            //!< you want to register events for all states
+    ES_ALL          = 4,       //!< you want to register events for all states
 
-    ES_NUMBER,         //!< the number of states
+    ES_NUMBER       = 5,       //!< the number of states
   };
 

trunk/src/lib/event/event_handler.cc

@@ -26 +26 @@
 #include "class_list.h"
 
+#include "t_stack.h"
+
 using namespace std;
 
@@ -47 +49 @@
   this->state = ES_GAME;
   this->keyMapper = NULL;
+  this->stateStack = NULL;
 }
 
@@ -72 +75 @@
     }
   }
+  delete this->stateStack;
   delete this->keyMapper;
 
@@ -87 +91 @@
 void EventHandler::init(IniParser* iniParser)
 {
-  this->keyMapper = new KeyMapper();
-  this->keyMapper->loadKeyBindings(iniParser);
-}
+  if (this->keyMapper == NULL)
+  {
+    this->keyMapper = new KeyMapper();
+    this->keyMapper->loadKeyBindings(iniParser);
+  }
+  if (this->stateStack == NULL)
+    this->stateStack = new tStack<short>;
+}
+
+/**
+ * pushes the current State in the State-stack, and selects state
+ * @param state the new State to set
+ */
+void EventHandler::pushState(elState state)
+{
+  if (likely(state != ES_NULL && state != ES_ALL && this->stateStack != NULL))
+  {
+    this->stateStack->push(this->state);
+    this->setState(state);
+  }
+  else
+  {
+    PRINTF(2)("unable to push State\n");
+  }
+}
+
+/**
+ * this removes the topmost stack-entry and select the underlying one
+ * @returns the next stack-entry
+ */
+elState EventHandler::popState()
+{
+  if (unlikely(this->stateStack == NULL))
+    return ES_NULL;
+  elState state = (elState)this->stateStack->pop();
+  if (state == ES_NULL)
+  {
+    PRINTF(2)("No more states availiable. (unable to pop state)\n");
+    return ES_NULL;
+  }
+  else
+  {
+    this->setState(state);
+    return state;
+  }
+}
+
 
 /**

trunk/src/lib/event/event_handler.h

@@ -14 +14 @@
 // FORWARD DECLARATION
 class EventListener;
-template <class T> class tList;
+template<class T> class tList;
+template<class T> class tStack;
 class IniParser;
 
@@ -30 +31 @@
   /** @returns the current state */
   inline elState getState() const { return this->state; };
+
+  void pushState(elState state);
+  elState popState();
 
   void subscribe(EventListener* el, elState state, int eventType);
@@ -50 +54 @@
   static EventHandler*       singletonRef;                    //!< the singleton reference
 
-  EventListener*             listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners
-  elState                    state;                           //!< the state of the event handlder
-  KeyMapper*                 keyMapper;                       //!< reference to the key mapper
+  EventListener*             listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners.
+  elState                    state;                           //!< the state of the event handlder.
+  tStack<short>*             stateStack;                      //!< a stack for the States we are in.
+  KeyMapper*                 keyMapper;                       //!< reference to the key mapper.
+
 };