From 97c9b06a7edb9cd405eff59afcb260d1ccf5f113 Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Mon, 21 Dec 2020 16:08:45 +0000
Subject: [PATCH] mice.xml: don't let mouse move control surfaces while paused
 or replaying.

Avoids loss of control caused by movement of mouse while paused, if in
flight-control mode.

The new behaviour is enabled by default.

It can be disabled by manually setting
/sim/freeze-mouse-flight-controls-on-pause=false. But note that this property
is deliberately not archived so this needs to be done each time Flightgear is
run.
---
 defaults.xml |  1 +
 mice.xml     | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/defaults.xml b/defaults.xml
index 76c877c3e..d29bed096 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -898,6 +898,7 @@ Started September 2000 by David Megginson, david@megginson.com
     <mp-carriers>
       <auto-attach type="bool" userarchive="y">true</auto-attach>
     </mp-carriers>
+    <freeze-mouse-flight-controls-on-pause type="bool" userarchive="n">true</freeze-mouse-flight-controls-on-pause>
   </sim>
   <!-- accelerations -->
   <accelerations>
diff --git a/mice.xml b/mice.xml
index 9594a75ed..88815e20f 100644
--- a/mice.xml
+++ b/mice.xml
@@ -115,6 +115,17 @@ current mode for each mouse is held in the
        <not>
         <property>/devices/status/mice/mouse[0]/button[1]</property>
        </not>
+       
+       <not>
+        <and>
+         <property>/sim/freeze-mouse-flight-controls-on-pause</property>
+         <or>
+          <property>/sim/replay/replay-state</property>
+          <property>/sim/freeze/master</property>
+         </or>
+        </and>
+       </not>
+      
       </and>
      </condition>
      <command>property-adjust</command>
@@ -133,6 +144,17 @@ current mode for each mouse is held in the
        <not>
         <property>/devices/status/mice/mouse[0]/button[1]</property>
        </not>
+       
+       <not>
+        <and>
+         <property>/sim/freeze-mouse-flight-controls-on-pause</property>
+         <or>
+          <property>/sim/replay/replay-state</property>
+          <property>/sim/freeze/master</property>
+         </or>
+        </and>
+       </not>
+      
       </and>
      </condition>
      <command>property-adjust</command>
@@ -161,6 +183,17 @@ current mode for each mouse is held in the
        <not>
         <property>/devices/status/mice/mouse[0]/button[1]</property>
        </not>
+       
+       <not>
+        <and>
+         <property>/sim/freeze-mouse-flight-controls-on-pause</property>
+         <or>
+          <property>/sim/replay/replay-state</property>
+          <property>/sim/freeze/master</property>
+         </or>
+        </and>
+       </not>
+      
       </and>
      </condition>
      <command>property-adjust</command>