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

Timestamp:

Jun 5, 2006, 12:46:02 PM (19 years ago)

Author:

bensch

Message:

trunk: output of EventListener Nicer

Location:

trunk/src/lib/event

Files:

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

trunk/src/lib/event/event_def.h

@@ -42 +42 @@
 //! this is an enumeration of all states of the event_handler/game
 typedef enum elState
-  {
-    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_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          = 4,       //!< you want to register events for all states
+  ES_ALL          = 4,       //!< you want to register events for all states
 
-    ES_NUMBER       = 5,       //!< the number of states
-  };
+  ES_NUMBER       = 5,       //!< the number of states
+};
+
+
 
 

trunk/src/lib/event/event_handler.cc

@@ -21 +21 @@
 #include "event.h"
 #include "key_mapper.h"
+#include "key_names.h"
 
 #include "compiler.h"
@@ -62 +63 @@
 EventHandler::~EventHandler ()
 {
+  bool forgotToUnsubscribe = false;
+
   for(int i = 0; i < ES_NUMBER; ++i)
   {
@@ -68 +71 @@
       if(!this->listeners[i][j].empty())
       {
-        PRINTF(2)("forgot to unsubscribe an EventListener!\n");// %s!\n", this->listeners[i][j]->getName());
+        if (!forgotToUnsubscribe)
+        {
+          forgotToUnsubscribe = true;
+          PRINTF(2)("forgot to unsubscribe an EventListener!\n");// %s!\n", this->listeners[i][j]->getName());
+        }
       }
     }
   }
+
+  if (forgotToUnsubscribe)
+  {
+    PRINTF(2)("Listing still subscribed EventListeners\n");
+    PRINTF(2)("========================================\n");
+    this->debug();
+    PRINTF(2)("========================================\n");
+  }
+
   SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
 
@@ -485 +501 @@
 }
 
+
+/**
+ * @param state The State to get the Name of.
+ * @returns the Name of the State.
+ */
+const std::string& EventHandler::ELStateToString(elState state)
+{
+  if (state < ES_NUMBER)
+    return EventHandler::stateNames[state];
+  else
+    return EventHandler::stateNames[5];
+}
+
+/**
+ * @param stateName the Name of the State to retrieve.
+ * @return the State given by the name
+ */
+elState EventHandler::StringToELState(const std::string& stateName)
+{
+  for (unsigned int i = 0 ; i < ES_NUMBER; i++)
+    if (stateName == EventHandler::stateNames[i])
+      return (elState)i;
+  return ES_NULL;
+}
+
+const std::string  EventHandler::stateNames[] =
+{
+  "game",
+  "game_menu",
+  "menu",
+  "shell",
+  "all",
+  "unknown",
+};
+
+
 /**
  * @brief outputs some nice information about the EventHandler
@@ -497 +549 @@
     for(int j = 0; j < EV_NUMBER; ++j)
       for (unsigned int evl = 0; evl < this->listeners[i][j].size(); evl++)
-        PRINT(0)("Event %d of State %d subscribed to %s (%p)\n", j, i, this->listeners[i][j][evl]->getName(), this->listeners[i][j][evl]);
+        PRINT(0)("Event %s(%d) of State %s(%d) subscribed to %s (%p)\n",
+        EVToKeyName(j).c_str(), j,
+        ELStateToString((elState)i).c_str(), i,
+        this->listeners[i][j][evl]->getName(), this->listeners[i][j][evl]);
   }
   PRINT(0)("============================EH=\n");

trunk/src/lib/event/event_handler.h

@@ -19 +19 @@
 
 //! The one Event Handler from Orxonox
-class EventHandler : public BaseObject {
+class EventHandler : public BaseObject
+{
 
- public:
+public:
   virtual ~EventHandler();
   /** @returns a Pointer to the only object of this Class */
@@ -29 +30 @@
   void setState(elState state);
   /** @returns the current state */
-  inline elState getState() const { return this->state; };
+inline elState getState() const { return this->state; };
 
   void pushState(elState state);
@@ -52 +53 @@
   void debug() const;
 
- private:
+  static const std::string& ELStateToString(elState state);
+  static elState StringToELState(const std::string& stateName);
+
+private:
   EventHandler();
 
   bool findListener(std::vector<EventListener*>::iterator* it, elState state, int eventType, EventListener* listener);
 
- private:
+public:
+  static const std::string     stateNames[];
+
+private:
   static EventHandler*         singletonRef;                    //!< the singleton reference
 

trunk/src/lib/event/key_names.h

@@ -52 +52 @@
 std::string SDLKToKeyname( int key);
 
+
 #endif /* _KEY_NAMES_H */