début de pprint des événements.

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

diff --git a/src/app/eventutils.py b/src/app/eventutils.py
index 1172794..3ce142d 100755 (executable)
--- a/src/app/eventutils.py
+++ b/src/app/eventutils.py
@@ -31,8 +31,16 @@ import pygame
 from StringIO import StringIO
 from logging import getLogger, basicConfig, DEBUG
 import sys
 from StringIO import StringIO
 from logging import getLogger, basicConfig, DEBUG
 import sys

+from events import TIMEOUT, COLOVER, eventNames

 basicConfig(level=DEBUG, stream = sys.stdout)
 basicConfig(level=DEBUG, stream = sys.stdout)

-console = getLogger('minwii.eventutils')
+console = getLogger('minwii')
+eventLog = getLogger('minwii.events')
+
+hiddenEvents = {pygame.MOUSEMOTION:True,
+                TIMEOUT:True,
+                #COLOVER:True,
+                }
+from event_pprinters import pprinters

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


@@ -54,6 +62,8 @@ class _EventDispatcher :
         events = pygame.event.get()
         for event in events :
             listeners = self.registry.get(event.type, {})
         events = pygame.event.get()
         for event in events :
             listeners = self.registry.get(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)
 


@@ -105,8 +115,3 @@ class EventInitializer(type):
 
 class EventHandlerMixin(object) :
     __metaclass__ = EventInitializer
 
 class EventHandlerMixin(object) :
     __metaclass__ = EventInitializer

-    
-    #def input(self) :
-    #    event = pygame.event.wait()
-    #    handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
-    #    handler(event)