X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/1a92a61309c2949f228b6dc70c346fcff514f134..b45441266b72222f09df4deecd8983ede64b8867:/src/app/eventutils.py?ds=inline

diff --git a/src/app/eventutils.py b/src/app/eventutils.py
index c6c7f16..969ad81 100755
--- a/src/app/eventutils.py
+++ b/src/app/eventutils.py
@@ -53,6 +53,11 @@ class _EventDispatcher :
     def dispatchEvents(self) :
         events = pygame.event.get()
         for event in events :
+            #if event.type == pygame.MOUSEMOTION :
+            #    if hasattr(event, 'wiimoteid') :
+            #        console.info(event)
+            #        #return
+                    
             listeners = self.registry.get(event.type, {})
             for listener in listeners.keys() :
                 listener(event)
@@ -65,7 +70,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()
@@ -73,10 +78,10 @@ class _EventDispatcher :
 
 EventDispatcher = _EventDispatcher()
 
-def event_handler(eventType) :
+def event_handler(*eventTypes) :
     def markFunctionAsListener(m) :
         m.__islistener__ = True
-        m.__eventtype__ = eventType
+        m.__eventtypes__ = eventTypes
         return m
     return markFunctionAsListener
 
@@ -88,7 +93,8 @@ class EventInitializer(type):
             for k, v in dict.items() :
                 if isinstance(v, types.FunctionType) and hasattr(v, '__islistener__') :
                     listener = getattr(self, k)
-                    EventDispatcher.addEventListener(v.__eventtype__, listener)
+                    for eventType in v.__eventtypes__ :
+                        EventDispatcher.addEventListener(eventType, listener)
         
         def ctor(self, *args, **kw) :
             default_ctor = dict.get('__init__')