Changeset 4364 in orxonox.OLD

Timestamp:

May 28, 2005, 3:14:43 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: filled the flush function with more sense and rearanged some structures

Location:

orxonox/trunk/src/util/event

Files:

• event_def.h (modified) (2 diffs)
• event_handler.cc (modified) (3 diffs)
• event_handler.h (modified) (2 diffs)

orxonox/trunk/src/util/event/event_def.h

@@ -11 +11 @@
 
 #define CMD_LENGHT 16
+#define N_STD_KEYS SDLK_LAST
+#define N_BUTTONS 6
+#define DEFAULT_KEYBIND_FILE "~/.orxonox/orxonox.conf"
+
 
 typedef enum extEventTyes
@@ -22 +26 @@
   };
 
+typedef enum elState
+  {
+    ES_GAME,
+    ES_GAME_MENU,
+    ES_MENU,
+
+    ES_ALL,
+
+    ES_NUMBER,
+  };
+
 
 #endif /* _EVENT_DEF_H */

orxonox/trunk/src/util/event/event_handler.cc

@@ -198 +198 @@
 }
 
-void EventHandler::flush()
-{
-  for(int i = 0; i < ES_NUMBER; ++i)
+void EventHandler::flush(elState state)
+{
+  if( state == ES_ALL)
+    {
+      for(int i = 0; i < ES_NUMBER; ++i)
+        {
+          for(int j = 0; j < SDLK_LAST; ++j)
+            {
+              this->listeners[i][j] = NULL;
+            }
+        }
+    }
+  else
     {
       for(int j = 0; j < SDLK_LAST; ++j)
         {
-          this->listeners[i][j] = NULL;
+          this->listeners[state][j] = NULL;
         }
     }
@@ -214 +224 @@
 {
   SDL_Event event;
-  //Command cmd;
   Event ev;
   EventListener* listener;
@@ -270 +279 @@
         }
 
+      /* small debug routine: shows alle events dispatched by the event handler */
+      PRINT(0)("\n==========================| EventHandler::Process () |===\n");
+      PRINT(0)("=  Got Event nr%i\n, for state %i", event.type, this->state);  
+      PRINT(0)("=======================================================\n");
+      
       listener = this->listeners[this->state][event.key.keysym.sym];
       //if( listener != NULL)

orxonox/trunk/src/util/event/event_handler.h

@@ -15 +15 @@
 
 
-#define N_STD_KEYS SDLK_LAST
-#define N_BUTTONS 6
-#define DEFAULT_KEYBIND_FILE "~/.orxonox/orxonox.conf"
-
-typedef enum elState
-  {
-    ES_GAME,
-    ES_GAME_MENU,
-    ES_MENU,
-
-    ES_ALL,
-
-    ES_NUMBER,
-  };
 
 //! Key aliasing structure
@@ -53 +39 @@
   void subscribeListener(EventListener* el, elState state, int eventType);
   void unsubscribeListener(int eventType, elState state);
-  void flush();
+  void flush(elState state);
   
   void loadKeyBindings(const char* fileName);