Changeset 7895 in orxonox.OLD for branches/gui/src/lib/event

Timestamp:

May 27, 2006, 5:29:48 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a bug in the EventHandler, that resulted from multiple inputs or so…

Location:

branches/gui/src/lib/event

Files:

• event_handler.cc (modified) (13 diffs)
• event_handler.h (modified) (3 diffs)

branches/gui/src/lib/event/event_handler.cc

@@ -42 +42 @@
 
   /* now initialize them all to zero */
-  this->withUNICODE(false);
+  for (unsigned int i = 0; i < ES_NUMBER; i++)
+    this->bUNICODE[i] = false;
   this->grabEvents(false);
 
@@ -87 +88 @@
   this->keyMapper.loadKeyBindings();
 }
+
+/**
+ * @param state: to which the event handler shall change
+ */
+void EventHandler::setState(elState state)
+{
+  this->state = state;
+  SDL_EnableUNICODE(this->bUNICODE[state]);
+};
+
 
 /**
@@ -144 +155 @@
   {
     for(unsigned int i = 0; i < ES_NUMBER; i++)
-    {
-      if( !likely(this->listeners[i][eventType].empty()))
-      {
-        PRINTF(2)("'%s' of class '%s' tried to subscribe to event %i @ state %i but this event has already been subscribed\n", el->getName(), el->getClassName(), eventType, state);
-      }
       this->listeners[i][eventType].push_back(el);
-    }
-  }
-  else
-  {
-    if( likely(!this->listeners[state][eventType].empty()))
-    {
-      PRINTF(2)("%s of class %s tried to subscribe to event %i @ state %i but this event has already been subscribed\n", el->getName(), el->getClassName(), eventType, state);
-    }
+  }
+  else
     this->listeners[state][eventType].push_back(el);
-  }
 }
 
@@ -178 +177 @@
     {
       std::vector<EventListener*>::iterator listener =
-         std::find(this->listeners[i][eventType].begin(),
-                   this->listeners[i][eventType].end(),
-                   el);
+        std::find(this->listeners[i][eventType].begin(),
+                  this->listeners[i][eventType].end(),
+                  el);
       if (listener != this->listeners[i][eventType].end())
         this->listeners[i][eventType].erase(listener);
@@ -187 +186 @@
   {
     std::vector<EventListener*>::iterator listener =
-        std::find(this->listeners[state][eventType].begin(),
-                  this->listeners[state][eventType].end(),
-                  el);
+      std::find(this->listeners[state][eventType].begin(),
+                this->listeners[state][eventType].end(),
+                el);
     if (listener != this->listeners[state][eventType].end())
       this->listeners[state][eventType].erase(listener);
@@ -261 +260 @@
 
 
-void EventHandler::withUNICODE(bool enableUNICODE)
-{
-  SDL_EnableUNICODE(enableUNICODE);
-  this->bUNICODE = enableUNICODE;
+void EventHandler::withUNICODE(elState state, bool enableUNICODE)
+{
+  this->bUNICODE[state] = enableUNICODE;
+  if (this->state == state)
+    SDL_EnableUNICODE(enableUNICODE);
 }
 
@@ -283 +283 @@
 
 /**
- *  core function of event handler: receives all events from SDL
-
-   The event from the SDL framework are collected here and distributed to all listeners.
-*/
+ *  @brief core function of event handler: receives all events from SDL
+ *
+ * The event from the SDL framework are collected here and distributed to all listeners.
+ */
 void EventHandler::process()
 {
@@ -299 +299 @@
         ev.bPressed = true;
         ev.type = event.key.keysym.sym;
-        if (unlikely(this->bUNICODE))
+        if (unlikely(this->bUNICODE[this->state]))
           ev.x = event.key.keysym.unicode;
         break;
@@ -305 +305 @@
         ev.bPressed = false;
         ev.type = event.key.keysym.sym;
-        if (unlikely(this->bUNICODE))
+        if (unlikely(this->bUNICODE[this->state]))
           ev.x = event.key.keysym.unicode;
         break;
@@ -358 +358 @@
     /* small debug routine: shows all events dispatched by the event handler */
     PRINT(4)("\n==========================| EventHandler::process () |===\n");
-    PRINT(4)("=  Got Event nr %i, for state %i", ev.type, this->state);
-
-
-    for (unsigned int i = 0; i < this->listeners[this->state][ev.type].size(); i++)
+    PRINT(4)("=  Got Event nr %i, for state %i\n", ev.type, this->state);
+
+    /// setting a temporary state in case of an EventListener's process changes the state.
+    elState currentState = this->state;
+    for (unsigned int i = 0; i < this->listeners[currentState][ev.type].size(); i++)
     {
       PRINT(4)("=  Event dispatcher msg: This event has been consumed\n");
+      PRINT(4)("=  Got Event nr %i, for state %i %s::%s\n", ev.type, currentState, this->listeners[this->state][ev.type][i]->getClassName(), this->listeners[currentState][ev.type][i]->getName());
       PRINT(4)("=======================================================\n");
-      listeners[this->state][ev.type][i]->process(ev);
+      this->listeners[currentState][ev.type][i]->process(ev);
     }
     /*    else
@@ -375 +377 @@
 }
 
-
+/**
+ * @brief An eventFilter.
+ * @param event the Event to be filtered.
+ * @returns 0 on filtered Event. 1 Otherwise.
+ */
 int EventHandler::eventFilter(const SDL_Event *event)
 {
@@ -400 +406 @@
 
 /**
- * outputs some nice information about the EventHandler
+ * @brief outputs some nice information about the EventHandler
  */
 void EventHandler::debug() const
@@ -408 +414 @@
   PRINT(0)("===============================\n");
   for(int i = 0; i < ES_NUMBER; ++i)
+  {
     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)("============================EH=\n");
 }

branches/gui/src/lib/event/event_handler.h

@@ -26 +26 @@
   void init();
 
-  /** @param state: to which the event handler shall change */
-  inline void setState(elState state) { this->state = state; };
+  void setState(elState state);
   /** @returns the current state */
   inline elState getState() const { return this->state; };
@@ -42 +41 @@
 
 
-  void withUNICODE(bool enableUNICODE);
+  void withUNICODE(elState state, bool enableUNICODE);
   void grabEvents(bool grabEvents);
   bool grabbedEvents() const { return this->eventsGrabbed; };
@@ -62 +61 @@
   KeyMapper                    keyMapper;                       //!< reference to the key mapper.
 
-  bool                         bUNICODE;                        //!< If unicode should be enabled.
+  bool                         bUNICODE[ES_NUMBER];             //!< If unicode should be enabled.
   bool                         eventsGrabbed;                   //!< If the events should be grabbed
 };