bugfix

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

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index 7680581..3328eff 100755 (executable)
--- a/src/pywiiuse/pygame_wiimouse.py
+++ b/src/pywiiuse/pygame_wiimouse.py
@@ -57,8 +57,8 @@ class wiimote_thread(Thread):
                         m = self.wiimotes[i]
                         if m[0].event == wiiuse.EVENT:
                             self.eventCallBack(self, i, m)
                         m = self.wiimotes[i]
                         if m[0].event == wiiuse.EVENT:
                             self.eventCallBack(self, i, m)

-            except :
-                pass
+            except Exception, e:
+                print e

                 
             while True:
                 try:
                 
             while True:
                 try:


@@ -107,7 +107,7 @@ class wiimote_thread(Thread):
 
 
 def _default_event_cb(self, id, wmp):
 
 
 def _default_event_cb(self, id, wmp):

-    '''Called when the library has some data for the user.'''
+    ''' default callback that emulate a one button mouse '''

     if id != self.selectedWiimoteIndex : return
     wm = wmp[0]
     pos = (wm.ir.x, wm.ir.y)
     if id != self.selectedWiimoteIndex : return
     wm = wmp[0]
     pos = (wm.ir.x, wm.ir.y)


@@ -129,6 +129,48 @@ def _default_event_cb(self, id, wmp):
                                        button = 1)
             pygame.event.post(event)
 
                                        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
 
 
 WT = None