summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--synaptics.c6
-rw-r--r--synaptics.h3
2 files changed, 2 insertions, 7 deletions
diff --git a/synaptics.c b/synaptics.c
index 77bacac..3c66642 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -1050,7 +1050,6 @@ SetTapState(SynapticsPrivate *priv, enum TapState tap_state, int millis)
static void
SetMovingState(SynapticsPrivate *priv, enum MovingState moving_state, int millis)
{
- /* SynapticsSHM *para = priv->synpara; */
DBG(7, ErrorF("SetMovingState - %d -> %d center at %d/%d (millis:%d)\n", priv->moving_state,
moving_state,priv->hwState.x, priv->hwState.y, millis));
@@ -1106,9 +1105,6 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw,
priv->touch_on.millis = hw->millis;
} else if (release) {
priv->touch_on.millis = hw->millis;
- move = ((priv->tap_max_fingers <= 1) &&
- ((abs(hw->x - priv->touch_on.x) >= para->tap_move) ||
- (abs(hw->y - priv->touch_on.y) >= para->tap_move)));
}
if (hw->z > para->finger_high)
if (priv->tap_max_fingers < hw->numFingers)
@@ -1656,7 +1652,7 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
{
SynapticsPrivate *priv = (SynapticsPrivate *) (local->private);
SynapticsSHM *para = priv->synpara;
- Bool finger;
+ int finger;
int dx, dy, buttons, rep_buttons, id;
edge_type edge;
int change;
diff --git a/synaptics.h b/synaptics.h
index 8292802..9cd3969 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -137,7 +137,7 @@ typedef struct _SynapticsMoveHist
int millis;
} SynapticsMoveHistRec;
-enum FingerState {
+enum FingerState { /* Note! The order matters. Compared with < operator. */
FS_UNTOUCHED,
FS_TOUCHED,
FS_PRESSED
@@ -146,7 +146,6 @@ enum FingerState {
enum MovingState {
MS_FALSE,
MS_TOUCHPAD_RELATIVE,
- MS_TOUCHPAD_ABSOLUTE, /* lets reserve this for future extension, in no way supported for now */
MS_TRACKSTICK /* trackstick is always relative */
};