XLibre/xf86-input-synaptics
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-synaptics.git synced 2026-04-14 11:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added heuristics for palm detection. There are some

Browse Source 
hardcoded values that should probably be converted to parameters.
This commit is contained in:
Peter Osterlund
2002-07-06 01:46:05 +02:00
parent ae9d614d34
commit e9febd174f
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
synaptics.c
View File

@@ -61,6 +61,7 @@ typedef enum {
LEFT_TOP_EDGE = TOP_EDGE | LEFT_EDGE
} edge_type;
#define MAX(a, b) (((a)>(b))?(a):(b))
#define DIFF_TIME(a, b) (((a)>(b))?(a)-(b):(b)-(a))
#define VERSION "0.10p1"
@@ -523,8 +524,42 @@ ReadInput(LocalDevicePtr local)
finger = (((z > para->finger_high) && !priv->finger_flag) ||
((z > para->finger_low) && priv->finger_flag));
/* palm detection */
if(SYN_CAP_EXTENDED(priv->capabilities) && SYN_CAP_PALMDETECT(priv->capabilities)) {
if(finger) {
if((z > 200) && (w > 10))
priv->palm = TRUE;
} else {
priv->palm = FALSE;
}
if(x == 0)
priv->avg_w = 0;
else
priv->avg_w += (w - priv->avg_w + 1) / 2;
if(finger && !priv->finger_flag) {
int safe_w = MAX(w, priv->avg_w);
if(w < 2)
finger = TRUE; /* more than one finger -> not a palm */
else if((safe_w < 6) && (priv->prev_z < para->finger_high))
finger = TRUE; /* thin finger, distinct touch -> not a palm */
else if((safe_w < 7) && (priv->prev_z < para->finger_high / 2))
finger = TRUE; /* thin finger, distinct touch -> not a palm */
else if(z > priv->prev_z + 1) /* z not stable, may be a palm */
finger = FALSE;
else if(z < priv->prev_z - 5) /* z not stable, may be a palm */
finger = FALSE;
else if(z > 200) /* z too large -> probably palm */
finger = FALSE;
else if(w > 10) /* w too large -> probably palm */
finger = FALSE;
}
priv->prev_z = z;
}
/* tap and drag detection */
if(finger && !priv->finger_flag) { /* touched */
if(priv->palm) {
/* Palm detected, skip tap/drag processing */
} else if(finger && !priv->finger_flag) { /* touched */
DBG(7, ErrorF("touched - x:%d, y:%d packet:%lu\n", x, y, priv->count_packet));
if(priv->tap) {
DBG(7, ErrorF("drag detected - tap time:%lu\n", priv->count_packet_tapping));
@@ -638,7 +673,7 @@ ReadInput(LocalDevicePtr local)
DBG(7, ErrorF("edge scroll detected on right edge\n"));
}
}
if(priv->vert_scroll_on && (!(edge & RIGHT_EDGE) || !finger)) {
if(priv->vert_scroll_on && (!(edge & RIGHT_EDGE) || !finger || priv->palm)) {
DBG(7, ErrorF("edge scroll off\n"));
priv->vert_scroll_on = FALSE;
}
@@ -659,7 +694,7 @@ ReadInput(LocalDevicePtr local)
}
/* movement */
if(finger && !priv->vert_scroll_on && !priv->finger_count) {
if(finger && !priv->vert_scroll_on && !priv->finger_count && !priv->palm) {
if(priv->count_packet_finger > 3) { /* min. 3 packets */
dy = (1 *
(((priv->move_hist[MOVE_HIST(1)].y + priv->move_hist[MOVE_HIST(2)].y) / 2) -

4
synaptics.h
View File

@@ -74,6 +74,10 @@ typedef struct _SynapticsPrivateRec
int repeatButtons; /* buttons for repeat */
int lastButtons; /* last State of the buttons */
int finger_count; /* tap counter for fingers */
int palm; /* Set to true when palm detected, reset to false when
* palm/finger contact disappears */
int prev_z; /* previous z value, for palm detection */
int avg_w; /* weighted average of previous w values */
}
SynapticsPrivateRec, *SynapticsPrivatePtr;