Affichage écran de lancement.

[minwii.git] / src / app / eventutils.py

diff --git a/src/app/eventutils.py b/src/app/eventutils.py
index fda8154..efa1f7e 100755 (executable)
--- a/src/app/eventutils.py
+++ b/src/app/eventutils.py
@@ -29,7 +29,10 @@ $URL$
 import types
 import pygame
 from StringIO import StringIO
 import types
 import pygame
 from StringIO import StringIO

-from events import NOTEON
+from logging import getLogger, basicConfig, DEBUG
+import sys
+basicConfig(level=DEBUG, stream = sys.stdout)
+console = getLogger('minwii.eventutils')

 
 class _EventDispatcher :
     def __init__(self) :
 
 class _EventDispatcher :
     def __init__(self) :


@@ -37,17 +40,21 @@ class _EventDispatcher :
         
     def addEventListener(self, eventType, listener) :
         if self.registry.has_key(eventType) :
         
     def addEventListener(self, eventType, listener) :
         if self.registry.has_key(eventType) :

-            self.registry[eventType].append(listener)
+            self.registry[eventType][listener] = True

         else :
         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 :
     
     def dispatchEvents(self) :
         events = pygame.event.get()
         for event in events :

-            listeners = self.registry.get(event.type, [])
-            if event.type == NOTEON :
-                print len(listeners)
-            for listener in listeners :
+            listeners = self.registry.get(event.type, {})
+            for listener in listeners.keys() :

                 listener(event)
     def reset(self) :
         self.registry = {}
                 listener(event)
     def reset(self) :
         self.registry = {}


@@ -58,7 +65,7 @@ class _EventDispatcher :
         keys.sort()
         for k in keys :
             print >> out, "event", k
         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()
                 print >> out, listener.__name__
         out.seek(0)
         return out.read()