XLibre/xf86-input-synaptics
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-synaptics.git synced 2026-03-24 09:44:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ABS_MT events for the palm detection when supported

Browse Source 
Use ABS_MT_TOUCH_MAJOR and ABS_MT_PRESSURE instead of ABS_TOOL_WIDTH
and ABS_PRESSURE when supported so that the pressure and the width of
all the fingers is taken into account for the palm detection.

This also fixes the palm detection for those touchpads for which the
kernel only sends ABS_MT_TOUCH_MAJOR and not ABS_TOOL_WIDTH.

Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Gabriele Mazzotta
2014-09-16 17:20:15 +02:00
committed by Peter Hutterer
parent 41b2312c00
commit a897147be0
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eventcomm.c
View File

@@ -606,6 +606,14 @@ EventProcessTouchEvent(InputInfoPtr pInfo, struct SynapticsHwState *hw,
hw->slot_state[slot_index] = SLOTSTATE_CLOSE;
proto_data->num_touches--;
}
/* When there are no fingers on the touchpad, set width and
* pressure to zero as ABS_MT_TOUCH_MAJOR and ABS_MT_PRESSURE
* are not zero when fingers are released. */
if (proto_data->num_touches == 0) {
hw->fingerWidth = 0;
hw->z = 0;
}
}
else {
ValuatorMask *mask = proto_data->last_mt_vals[slot_index];
@@ -618,6 +626,10 @@ EventProcessTouchEvent(InputInfoPtr pInfo, struct SynapticsHwState *hw,
hw->cumulative_dx += ev->value - last_val;
else if (ev->code == ABS_MT_POSITION_Y)
hw->cumulative_dy += ev->value - last_val;
else if (ev->code == ABS_MT_TOUCH_MAJOR)
hw->fingerWidth = ev->value;
else if (ev->code == ABS_MT_PRESSURE)
hw->z = ev->value;
}
valuator_mask_set(mask, map, ev->value);

3
src/synaptics.c
View File

@@ -1829,6 +1829,9 @@ SynapticsDetectFinger(SynapticsPrivate * priv, struct SynapticsHwState *hw)
if ((hw->z > para->palm_min_z) && (hw->fingerWidth > para->palm_min_width))
return FS_BLOCKED;
if (priv->has_touch)
return finger;
if (hw->x == 0 || priv->finger_state == FS_UNTOUCHED)
priv->avg_width = 0;
else