diff options
| -rw-r--r-- | src/synaptics.c | 12 | ||||
| -rw-r--r-- | src/synapticsstr.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 494101b..ce50d97 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -675,6 +675,7 @@ set_default_parameters(InputInfoPtr pInfo) pars->tap_time_2 = xf86SetIntOption(opts, "MaxDoubleTapTime", 180); pars->click_time = xf86SetIntOption(opts, "ClickTime", 100); pars->clickpad = xf86SetBoolOption(opts, "ClickPad", pars->clickpad); /* Probed */ + pars->clickpad_ignore_motion_time = 100; /* ms */ /* middle mouse button emulation on a clickpad? nah, you're joking */ middle_button_timeout = pars->clickpad ? 0 : 75; pars->emulate_mid_button_time = @@ -1031,6 +1032,7 @@ SynapticsReset(SynapticsPrivate * priv) priv->count_packet_finger = 0; priv->finger_state = FS_UNTOUCHED; priv->last_motion_millis = 0; + priv->clickpad_click_millis = 0; priv->inside_button_area = FALSE; priv->tap_state = TS_START; priv->tap_button = 0; @@ -2810,6 +2812,7 @@ update_hw_button_state(const InputInfoPtr pInfo, struct SynapticsHwState *hw, hw->left = 0; hw->middle = 1; } + priv->clickpad_click_millis = now; } else if (hw->left) { hw->left = (priv->lastButtons & 1) ? 1 : 0; @@ -3134,6 +3137,15 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now, if (priv->has_scrollbuttons) double_click = adjust_state_from_scrollbuttons(pInfo, hw); + /* Ignore motion the first X ms after a clickpad click */ + if (priv->clickpad_click_millis) { + if(TIME_DIFF(priv->clickpad_click_millis + + para->clickpad_ignore_motion_time, now) > 0) + ignore_motion = TRUE; + else + priv->clickpad_click_millis = 0; + } + /* now we know that these _coordinates_ aren't in the area. invalid are: x, y, z, numFingers, fingerWidth valid are: millis, left/right/middle/up/down/etc. diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 2c4e727..72140c3 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -160,6 +160,7 @@ typedef struct _SynapticsParameters { int tap_time_2; /* max. tapping time for double taps */ int click_time; /* The duration of a single click */ Bool clickpad; /* Device is a has integrated buttons */ + int clickpad_ignore_motion_time; /* Ignore motion for X ms after a click */ int emulate_mid_button_time; /* Max time between left and right button presses to emulate a middle button press. */ int emulate_twofinger_z; /* pressure threshold to emulate two finger touch (for Alps) */ @@ -250,6 +251,7 @@ struct _SynapticsPrivateRec { enum FingerState finger_state; /* previous finger state */ CARD32 last_motion_millis; /* time of the last motion */ Bool inside_button_area; /* Inside button area (ignore motion) */ + int clickpad_click_millis; /* Time of last clickpad click */ enum TapState tap_state; /* State of tap processing */ int tap_max_fingers; /* Max number of fingers seen since entering start state */ |