From a6c2cfa172db0a0c6072fbee96b616f1f4ffcc4e Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Sun, 11 Sep 2011 08:52:04 +0200
Subject: [PATCH] warthog: add first aircraft specific overlay file

These files take complexity out of the main joystick file, while
not adding much code. They also update the description (<desc>)
used by the Help->Joystick information dialog. All <nasal> code
is executed in the joystick's namespace, so variables and funtions
of the main file (popup()) can be accessed.
---
 .../Joysticks/ThrustMaster/Warthog-Stick.xml  | 18 +++++-----
 .../ThrustMaster/Warthog-Throttle.xml         | 18 +++++-----
 .../ThrustMaster/Warthog/Throttle/harrier.xml | 35 +++++++++++++++++++
 3 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml

diff --git a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
index 7cc8db36d..416f43c6f 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
@@ -27,11 +27,6 @@
 				}
 			}
 
-			load_overlay("generic.xml");
-			if (is_helicopter)
-				load_overlay("helicopter.xml");
-			load_overlay(getprop("/sim/aircraft") ~ ".xml");
-
 			foreach (var b; this.getChildren("button")) {
 				if (b.getAttribute("children") == 1) {
 					var name = b.getNode("name", 1).getValue() or "??";
@@ -44,13 +39,18 @@
 			setlistener(_, func(n) mod = n.getValue());
 
 			var trimstep = 0.75;
+
+			load_overlay("generic.xml");
+			if (is_helicopter)
+				load_overlay("helicopter.xml");
+			load_overlay(getprop("/sim/aircraft") ~ ".xml");
 		</script>
 	</nasal>
 
 	<axis n="0">
 		<name>X-axis</name>
 		<desc>aileron</desc>
-		<tolerance>0.0001</tolerance>
+		<tolerance>0.00001</tolerance>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/aileron</property>
@@ -60,7 +60,7 @@
 	<axis n="1">
 		<name>Y-axis</name>
 		<desc>elevator</desc>
-		<tolerance>0.0001</tolerance>
+		<tolerance>0.00001</tolerance>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/elevator</property>
@@ -127,7 +127,7 @@
 	</axis>
 
 	<button n="0">
-		<name>Trigger Button 1</name>
+		<name>Trigger Button/Half Pushed</name>
 		<desc>gun trigger stage 1</desc>
 		<binding>
 			<command>nasal</command>
@@ -171,7 +171,7 @@
 	</button>
 
 	<button n="5">
-		<name>Trigger Button 2</name>
+		<name>Trigger Button/Fully Pushed</name>
 		<desc>gun trigger stage 2</desc>
 		<binding>
 			<command>nasal</command>
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
index c9c83465c..c535f1589 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
@@ -27,11 +27,6 @@
 				}
 			}
 
-			load_overlay("generic");
-			if (is_helicopter)
-				load_overlay("helicopter");
-			load_overlay(getprop("/sim/aircraft"));
-
 			foreach (var b; this.getChildren("button")) {
 				if (b.getAttribute("children") == 1) {
 					var name = b.getNode("name", 1).getValue() or "??";
@@ -51,6 +46,11 @@
 				var t = viewdir[i].getNode("type");
 				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
 			}
+
+			load_overlay("generic.xml");
+			if (is_helicopter)
+				load_overlay("helicopter.xml");
+			load_overlay(getprop("/sim/aircraft") ~ ".xml");
 		</script>
 	</nasal>
 
@@ -94,8 +94,8 @@
 
 	<axis n="2">
 		<name>Right Throttle</name>
-		<desc>right throttle (odd engines)</desc>
-		<tolerance>0.0001</tolerance>
+		<desc>right throttle</desc>
+		<tolerance>0.00001</tolerance>
 		<binding>
 			<command>nasal</command>
 			<script>controls.perEngineSelectedAxisHandler(0)(right_engines)</script>
@@ -104,13 +104,13 @@
 
 	<axis n="3">
 		<name>Left Throttle</name>
-		<desc>left throttle (even engines)</desc>
+		<desc>left throttle</desc>
 		<number>
 			<unix>3</unix>
 			<mac>3</mac>
 			<windows>5</windows>
 		</number>
-		<tolerance>0.0001</tolerance>
+		<tolerance>0.00001</tolerance>
 		<binding>
 			<command>nasal</command>
 			<script>controls.perEngineSelectedAxisHandler(0)(left_engines)</script>
diff --git a/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml b/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
new file mode 100644
index 000000000..2d1921b70
--- /dev/null
+++ b/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- left throttle: control thrust vector -->
+
+<PropertyList>
+	<nasal>
+		<script>
+			var thrust_display = func {
+				var thv = getprop("/controls/engines/engine[0]/mixture");
+				popup("Thrust vector " ~ int(thv * 120 - 20 + 0.5));
+			}
+		</script>
+	</nasal>
+
+	<axis n="2">
+		<name>Right Throttle</name>
+		<desc>throttle</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.throttleAxis()</script>
+		</binding>
+	</axis>
+
+	<axis n="3">
+		<name>Left Throttle</name>
+		<desc>thrust vector</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				controls.mixtureAxis();
+				thrust_display();
+			</script>
+		</binding>
+	</axis>
+</PropertyList>