From 5d2316442ba79593ff59954d8024b19433ea4f19 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sat, 24 Jun 2006 18:18:01 +0000
Subject: [PATCH] - use cmdarg().getParent() to access own property root - use
 kbd-ctrl combinations for weapon control (at least one js in cvs   should
 demonstrate that :-)

---
 Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
index a418f88c8..0e13610dc 100644
--- a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
+++ b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
@@ -38,6 +38,16 @@ When flying the Harrier, "F3/hat left" and "right" control the thrust vector.
 
 
 
+With the keyboard's Control key pressed, the following keys have a different meaning:
+
+Control +            no modifier
+                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+button 0 (trigger):  trigger selected weapon
+button 1 (left):     switch to previous weapon system
+button 3 (right):    switch to next weapobn system
+
+
+
 ___________________________________ Customization ____________________________________
 
 
@@ -102,11 +112,16 @@ ________________________________________________________________________________
 
 	<nasal>
 		<script><![CDATA[
-			data = props.globals.getNode(this).getNode("data");
+			data = cmdarg().getParent().getNode("data");
 			mode = data.getNode("mode");
 			modifier = data.getNode("modifier");
 			f1 = f2 = 0;
 			left_brake = right_brake = 0;
+			trigger = 0;
+
+			kbdshift = props.globals.getNode("/devices/status/keyboard/shift", 1);
+			kbdctrl = props.globals.getNode("/devices/status/keyboard/ctrl", 1);
+			kbdalt = props.globals.getNode("/devices/status/keyboard/alt", 1);
 
 			get_mode = func { modifier.getValue() + mode.getValue() * 4 }
 
@@ -175,7 +190,11 @@ ________________________________________________________________________________
 			<script>
 				m = get_mode();
 				if (m == 0) {
-					controls.applyBrakes(1);
+					if (kbdctrl.getBoolValue()) {
+						controls.trigger(trigger = 1);
+					} else {
+						controls.applyBrakes(1);
+					}
 				} elsif (m == 1) {
 					controls.applyBrakes(1);
 				} elsif (m == 2) {
@@ -191,6 +210,11 @@ ________________________________________________________________________________
 				<script>
 					m = get_mode();
 					if (m == 0) {
+						if (trigger) {
+							controls.trigger(trigger = 0);
+						} else {
+							controls.applyBrakes(0);
+						}
 						controls.applyBrakes(0);
 					} elsif (m == 1) {
 						i = controls.applyParkingBrake(1);
@@ -218,7 +242,11 @@ ________________________________________________________________________________
 			<script>
 				m = get_mode();
 				if (m == 0) {
-					controls.flapsDown(-1);
+					if (kbdctrl.getBoolValue()) {
+						controls.weaponSelect(-1);
+					} else {
+						controls.flapsDown(-1);
+					}
 				} elsif (m == 1) {
 					controls.gearDown(-1);
 				} elsif (m == 2) {
@@ -280,7 +308,11 @@ ________________________________________________________________________________
 			<script>
 				m = get_mode();
 				if (m == 0) {
-					controls.flapsDown(1);
+					if (kbdctrl.getBoolValue()) {
+						controls.weaponSelect(1);
+					} else {
+						controls.flapsDown(1);
+					}
 				} elsif (m == 1) {
 					controls.gearDown(1);
 				} elsif (m == 2) {