bugfix

[minwii.git] / src / pywiiuse / pygame_wiimouse.py

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index f77856c..3328eff 100755 (executable)
--- a/src/pywiiuse/pygame_wiimouse.py
+++ b/src/pywiiuse/pygame_wiimouse.py
@@ -28,6 +28,10 @@ class wiimote_thread(Thread):
         self._paused = False
         self.start()
         self.startup.get(True) # wait for the thread to get started and acquire the motes
+        self.eventCallBack = _default_event_cb
+    
+    def setEventCallBack(self, func) :
+        self.eventCallBack = func
 
     def run(self):
         '''This runs in a separate thread'''
@@ -49,11 +53,12 @@ class wiimote_thread(Thread):
             if self._paused : continue
             try :
                 if wiiuse.poll(self.wiimotes, self.nmotes) :
-                    m = self.wiimotes[self.selectedWiimoteIndex]
-                    if m[0].event == wiiuse.EVENT:
-                        self.event_cb(m)
-            except :
-                pass
+                    for i in range(self.nmotes) :
+                        m = self.wiimotes[i]
+                        if m[0].event == wiiuse.EVENT:
+                            self.eventCallBack(self, i, m)
+            except Exception, e:
+                print e
                 
             while True:
                 try:
@@ -73,31 +78,7 @@ class wiimote_thread(Thread):
 
     def do(self, func, *args):
         '''Run the function in the thread handling the wiimote'''
-        self.queue.put((func, args))
-
-    def event_cb(self, wmp):
-        '''Called when the library has some data for the user.'''
-        wm = wmp[0]
-        pos = (wm.ir.x, wm.ir.y)
-        pygame.mouse.set_pos(pos)
-        
-        eventType = None
-
-        if wm.btns and \
-            wiiuse.is_just_pressed(wm, wiiuse.button['B']) :
-                event = pygame.event.Event(pygame.MOUSEBUTTONDOWN,
-                                           pos = pos,
-                                           button = 1)
-                pygame.event.post(event)
-
-        if wm.btns_released and \
-            wiiuse.is_released(wm, wiiuse.button['B']):
-                event = pygame.event.Event(pygame.MOUSEBUTTONUP,
-                                           pos = pos,
-                                           button = 1)
-                pygame.event.post(event)
-                    
-                    
+        self.queue.put((func, args))                    
 
     def control_cb(self, wmp, attachment, speaker, ir, led, battery):
         '''Could check the battery level and such here'''
@@ -125,6 +106,73 @@ class wiimote_thread(Thread):
         return self.actual_nmotes
 
 
+def _default_event_cb(self, id, wmp):
+    ''' default callback that emulate a one button mouse '''
+    if id != self.selectedWiimoteIndex : return
+    wm = wmp[0]
+    pos = (wm.ir.x, wm.ir.y)
+    pygame.mouse.set_pos(pos)
+
+    eventType = None
+
+    if wm.btns and \
+        wiiuse.is_just_pressed(wm, wiiuse.button['B']) :
+            event = pygame.event.Event(pygame.MOUSEBUTTONDOWN,
+                                       pos = pos,
+                                       button = 1)
+            pygame.event.post(event)
+
+    if wm.btns_released and \
+        wiiuse.is_released(wm, wiiuse.button['B']):
+            event = pygame.event.Event(pygame.MOUSEBUTTONUP,
+                                       pos = pos,
+                                       button = 1)
+            pygame.event.post(event)
+
+def _full_mouse_event_cb(self, id, wmp):
+    ''' callback that emulate a 2 buttons mouse with wheel '''
+    if id != self.selectedWiimoteIndex : return
+    wm = wmp[0]
+    pos = (wm.ir.x, wm.ir.y)
+    pygame.mouse.set_pos(pos)
+
+    eventType = None
+
+    if wm.btns :
+        button = 0
+        if wiiuse.is_just_pressed(wm, wiiuse.button['B']) :
+            button = 1
+        elif wiiuse.is_just_pressed(wm, wiiuse.button['A']) :
+            button = 2
+        elif wiiuse.is_just_pressed(wm, wiiuse.button['Up']) :
+            button = 4
+        elif wiiuse.is_just_pressed(wm, wiiuse.button['Down']) :
+            button = 5
+
+        if button :
+            event = pygame.event.Event(pygame.MOUSEBUTTONDOWN,
+                                       pos = pos,
+                                       button = button)
+            pygame.event.post(event)
+
+    if wm.btns_released :
+        button = 0
+        if wiiuse.is_released(wm, wiiuse.button['B']) :
+            button = 1
+        elif wiiuse.is_released(wm, wiiuse.button['A']) :
+            button = 2
+        elif wiiuse.is_released(wm, wiiuse.button['Up']) :
+            button = 4
+        elif wiiuse.is_released(wm, wiiuse.button['Down']) :
+            button = 5
+        
+        if button :
+            event = pygame.event.Event(pygame.MOUSEBUTTONUP,
+                                       pos = pos,
+                                       button = button)
+            pygame.event.post(event)
+
+
 WT = None
 
 def init(nmotes, timeout, screenResolution=(660, 370), position='ABOVE'):