X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/a7c9d1fda4c70e7213db409ca66b1555e6539c21..866367171f81ef26d50bed69a749d3f90a1304e9:/src/app/eventutils.py

diff --git a/src/app/eventutils.py b/src/app/eventutils.py
index a89509b..efa1f7e 100755
--- a/src/app/eventutils.py
+++ b/src/app/eventutils.py
@@ -29,6 +29,10 @@ $URL$
 import types
 import pygame
 from StringIO import StringIO
+from logging import getLogger, basicConfig, DEBUG
+import sys
+basicConfig(level=DEBUG, stream = sys.stdout)
+console = getLogger('minwii.eventutils')
 
 class _EventDispatcher :
     def __init__(self) :
@@ -36,16 +40,24 @@ class _EventDispatcher :
         
     def addEventListener(self, eventType, listener) :
         if self.registry.has_key(eventType) :
-            self.registry[eventType].append(listener)
+            self.registry[eventType][listener] = True
         else :
-            self.registry[eventType] = [listener]
+            self.registry[eventType] = {listener:True}
+    
+    def removeEventListener(self, eventType, listener) :
+        try :
+            del self.registry[eventType][listener]
+        except KeyError :
+            console.warn("no listener to remove")
     
     def dispatchEvents(self) :
         events = pygame.event.get()
         for event in events :
-            listeners = self.registry.get(event.type, [])
-            for listener in listeners :
+            listeners = self.registry.get(event.type, {})
+            for listener in listeners.keys() :
                 listener(event)
+    def reset(self) :
+        self.registry = {}
     
     def __repr__(self) :
         out = StringIO()
@@ -53,7 +65,7 @@ class _EventDispatcher :
         keys.sort()
         for k in keys :
             print >> out, "event", k
-            for listener in self.registry[k] :
+            for listener in self.registry[k].keys() :
                 print >> out, listener.__name__
         out.seek(0)
         return out.read()
@@ -79,12 +91,12 @@ class EventInitializer(type):
                     EventDispatcher.addEventListener(v.__eventtype__, listener)
         
         def ctor(self, *args, **kw) :
-            init_listeners(self)
             default_ctor = dict.get('__init__')
             if not default_ctor :
                 super(cls, self).__init__(*args, **kw)
             else :
                 default_ctor(self, *args, **kw)
+            init_listeners(self)
         
         cls.__init__ = ctor