X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/f439fefd7ee0b44442268443f2fefb3d33a47fb8..b2d4a94dcd881e16c188b1efcb253f24873d8616:/src/app/eventutils.py?ds=inline diff --git a/src/app/eventutils.py b/src/app/eventutils.py index e45d5a3..c0aada5 100755 --- a/src/app/eventutils.py +++ b/src/app/eventutils.py @@ -29,16 +29,7 @@ $URL$ 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 log import console, eventLog, hiddenEvents, pprinters class _EventDispatcher : def __init__(self) : @@ -60,8 +51,9 @@ class _EventDispatcher : 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((eventNames.get(event.type, event.type), event)) + 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)