X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/b45441266b72222f09df4deecd8983ede64b8867..6b6e319a83b80bb127e82b5c8c3e63b422e36c56:/src/pywiiuse/pygame_wiimouse.py?ds=inline

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index 2c5911c..55a9c99 100755
--- a/src/pywiiuse/pygame_wiimouse.py
+++ b/src/pywiiuse/pygame_wiimouse.py
@@ -22,6 +22,7 @@ class wiimote_thread(Thread):
         self.queue = Queue()
         self.startup = Queue()
         self.nmotes = nmotes
+        self.selectedWiimoteIndex = 0
         self.timeout = timeout
         self.setDaemon(1)
         self._paused = False
@@ -48,25 +49,17 @@ class wiimote_thread(Thread):
             if self._paused : continue
             try :
                 if wiiuse.poll(self.wiimotes, self.nmotes) :
-                    for i in range(self.nmotes):
-                        m = self.wiimotes[i]
-                        if m[0].event == wiiuse.EVENT:
-                            self.event_cb(m)
+                    m = self.wiimotes[self.selectedWiimoteIndex]
+                    if m[0].event == wiiuse.EVENT:
+                        self.event_cb(m)
             except :
                 pass
                 
-            #try:
-            #    wiiuse.poll(self.wiimotes, self.nmotes)
-            #except:
-            #    pass
-
-            # allow executing functions in this thread
             while True:
                 try:
                     func, args = self.queue.get_nowait()
                 except Empty:
                     break
-                print 'do:', func.__name__, args
                 func(*args)
     
     def pause(self) :
@@ -74,6 +67,9 @@ class wiimote_thread(Thread):
     
     def resume(self) :
         self._paused = False
+    
+    def selectWiimote(self, wiimoteIndex) :
+        self.selectedWiimoteIndex = wiimoteIndex
 
     def do(self, func, *args):
         '''Run the function in the thread handling the wiimote'''
@@ -82,7 +78,26 @@ class wiimote_thread(Thread):
     def event_cb(self, wmp):
         '''Called when the library has some data for the user.'''
         wm = wmp[0]
-        pygame.mouse.set_pos((wm.ir.x, wm.ir.y))
+        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 control_cb(self, wmp, attachment, speaker, ir, led, battery):
         '''Could check the battery level and such here'''
@@ -106,18 +121,29 @@ class wiimote_thread(Thread):
             wiiuse.disconnect(self.wiimotes[i])
         self.go = False
 
+    def get_count(self):
+        return self.actual_nmotes
+
+
 WT = None
 
-def init(nmotes, timeout):
+def init(nmotes, timeout, screenResolution=(660, 370)):
     '''Initialize the module.'''
     global WT
     if WT:
         return
     WT = wiimote_thread(nmotes, timeout)
+    
+    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_ABOVE)
+
 
 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'''
@@ -169,7 +195,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):