From 7922658b2208aac38f60d9b5abb269644a6c0ee2 Mon Sep 17 00:00:00 2001
From: BARANGER Emmanuel <embaranger@free.fr>
Date: Thu, 8 Sep 2011 02:07:44 +0200
Subject: [PATCH 01/15] Merge branch 'master' of git://gitorious.org/fg/fgdata


From 558c321f9439eee30605889749c68cb0490e6d1e Mon Sep 17 00:00:00 2001
From: Mathias Froehlich <Mathias.Froehlich@web.de>
Date: Thu, 8 Sep 2011 19:34:15 +0200
Subject: [PATCH 02/15] Fix problem with the A320 family not starting up
 correctly.

---
 Nasal/aircraft.nas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Nasal/aircraft.nas b/Nasal/aircraft.nas
index 7c88f8d3d..a8c2b08bc 100644
--- a/Nasal/aircraft.nas
+++ b/Nasal/aircraft.nas
@@ -846,7 +846,7 @@ var tyresmoke = {
 	},
 	update: func {
 		var rollspeed = me.get_rollspeed();
-		var vert_speed = (me.vertical_speed) ? me.vertical_speed.getValue() : -999;
+		var vert_speed = (me.vertical_speed) != nil ? me.vertical_speed.getValue() : -999;
 		var groundspeed = me.speed.getValue();
 		var friction_factor = me.friction_factor.getValue();
 		var wow = me.wow.getValue();

From ea0c72494d275a0a0f71ef1c4b4ade530fa518a8 Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Fri, 9 Sep 2011 16:23:35 +0200
Subject: [PATCH 03/15] first draft of Thrustmaster HOTAS Warthog js config
 (WIP)

---
 .../Joysticks/ThrustMaster/Warthog-Stick.xml  | 182 ++++++++++
 .../ThrustMaster/Warthog-Throttle.xml         | 338 ++++++++++++++++++
 2 files changed, 520 insertions(+)
 create mode 100644 Input/Joysticks/ThrustMaster/Warthog-Stick.xml
 create mode 100644 Input/Joysticks/ThrustMaster/Warthog-Throttle.xml

diff --git a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
new file mode 100644
index 000000000..60a7e68e8
--- /dev/null
+++ b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+<!--
+	Copyright (c) 2011   Melchior FRANZ   mfranz # aon : at
+	Work In Progress
+-->
+
+<PropertyList>
+	<name>Thustmaster Joystick - HOTAS Warthog</name>
+
+	<nasal>
+		<script>
+			var this = cmdarg().getParent();
+			var popup = func gui.popupTip(call(sprintf, arg));
+
+			var trimstep = 0.75;
+
+			foreach (var b; this.getChildren("button")) {
+				if (b.getAttribute("children") == 1) {
+					var name = b.getNode("name", 1).getValue() or "??";
+					b.setValues({binding: {command: "nasal", script: 'popup("' ~ name ~ '")'}});
+				}
+			}
+		</script>
+	</nasal>
+
+	<axis n="0">
+		<name>X-axis</name>
+		<desc>aileron</desc>
+		<tolerance>0.0001</tolerance>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/flight/aileron</property>
+		</binding>
+	</axis>
+
+	<axis n="1">
+		<name>Y-axis</name>
+		<desc>elevator</desc>
+		<tolerance>0.0001</tolerance>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/flight/elevator</property>
+			<factor type="double">-1.0</factor>
+		</binding>
+	</axis>
+
+	<axis n="2">
+		<name>Trim Coolie Left/Right</name>
+		<desc>aileron trim</desc>
+		<low>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>controls.aileronTrim(-trimstep)</script>
+			</binding>
+		</low>
+		<high>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>controls.aileronTrim(trimstep)</script>
+			</binding>
+		</high>
+	</axis>
+
+	<axis n="3">
+		<name>Trim Coolie Down/Up</name>
+		<desc>elevator trim</desc>
+		<low>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>controls.elevatorTrim(trimstep)</script>
+			</binding>
+		</low>
+		<high>
+			<repeatable>true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>controls.elevatorTrim(-trimstep)</script>
+			</binding>
+		</high>
+	</axis>
+
+	<button n="0">
+		<name>Trigger Button 1</name>
+		<desc>gun trigger stage 1</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.trigger(1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.trigger(0)</script>
+			</binding>
+		</mod-up>
+	</button>
+
+	<button n="1">
+		<name>Weapons Release</name>
+	</button>
+
+	<button n="2">
+		<name>Nosewheel Steering Button</name>
+	</button>
+
+	<button n="3">
+		<name>Paddle Switch</name>
+	</button>
+
+	<button n="4">
+		<name>Master Mode Control Button</name>
+	</button>
+
+	<button n="5">
+		<name>Trigger Button 2</name>
+		<desc>gun trigger stage 2</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.trigger(2)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.trigger(0)</script>
+			</binding>
+		</mod-up>
+	</button>
+
+	<button n="6">
+		<name>Target Management Switch (TMS) up</name>
+	</button>
+
+	<button n="7">
+		<name>Target Management Switch (TMS) right</name>
+	</button>
+
+	<button n="8">
+		<name>Target Management Switch (TMS) down</name>
+	</button>
+
+	<button n="9">
+		<name>Target Management Switch (TMS) left</name>
+	</button>
+
+	<button n="10">
+		<name>Data Management Switch (DMS) up</name>
+	</button>
+
+	<button n="11">
+		<name>Data Management Switch (DMS) right</name>
+	</button>
+
+	<button n="12">
+		<name>Data Management Switch (DMS) down</name>
+	</button>
+
+	<button n="13">
+		<name>Data Management Switch (DMS) left</name>
+	</button>
+
+	<button n="14">
+		<name>Countermeasures Management Switch (CMS) up</name>
+	</button>
+
+	<button n="15">
+		<name>Countermeasures Management Switch (CMS) right</name>
+	</button>
+
+	<button n="16">
+		<name>Countermeasures Management Switch (CMS) down</name>
+	</button>
+
+	<button n="17">
+		<name>Countermeasures Management Switch (CMS) left</name>
+	</button>
+
+	<button n="18">
+		<name>Countermeasures Management Switch (CMS) push</name>
+	</button>
+</PropertyList>
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
new file mode 100644
index 000000000..fcef23493
--- /dev/null
+++ b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0"?>
+<!--
+	Copyright (c) 2011   Melchior FRANZ   mfranz # aon : at
+	Work In Progress
+-->
+
+<PropertyList>
+	<name>Thrustmaster Throttle - HOTAS Warthog</name>
+
+	<nasal>
+		<script>
+			var this = cmdarg().getParent();
+			var popup = func gui.popupTip(call(sprintf, arg));
+
+			var even_engines = [0, 2, 4, 6, 8, 10];
+			var odd_engines = [1, 3, 5, 7, 9, 11];
+			var viewstep = 0.5;
+			var viewdir = props.globals.getNode("/sim").getChildren("view");
+			forindex (var i; viewdir) {
+				var t = viewdir[i].getNode("type");
+				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
+			}
+
+			foreach (var b; this.getChildren("button")) {
+				if (b.getAttribute("children") == 1) {
+					var name = b.getNode("name", 1).getValue() or "??";
+					b.setValues({binding: {command: "nasal", script: 'popup("' ~ name ~ '")'}});
+				}
+			}
+		</script>
+	</nasal>
+
+	<axis n="0">
+		<name>Mouse Horizontal</name>
+		<desc>mouse horizontal</desc>
+		<low>
+			<repeatable type="bool">true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>view.panViewDir(-viewdir[view.index] * viewstep)</script>
+			</binding>
+		</low>
+		<high>
+			<repeatable type="bool">true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>view.panViewDir(viewdir[view.index] * viewstep)</script>
+			</binding>
+		</high>
+	</axis>
+
+	<axis n="1">
+		<name>Mouse Vertical</name>
+		<desc>mouse vertical</desc>
+		<low>
+			<repeatable type="bool">true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>view.panViewPitch(viewstep)</script>
+			</binding>
+		</low>
+		<high>
+			<repeatable type="bool">true</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>view.panViewPitch(-viewstep)</script>
+			</binding>
+		</high>
+	</axis>
+
+	<axis n="2">
+		<name>Right Throttle</name>
+		<desc>right throttle (odd engines)</desc>
+		<tolerance>0.0001</tolerance>
+		<binding>
+			<command>nasal</command>
+			<script>controls.perEngineSelectedAxisHandler(0)(odd_engines)</script>
+		</binding>
+	</axis>
+
+	<axis>
+		<name>Left Throttle</name>
+		<desc>left throttle (even engines)</desc>
+		<number>
+			<unix>3</unix>
+			<mac>3</mac>
+			<windows>5</windows>
+		</number>
+		<tolerance>0.0001</tolerance>
+		<binding>
+			<command>nasal</command>
+			<script>controls.perEngineSelectedAxisHandler(0)(even_engines)</script>
+		</binding>
+	</axis>
+
+	<axis>
+		<name>Friction Wheel</name>
+		<desc>rudder trim</desc>
+		<number>
+			<unix>4</unix>
+			<mac>4</mac>
+			<windows>6</windows>
+		</number>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/flight/rudder</property>
+			<factor type="double">-1</factor>
+		</binding>
+	</axis>
+
+	<axis>
+		<name>Coolie Switch Horizontal</name>
+		<number>
+			<unix>5</unix>
+			<mac>5</mac>
+			<windows>3</windows>
+		</number>
+		<low>
+			<binding>
+				<command>nasal</command>
+				<script>popup("coolie switch left")</script>
+			</binding>
+		</low>
+		<high>
+			<binding>
+				<command>nasal</command>
+				<script>popup("coolie switch right")</script>
+			</binding>
+		</high>
+	</axis>
+
+	<axis>
+		<name>Coolie Switch Vertical</name>
+		<number>
+			<unix>6</unix>
+			<mac>6</mac>
+			<windows>4</windows>
+		</number>
+		<low>
+			<binding>
+				<command>nasal</command>
+				<script>popup("coolie switch up")</script>
+			</binding>
+		</low>
+		<high>
+			<binding>
+				<command>nasal</command>
+				<script>popup("coolie switch down")</script>
+			</binding>
+		</high>
+	</axis>
+
+	<button n="0">
+		<name>Mouse Button</name>
+		<desc>reset view</desc>
+		<binding>
+			<command>nasal</command>
+			<script>view.resetView()</script>
+		</binding>
+	</button>
+
+	<button n="1">
+		<name>MIC Switch Push</name>
+		<desc>Push To Talk (PTT)</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.ptt(1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.ptt(0)</script>
+			</binding>
+		</mod-up>
+	</button>
+
+	<button n="2">
+		<name>MIC Switch Up</name>
+	</button>
+
+	<button n="3">
+		<name>MIC Switch Forward</name>
+	</button>
+
+	<button n="4">
+		<name>MIC Switch Down</name>
+	</button>
+
+	<button n="5">
+		<name>MIC Switch Aft</name>
+	</button>
+
+	<button n="6">
+		<name>Speedbrake Forward</name>
+	</button>
+
+	<button n="7">
+		<name>Speedbrake Aft</name>
+	</button>
+
+	<button n="8">
+		<name>Boat Switch Forward</name>
+	</button>
+
+	<button n="9">
+		<name>Boat Switch Aft</name>
+	</button>
+
+	<button n="10">
+		<name>China Hat Forward</name>
+	</button>
+
+	<button n="11">
+		<name>China Hat Aft</name>
+	</button>
+
+	<button n="12">
+		<name>Pinky Switch Forward</name>
+	</button>
+
+	<button n="13">
+		<name>Pinky Switch Aft</name>
+	</button>
+
+	<button n="14">
+		<name>Left Throttle Button</name>
+	</button>
+
+	<button n="15">
+		<name>Engine Fuel Flow Left</name>
+	</button>
+
+	<button n="16">
+		<name>Engine Fuel Flow Right</name>
+	</button>
+
+	<button n="17">
+		<name>Engine Operate Left MOTOR</name>
+	</button>
+
+	<button n="18">
+		<name>Engine Operate Right MOTOR</name>
+	</button>
+
+	<button n="19">
+		<name>APU Start</name>
+	</button>
+
+	<button n="20">
+		<name>Landing Gear Horn Silence Button</name>
+	</button>
+
+	<button n="21">
+		<name>Flaps Up</name>
+		<desc>flaps up</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.flapsDown(-1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.flapsDown(0)</script>
+			</binding>
+		</mod-up>
+	</button>
+
+	<button n="22">
+		<name>Flaps Down</name>
+		<desc>flaps down</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.flapsDown(1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.flapsDown(0)</script>
+			</binding>
+		</mod-up>
+	</button>
+
+	<button n="23">
+		<name>EAC Switch</name>
+	</button>
+
+	<button n="24">
+		<name>RADAR ALT</name>
+	</button>
+
+	<button n="25">
+		<name>Autopilot (Dis)Engage</name>
+	</button>
+
+	<button n="26">
+		<name>Autopilot PATH</name>
+		<binding>
+			<command>nasal</command>
+			<script>popup("autopilot path")</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>popup("autopilot alt/hdg")</script>
+			</binding>
+		</mod-up>
+	</button>
+
+	<button n="27">
+		<name>Autopilot ALT</name>
+		<binding>
+			<command>nasal</command>
+			<script>popup("autopilot alt")</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>popup("autopilot alt/hdg")</script>
+			</binding>
+		</mod-up>
+	</button>
+
+	<button n="28">
+		<name>Right Throttle Idle Switch</name>
+	</button>
+
+	<button n="29">
+		<name>Left Throttle Idle Switch</name>
+	</button>
+
+	<button n="30">
+		<name>Engine Operate Left IGN</name>
+	</button>
+
+	<button n="31">
+		<name>Engine Operate Right IGN</name>
+	</button>
+</PropertyList>

From 820323e8545a849f2bc4f1d7b1ceaa35a603897f Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Sat, 10 Sep 2011 00:03:11 +0200
Subject: [PATCH 04/15] warthog: add js overlay support

This allows to have generic axis/button definitions with aircraft
specific or aircraft class specific modification overlays. These
are also found in $FG_HOME, where they override global files. This
mechanism is desirable, because the Warthog is an A-10 replica, and
it should be possible to have an automatically loaded (1:1 mapped)
A-10 joystick config when flying the A-10, while using generic layouts
otherwise, or a specific helicopter overlay for helicopters etc.

Overlay files look exactly like joystick config files, except they
have no <name> and only specify actually differing elements. Axes
with <number> *need* a property index (e.g. <axis n="2">), which
usually corresponds to the <unix> value (i.e. n'th axis def in file).
Overlay files can contain a <nasal> block which is executed on
load. The files are to be named {$FG_ROOT,$FG_HOME}/Input/Joysticks/\
ThrustMaster/Warthog/{Joystick,Throttle}/{generic,helicopter,<aircraft>}\
.xml.
---
 .../Joysticks/ThrustMaster/Warthog-Stick.xml  | 28 ++++++++++++-
 .../ThrustMaster/Warthog-Throttle.xml         | 40 +++++++++++++++----
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
index 60a7e68e8..35ce2a9a4 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
@@ -8,11 +8,35 @@
 	<name>Thustmaster Joystick - HOTAS Warthog</name>
 
 	<nasal>
+		<command>nasal</command>
 		<script>
 			var this = cmdarg().getParent();
 			var popup = func gui.popupTip(call(sprintf, arg));
+			var is_dir = func(path) {(var stat = io.stat(path)) != nil and stat[11] == "dir"};
+			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
+			var dir = "/Input/Joysticks/ThrustMaster/Warthog/Joystick/";
 
-			var trimstep = 0.75;
+			var overlay = {};
+			foreach (var base; [getprop("/sim/fg-root"), getprop("/sim/fg-home")])
+				if (is_dir(base ~ dir))
+					foreach (var file; directory(base ~ dir))
+						overlay[file] = base ~ dir ~ file;
+
+			var load_overlay = func(name) {
+				var file = name ~ ".xml";
+				if (contains(overlay, file)) {
+					printlog("info", "WARTHOG: loading overlay " ~ overlay[file]);
+					cmdarg().getNode("script").setValue("");
+					io.read_properties(overlay[file], this);
+					props.runBinding(cmdarg());
+				}
+			}
+
+			load_overlay("generic");
+			if (is_helicopter)
+				load_overlay("helicopter");
+			load_overlay(getprop("/sim/aircraft"));
+			overlay = nil;
 
 			foreach (var b; this.getChildren("button")) {
 				if (b.getAttribute("children") == 1) {
@@ -20,6 +44,8 @@
 					b.setValues({binding: {command: "nasal", script: 'popup("' ~ name ~ '")'}});
 				}
 			}
+
+			var trimstep = 0.75;
 		</script>
 	</nasal>
 
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
index fcef23493..e943f35c3 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
@@ -8,9 +8,42 @@
 	<name>Thrustmaster Throttle - HOTAS Warthog</name>
 
 	<nasal>
+		<command>nasal</command>
 		<script>
 			var this = cmdarg().getParent();
 			var popup = func gui.popupTip(call(sprintf, arg));
+			var is_dir = func(path) {(var stat = io.stat(path)) != nil and stat[11] == "dir"}
+			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
+			var dir = "/Input/Joysticks/ThrustMaster/Warthog/Throttle/";
+
+			var overlay = {};
+			foreach (var base; [getprop("/sim/fg-root"), getprop("/sim/fg-home")])
+				if (is_dir(base ~ dir))
+					foreach (var file; directory(base ~ dir))
+						overlay[file] = base ~ dir ~ file;
+
+			var load_overlay = func(name) {
+				var file = name ~ ".xml";
+				if (contains(overlay, file)) {
+					printlog("info", "WARTHOG: loading overlay " ~ overlay[file]);
+					cmdarg().getNode("script").setValue("");
+					io.read_properties(overlay[file], this);
+					props.runBinding(cmdarg());
+				}
+			}
+
+			load_overlay("generic");
+			if (is_helicopter)
+				load_overlay("helicopter");
+			load_overlay(getprop("/sim/aircraft"));
+			overlay = nil;
+
+			foreach (var b; this.getChildren("button")) {
+				if (b.getAttribute("children") == 1) {
+					var name = b.getNode("name", 1).getValue() or "??";
+					b.setValues({binding: {command: "nasal", script: 'popup("' ~ name ~ '")'}});
+				}
+			}
 
 			var even_engines = [0, 2, 4, 6, 8, 10];
 			var odd_engines = [1, 3, 5, 7, 9, 11];
@@ -20,13 +53,6 @@
 				var t = viewdir[i].getNode("type");
 				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
 			}
-
-			foreach (var b; this.getChildren("button")) {
-				if (b.getAttribute("children") == 1) {
-					var name = b.getNode("name", 1).getValue() or "??";
-					b.setValues({binding: {command: "nasal", script: 'popup("' ~ name ~ '")'}});
-				}
-			}
 		</script>
 	</nasal>
 

From 587993138c10b5c0f046b450887283ab08bef5ff Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Sat, 10 Sep 2011 14:18:37 +0200
Subject: [PATCH 05/15] warthog: simplify overlay handling, more bindings

---
 .../Joysticks/ThrustMaster/Warthog-Stick.xml  |  79 +++++++---
 .../ThrustMaster/Warthog-Throttle.xml         | 149 +++++++++++++++---
 2 files changed, 180 insertions(+), 48 deletions(-)

diff --git a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
index 35ce2a9a4..7cc8db36d 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
@@ -12,31 +12,25 @@
 		<script>
 			var this = cmdarg().getParent();
 			var popup = func gui.popupTip(call(sprintf, arg));
-			var is_dir = func(path) {(var stat = io.stat(path)) != nil and stat[11] == "dir"};
 			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
-			var dir = "/Input/Joysticks/ThrustMaster/Warthog/Joystick/";
-
-			var overlay = {};
-			foreach (var base; [getprop("/sim/fg-root"), getprop("/sim/fg-home")])
-				if (is_dir(base ~ dir))
-					foreach (var file; directory(base ~ dir))
-						overlay[file] = base ~ dir ~ file;
 
 			var load_overlay = func(name) {
-				var file = name ~ ".xml";
-				if (contains(overlay, file)) {
-					printlog("info", "WARTHOG: loading overlay " ~ overlay[file]);
-					cmdarg().getNode("script").setValue("");
-					io.read_properties(overlay[file], this);
-					props.runBinding(cmdarg());
+				foreach (var dir; [getprop("/sim/fg-home"), getprop("/sim/fg-root")]) {
+					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Joystick/" ~ name;
+					if (io.stat(file) != nil) {
+						printlog("info", "WARTHOG: loading overlay " ~ file);
+						cmdarg().getNode("script").setValue("");
+						io.read_properties(file, this);
+						props.runBinding(cmdarg());
+						break;
+					}
 				}
 			}
 
-			load_overlay("generic");
+			load_overlay("generic.xml");
 			if (is_helicopter)
-				load_overlay("helicopter");
-			load_overlay(getprop("/sim/aircraft"));
-			overlay = nil;
+				load_overlay("helicopter.xml");
+			load_overlay(getprop("/sim/aircraft") ~ ".xml");
 
 			foreach (var b; this.getChildren("button")) {
 				if (b.getAttribute("children") == 1) {
@@ -45,6 +39,10 @@
 				}
 			}
 
+			var mod = 0;
+			var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
+			setlistener(_, func(n) mod = n.getValue());
+
 			var trimstep = 0.75;
 		</script>
 	</nasal>
@@ -72,38 +70,58 @@
 
 	<axis n="2">
 		<name>Trim Coolie Left/Right</name>
-		<desc>aileron trim</desc>
+		<desc>adjust aileron trim,  +mod: reset aileron trim</desc>
 		<low>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>controls.aileronTrim(-trimstep)</script>
+				<script>
+					if (mod)
+						controls.aileronTrim(-trimstep);
+					else
+						setprop("/controls/flight/aileron-trim", 0);
+				</script>
 			</binding>
 		</low>
 		<high>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>controls.aileronTrim(trimstep)</script>
+				<script>
+					if (mod)
+						controls.aileronTrim(trimstep);
+					else
+						setprop("/controls/flight/aileron-trim", 0);
+				</script>
 			</binding>
 		</high>
 	</axis>
 
 	<axis n="3">
 		<name>Trim Coolie Down/Up</name>
-		<desc>elevator trim</desc>
+		<desc>adjust elevator trim,  +mod: reset elevator trim</desc>
 		<low>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>controls.elevatorTrim(trimstep)</script>
+				<script>
+					if (mod)
+						controls.elevatorTrim(trimstep);
+					else
+						setprop("/controls/flight/elevator-trim", 0);
+				</script>
 			</binding>
 		</low>
 		<high>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>controls.elevatorTrim(-trimstep)</script>
+				<script>
+					if (mod)
+						controls.elevatorTrim(-trimstep);
+					else
+						setprop("/controls/flight/elevator-trim", 0);
+				</script>
 			</binding>
 		</high>
 	</axis>
@@ -133,6 +151,19 @@
 
 	<button n="3">
 		<name>Paddle Switch</name>
+		<desc>modifier button</desc>
+		<binding>
+			<command>property-assign</command>
+			<property>/devices/status/joysticks/warthog/modifier</property>
+			<value>1</value>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>property-assign</command>
+				<property>/devices/status/joysticks/warthog/modifier</property>
+				<value>0</value>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="4">
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
index e943f35c3..c9c83465c 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
@@ -12,23 +12,18 @@
 		<script>
 			var this = cmdarg().getParent();
 			var popup = func gui.popupTip(call(sprintf, arg));
-			var is_dir = func(path) {(var stat = io.stat(path)) != nil and stat[11] == "dir"}
 			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
-			var dir = "/Input/Joysticks/ThrustMaster/Warthog/Throttle/";
-
-			var overlay = {};
-			foreach (var base; [getprop("/sim/fg-root"), getprop("/sim/fg-home")])
-				if (is_dir(base ~ dir))
-					foreach (var file; directory(base ~ dir))
-						overlay[file] = base ~ dir ~ file;
 
 			var load_overlay = func(name) {
-				var file = name ~ ".xml";
-				if (contains(overlay, file)) {
-					printlog("info", "WARTHOG: loading overlay " ~ overlay[file]);
-					cmdarg().getNode("script").setValue("");
-					io.read_properties(overlay[file], this);
-					props.runBinding(cmdarg());
+				foreach (var dir; [getprop("/sim/fg-home"), getprop("/sim/fg-root")]) {
+					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Throttle/" ~ name;
+					if (io.stat(file) != nil) {
+						printlog("info", "WARTHOG: loading overlay " ~ file);
+						cmdarg().getNode("script").setValue("");
+						io.read_properties(file, this);
+						props.runBinding(cmdarg());
+						break;
+					}
 				}
 			}
 
@@ -36,7 +31,6 @@
 			if (is_helicopter)
 				load_overlay("helicopter");
 			load_overlay(getprop("/sim/aircraft"));
-			overlay = nil;
 
 			foreach (var b; this.getChildren("button")) {
 				if (b.getAttribute("children") == 1) {
@@ -45,8 +39,12 @@
 				}
 			}
 
-			var even_engines = [0, 2, 4, 6, 8, 10];
-			var odd_engines = [1, 3, 5, 7, 9, 11];
+			var mod = 0;
+			var _ = props.globals.initNode("/devices/status/joysticks/warthog/modifier", mod, "INT");
+			setlistener(_, func(n) mod = n.getValue());
+
+			var left_engines = [0, 2, 4, 6, 8, 10];
+			var right_engines = [1, 3, 5, 7, 9, 11];
 			var viewstep = 0.5;
 			var viewdir = props.globals.getNode("/sim").getChildren("view");
 			forindex (var i; viewdir) {
@@ -100,11 +98,11 @@
 		<tolerance>0.0001</tolerance>
 		<binding>
 			<command>nasal</command>
-			<script>controls.perEngineSelectedAxisHandler(0)(odd_engines)</script>
+			<script>controls.perEngineSelectedAxisHandler(0)(right_engines)</script>
 		</binding>
 	</axis>
 
-	<axis>
+	<axis n="3">
 		<name>Left Throttle</name>
 		<desc>left throttle (even engines)</desc>
 		<number>
@@ -115,11 +113,11 @@
 		<tolerance>0.0001</tolerance>
 		<binding>
 			<command>nasal</command>
-			<script>controls.perEngineSelectedAxisHandler(0)(even_engines)</script>
+			<script>controls.perEngineSelectedAxisHandler(0)(left_engines)</script>
 		</binding>
 	</axis>
 
-	<axis>
+	<axis n="4">
 		<name>Friction Wheel</name>
 		<desc>rudder trim</desc>
 		<number>
@@ -129,12 +127,12 @@
 		</number>
 		<binding>
 			<command>property-scale</command>
-			<property>/controls/flight/rudder</property>
+			<property>/controls/flight/rudder-trim</property>
 			<factor type="double">-1</factor>
 		</binding>
 	</axis>
 
-	<axis>
+	<axis n="5">
 		<name>Coolie Switch Horizontal</name>
 		<number>
 			<unix>5</unix>
@@ -155,7 +153,7 @@
 		</high>
 	</axis>
 
-	<axis>
+	<axis n="6">
 		<name>Coolie Switch Vertical</name>
 		<number>
 			<unix>6</unix>
@@ -254,22 +252,103 @@
 
 	<button n="15">
 		<name>Engine Fuel Flow Left</name>
+		<desc>engine fuel flow left</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; left_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/fuel-pump", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; left_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/fuel-pump", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="16">
 		<name>Engine Fuel Flow Right</name>
+		<desc>engine fuel flow right</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; right_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/fuel-pump", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; right_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/fuel-pump", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="17">
 		<name>Engine Operate Left MOTOR</name>
+		<desc>engine operate left motor (magnetos)</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; left_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/magnetos", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; left_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/magnetos", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="18">
 		<name>Engine Operate Right MOTOR</name>
+		<desc>engine operate right motor (magnetos)</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; right_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/magnetos", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; right_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/magnetos", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="19">
 		<name>APU Start</name>
+		<desc>APU (auxiliary power unit) on/off</desc>
+		<binding>
+			<command>property-assign</command>
+			<property>/controls/electric/APU-generator</property>
+			<value>1</value>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>property-assign</command>
+				<property>/controls/electric/APU-generator</property>
+				<value>0</value>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="20">
@@ -356,9 +435,31 @@
 
 	<button n="30">
 		<name>Engine Operate Left IGN</name>
+		<desc>start left engines</desc>
+		<binding>
+			<command>nasal</command>
+			<script>call(controls.startEngine, [1] ~ left_engines)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>call(controls.startEngine, [0] ~ left_engines)</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="31">
 		<name>Engine Operate Right IGN</name>
+		<desc>start right engines</desc>
+		<binding>
+			<command>nasal</command>
+			<script>call(controls.startEngine, [1] ~ right_engines)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>call(controls.startEngine, [0] ~ right_engines)</script>
+			</binding>
+		</mod-up>
 	</button>
 </PropertyList>

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 06/15] 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>

From 1a4fa0b16fd2079bc0380e19ad33f0610a208fe6 Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Sun, 11 Sep 2011 19:26:40 +0200
Subject: [PATCH 07/15] warthog: fix trimming; more bindings (similar to
 cougar)

---
 .../Joysticks/ThrustMaster/Warthog-Stick.xml  | 137 +++++++++++++++++-
 .../ThrustMaster/Warthog-Throttle.xml         |  90 ++++++------
 .../ThrustMaster/Warthog/Throttle/harrier.xml |   4 +-
 3 files changed, 176 insertions(+), 55 deletions(-)

diff --git a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
index 416f43c6f..4b47100ff 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
@@ -39,6 +39,14 @@
 			setlistener(_, func(n) mod = n.getValue());
 
 			var trimstep = 0.75;
+			var viewstep = 0.5;
+
+			var reset_zoom = func setprop("/sim/current-view/field-of-view", 55);
+			var viewdir = props.globals.getNode("/sim").getChildren("view");
+			forindex (var i; viewdir) {
+				var t = viewdir[i].getNode("type");
+				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
+			}
 
 			load_overlay("generic.xml");
 			if (is_helicopter)
@@ -77,9 +85,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.aileronTrim(-trimstep);
-					else
 						setprop("/controls/flight/aileron-trim", 0);
+					else
+						controls.aileronTrim(-trimstep);
 				</script>
 			</binding>
 		</low>
@@ -89,9 +97,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.aileronTrim(trimstep);
-					else
 						setprop("/controls/flight/aileron-trim", 0);
+					else
+						controls.aileronTrim(trimstep);
 				</script>
 			</binding>
 		</high>
@@ -106,9 +114,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.elevatorTrim(trimstep);
-					else
 						setprop("/controls/flight/elevator-trim", 0);
+					else
+						controls.elevatorTrim(trimstep);
 				</script>
 			</binding>
 		</low>
@@ -118,9 +126,9 @@
 				<command>nasal</command>
 				<script>
 					if (mod)
-						controls.elevatorTrim(-trimstep);
-					else
 						setprop("/controls/flight/elevator-trim", 0);
+					else
+						controls.elevatorTrim(-trimstep);
 				</script>
 			</binding>
 		</high>
@@ -187,53 +195,166 @@
 
 	<button n="6">
 		<name>Target Management Switch (TMS) up</name>
+		<desc>zoom in,  +mod: reset zoom</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>
+				if (mod)
+					reset_zoom();
+				else
+					view.decrease(1);
+			</script>
+		</binding>
 	</button>
 
 	<button n="7">
 		<name>Target Management Switch (TMS) right</name>
+		<desc>next active view,  +mod: next view</desc>
+		<binding>
+			<command>nasal</command>
+			<script>view.stepView(1, mod)</script>
+		</binding>
 	</button>
 
 	<button n="8">
 		<name>Target Management Switch (TMS) down</name>
+		<desc>zoom out,  +mod: reset zoom</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>
+				if (mod)
+					reset_zoom();
+				else
+					view.increase(1);
+			</script>
+		</binding>
 	</button>
 
 	<button n="9">
 		<name>Target Management Switch (TMS) left</name>
+		<desc>previous active view,  +mod: previous view</desc>
+		<binding>
+			<command>nasal</command>
+			<script>view.stepView(-1, mod)</script>
+		</binding>
 	</button>
 
 	<button n="10">
 		<name>Data Management Switch (DMS) up</name>
+		<desc>brakes</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.applyBrakes(1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.applyBrakes(0)</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="11">
 		<name>Data Management Switch (DMS) right</name>
+		<desc>brakes right</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.applyBrakes(1, 1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.applyBrakes(0, 1)</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="12">
 		<name>Data Management Switch (DMS) down</name>
+		<desc>toggle parking brake</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.applyBrakes(1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					var i = controls.applyParkingBrake(1);
+					popup("Parking Brake %s", i ? "ON" : "OFF");
+					controls.applyBrakes(0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="13">
 		<name>Data Management Switch (DMS) left</name>
+		<desc>brakes left</desc>
+		<binding>
+			<command>nasal</command>
+			<script>controls.applyBrakes(1, -1)</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>controls.applyBrakes(0, -1)</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="14">
 		<name>Countermeasures Management Switch (CMS) up</name>
+		<desc>view up</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewPitch(viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="15">
 		<name>Countermeasures Management Switch (CMS) right</name>
+		<desc>view right</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewDir(viewdir[view.index] * viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="16">
 		<name>Countermeasures Management Switch (CMS) down</name>
+		<desc>view down</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewPitch(-viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="17">
 		<name>Countermeasures Management Switch (CMS) left</name>
+		<desc>view left</desc>
+		<repeatable>true</repeatable>
+		<binding>
+			<command>nasal</command>
+			<script>view.panViewDir(-viewdir[view.index] * viewstep)</script>
+		</binding>
 	</button>
 
 	<button n="18">
 		<name>Countermeasures Management Switch (CMS) push</name>
+		<desc>center view,  +mod: centered cockpit view</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				if (mod)
+					setprop("/sim/current-view/view-number", 0);
+				view.resetView();
+			</script>
+		</binding>
 	</button>
 </PropertyList>
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
index c535f1589..8b5dbc672 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
@@ -40,12 +40,6 @@
 
 			var left_engines = [0, 2, 4, 6, 8, 10];
 			var right_engines = [1, 3, 5, 7, 9, 11];
-			var viewstep = 0.5;
-			var viewdir = props.globals.getNode("/sim").getChildren("view");
-			forindex (var i; viewdir) {
-				var t = viewdir[i].getNode("type");
-				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
-			}
 
 			load_overlay("generic.xml");
 			if (is_helicopter)
@@ -56,40 +50,10 @@
 
 	<axis n="0">
 		<name>Mouse Horizontal</name>
-		<desc>mouse horizontal</desc>
-		<low>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewDir(-viewdir[view.index] * viewstep)</script>
-			</binding>
-		</low>
-		<high>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewDir(viewdir[view.index] * viewstep)</script>
-			</binding>
-		</high>
 	</axis>
 
 	<axis n="1">
 		<name>Mouse Vertical</name>
-		<desc>mouse vertical</desc>
-		<low>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewPitch(viewstep)</script>
-			</binding>
-		</low>
-		<high>
-			<repeatable type="bool">true</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>view.panViewPitch(-viewstep)</script>
-			</binding>
-		</high>
 	</axis>
 
 	<axis n="2">
@@ -129,58 +93,60 @@
 			<command>property-scale</command>
 			<property>/controls/flight/rudder-trim</property>
 			<factor type="double">-1</factor>
+			<power type="int">2</power>
 		</binding>
 	</axis>
 
 	<axis n="5">
 		<name>Coolie Switch Horizontal</name>
+		<desc>adjust mixture: left = leaner, right = fatter</desc>
 		<number>
 			<unix>5</unix>
 			<mac>5</mac>
 			<windows>3</windows>
 		</number>
 		<low>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch left")</script>
+				<script>controls.adjMixture(-1)</script>
 			</binding>
 		</low>
 		<high>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch right")</script>
+				<script>controls.adjMixture(1)</script>
 			</binding>
 		</high>
 	</axis>
 
 	<axis n="6">
 		<name>Coolie Switch Vertical</name>
+		<desc>adjust propeller pitch: forward = increase, backward = decrease</desc>
 		<number>
 			<unix>6</unix>
 			<mac>6</mac>
 			<windows>4</windows>
 		</number>
 		<low>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch up")</script>
+				<script>controls.adjPropeller(1)</script>
 			</binding>
 		</low>
 		<high>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>popup("coolie switch down")</script>
+				<script>controls.adjPropeller(-1)</script>
 			</binding>
 		</high>
 	</axis>
 
 	<button n="0">
 		<name>Mouse Button</name>
-		<desc>reset view</desc>
-		<binding>
-			<command>nasal</command>
-			<script>view.resetView()</script>
-		</binding>
 	</button>
 
 	<button n="1">
@@ -427,10 +393,44 @@
 
 	<button n="28">
 		<name>Right Throttle Idle Switch</name>
+		<desc>right engines cutoff</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; right_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; right_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="29">
 		<name>Left Throttle Idle Switch</name>
+		<desc>left engines cutoff</desc>
+		<binding>
+			<command>nasal</command>
+			<script>
+				foreach (var i; left_engines)
+					setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 1);
+			</script>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>nasal</command>
+				<script>
+					foreach (var i; left_engines)
+						setprop("/controls/engines/engine[" ~ i ~ "]/cutoff", 0);
+				</script>
+			</binding>
+		</mod-up>
 	</button>
 
 	<button n="30">
diff --git a/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml b/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
index 2d1921b70..c938dd19e 100644
--- a/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Throttle/harrier.xml
@@ -6,8 +6,8 @@
 	<nasal>
 		<script>
 			var thrust_display = func {
-				var thv = getprop("/controls/engines/engine[0]/mixture");
-				popup("Thrust vector " ~ int(thv * 120 - 20 + 0.5));
+				var thv = getprop("/controls/engines/engine/mixture");
+				popup("Thrust vector %d", thv * 120 - 20 + 0.5);
 			}
 		</script>
 	</nasal>

From 975e7d6c54af556471b7024d510daabc3d1af12f Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sun, 11 Sep 2011 22:24:41 +0100
Subject: [PATCH 08/15] Update to the 3DClouds README file covering recent
 changes.

---
 Docs/README.3DClouds | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Docs/README.3DClouds b/Docs/README.3DClouds
index b8ebc2190..8bc6039d4 100644
--- a/Docs/README.3DClouds
+++ b/Docs/README.3DClouds
@@ -32,34 +32,41 @@ by a OpenGL Shader - a small program that is run on your graphics card.
 The cloud is defined by the following properties:
 
 <min-cloud-width-m>   - minimum width of the cloud in meters (default 500)
-<max-cloud-width-m>   - maximum width of the cloud (default min-cloud-width-m)
-<min-cloud-height-m>  - minimum height of the cloud (default min-cloud-width-m)
-<max-cloud-height-m>  - maximum height of the cloud (default max-cloud-width-m)
+<max-cloud-width-m>   - maximum width of the cloud (default min-cloud-width-m*1.5)
+<min-cloud-height-m>  - minimum height of the cloud (default 400)
+<max-cloud-height-m>  - maximum height of the cloud (default min-cloud-height-m*1.5)
 <texture>             - texture file of sprites to use (default cl_cumulus.png)
 <num-textures-x>      - number of cloud textures defined horizontally in the
                         texture file (default 4)
 <num-textures-y>      - number of cloud textures defined vertically in the
                         texture file (default 4)
+<height-map-texture>  - whether to choose the vertical texture index based on
+                        sprite height within the clouds (default false)
 <num-sprites>         - Number of sprite to generate for the cloud (default 20)
 <bottom-shade>        - Light multiplier for sprites at the bottom of the cloud
                         (default 1.0)
 <min-sprite-width-m>  - minimum width of the sprites used to create the cloud
                         (default 200)
 <max-sprite-width-m>  - maximum width of the sprites used to create the cloud
-                        (default min-sprite-width-m)
+                        (default min-sprite-width-m*1.5)
 <min-sprite-height-m> - minimum height of the spites used to create the cloud
-                        (default min-sprite-width-m)
+                        (default 150)
 <max-sprite-height-m> - maximum height of the sprites used to create the cloud
-                        (default max-sprite-height-m)
+                        (default min-sprite-height-m*1.5)
+<z-scale>             - vertical scaling factor to apply to to the sprite after
+                        billboarding. A small value would create a sprite that
+                        looks squashed when viewed from the side. (default 1.0)
+                        
 
 The texture to use for the sprites is defined in the <texture> tag.
 To allow some variation, you can create a texture file containing multiple
 sprites in a grid, and define the <num-textures-x/y> tags. The code
 decides which texture to use for a given sprite : randomly in the x-direction
-and based on the altitude of the sprite within the cloud in the y-direction.
-Therefore, you should put sprite textures you want to use for the bottom of
-your cloud at the bottom of the texture file, and those you want to use for
-the top of the cloud at the top of the texture file.
+and based on the altitude of the sprite within the cloud in the y-direction
+if <height-map-texture> is set. Therefore, you should put sprite textures 
+you want to use for the bottom of your cloud at the bottom of the texture 
+file, and those you want to use for the top of the cloud at the top of the 
+texture file.
 
 For example, the following Nasal snippet will create a cloud immediately above the
 aircraft at an altitude of 1000 ft above /environment/clouds/layer[0]/elevation-ft :
@@ -92,14 +99,14 @@ Deleting Individual Clouds
 Clouds may be deleted by using the "del-cloud" command. This takes the following
 property arguments.
 
-<layer>      - The cloud layer number containing the cloud to delet. (default 0)
+<layer>      - The cloud layer number containing the cloud to delete. (default 0)
 <index>      - The unique identifier of the cloud to delete.
 
 Global 3D Clouds
 ================
 
-The global weather system uses sets of clouds defined in cloudlayers.xml
-in your FG_ROOT.
+The global weather system uses sets of clouds defined in 
+FG_ROOT/Environment/cloudlayers.xml
 
 The file has 3 distinct sections: layers, cloud boxes and clouds,
 described below.

From 76b1d549a522eac959c32059df9ee1857e100135 Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Mon, 12 Sep 2011 18:58:44 +0200
Subject: [PATCH 09/15] warthog: move js config files into Warthog dir; add
 more overlays

---
 .../Warthog/Throttle/helicopter.xml           | 13 ++++
 .../{ => Warthog}/Warthog-Stick.xml           | 67 ++++++++++---------
 .../{ => Warthog}/Warthog-Throttle.xml        | 21 ++++--
 3 files changed, 61 insertions(+), 40 deletions(-)
 create mode 100644 Input/Joysticks/ThrustMaster/Warthog/Throttle/helicopter.xml
 rename Input/Joysticks/ThrustMaster/{ => Warthog}/Warthog-Stick.xml (85%)
 rename Input/Joysticks/ThrustMaster/{ => Warthog}/Warthog-Throttle.xml (95%)

diff --git a/Input/Joysticks/ThrustMaster/Warthog/Throttle/helicopter.xml b/Input/Joysticks/ThrustMaster/Warthog/Throttle/helicopter.xml
new file mode 100644
index 000000000..51cf49390
--- /dev/null
+++ b/Input/Joysticks/ThrustMaster/Warthog/Throttle/helicopter.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+	<axis n="5">
+		<name>Hat Switch Horizontal</name>
+		<desc>adjust engine balance</desc>
+	</axis>
+
+	<axis n="6">
+		<name>Hat Switch Vertical</name>
+		<desc>adjust engine power</desc>
+	</axis>
+</PropertyList>
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
similarity index 85%
rename from Input/Joysticks/ThrustMaster/Warthog-Stick.xml
rename to Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
index 4b47100ff..614cb4d44 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Stick.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Stick.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0"?>
 <!--
 	Copyright (c) 2011   Melchior FRANZ   mfranz # aon : at
-	Work In Progress
+
+	This driver supports joystick overlay files (see ./Warthog/README).
+
+	TMS ... Target Management Switch (black, rippled cursor switch, left side)
+	DMS ... Data Management Switch (black cursor switch with flat cross on top, right side)
+	CMS ... Countermeasures Management Switch  (grey)
 -->
 
 <PropertyList>
@@ -13,10 +18,12 @@
 			var this = cmdarg().getParent();
 			var popup = func gui.popupTip(call(sprintf, arg));
 			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
+			var aircraft_type = getprop("/sim/type");
+			var overlay = getprop("/input/joysticks/overlay");
 
 			var load_overlay = func(name) {
 				foreach (var dir; [getprop("/sim/fg-home"), getprop("/sim/fg-root")]) {
-					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Joystick/" ~ name;
+					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Joystick/" ~ name ~ ".xml";
 					if (io.stat(file) != nil) {
 						printlog("info", "WARTHOG: loading overlay " ~ file);
 						cmdarg().getNode("script").setValue("");
@@ -48,10 +55,14 @@
 				viewdir[i] = t != nil and t.getValue() == "lookat" ? 1 : -1;
 			}
 
-			load_overlay("generic.xml");
+			load_overlay("generic");
 			if (is_helicopter)
-				load_overlay("helicopter.xml");
-			load_overlay(getprop("/sim/aircraft") ~ ".xml");
+				load_overlay("helicopter");
+			if (aircraft_type)
+				load_overlay(aircraft_type);
+			if (overlay)
+				load_overlay(overlay);
+			load_overlay(getprop("/sim/aircraft"));
 		</script>
 	</nasal>
 
@@ -77,7 +88,7 @@
 	</axis>
 
 	<axis n="2">
-		<name>Trim Coolie Left/Right</name>
+		<name>Trim Hat Switch Left/Right</name>
 		<desc>adjust aileron trim,  +mod: reset aileron trim</desc>
 		<low>
 			<repeatable>true</repeatable>
@@ -106,7 +117,7 @@
 	</axis>
 
 	<axis n="3">
-		<name>Trim Coolie Down/Up</name>
+		<name>Trim Hat Switch Down/Up</name>
 		<desc>adjust elevator trim,  +mod: reset elevator trim</desc>
 		<low>
 			<repeatable>true</repeatable>
@@ -136,17 +147,7 @@
 
 	<button n="0">
 		<name>Trigger Button/Half Pushed</name>
-		<desc>gun trigger stage 1</desc>
-		<binding>
-			<command>nasal</command>
-			<script>controls.trigger(1)</script>
-		</binding>
-		<mod-up>
-			<binding>
-				<command>nasal</command>
-				<script>controls.trigger(0)</script>
-			</binding>
-		</mod-up>
+		<desc>camera oper</desc>
 	</button>
 
 	<button n="1">
@@ -180,10 +181,10 @@
 
 	<button n="5">
 		<name>Trigger Button/Fully Pushed</name>
-		<desc>gun trigger stage 2</desc>
+		<desc>gun trigger</desc>
 		<binding>
 			<command>nasal</command>
-			<script>controls.trigger(2)</script>
+			<script>controls.trigger(1)</script>
 		</binding>
 		<mod-up>
 			<binding>
@@ -194,7 +195,7 @@
 	</button>
 
 	<button n="6">
-		<name>Target Management Switch (TMS) up</name>
+		<name>left black curosr (TMS) up</name>
 		<desc>zoom in,  +mod: reset zoom</desc>
 		<repeatable>true</repeatable>
 		<binding>
@@ -209,7 +210,7 @@
 	</button>
 
 	<button n="7">
-		<name>Target Management Switch (TMS) right</name>
+		<name>left black cursor (TMS) right</name>
 		<desc>next active view,  +mod: next view</desc>
 		<binding>
 			<command>nasal</command>
@@ -218,7 +219,7 @@
 	</button>
 
 	<button n="8">
-		<name>Target Management Switch (TMS) down</name>
+		<name>left black cursor (TMS) down</name>
 		<desc>zoom out,  +mod: reset zoom</desc>
 		<repeatable>true</repeatable>
 		<binding>
@@ -233,7 +234,7 @@
 	</button>
 
 	<button n="9">
-		<name>Target Management Switch (TMS) left</name>
+		<name>left black cursor (TMS) left</name>
 		<desc>previous active view,  +mod: previous view</desc>
 		<binding>
 			<command>nasal</command>
@@ -242,7 +243,7 @@
 	</button>
 
 	<button n="10">
-		<name>Data Management Switch (DMS) up</name>
+		<name>right black cursor (DMS) up</name>
 		<desc>brakes</desc>
 		<binding>
 			<command>nasal</command>
@@ -257,7 +258,7 @@
 	</button>
 
 	<button n="11">
-		<name>Data Management Switch (DMS) right</name>
+		<name>right black cursor (DMS) right</name>
 		<desc>brakes right</desc>
 		<binding>
 			<command>nasal</command>
@@ -272,7 +273,7 @@
 	</button>
 
 	<button n="12">
-		<name>Data Management Switch (DMS) down</name>
+		<name>right black cursor (DMS) down</name>
 		<desc>toggle parking brake</desc>
 		<binding>
 			<command>nasal</command>
@@ -291,7 +292,7 @@
 	</button>
 
 	<button n="13">
-		<name>Data Management Switch (DMS) left</name>
+		<name>right black cursor (DMS) left</name>
 		<desc>brakes left</desc>
 		<binding>
 			<command>nasal</command>
@@ -306,7 +307,7 @@
 	</button>
 
 	<button n="14">
-		<name>Countermeasures Management Switch (CMS) up</name>
+		<name>grey cursor (CMS) up</name>
 		<desc>view up</desc>
 		<repeatable>true</repeatable>
 		<binding>
@@ -316,7 +317,7 @@
 	</button>
 
 	<button n="15">
-		<name>Countermeasures Management Switch (CMS) right</name>
+		<name>grey cursor (CMS) right</name>
 		<desc>view right</desc>
 		<repeatable>true</repeatable>
 		<binding>
@@ -326,7 +327,7 @@
 	</button>
 
 	<button n="16">
-		<name>Countermeasures Management Switch (CMS) down</name>
+		<name>grey cursor (CMS) down</name>
 		<desc>view down</desc>
 		<repeatable>true</repeatable>
 		<binding>
@@ -336,7 +337,7 @@
 	</button>
 
 	<button n="17">
-		<name>Countermeasures Management Switch (CMS) left</name>
+		<name>grey cursor (CMS) left</name>
 		<desc>view left</desc>
 		<repeatable>true</repeatable>
 		<binding>
@@ -346,7 +347,7 @@
 	</button>
 
 	<button n="18">
-		<name>Countermeasures Management Switch (CMS) push</name>
+		<name>grey cursor (CMS) push</name>
 		<desc>center view,  +mod: centered cockpit view</desc>
 		<binding>
 			<command>nasal</command>
diff --git a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
similarity index 95%
rename from Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
rename to Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
index 8b5dbc672..3a81acb99 100644
--- a/Input/Joysticks/ThrustMaster/Warthog-Throttle.xml
+++ b/Input/Joysticks/ThrustMaster/Warthog/Warthog-Throttle.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <!--
 	Copyright (c) 2011   Melchior FRANZ   mfranz # aon : at
-	Work In Progress
+
+	This driver supports joystick overlay files (see ./Warthog/README).
 -->
 
 <PropertyList>
@@ -13,10 +14,12 @@
 			var this = cmdarg().getParent();
 			var popup = func gui.popupTip(call(sprintf, arg));
 			var is_helicopter = (var _ = props.globals.getNode("rotors", 0)) != nil and _.getAttribute("children");
+			var aircraft_type = getprop("/sim/type");
+			var overlay = getprop("/input/joysticks/overlay");
 
 			var load_overlay = func(name) {
 				foreach (var dir; [getprop("/sim/fg-home"), getprop("/sim/fg-root")]) {
-					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Throttle/" ~ name;
+					var file = dir ~ "/Input/Joysticks/ThrustMaster/Warthog/Throttle/" ~ name ~ ".xml";
 					if (io.stat(file) != nil) {
 						printlog("info", "WARTHOG: loading overlay " ~ file);
 						cmdarg().getNode("script").setValue("");
@@ -41,10 +44,14 @@
 			var left_engines = [0, 2, 4, 6, 8, 10];
 			var right_engines = [1, 3, 5, 7, 9, 11];
 
-			load_overlay("generic.xml");
+			load_overlay("generic");
 			if (is_helicopter)
-				load_overlay("helicopter.xml");
-			load_overlay(getprop("/sim/aircraft") ~ ".xml");
+				load_overlay("helicopter");
+			if (aircraft_type)
+				load_overlay(aircraft_type);
+			if (overlay)
+				load_overlay(overlay);
+			load_overlay(getprop("/sim/aircraft"));
 		</script>
 	</nasal>
 
@@ -98,7 +105,7 @@
 	</axis>
 
 	<axis n="5">
-		<name>Coolie Switch Horizontal</name>
+		<name>Hat Switch Horizontal</name>
 		<desc>adjust mixture: left = leaner, right = fatter</desc>
 		<number>
 			<unix>5</unix>
@@ -122,7 +129,7 @@
 	</axis>
 
 	<axis n="6">
-		<name>Coolie Switch Vertical</name>
+		<name>Hat Switch Vertical</name>
 		<desc>adjust propeller pitch: forward = increase, backward = decrease</desc>
 		<number>
 			<unix>6</unix>

From 8fd08c7e030adb6bbe4f371fc463d20bd21e31e2 Mon Sep 17 00:00:00 2001
From: Melchior FRANZ <mfranz@aon.at>
Date: Thu, 15 Sep 2011 21:38:14 +0200
Subject: [PATCH 10/15] warthog: add missing file

---
 Input/Joysticks/ThrustMaster/Warthog/README | 35 +++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 Input/Joysticks/ThrustMaster/Warthog/README

diff --git a/Input/Joysticks/ThrustMaster/Warthog/README b/Input/Joysticks/ThrustMaster/Warthog/README
new file mode 100644
index 000000000..fc0e4d898
--- /dev/null
+++ b/Input/Joysticks/ThrustMaster/Warthog/README
@@ -0,0 +1,35 @@
+("Master files") Warthog-Stick.xml and Warthog-Throttle.xml support
+configuration overlay files. These are optional and can be used to
+modify the default configuration. Warthog-Stick.xml searches for
+overlay files in
+
+  {$FG_HOME,$FG_ROOT}/Input/Joysticks/ThrustMaster/Warthog/Stick/
+
+and Warthog-Throttle.xml in
+
+  {$FG_HOME,$FG_ROOT}/Input/Joysticks/ThrustMaster/Warthog/Throttle/
+
+
+Available files are loaded in the following order, where <x> is replaced
+by the contents of property "x":
+
+  - generic.xml
+  - helicopter.xml  (only helicopters)
+  - </sim/type>.xml  (some aircraft set this property to "seaplane")
+  - </input/joysticks/overlay>.xml  (not used by the system; meant to
+               be set on the command line or in wrapper scripts,
+               for example: --prop:input/joysticks/overlay=modern_jet)
+  - </sim/aircraft>.xml  (aircraft name, for example "harrier.xml")
+
+
+If a file is found under $FG_HOME, then an equally named file under
+$FG_ROOT will be ignored.
+
+Overlay files are like stripped down joystick driver files, but shall
+not have a <name> entry. They only need to define what should differ
+from the already loaded joystick configuration. Make sure that an
+axis definition uses the same index as the master file. The n-th
+<axis> in an XML config file usually has index n, even if the axis
+uses <number><unix> etc. Nasal blocks are properly executed in the
+namespace of the master file, so you can access all its functions
+and variables.

From fa7c100289322a3b32ee783f154aff30fdf5597c Mon Sep 17 00:00:00 2001
From: Durk Talsma <durk@linux-gj5p.site>
Date: Sat, 17 Sep 2011 17:17:29 +0200
Subject: [PATCH 11/15] Two sample settings for starting up flightgear in
 combination with the --parkpos=AVAILABLE option.

---
 Startup/777-commercial.xml | 18 ++++++++++++++++++
 Startup/c172p.xml          | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 Startup/777-commercial.xml
 create mode 100644 Startup/c172p.xml

diff --git a/Startup/777-commercial.xml b/Startup/777-commercial.xml
new file mode 100644
index 000000000..61271b99b
--- /dev/null
+++ b/Startup/777-commercial.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!--
+************************************************************************
+Some things that ATC likes to know about.
+Durk Talsma Sept-17, 2011.
+************************************************************************
+-->
+
+<PropertyList>
+    <sim>
+        <atc>
+            <acradius type="double">41</acradius>
+            <flight-type type="string">gate</flight-type>
+            <airline type="string">NONE</airline>
+        </atc>
+    </sim>
+</PropertyList>
diff --git a/Startup/c172p.xml b/Startup/c172p.xml
new file mode 100644
index 000000000..ef62e95ea
--- /dev/null
+++ b/Startup/c172p.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!--
+************************************************************************
+Some things that ATC likes to know about.
+Durk Talsma Sept-17, 2011.
+************************************************************************
+-->
+
+<PropertyList>
+    <sim>
+        <atc>
+            <acradius type="double">5</acradius>
+            <flight-type type="string">ga</flight-type>
+            <airline type="string">NONE</airline>
+        </atc>
+    </sim>
+</PropertyList>

From 9195b36005132bd47baf67bb83702482c0983ab5 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 18 Sep 2011 12:36:40 +0200
Subject: [PATCH 12/15] #441: overlay dialog must be reinitialized after
 reloading GUI

---
 Nasal/gui.nas | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index debc7fba9..01f57bd28 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -411,24 +411,29 @@ var OverlaySelector = {
         m.sortprop = relpath(sortprop or nameprop);
         m.mpprop = mpprop;
         m.callback = callback;
+        m.title = title;
+        m.dialog_name = name;
         m.result = data.initNode("result", "");
         m.listener = setlistener(m.result, func(n) m.select(n.getValue()));
-
-        m.prop.getNode("group/text/label").setValue(title);
-        m.prop.getNode("group/button/binding/script").setValue('gui.Dialog.instance["' ~ name ~ '"].close()');
-        m.list = m.prop.getNode("list");
-        m.list.getNode("property").setValue(m.result.getPath());
-
         if (m.mpprop != nil)
             aircraft.data.add(m.nameprop);
-
-        m.rescan();
-        m.current = -1;
-        m.select(getprop(m.nameprop) or "");
+        m.reinit();
+        # need to reinit again, whenever the GUI is reloaded
+        m.reinit_listener = setlistener("/sim/signals/reinit-gui", func(n) m.reinit());
         return m;
     },
+    reinit: func {
+        me.prop.getNode("group/text/label").setValue(me.title);
+        me.prop.getNode("group/button/binding/script").setValue('gui.Dialog.instance["' ~ me.dialog_name ~ '"].close()');
+        me.list = me.prop.getNode("list");
+        me.list.getNode("property").setValue(me.result.getPath());
+        me.rescan();
+        me.current = -1;
+        me.select(getprop(me.nameprop) or "");
+    },
     del: func {
         removelistener(me.listener);
+        removelistener(me.reinit_listener);
     },
     rescan: func {
         me.data = [];

From ded0a18b5e94acee62412ead71666cb05d6bedf2 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 18 Sep 2011 13:00:18 +0100
Subject: [PATCH 13/15] Zoom controls on the map dialg.

---
 gui/dialogs/map.xml | 60 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/gui/dialogs/map.xml b/gui/dialogs/map.xml
index d5aa0f975..c80efd179 100644
--- a/gui/dialogs/map.xml
+++ b/gui/dialogs/map.xml
@@ -182,16 +182,60 @@ command interface /autopilot/route-manager/input:
 
             <vrule/>
 
-            <map>
-                <!-- <halign>fill</halign> -->
-                <valign>fill</valign>
-                <halign>fill</halign>
+            <group>
+                <layout>vbox</layout>
                 <stretch>true</stretch>
-                <pref-height>400</pref-height>
-                <pref-width>600</pref-width>
-                <property>/gui/map</property>
-            </map>
+                
+                <map>
+                    <!-- <halign>fill</halign> -->
+                    <valign>fill</valign>
+                    <halign>fill</halign>
+                    <stretch>true</stretch>
+                    <pref-height>400</pref-height>
+                    <pref-width>600</pref-width>
+                    <property>/gui/map</property>
+                </map>
+            
+                <hrule/>
+                
+                <group>
+                    <layout>hbox</layout>
+                    
+                    <button>
+            			<legend>-</legend>
+            			<pref-width>22</pref-width>
+            			<pref-height>22</pref-height>
 
+            			<binding>
+            				<command>property-adjust</command>
+            				<property>/gui/map/zoom</property>
+            				<min>0</min>
+            				<step>-1</step>
+            			</binding>
+            		</button>
+            		
+                    <text>
+                        <label>MMM</label>
+                        <format>Zoom %d</format>
+                        <property>/gui/map/zoom</property>
+                        <live>true</live>
+                    </text>
+                    
+                    <button>
+            			<legend>+</legend>
+            			<pref-width>22</pref-width>
+            			<pref-height>22</pref-height>
+
+            			<binding>
+            				<command>property-adjust</command>
+            				<property>/gui/map/zoom</property>
+            				<step>1</step>
+            				<max>12</max>
+            			</binding>
+            		</button>
+                </group>
+            </group>
+            
         </group>
 </PropertyList>
 

From 798fd6f0d901055926e0b34914ead6f837c5dcee Mon Sep 17 00:00:00 2001
From: BARANGER Emmanuel <embaranger@free.fr>
Date: Tue, 20 Sep 2011 01:45:28 +0200
Subject: [PATCH 14/15] Merge branch 'master' of git://gitorious.org/fg/fgdata


From eca0b604014aa0901a8916604460e1602cd6b3b6 Mon Sep 17 00:00:00 2001
From: BARANGER Emmanuel <embaranger@free.fr>
Date: Tue, 20 Sep 2011 23:54:52 +0200
Subject: [PATCH 15/15] Merge branch 'master' of git://gitorious.org/fg/fgdata