From 5f1784937e82d1dc2ce1852fb4390c3c842894cc Mon Sep 17 00:00:00 2001
From: Richard Harrison <rjh@zaretto.com>
Date: Thu, 9 Apr 2020 23:37:17 +0200
Subject: [PATCH] Added Joystick Sensitivity Reduction to dialog.

This allows the setting of the <power> tag - which in turn will decreases the sensitivity around the zero position
---
 Nasal/joystick.nas                 | 23 +++++++++++---
 gui/dialogs/button-axis-config.xml | 50 ++++++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/Nasal/joystick.nas b/Nasal/joystick.nas
index e75979518..536193da1 100644
--- a/Nasal/joystick.nas
+++ b/Nasal/joystick.nas
@@ -15,6 +15,7 @@ var Axis = {
     m.prop = prop;
     m.invertable = invertable;
     m.inverted = 0;
+    m.power = 1.0;
     return m;
   },
 
@@ -24,6 +25,7 @@ var Axis = {
     m.prop = me.prop;
     m.invertable = me.invertable;
     m.inverted = me.inverted;
+    m.power = me.power;
     return m;
   },
 
@@ -37,12 +39,13 @@ var Axis = {
 
   getName: func() { return me.name; },
   getBinding: func(axis) { return props.Node.new(); },
+
   isInvertable: func() { return me.invertable; },
   isInverted: func() { return me.inverted; },
+  getPower: func() { return me.power; },
 
-  setInverted: func(b) {
-    if (me.invertable) me.inverted = b;
-  },
+  setPower: func(v) { me.power = v; },
+  setInverted: func(b) { if (me.invertable) me.inverted = b; },
 };
 
 var CustomAxis = {
@@ -100,11 +103,13 @@ var UnboundAxis = {
 
 
 var PropertyScaleAxis = {
-  new: func(name, prop, factor=1, offset=0) {
+  new: func(name, prop, factor=1, offset=0, power=1) {
     var m = { parents: [PropertyScaleAxis, Axis.new(name, prop, 1) ] };
     m.prop=prop;
     m.factor = factor;
     m.offset = offset;
+    m.power = power;
+
     return m;
   },
 
@@ -116,6 +121,7 @@ var PropertyScaleAxis = {
     m.prop= me.prop;
     m.factor = me.factor;
     m.offset = me.offset;
+    m.power = me.power;
     return m;
   },
 
@@ -134,9 +140,11 @@ var PropertyScaleAxis = {
     # (value 0 wouldn't be appropriate for a default factor)
     factorNode = bindingNode.getNode("factor", 0);
     me.factor = (factorNode != nil) ? factorNode.getValue() : 1.0;
-
     me.inverted = (me.factor < 0);
     me.offset = bindingNode.getNode("offset", 1).getValue();
+
+    powerNode = bindingNode.getNode("power", 0);
+    me.power = (powerNode != nil) ? powerNode.getValue() : 1.0;
   },
 
   getBinding: func(axis) {
@@ -151,6 +159,7 @@ var PropertyScaleAxis = {
       p.getNode("binding", 1).getNode("factor", 1).setValue(me.factor);
     }
     p.getNode("binding", 1).getNode("offset", 1).setValue(me.offset);
+    p.getNode("binding", 1).getNode("power",1 ).setValue(me.power);
     return p;
   },
 
@@ -642,6 +651,7 @@ var readConfig = func(dialog_root="/sim/gui/dialogs/joystick-config") {
           p.getNode("binding", 1).setValue(binding.getName());
           p.getNode("invertable", 1).setValue(binding.isInvertable());
           p.getNode("inverted", 1).setValue(binding.isInverted());
+          p.getNode("power", 1).setValue(binding.getPower());
         }
       }
 
@@ -650,12 +660,14 @@ var readConfig = func(dialog_root="/sim/gui/dialogs/joystick-config") {
         p.getNode("binding", 1).setValue("None");
         p.getNode("invertable", 1).setValue(0);
         p.getNode("inverted", 1).setValue(0);
+        p.getNode("power", 1).setValue(1.0);
         p.removeChild("original_binding");
       }
     } else {
       p.getNode("binding", 1).setValue("None");
       p.getNode("invertable", 1).setValue(0);
       p.getNode("inverted", 1).setValue(0);
+      p.getNode("power", 1).setValue(1.0);
       p.removeChild("original_binding");
     }
   }
@@ -743,6 +755,7 @@ var writeConfig = func(dialog_root="/sim/gui/dialogs/joystick-config", reset=0)
         if (binding.getName() == name) {
           var b = binding.clone();
           b.setInverted(getprop(dialog_root ~ "/axis[" ~ axis ~ "]/inverted"));
+          b.setPower(getprop(dialog_root ~ "/axis[" ~ axis ~ "]/power"));
 
           # Generate the axis and binding
           var axisnode = config.getNode("axis[" ~ axis ~ "]", 1);
diff --git a/gui/dialogs/button-axis-config.xml b/gui/dialogs/button-axis-config.xml
index 6e896be1e..f5faab2b3 100644
--- a/gui/dialogs/button-axis-config.xml
+++ b/gui/dialogs/button-axis-config.xml
@@ -4,11 +4,16 @@
 	<nasal>
 		<open><![CDATA[
 
+var curpower = getprop("/sim/gui/dialogs/joystick-config/axis[" ~ getprop("/sim/gui/dialogs/joystick-config/current-axis") ~ "]/power");
+if (curpower == nil)
+  curpower = 1.0;
+setprop("/sim/gui/dialogs/joystick-config/gui-factor",curpower);
+
 var assignAxis = func(cmd) {
-
   var i = getprop("/sim/gui/dialogs/joystick-config/current-axis");
-  setprop("/sim/gui/dialogs/joystick-config/axis[" ~ i ~ "]/binding", cmd);
-
+  if (cmd != nil)
+    setprop("/sim/gui/dialogs/joystick-config/axis[" ~ i ~ "]/binding", cmd);
+  setprop("/sim/gui/dialogs/joystick-config/axis[" ~ i ~ "]/power", getprop("/sim/gui/dialogs/joystick-config/gui-factor"));
   joystick.writeConfig();
   fgcommand("reinit", props.Node.new({"subsystem": "input"}));
   fgcommand("dialog-close", props.Node.new({"dialog-name": "button-axis-config"}));
@@ -437,9 +442,48 @@ var assignAxis = func(cmd) {
     </button>
 
 
+    <slider>
+      <row>11</row>
+      <col>0</col>
+      <colspan>1</colspan>
+      <name>sensitivity</name>
+      <min>0</min>
+      <max>5</max>
+      <step>0.1</step>
+      <live>true</live>
+      <property>/sim/gui/dialogs/joystick-config/gui-factor</property>
+      <binding>
+        <command>dialog-apply</command>
+        <object-name>sensitivity</object-name>
+      </binding>
+    </slider>
+
+    <text>
+      <row>11</row>
+      <col>1</col>
+      <halign>left</halign>
+      <format>Sensitivity Reduction %2.1f</format>
+      <label>0</label>
+      <property>/sim/gui/dialogs/joystick-config/gui-factor</property>
+      <live>true</live>
+    </text>
+
+    <button>
+      <row>11</row>
+      <col>2</col>
+      <halign>fill</halign>
+      <legend>Apply sensitivity</legend>
+      <binding>
+        <command>nasal</command>
+        <script>
+          assignAxis(nil);
+        </script>
+      </binding>
+    </button>
 
   </group>
 
+
   <group>
     <empty>
       <stretch>true</stretch>