Encore un coup pour préparer la personalisation du comportement des wiimotes.

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

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index 8a4f6e0..7680581 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,9 +53,10 @@ 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)
+                    for i in range(self.nmotes) :
+                        m = self.wiimotes[i]
+                        if m[0].event == wiiuse.EVENT:
+                            self.eventCallBack(self, i, m)
             except :
                 pass
                 
@@ -60,7 +65,6 @@ class wiimote_thread(Thread):
                     func, args = self.queue.get_nowait()
                 except Empty:
                     break
-                print 'do:', func.__name__, args
                 func(*args)
     
     def pause(self) :
@@ -74,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'''
@@ -122,25 +102,62 @@ class wiimote_thread(Thread):
             wiiuse.disconnect(self.wiimotes[i])
         self.go = False
 
+    def get_count(self):
+        return self.actual_nmotes
+
+
+def _default_event_cb(self, id, wmp):
+    '''Called when the library has some data for the user.'''
+    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)
+
+
+
 WT = None
 
-def init(nmotes, timeout, screenResolution=(660, 370)):
+def init(nmotes, timeout, screenResolution=(660, 370), position='ABOVE'):
     '''Initialize the module.'''
     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
+    
+    
     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=wiiuse.IR_BELOW)
+        wm.enable_ir(1, vres = screenResolution, position=position)
 
 
 def get_count():
     '''How many Wiimotes were found?'''
-    return WT.actual_nmotes
+    return WT.get_count()
 
 def quit():
     '''Gracefully shutdown the connection and turn off the wiimote leds'''
@@ -192,7 +209,6 @@ class wiimote(object):
                 enable |= wiiuse.ORIENT_THRESH
             else:
                 disable |= wiiuse.ORIENT_THRESH
-        print enable, disable
         WT.do(wiiuse.set_flags, self.wm, enable, disable)
 
     def set_orient_thresh(self, thresh):