Changeset 7911 in orxonox.OLD

Timestamp:

May 27, 2006, 5:56:15 PM (18 years ago)

Author:

bensch

Message:

gui: Only one copy of one eventListener can be assigned to one Event in each state. Everything else will be refused

Location:

branches/gui/src/lib/event

Files:

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

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

@@ -183 +183 @@
   {
     for(unsigned int i = 0; i < ES_NUMBER; i++)
-      this->listeners[i][eventType].push_back(el);
-  }
-  else
-    this->listeners[state][eventType].push_back(el);
+      if (!this->findListener( NULL, (elState)i, eventType, el))
+        this->listeners[i][eventType].push_back(el);
+      else
+      {
+        PRINTF(2)("%s::%s was already subscribed to state %d event %d\n", el->getClassName(), el->getName(), i, eventType);
+      }
+  }
+  else
+  {
+    if (!this->findListener( NULL, state, eventType, el))
+      this->listeners[state][eventType].push_back(el);
+    else
+    {
+      PRINTF(2)("%s::%s was already subscribed to state %d event %d\n", el->getClassName(), el->getName(), state, eventType);
+    }
+  }
 }
 
@@ -204 +216 @@
     for (unsigned int i = 0; i < ES_NUMBER; i++)
     {
-      std::vector<EventListener*>::iterator listener =
-        std::find(this->listeners[i][eventType].begin(),
-                  this->listeners[i][eventType].end(),
-                  el);
-      if (listener != this->listeners[i][eventType].end())
+      std::vector<EventListener*>::iterator listener;
+      if (this->findListener(&listener, (elState)i, eventType, el))
         this->listeners[i][eventType].erase(listener);
     }
   else
   {
-    std::vector<EventListener*>::iterator listener =
-      std::find(this->listeners[state][eventType].begin(),
-                this->listeners[state][eventType].end(),
-                el);
-    if (listener != this->listeners[state][eventType].end())
+    std::vector<EventListener*>::iterator listener;
+    if (this->findListener(&listener, state, eventType, el))
       this->listeners[state][eventType].erase(listener);
   }
@@ -293 +299 @@
 
 
+bool EventHandler::findListener(std::vector<EventListener*>::iterator* it, elState state, int eventType, EventListener* listener)
+{
+  std::vector<EventListener*>::iterator findIterator =
+    std::find(this->listeners[state][eventType].begin(), this->listeners[state][eventType].end(), listener);
+  if (it != NULL)
+    *it = findIterator;
+  return ( findIterator != this->listeners[state][eventType].end());
+
+}
+
+
+
 /**
  * @brief if the unicode characters should be recorded.
@@ -323 +341 @@
   }
 }
+
 
 
@@ -418 +437 @@
 
   /// setting a temporary state in case of an EventListener's process changes the state.
-  printf("%d\n", this->listeners[state][event.type].size());
+  printf("%d event: %d state: %d\n", this->listeners[state][event.type].size(), event.type, state);
   for (unsigned int i = 0; i < this->listeners[state][event.type].size(); i++)
   {

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

@@ -55 +55 @@
   EventHandler();
 
+  bool findListener(std::vector<EventListener*>::iterator* it, elState state, int eventType, EventListener* listener);
+
  private:
   static EventHandler*         singletonRef;                    //!< the singleton reference