implémentation de tous les modes.

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

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

-from logging import getLogger, basicConfig, DEBUG
-import sys
-from events import TIMEOUT, COLOVER, eventNames
-basicConfig(level=DEBUG, stream = sys.stdout)
-console = getLogger('minwii')
-eventLog = getLogger('minwii.events')
-
-hiddenEvents = {pygame.MOUSEMOTION:True,
-                TIMEOUT:True,
-                #COLOVER:True,
-                }
-from event_pprinters import pprinters
+from log import console, eventLogger

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


@@ -56,15 +45,13 @@ class _EventDispatcher :
         try :
             del self.registry[eventType][listener]
         except KeyError :
         try :
             del self.registry[eventType][listener]
         except KeyError :

-            console.warn("no listener to remove")
+            console.debug("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 :

+            eventLogger.info(event)

             listeners = self.registry.get(event.type, {})
             listeners = self.registry.get(event.type, {})

-            if not hiddenEvents.has_key(event.type):
-            #if listeners and not hiddenEvents.has_key(event.type) :
-                eventLog.info(pprinters[event.type](event))

             for listener in listeners.keys() :
                 listener(event)
 
             for listener in listeners.keys() :
                 listener(event)