workarrund bug pygame.

[minwii.git] / src / app / widgets / playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 955a3ab..cf4b0ae 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -9,41 +9,23 @@ $URL$
 import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients
 import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients

+from cursors import WarpingCursor
+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.
 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
 ON_TOP_LUMINANCE = 0.6
 ON_BOTTOM_LUMINANCE = 0.9
 ON_SATURATION = 1
 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
 OFF_SATURATION = 1
 ON_TOP_LUMINANCE = 0.6
 ON_BOTTOM_LUMINANCE = 0.9
 ON_SATURATION = 1

-ON_COLUMN_OVERSIZING = 1.5
+ON_COLUMN_OVERSIZING = 2

 
 
 
 

-def rename_method(newName) :
-    def doRename(m) :
-        m.__name__ = newName
-        return m
-    return doRename
-
-
-class MetaRenamer(type):
-    def __new__(mcs, name, bases, dict) :
-        for k, v in dict.items() :
-            if isinstance(v, types.FunctionType) :
-                if k != v.__name__ :
-                    print 'renommage de %s en %s' % (k, v.__name__)
-                    dict[v.__name__] = v
-                    del dict[k]
-        return type.__new__(mcs, name, bases, dict)
-
-
-class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
-
-    __metaclass__ = MetaRenamer
+class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :

 
     def __init__(self, distinctNotes=[]) :
         """
 
     def __init__(self, distinctNotes=[]) :
         """


@@ -54,9 +36,12 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []

+        self.cursor = None

         self._initRects()
         self._initColumns()
         self._running = False
         self._initRects()
         self._initColumns()
         self._running = False

+        self.draw(pygame.display.get_surface())
+        self._initCursor()

             
     
     
             
     
     


@@ -91,10 +76,13 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
         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)
             c = Column(hue, rect)
             self.add(c)

-            
+    
+    def _initCursor(self) :
+        self.cursor = WarpingCursor(blinkMode=True)
+        self.add(self.cursor)
+        

         
     def highlightColumn(self, index) :
         for i, sprite in enumerate(self.sprites()) :
         
     def highlightColumn(self, index) :
         for i, sprite in enumerate(self.sprites()) :


@@ -103,17 +91,15 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
     
     def run(self):
         self._running = True
     
     def run(self):
         self._running = True

+        clock = pygame.time.Clock()
+        pygame.display.flip()

         while self._running :
         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)

     
     

-    @rename_method('eventHandler%s' % pygame.KEYDOWN)       
+    @event_handler(pygame.KEYDOWN)       

     def handleKeyDown(self, event) :
         if event.key == pygame.K_q:
             self._running = False
     def handleKeyDown(self, event) :
         if event.key == pygame.K_q:
             self._running = False


@@ -121,6 +107,10 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         
         if uni.isdigit() and int(uni) <=8 :
             self.highlightColumn(int(uni))
         
         if uni.isdigit() and int(uni) <=8 :
             self.highlightColumn(int(uni))

+    
+    @event_handler(pygame.MOUSEMOTION)
+    def handleMouseMotion(self, event) :
+        pass

         
         
     
         
         
     


@@ -139,7 +129,7 @@ class SongPlayingScreenTest(_PlayingScreenBase) :
         super(SongPlayingScreenTest, self).__init__([o])
     
 
         super(SongPlayingScreenTest, self).__init__([o])
     
 

-class Column(pygame.sprite.Sprite) :
+class Column(pygame.sprite.Sprite, EventHandlerMixin) :

     
     def __init__(self, hue, rect) :
         pygame.sprite.Sprite.__init__(self)
     
     def __init__(self, hue, rect) :
         pygame.sprite.Sprite.__init__(self)


@@ -151,7 +141,8 @@ class Column(pygame.sprite.Sprite) :
         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)
         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)

-        rectOn = rect.inflate(ON_COLUMN_OVERSIZING * rect.width, 0)
+        rectOn = pygame.Rect((rect.left - rect.width/2, 0),
+                             (rect.width * ON_COLUMN_OVERSIZING, rect.height))

         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         self.rectOn = rectOn
         
         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         self.rectOn = rectOn
         


@@ -165,6 +156,15 @@ class Column(pygame.sprite.Sprite) :
         else :
             self.image = self.stateOff
             self.rect = self.rectOff
         else :
             self.image = self.stateOff
             self.rect = self.rectOff

+    
+    @event_handler(pygame.MOUSEBUTTONDOWN)
+    def onMouseDown(self, event) :
+        if self.rect.collidepoint(*event.pos) :
+            self.update(True)
+
+    @event_handler(pygame.MOUSEBUTTONUP)
+    def onMouseUp(self, event) :
+        self.update(False)

         
 def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255
         
 def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255