avancement sur cursors.

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 955a3ab..09b9550 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -9,6 +9,7 @@ $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 math import floor
 import types
 # TODO : positionner cette constance en fonction de la résolution d'affichage
 from math import floor
 import types
 # TODO : positionner cette constance en fonction de la résolution d'affichage


@@ -23,9 +24,9 @@ ON_SATURATION = 1
 ON_COLUMN_OVERSIZING = 1.5
 
 
 ON_COLUMN_OVERSIZING = 1.5
 
 

-def rename_method(newName) :
+def event_handler(eventType) :

     def doRename(m) :
     def doRename(m) :

-        m.__name__ = newName
+        m.__name__ = 'eventHandler%s' % eventType

         return m
     return doRename
 
         return m
     return doRename
 


@@ -54,9 +55,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()

             
     
     
             
     
     


@@ -94,7 +98,11 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
             print hue
             c = Column(hue, rect)
             self.add(c)
             print hue
             c = Column(hue, rect)
             self.add(c)

-            
+    
+    def _initCursor(self) :
+        self.cursor = WarpingCursor()
+        #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()) :


@@ -113,7 +121,7 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
         handler(event)
     
         handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
         handler(event)
     

-    @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 +129,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