Move tapping parameter to memory.c

The tapping was not properly turned off by the parameter, resulting
in spurious clicks when typing. This patch moves the tapping parameter
logic to memory.c, which fixes the problem.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

2 files changed, 4 insertions, 5 deletions

diff --git a/src/gestures.c b/src/gestures.c
index 3f59a1e..db3fc83 100644
--- a/src/gestures.c
+++ b/src/gestures.c
@@ -27,7 +27,6 @@
 
 static const int FINGER_THUMB_MS = 600;
 static const int BUTTON_HOLD_MS = 200;
-#define use_tapping 0
 
 /**
  * extract_buttons
@@ -197,9 +196,6 @@ void extract_delayed_gestures(struct Gestures *gs, struct MTouch* mt)
 {
         mt->mem.wait = 0;
 
-        if (!use_tapping && mt->caps.has_left)
-                return;
-
         if (mt->mem.tpdown < mt->mem.tpup) {
                 switch (mt->mem.maxtap) {
                 case 1:
diff --git a/src/memory.c b/src/memory.c
index 2bb4d95..974a531 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -21,6 +21,8 @@
 
 #include "memory.h"
 
+#define use_tapping 0
+
 /* click area definition */
 #define CLICK_AREA(c) ((c->has_ibt ? 0.20 : 0.00) * get_cap_ysize(c))
 
@@ -279,7 +281,8 @@ void refresh_memory(struct Memory *m,
         update_configuration(m, prev_state, state);
         update_pointers(m, state, caps);
         update_movement(m, prev_state, state, caps);
-        update_tapping(m, prev_state, state, caps);
+        if (use_tapping || !caps->has_left)
+                update_tapping(m, prev_state, state, caps);
 }
 
 void output_memory(const struct Memory *m)