| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 27 Jun 2012 22:36:15 +0200
From: Olivier Goffart <ogoffart@...oq.com>
To: avatar@...telic.com
Cc: linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
Olivier Goffart <ogoffart@...oq.com>
Subject: [PATCH] Fix sentelic multi-touch driver
Always report both finger between the sync. Even if the documentation
of input-mt says one can only report one at the time, it does not
work otherwise. This fix scrolling in X11 which flickers a lot.
Ignore the duplicate or release events. They keep some gestures from
working (such as the two-finger tap)
This seems to fix the problems reported here:
https://bugzilla.kernel.org/show_bug.cgi?id=43591
Signed-off-by: Olivier Goffart <ogoffart@...oq.com>
---
drivers/input/mouse/sentelic.c | 46 +++++++++++++++++++++++++++++++++++++-----
drivers/input/mouse/sentelic.h | 3 +++
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index 3f5649f..b205857 100644
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -731,6 +731,17 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
*/
fgrs = 2;
+ if (abs_x == 0 && abs_y == 0) {
+ /*
+ * We can ignore multi-finger release events.
+ * We notice a finger has left the touchpad
+ * when we receive events for the other finger.
+ * And for the last finger, we receive
+ * single-finger release events.
+ */
+ return PSMOUSE_FULL_PACKET;
+ }
+
/* MFMC packet */
if (packet[0] & FSP_PB0_MFMC_FGR2) {
/* 2nd finger */
@@ -742,10 +753,16 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
*/
fgrs = 1;
fsp_set_slot(dev, 0, false, 0, 0);
+ fsp_set_slot(dev, 1, fgrs == 1,
+ abs_x, abs_y);
+ } else {
+ ad->last_mt_fgr = 2;
+ fsp_set_slot(dev, 0, true,
+ ad->finger1_abs_x,
+ ad->finger1_abs_y);
+ fsp_set_slot(dev, 1, fgrs == 2,
+ abs_x, abs_y);
}
- ad->last_mt_fgr = 2;
-
- fsp_set_slot(dev, 1, fgrs == 2, abs_x, abs_y);
} else {
/* 1st finger */
if (ad->last_mt_fgr == 1) {
@@ -755,10 +772,29 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
* the 2nd finger is up
*/
fgrs = 1;
+ fsp_set_slot(dev, 0, fgrs != 0,
+ abs_x, abs_y);
fsp_set_slot(dev, 1, false, 0, 0);
+ } else {
+ ad->finger1_abs_x = abs_x;
+ ad->finger1_abs_y = abs_y;
+
+ /*
+ * There is a superflous event from the
+ * driver when the two fingers are put
+ * on the touchpad. Don't set
+ * last_mt_fgr if we have not seen the
+ * second figner yet, so the previous
+ * workarond is not triggered and the
+ * superflous event is ignored.
+ * This is required to get the two
+ * finger tap gesture working.
+ */
+ if (ad->last_mt_fgr != 0)
+ ad->last_mt_fgr = 1;
+
+ return PSMOUSE_FULL_PACKET;
}
- ad->last_mt_fgr = 1;
- fsp_set_slot(dev, 0, fgrs != 0, abs_x, abs_y);
}
} else {
/* SFAC packet */
diff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h
index aa697ec..7224f84 100644
--- a/drivers/input/mouse/sentelic.h
+++ b/drivers/input/mouse/sentelic.h
@@ -117,6 +117,9 @@ struct fsp_data {
unsigned char last_reg; /* Last register we requested read from */
unsigned char last_val;
unsigned int last_mt_fgr; /* Last seen finger(multitouch) */
+
+ unsigned short finger1_abs_x; /* finger1 absolute position */
+ unsigned short finger1_abs_y;
};
#ifdef CONFIG_MOUSE_PS2_SENTELIC
--
1.7.11.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists