From 6b3cfdfcbe09007e02728d038f2696241d4ba031 Mon Sep 17 00:00:00 2001
From: rsn8887 <rsn8887@users.noreply.github.com>
Date: Sun, 9 Sep 2018 12:17:54 -0500
Subject: [PATCH] improve pointer response to diagonal stick directions

---
 README.MD      |  4 ++++
 src/od-joy.cpp | 41 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index b676dfe..05e22b0 100644
--- a/README.MD
+++ b/README.MD
@@ -119,6 +119,10 @@ Mouse + keyboard tested working with the "Jelly Comb Mini Bluetooth Keyboard Wit
 
 CHANGELOG
 =====
+1.70
+
+- Improve pointer response to diagonal stick directions
+
 1.69
 
 - Improve pointer response to slow finger motion
diff --git a/src/od-joy.cpp b/src/od-joy.cpp
index 94dca7c..4a6b0e6 100755
--- a/src/od-joy.cpp
+++ b/src/od-joy.cpp
@@ -338,12 +338,45 @@ void read_joystick(int nr, unsigned int *dir, int *button)
 			//max movement is mouseScale.
 			//that way, when in one of the other mouse modes,
 			//the Y button to change scale still works
+			const float maxAxis = 32767.0f;
 			magnitude=sqrt(analogX*analogX+analogY*analogY);
-			if (magnitude >= deadZone)
+			if (magnitude > deadZone && deadZone < maxAxis)
 			{
-				scalingFactor=1.0f/magnitude*(magnitude-deadZone)/(32769.0f-deadZone);
-				analogX = analogX * scalingFactor;
-				analogY = analogY * scalingFactor;
+				//adjust maximum magnitude
+				float absAnalogX = fabs(analogX);
+				float absAnalogY = fabs(analogY);
+				float maxX;
+				float maxY;
+				if (absAnalogX > absAnalogY){
+					maxX = maxAxis;
+					maxY = (maxAxis * analogY) / absAnalogX;
+				}else{
+					maxX = (maxAxis * analogX) / absAnalogY;
+					maxY = maxAxis;
+				}
+				float maximum = sqrt(maxX * maxX + maxY * maxY);
+				if (maximum > 1.25f * maxAxis) maximum = 1.25f * maxAxis;
+				if (maximum < magnitude) maximum = magnitude;
+
+				// find scaled axis values with magnitudes between zero and maximum
+				float scalingFactor = maximum / magnitude * (magnitude - deadZone) / (maximum - deadZone);
+				analogX = (analogX * scalingFactor);
+				analogY = (analogY * scalingFactor);
+
+				// clamp to ensure results will always lie between 0 and 1.0f
+				float clampingFactor = 1.0f / maxAxis;
+				absAnalogX = fabs(analogX);
+				absAnalogY = fabs(analogY);
+				if (absAnalogX > maxAxis || absAnalogY > maxAxis){
+					if (absAnalogX > absAnalogY)
+						clampingFactor = 1.0f / absAnalogX;
+					else
+						clampingFactor = 1.0f / absAnalogY;
+				}
+
+				analogX *= clampingFactor;
+				analogY *= clampingFactor;
+
 				lastmx += (int) (analogX * mouseScale);
 				lastmy += (int) (analogY * mouseScale);
 				newmousecounters=1;