Make scrolling immediately react to keypresses regardless of the prev…

…ious internal scroll state.
UltimateHackingKeyboard · Dec 7, 2017 · 2f7f7b1 · 2f7f7b1
1 parent 2eb25ce
commit 2f7f7b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
@@ -25,6 +25,7 @@ uint16_t DoubleTapSwitchLayerTimeout = 250;
 static bool activeMouseStates[ACTIVE_MOUSE_STATES_COUNT];
 
 mouse_kinetic_state_t MouseMoveState = {
+    .isScroll = false,
     .upState = SerializedMouseAction_MoveUp,
     .downState = SerializedMouseAction_MoveDown,
     .leftState = SerializedMouseAction_MoveLeft,
@@ -38,6 +39,7 @@ mouse_kinetic_state_t MouseMoveState = {
 };
 
 mouse_kinetic_state_t MouseScrollState = {
+    .isScroll = true,
     .upState = SerializedMouseAction_ScrollDown,
     .downState = SerializedMouseAction_ScrollUp,
     .leftState = SerializedMouseAction_ScrollLeft,
@@ -97,6 +99,11 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState)
 
         float distance = kineticState->currentSpeed * elapsedTime / 1000;
 
+        if (kineticState->isScroll && !kineticState->wasMoveAction) {
+            kineticState->xSum = 0;
+            kineticState->ySum = 0;
+        }
+
         if (activeMouseStates[kineticState->leftState]) {
             kineticState->xSum -= distance;
         } else if (activeMouseStates[kineticState->rightState]) {
@@ -108,6 +115,11 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState)
         kineticState->xSum = xSumFrac;
         kineticState->xOut = xSumInt;
 
+        if (kineticState->isScroll && !kineticState->wasMoveAction && kineticState->xOut == 0) {
+            kineticState->xOut = kineticState->xSum > 0 ? 1 : -1;
+            kineticState->xSum = 0;
+        }
+
         if (activeMouseStates[kineticState->upState]) {
             kineticState->ySum -= distance;
         } else if (activeMouseStates[kineticState->downState]) {
@@ -118,6 +130,11 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState)
         float ySumFrac = modff(kineticState->ySum, &ySumInt);
         kineticState->ySum = ySumFrac;
         kineticState->yOut = ySumInt;
+
+        if (kineticState->isScroll && !kineticState->wasMoveAction && kineticState->yOut == 0) {
+            kineticState->yOut = kineticState->ySum > 0 ? 1 : -1;
+            kineticState->ySum = 0;
+        }
     } else {
         kineticState->currentSpeed = 0;
     }

diff --git a/right/src/usb_report_updater.h b/right/src/usb_report_updater.h
@@ -43,6 +43,7 @@
     } mouse_speed_t;
 
     typedef struct {
+        bool isScroll;
         bool wasMoveAction;
         serialized_mouse_action_t upState;
         serialized_mouse_action_t downState;