cleanup.

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

diff --git a/src/app/widgets/cursors.py b/src/app/widgets/cursors.py
index 863b757..c8df104 100755 (executable)
--- a/src/app/widgets/cursors.py
+++ b/src/app/widgets/cursors.py
@@ -8,11 +8,12 @@ $URL$
 
 import pygame
 import os
 
 import pygame
 import os

+from threading import Thread
+import time

 from eventutils import EventHandlerMixin, event_handler
 from eventutils import EventHandlerMixin, event_handler

-from events import TIMEOUT

 from itertools import cycle
 
 from itertools import cycle
 

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

     '''
     The class for animating the warping cursor
     '''
     '''
     The class for animating the warping cursor
     '''


@@ -20,7 +21,7 @@ class WarpingCursor(pygame.sprite.Sprite, EventHandlerMixin):
     @staticmethod
     def _get_theme_images(name) :
         basePath = os.path.abspath(__file__).split(os.path.sep)[:-1]
     @staticmethod
     def _get_theme_images(name) :
         basePath = os.path.abspath(__file__).split(os.path.sep)[:-1]

-        basePath.append('data')
+        basePath.extend(['data', 'cursor'])

         basePath.append(name)
         basePath = os.path.sep.join(basePath)
         images = [f for f in os.listdir(basePath) if os.path.splitext(f)[1] == '.png']
         basePath.append(name)
         basePath = os.path.sep.join(basePath)
         images = [f for f in os.listdir(basePath) if os.path.splitext(f)[1] == '.png']


@@ -28,8 +29,7 @@ class WarpingCursor(pygame.sprite.Sprite, EventHandlerMixin):
 
     
     def __init__(self, theme='black', duration=50, blinkMode=True):
 
     
     def __init__(self, theme='black', duration=50, blinkMode=True):

-        pygame.sprite.Sprite.__init__(self)
-        pygame.mouse.set_visible(False)
+        pygame.sprite.DirtySprite.__init__(self)

         imagesPath, images = WarpingCursor._get_theme_images(theme)
         flashImage = images.pop(images.index('flash.png'))
         flashImagePath = os.path.sep.join([imagesPath, flashImage]) 
         imagesPath, images = WarpingCursor._get_theme_images(theme)
         flashImage = images.pop(images.index('flash.png'))
         flashImagePath = os.path.sep.join([imagesPath, flashImage]) 


@@ -48,39 +48,83 @@ class WarpingCursor(pygame.sprite.Sprite, EventHandlerMixin):
         self.duration = duration
         
         self.image = self.images[0]
         self.duration = duration
         
         self.image = self.images[0]

-        self.rect = pygame.Rect((-self.width/2,-self.height/2), (self.width, self.height))
+        # workarround cursor alignement problem
+        pygame.event.set_blocked(pygame.MOUSEMOTION)
+        pygame.mouse.set_pos(pygame.mouse.get_pos())
+        pygame.event.set_allowed(pygame.MOUSEMOTION)
+        # ---
+        x, y = pygame.mouse.get_pos()
+        left = x - self.width / 2
+        top = y - self.height / 2
+        self.rect = pygame.Rect((left, top), (self.width, self.height))

         
         self.blinkMode = blinkMode
         self._startBlink()
         
         self.blinkMode = blinkMode
         self._startBlink()

-            
+    
+    def __del__(self) :
+        if hasattr(self, 'timer') :
+            try : self.timer.stop()
+            except : pass
+    

     def _startBlink(self) :
         if self.blinkMode :
             self._blinking = True
     def _startBlink(self) :
         if self.blinkMode :
             self._blinking = True

-            pygame.time.set_timer(TIMEOUT, self.duration)

             self.iterator = self.iterImages()
             self.iterator = self.iterImages()

+            self.timer = ForeverTimer(self.duration, self.loadNext)
+            self.timer.start()

     
     

+    def _stopBlink(self) :
+        if self.blinkMode :
+            self.timer.stop()
+            

     def iterImages(self) :
         for img in cycle(self.images) :
             yield img
     
     def iterImages(self) :
         for img in cycle(self.images) :
             yield img
     

-    @event_handler(TIMEOUT)
-    def loadNext(self, event) :
+    def loadNext(self) :

         if self._blinking :
         if self._blinking :

+            self.dirty = 1

             self.image = self.iterator.next()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
     def flashOn(self, event) :
             self.image = self.iterator.next()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
     def flashOn(self, event) :

+        self.dirty = 1

         self._blinking = False
         self.image = self.flashImage
 
     @event_handler(pygame.MOUSEBUTTONUP)
     def flashOff(self, event) :
         self._blinking = False
         self.image = self.flashImage
 
     @event_handler(pygame.MOUSEBUTTONUP)
     def flashOff(self, event) :

+        self.dirty = 1

         if self.blinkMode :
             self._blinking = True
         if self.blinkMode :
             self._blinking = True

-            self.loadNext(event)

         else :
             self.image = self.images[0]
     
     @event_handler(pygame.MOUSEMOTION)
     def move(self, event) :
         else :
             self.image = self.images[0]
     
     @event_handler(pygame.MOUSEMOTION)
     def move(self, event) :

+        self.dirty = 1

         self.rect.move_ip(event.rel)
         self.rect.move_ip(event.rel)

+    
+    def setPosition(self, pos) :
+        self.dirty = 1
+        x, y = pos
+        rx, ry = self.rect.centerx, self.rect.centery
+        self.rect.move_ip(x-rx, y-ry)
+
+
+class ForeverTimer(Thread) :
+    def __init__(self, duration, func, *args, **kw) :
+        Thread.__init__(self)
+        self.duration = duration / 1000.
+        self.func = func
+        self.args = args
+        self.kw = kw
+        self.running = True
+
+    def run(self) :
+        while self.running :
+            self.func(*self.args, **self.kw)
+            time.sleep(self.duration)
+    
+    def stop(self) :
+        self.running = False
\ No newline at end of file