Amélioration cosmétique.

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

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index 835bff8..013d91b 100755 (executable)
--- a/src/pywiiuse/pygame_wiimouse.py
+++ b/src/pywiiuse/pygame_wiimouse.py
@@ -17,18 +17,24 @@ wiiuse = None # import within the thread, why do I have to do this?
 
 class wiimote_thread(Thread):
     '''Manage the wiiuse interface'''
 
 class wiimote_thread(Thread):
     '''Manage the wiiuse interface'''

-    def __init__(self, nmotes=1, timeout=5):
+    
+    def __init__(self, nmotes=1, timeout=5, screenResolution=(660, 370), position='ABOVE'):

         Thread.__init__(self, name='wiimote')
         self.queue = Queue()
         self.startup = Queue()
         self.nmotes = nmotes
         Thread.__init__(self, name='wiimote')
         self.queue = Queue()
         self.startup = Queue()
         self.nmotes = nmotes

-        self.selectedWiimoteIndex = 0

         self.timeout = timeout
         self.timeout = timeout

+        self.screenResolution = screenResolution
+        self.position = position
+        self.selectedWiimoteIndex = 0

         self.setDaemon(1)
         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
         self.setDaemon(1)
         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'''
 
     def run(self):
         '''This runs in a separate thread'''


@@ -38,9 +44,19 @@ class wiimote_thread(Thread):
         found = wiiuse.find(self.wiimotes, self.nmotes, self.timeout)
         self.actual_nmotes = wiiuse.connect(self.wiimotes, self.nmotes)
         
         found = wiiuse.find(self.wiimotes, self.nmotes, self.timeout)
         self.actual_nmotes = wiiuse.connect(self.wiimotes, self.nmotes)
         

-
-        for i in range(self.nmotes):
-            wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+        
+        if self.nmotes <= 4 :
+            for i in range(self.nmotes):
+                wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+        else :
+            for i in range(4):
+                wiiuse.set_leds(self.wiimotes[i], wiiuse.LED[i])
+
+            if self.nmotes == 5 :
+                wiiuse.set_leds(self.wiimotes[4], wiiuse.LED_1 | wiiuse.LED_4)
+            if self.nmotes == 6 :
+                wiiuse.set_leds(self.wiimotes[4], wiiuse.LED_1 | wiiuse.LED_4)
+                wiiuse.set_leds(self.wiimotes[5], wiiuse.LED_1 | wiiuse.LED_2 | wiiuse.LED_3 | wiiuse.LED_4)

 
         self.go = self.actual_nmotes != 0
 
 
         self.go = self.actual_nmotes != 0
 


@@ -54,8 +70,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:


@@ -72,6 +88,23 @@ class wiimote_thread(Thread):
     
     def selectWiimote(self, wiimoteIndex) :
         self.selectedWiimoteIndex = wiimoteIndex
     
     def selectWiimote(self, wiimoteIndex) :
         self.selectedWiimoteIndex = wiimoteIndex

+        for i in range(self.actual_nmotes) :
+            wm = self.wiimotes[i]
+            if i == wiimoteIndex :
+                self.do(wiiuse.set_ir, wm, 1)
+                self.do(wiiuse.set_ir_vres, wm, *self.screenResolution)
+                if self.position == 'ABOVE' :
+                    position = wiiuse.IR_ABOVE
+                elif self.position == 'BELOW' :
+                    position = wiiuse.IR_BELOW
+                else :
+                    position = wiiuse.IR_ABOVE
+                self.do(wiiuse.set_ir_position, wm, position)
+                # TODO aspect ratio
+                #self.do(wiiuse.set_aspect_ratio, wm, aspect)
+                
+            else :
+                self.do(wiiuse.set_ir, wm, 0)

 
     def do(self, func, *args):
         '''Run the function in the thread handling the wiimote'''
 
     def do(self, func, *args):
         '''Run the function in the thread handling the wiimote'''


@@ -104,7 +137,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)


@@ -126,6 +159,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


@@ -135,21 +210,14 @@ def init(nmotes, timeout, screenResolution=(660, 370), position='ABOVE'):
     global WT
     if WT:
         return
     global WT
     if WT:
         return

-    WT = wiimote_thread(nmotes, timeout)
-    
-    if position == 'ABOVE' :
-        position = wiiuse.IR_ABOVE
-    elif position == 'BELOW' :
-        position = wiiuse.IR_BELOW
-    else :
-        position = wiiuse.IR_ABOVE

     
     

+    WT = wiimote_thread(nmotes, timeout, screenResolution, position)

     
     nmotes = get_count()
     for i in range(nmotes) :
         wm = Wiimote(i) # access the wiimote object
         wm.enable_accels(0) # turn off acceleration reporting
     
     nmotes = get_count()
     for i in range(nmotes) :
         wm = Wiimote(i) # access the wiimote object
         wm.enable_accels(0) # turn off acceleration reporting

-        wm.enable_ir(1, vres = screenResolution, position=position)
+        #wm.enable_ir(1, vres = screenResolution, position=position)

 
 
 def get_count():
 
 
 def get_count():