From 116026606d00902408469e863e0d416a8102d5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Thu, 22 Aug 2013 14:18:07 +0200
Subject: [PATCH 1/4] FGCom dialog: avid to change server until FGCom is
 enabled

---
 gui/dialogs/fgcom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gui/dialogs/fgcom.xml b/gui/dialogs/fgcom.xml
index a4be3a43a..74933c2e3 100644
--- a/gui/dialogs/fgcom.xml
+++ b/gui/dialogs/fgcom.xml
@@ -358,6 +358,12 @@
       <editable>false</editable>
       <property>/sim/fgcom/selected-server</property>
       <properties>/sim/gui/dialogs/multiplay/fgcom-servers</properties>
+      <enable>
+        <equals>
+          <property>/sim/fgcom/enabled</property>
+          <value>1</value>
+        </equals>
+      </enable>
       <binding>
         <command>dialog-apply</command>
         <object-name>server</object-name>

From 70c6f4004cff89ea9d217cff8b012132f439ee99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Thu, 22 Aug 2013 15:06:32 +0200
Subject: [PATCH 2/4] KT76A: cleaning <params>

---
 Aircraft/Instruments-3d/kt76a/KT76A.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Aircraft/Instruments-3d/kt76a/KT76A.xml b/Aircraft/Instruments-3d/kt76a/KT76A.xml
index bc274dbc9..22a9cd08f 100644
--- a/Aircraft/Instruments-3d/kt76a/KT76A.xml
+++ b/Aircraft/Instruments-3d/kt76a/KT76A.xml
@@ -13,7 +13,7 @@
   <path>KT76A.ac</path>
 
   <params>
-    <transponder-serviceable>instrumentation/transponder/serviceable</transponder-serviceable>
+    <serviceable>instrumentation/transponder/serviceable</serviceable>
 
     <knob-mode>instrumentation/transponder/inputs/knob-mode</knob-mode>
     <ident-btn>instrumentation/transponder/inputs/ident-btn</ident-btn>

From 7af288d91959ba5bcdf906d0cd41e22ca5dad52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Thu, 22 Aug 2013 15:13:50 +0200
Subject: [PATCH 3/4] Add translation movement in spring-loaded-view mode

---
 mice.xml | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/mice.xml b/mice.xml
index 1265506a9..b41927cc8 100644
--- a/mice.xml
+++ b/mice.xml
@@ -309,11 +309,38 @@ current mode for each mouse is held in the
    <constrained type="bool">true</constrained>
    <pass-through type="bool">false</pass-through>
 
+   <!-- extra buttons control FoV -->
+   <!-- these are often assigned to mouse-wheel motion in Linux -->
+   <button n="3">
+    <binding>
+     <condition>
+       <property>/devices/status/mice/mouse[0]/button[2]</property>
+     </condition>
+      <command>nasal</command>
+      <script>view.decrease()</script>
+    </binding>
+   </button>
+
+   <button n="4">
+    <binding>
+     <condition>
+       <property>/devices/status/mice/mouse[0]/button[2]</property>
+     </condition>
+      <command>nasal</command>
+      <script>view.increase()</script>
+    </binding>
+   </button>
+
    <!-- Mouse left/right motion -->
    <x-axis>
 
     <!-- rotate the view left or right -->
     <binding>
+     <condition>
+      <not>
+       <property>/devices/status/mice/mouse[0]/button[1]</property>
+      </not>
+     </condition>
      <command>property-adjust</command>
      <property>/sim/current-view/heading-offset-deg</property>
      <factor type="double">-360</factor>
@@ -322,6 +349,17 @@ current mode for each mouse is held in the
      <wrap type="bool">true</wrap>
     </binding>
 
+    <!-- Middle button pressed: move the view position left or right -->
+    <binding>
+     <condition>
+      <property>/devices/status/mice/mouse[0]/button[1]</property>
+     </condition>
+     <command>property-adjust</command>
+     <property>/sim/current-view/x-offset-m</property>
+     <factor type="double">1</factor>
+     <wrap type="bool">false</wrap>
+    </binding>
+
    </x-axis>
 
    <!-- Mouse up/down motion -->
@@ -329,6 +367,11 @@ current mode for each mouse is held in the
 
     <!-- tilt the view up and down -->
     <binding>
+     <condition>
+      <not>
+       <property>/devices/status/mice/mouse[0]/button[1]</property>
+      </not>
+     </condition>
      <command>property-adjust</command>
      <property>/sim/current-view/pitch-offset-deg</property>
      <factor type="double">-180</factor>
@@ -337,8 +380,51 @@ current mode for each mouse is held in the
      <wrap type="bool">false</wrap>
     </binding>
 
+    <!-- Middle button pressed move the view up and down -->
+    <binding>
+     <condition>
+      <property>/devices/status/mice/mouse[0]/button[1]</property>
+     </condition>
+     <command>property-adjust</command>
+     <property>/sim/current-view/y-offset-m</property>
+     <factor type="double">-1</factor>
+     <wrap type="bool">false</wrap>
+    </binding>
+
    </y-axis>
 
+   <y-axis-ctrl>
+       <!-- Middle button and Ctrl pressed: move the view forward and backward -->
+       <binding>
+        <condition>
+         <property>/devices/status/mice/mouse[0]/button[1]</property>
+        </condition>
+        <command>property-adjust</command>
+        <property>/sim/current-view/z-offset-m</property>
+        <factor type="double">1</factor>
+        <wrap type="bool">false</wrap>
+       </binding>
+
+       <binding>
+         <condition>
+           <not><property>/devices/status/mice/mouse[0]/button[1]</property></not>
+         </condition>
+         <command>property-adjust</command>
+         <property>/sim/current-view/y-offset-m</property>
+         <factor type="double">-1</factor>
+         <wrap type="bool">false</wrap>
+       </binding>
+    </y-axis-ctrl>
+
+    <x-axis-ctrl>
+       <binding>
+         <command>property-adjust</command>
+         <property>/sim/current-view/x-offset-m</property>
+         <factor type="double">1</factor>
+         <wrap type="bool">false</wrap>
+       </binding>
+    </x-axis-ctrl>
+
   </mode>
     
  </mouse> <!-- of mouse 0 -->

From cd41a649ec72ec77046114ead326b726ed479316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Thu, 22 Aug 2013 17:06:04 +0200
Subject: [PATCH 4/4] Avoid OpenAL context conflict by switching sound device

---
 gui/dialogs/sound.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml
index 400e16dd2..60f67bed6 100644
--- a/gui/dialogs/sound.xml
+++ b/gui/dialogs/sound.xml
@@ -356,7 +356,13 @@
         if (cmp(current, new) != 0) {
           setprop("sim/sound/devices/name", new);
           setprop("sim/sound/device-name", new);
-          fgcommand("reinit", props.Node.new({ "subsystem" : "sound" }));
+          if(getprop("/sim/fgcom/enabled")) {
+            setprop("/sim/fgcom/enabled", 0);
+            settimer( func { fgcommand("reinit", props.Node.new({ "subsystem" : "sound" })); }, 0.5 );
+            settimer( func { setprop("/sim/fgcom/enabled", 1); print("enable fgcom");}, 1 );
+          } else {
+            fgcommand("reinit", props.Node.new({ "subsystem" : "sound" }));
+          }
         }
       }