add left handed mouse for in-falcon control, rework module syn/exit

git-svn-id: https://fscode.googlecode.com/svn/trunk@447 400e30b4-3047-0410-9b5d-373f348d38bd

Author: nils.meier@gmail.com

modules/falcon.py

@@ -101,9 +101,6 @@ class FLIGHTDATA(ctypes.Structure):
 _pFlightData2 = None
 _pOSBData = None
 
-def sync(): 
-    pass
-
 def getFlightData():
 
     global _pFlightData

modules/keyboard.py

@@ -227,8 +227,6 @@ def isDown(c):
 def isToggled(c):
     return bool(ctypes.windll.user32.GetKeyState(c) & 0x0001)    
 
-def sync():
-    pass
 
 
 

modules/log.py

@@ -19,5 +19,3 @@ def log(level, *args):
         frm = frm.f_back
     logging.getLogger(name).log(level, *args)
 
-def sync():
-    pass

modules/mouse.py

@@ -63,15 +63,26 @@ def lowLevelMouseProc(self, nCode, wParam, lParam):
 _hWheel = _Atomic(0)
 _wheel = _Atomic(0)
 _hook = _Hook()
+_mouseSwapped = False
 
+''' returns current vertical mouse wheel position '''
 def getWheel():
     return _wheel.set(0)
 
+''' returns current horizontal mouse wheel position '''
 def getHWheel():
     return _hWheel.set(0)
 
-def swapMouseButtons(leftIsRight):
-    return ctypes.windll.user32.SwapMouseButton(leftIsRight)
+''' swaps left and right mouse button for one cycle '''
+def swapMouseButtons():
+    global _mouseSwapped
+    _mouseSwapped = True
 
 def sync():
-    pass
+    global _mouseSwapped
+    ctypes.windll.user32.SwapMouseButton(_mouseSwapped)
+    _mouseSwapped = False
+
+def exit():
+    ctypes.windll.user32.SwapMouseButton(False)
+    

modules/state.py

@@ -84,9 +84,6 @@ def _init():
     __dict = dict()
     __holds = dict()
 
-def sync():
-    pass
-
 _init()
 
 

scripts/myfalcon.py

@@ -14,7 +14,7 @@
 #   Map Push Button into Button (Missile Uncage)
 #   Map Rotation into Axis (Missile Acquisition Sound Level)
 #
-import joysticks, phidgets, state, log, keyboard, falcon, time
+import joysticks, phidgets, state, log, keyboard, falcon, time, mouse
 
 # Throttle Quadrant
 CURSOR_WE_AXIS_OUT = 0
@@ -45,7 +45,6 @@
 OVERRIDE_DOG_BUTTON_OUT = 7
 OVERRIDE_HOLD_SECONDS = 0.1
 
-
 # sticks
 vjoy = joysticks.get('vJoy Device')
 combatstick = joysticks.get("CH Combatstick USB")
@@ -85,6 +84,9 @@
     flightData = falcon.getFlightData()
     if flightData.gearPos and flightData.vt>0: # might be taxiing w/brakes
         zoom = state.get("zoom")
+    
+    # if we're in Falcon we assume left handed mouse
+    mouse.swapMouseButtons()
 except:
     pass
 

simscript.py

@@ -215,6 +215,21 @@ def actions():
         for handle in filter(lambda n: n.endswith('.py'), os.listdir("scripts")):
             actions.append( (handle, None, script and os.path.basename(script.file)==handle, lambda f=handle: switch(f)) )
         return actions
+
+    def sync(mod):
+        try:
+            method = mod.sync
+        except AttributeError:
+            return
+        method()
+
+    def exit(mod):
+        try:
+            method = mod.exit
+        except AttributeError:
+            return
+        method()
+        
 
     tray = windows.TrayIcon("SimScript", os.path.abspath('simscript.ico'), actions) if windows else None
 
@@ -225,30 +240,33 @@ def actions():
         try:
 
             # take time                
-            sync = (time.clock()+(1.0/hertz))
+            next = (time.clock()+(1.0/hertz))
 
             # pump our threads messages
             if windows: windows.pumpMessages(False)
 
             # sync modules
-            for mod in modules: mod.sync()
+            for mod in modules:
+                sync(mod)
 
             # run script
             if script: script.run()
 
-            # sync time
-            wait = sync-time.clock()
+            # check time
+            wait = next-time.clock()
             if wait>=0 : 
                     time.sleep(wait)
             else:
-                log.info("%s executions took longer than sync frequency (%dms>%dms)" % ( script, (1.0/hertz-wait)*1000, 1.0/hertz*1000))
+                log.info("%s executions took longer than next frequency (%dms>%dms)" % ( script, (1.0/hertz-wait)*1000, 1.0/hertz*1000))
 
         except KeyboardInterrupt:
             log.info("Interrupted")
             active = False
 
     # Cleanup
     log.info("Exiting")
+    for mod in modules:
+        exit(mod) 
     tray.close()
     logfile.hide()