X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/62d5191553d75c84d63ace49f6f5173a35773c88..73afe12f27b72efbe72bfa4d8b1bf9c958f38a6e:/src/app/eventutils.py diff --git a/src/app/eventutils.py b/src/app/eventutils.py index 3ce142d..9a7dd18 100755 --- a/src/app/eventutils.py +++ b/src/app/eventutils.py @@ -29,18 +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 event_pprinters import pprinters +from log import console, eventLogger, hiddenEvents, pprinters class _EventDispatcher : def __init__(self) : @@ -62,8 +51,8 @@ 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(pprinters[event.type](event)) + if not hiddenEvents.has_key(event.type): + eventLogger.info(event) for listener in listeners.keys() : listener(event)