Added additional config settings to default config and applied scrolling changes from Tylemagne#143

Author: connordear

Windows/Gopher/ConfigFile.cpp

@@ -142,6 +142,10 @@ void ConfigFile::ExtractKeys()
     outfile << "# ACCELERATION_FACTOR = 3" << std::endl;
     outfile << "#  Swaps the function of the thumbsticks. Set to 0 for default behavior or set to 1 to have the mouse movement on the right stick and scrolling on the left stick." << std::endl;
     outfile << "SWAP_THUMBSTICKS = 0" << std::endl;
+    outfile << "DEAD_ZONE = 6000 # Thumbstick dead zone to use for mouse movement. Absolute maximum thumbstick value is 32768." << std::endl;
+    outfile << "SCROLL_DEAD_ZONE = 5000 # Thumbstick dead zone to use for scroll wheel movement. Absolute maximum thumbstick value is 32768." << std::endl;
+    outfile << "TRIGGER_DEAD_ZONE = 0 # Dead zone for the left and right triggers to detect a trigger press. Range from 0 (accept all input) to 255 (ignore all input)." << std::endl;
+    outfile << "SCROLL_SPEED = 0.1 # Speed at which you scroll (scalar)" << std::endl;
     // End config dump
 
     outfile.close();

Windows/Gopher/Gopher.cpp

@@ -473,16 +473,18 @@ float Gopher::getDelta(short t)
 //   Calculates a multiplier for an analog thumbstick based on the update rate.
 //
 // Params:
-//   tValue     The thumbstick value
+//   magnitude The thumbstick magnitude in XY-plane, which is sqrt(deltaX*deltaX + deltaY*deltaY). Must be larger than deadzone.
 //   deadzone   The dead zone to use for this thumbstick
 //   accel      An exponent to use to create an input curve (Optional). 0 to use a linear input
 //   
 // Returns:
 //   Multiplier used to properly scale the given thumbstick value.
-float Gopher::getMult(float lengthsq, float deadzone, float accel = 0.0f)
+float Gopher::getMult(float magnitude, float deadzone, float accel = 0.0f)
 {
-  // Normalize the thumbstick value.
-  float mult = (sqrt(lengthsq) - deadzone) / (MAXSHORT - deadzone);
+    // Normalize the thumbstick value (result is in range 0 to 1).
+    // Note that the smallest accepted thumbstick distance is deadzone.
+    // Thus, 0% would be deadzone (and below) and 100% would be (MAXSHORT - deadzone)
+    float mult = (magnitude - deadzone) / (MAXSHORT - deadzone);
 
   // Apply a curve to the normalized thumbstick value.
   if (accel > 0.0001f)
@@ -504,15 +506,15 @@ void Gopher::handleMouseMovement()
 
   if (SWAP_THUMBSTICKS == 0)
   {
-    // Use left stick
-    tx = _currentState.Gamepad.sThumbLX;
-    ty = _currentState.Gamepad.sThumbLY;
+      // Use left stick
+      tx = getDelta(_currentState.Gamepad.sThumbLX);
+      ty = getDelta(_currentState.Gamepad.sThumbLY);
   }
   else
   {
-    // Use right stick
-    tx = _currentState.Gamepad.sThumbRX;
-    ty = _currentState.Gamepad.sThumbRY;
+      // Use right stick
+      tx = getDelta(_currentState.Gamepad.sThumbRX);
+      ty = getDelta(_currentState.Gamepad.sThumbRY);
   }
 
   float x = cursor.x + _xRest;
@@ -525,10 +527,10 @@ void Gopher::handleMouseMovement()
   float lengthsq = unsigned int(tx * tx + ty * ty);
   if (lengthsq > DEAD_ZONE * DEAD_ZONE)
   {
-    float mult = speed * getMult(lengthsq, DEAD_ZONE, acceleration_factor);
+      float mult = speed * getMult(sqrt(lengthsq), DEAD_ZONE, acceleration_factor);
 
-    dx = getDelta(tx) * mult;
-    dy = getDelta(ty) * mult;
+      dx = tx * mult;
+      dy = ty * mult;
   }
 
   x += dx;
@@ -561,12 +563,17 @@ void Gopher::handleScrolling()
   }
 
   // Handle dead zone
-  float magnitude = sqrt(tx * tx + ty * ty);
-
-  if (magnitude > SCROLL_DEAD_ZONE)
+  float magnitudeX = abs(tx);
+  float magnitudeY = abs(ty);
+  if (magnitudeX > SCROLL_DEAD_ZONE)
+  {
+      int scrollX = tx * getMult(magnitudeX, SCROLL_DEAD_ZONE) * SCROLL_SPEED;
+      mouseEvent(MOUSEEVENTF_HWHEEL, scrollX);
+  }
+  if (magnitudeY > SCROLL_DEAD_ZONE)
   {
-    mouseEvent(MOUSEEVENTF_HWHEEL, tx * getMult(tx * tx, SCROLL_DEAD_ZONE) * SCROLL_SPEED);
-    mouseEvent(MOUSEEVENTF_WHEEL, ty * getMult(ty * ty, SCROLL_DEAD_ZONE) * SCROLL_SPEED);
+      int scrollY = ty * getMult(magnitudeY, SCROLL_DEAD_ZONE) * SCROLL_SPEED;
+      mouseEvent(MOUSEEVENTF_WHEEL, scrollY);
   }
 }