mirror of
https://github.com/X11Libre/xf86-input-synaptics.git
synced 2026-03-24 01:34:04 +00:00
Allow dead areas to update the button state
On clickpads, a dead area helps prevent pointer movement when the buttons
are pressed. Thus check for the button state before resetting the hw state
in case we get a right-click in the soft button area.
For clickfinger, the effect is that clickfinger events are now triggered if
the finger rests in the dead area.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit a5ac54f60a)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Conflicts:
src/synaptics.c
This commit is contained in:
@@ -3307,6 +3307,9 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
|
||||
|
||||
inside_active_area = is_inside_active_area(priv, hw->x, hw->y);
|
||||
|
||||
/* these two just update hw->left, right, etc. */
|
||||
update_hw_button_state(pInfo, hw, priv->old_hw_state, now, &delay);
|
||||
|
||||
/* 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.
|
||||
@@ -3318,8 +3321,6 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
|
||||
* really release, the finger should remain down. */
|
||||
}
|
||||
|
||||
/* these two just update hw->left, right, etc. */
|
||||
update_hw_button_state(pInfo, hw, priv->old_hw_state, now, &delay);
|
||||
if (priv->has_scrollbuttons)
|
||||
double_click = adjust_state_from_scrollbuttons(pInfo, hw);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user