From 54587d166dc84120cd306c9c7809272fc5484d7f Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Thu, 3 Sep 2015 22:22:44 -0700
Subject: [PATCH] Less choppy axis timing

---
 src/video/gltouchjoy_kpad.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/video/gltouchjoy_kpad.c b/src/video/gltouchjoy_kpad.c
index 4dc36d7a..6cf5564d 100644
--- a/src/video/gltouchjoy_kpad.c
+++ b/src/video/gltouchjoy_kpad.c
@@ -62,8 +62,6 @@ static struct {
     struct timespec timingBegins[MAX_REPEATING];
     bool buttonBegan;
     bool axisBegan;
-
-    ////int callbackIgnoreThreshold;
     int lastScancode;
 
     float repeatThresholdNanos;
@@ -186,7 +184,6 @@ static void touchkpad_keyboardReadCallback(void) {
     if (lockedButton && lockedAxis && fired < 0) {
         LOG("REPEAT KEY CALLBACK DONE ...");
         keydriver_keyboardReadCallback = NULL;
-        ////callbackCounter = 0;
     }
 
     if (lockedAxis) {
@@ -250,12 +247,17 @@ static void touchkpad_axisDown(void) {
         kpad.axisBegan = true;
         _touch_sourceBegin(&kpad.axisLock);
     }
+
+    keydriver_keyboardReadCallback = &touchkpad_keyboardReadCallback;
+    struct timespec now = { 0 };
+    clock_gettime(CLOCK_MONOTONIC, &now);
+    kpad.timingBegins[REPEAT_AXIS] = now;
+    kpad.timingBegins[REPEAT_AXIS_ALT] = now;
+
     kpad.axisCurrentOctant = ORIGIN;
     if (axes.rosetteScancodes[ROSETTE_CENTER] >= 0) {
-        keydriver_keyboardReadCallback = &touchkpad_keyboardReadCallback;
         kpad.scancodes[REPEAT_AXIS] = axes.rosetteScancodes[ROSETTE_CENTER];
         kpad.scancodes[REPEAT_AXIS_ALT] = -1;
-        clock_gettime(CLOCK_MONOTONIC, &kpad.timingBegins[REPEAT_AXIS]);
     }
 }
 
@@ -293,14 +295,6 @@ static void touchkpad_axisMove(int dx, int dy) {
 
         LOG("radians:%f radnorm:%f octant:%f, currOctant:%d", radians, radnorm, octant, kpad.axisCurrentOctant);
 
-        // handle a new octant
-
-        keydriver_keyboardReadCallback = &touchkpad_keyboardReadCallback;
-        struct timespec now = { 0 };
-        clock_gettime(CLOCK_MONOTONIC, &now);
-        kpad.timingBegins[REPEAT_AXIS] = now;
-        kpad.timingBegins[REPEAT_AXIS_ALT] = now;
-
         kpad.scancodes[REPEAT_AXIS_ALT] = -1;
         switch (kpad.axisCurrentOctant) {
             case OCTANT_NORTHWEST:
@@ -545,7 +539,6 @@ static void _init_gltouchjoy_kpad(void) {
     }
 
     kpad.currButtonDisplayChar = ' ';
-    ////kpad.callbackIgnoreThreshold = 1;
 
     kpad.repeatThresholdNanos = KEY_REPEAT_THRESHOLD_NANOS;