X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/a1cb64098e2a34d115378fdced1044da37e94395..1949ce08d8bd0e485280de3039c1c103522d7c2d:/src/app/widgets/playingscreen.py?ds=inline

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 23f2643..146e549 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -10,12 +10,12 @@ import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients
 from cursors import WarpingCursor
-from eventutils import event_handler, EventHandlerMixin
+from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from math import floor
 import types
 # TODO : positionner cette constance en fonction de la résolution d'affichage
 # externaliser la conf.
-BORDER = 5 # 5px
+BORDER = 0 # 5px
 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
 OFF_SATURATION = 1
@@ -76,13 +76,12 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
-            print hue
             c = Column(hue, rect)
             self.add(c)
     
     def _initCursor(self) :
         self.cursor = WarpingCursor()
-        #self.add(self.cursor)
+        self.add(self.cursor)
         
         
     def highlightColumn(self, index) :
@@ -92,15 +91,13 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
     
     def run(self):
         self._running = True
+        clock = pygame.time.Clock()
+        pygame.display.flip()
         while self._running :
-            pygame.display.flip()
-            events = pygame.event.get()
-            for event in events:
-                self.input(event)
-
-    def input(self, event) :
-        handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
-        handler(event)
+            EventDispatcher.dispatchEvents()
+            dirty = self.draw(pygame.display.get_surface())
+            pygame.display.update(dirty)
+            clock.tick(50)
     
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :