From: Henrik Rydberg <rydberg@euromail.se>
To: akpm@osdl.org, Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] input: mousedev: Distinguish a moving finger from a tapping finger
Date: Fri, 05 Sep 2008 03:17:42 +0200 [thread overview]
Message-ID: <48C088B6.5020406@euromail.se> (raw)
The tap functionality of mousedev does not distinguish between a tap
(on/off localized in time and space) and a quick move (on/off localized
in time only). This patch improves the tap detection by testing also
for space locality.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
drivers/input/mousedev.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 8137e50..27e1d73 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -49,6 +49,10 @@ static unsigned tap_time = 200;
module_param(tap_time, uint, 0644);
MODULE_PARM_DESC(tap_time, "Tap time for touchpads in absolute mode (msecs)");
+static unsigned tap_move = 20;
+module_param(tap_move, uint, 0644);
+MODULE_PARM_DESC(tap_move, "Tap distance for touchpads in absolute mode (res)");
+
struct mousedev_hw_data {
int dx, dy, dz;
int x, y;
@@ -76,6 +80,7 @@ struct mousedev {
int old_x[4], old_y[4];
int frac_dx, frac_dy;
unsigned long touch;
+ int touch_dx, touch_dy;
};
enum mousedev_emul {
@@ -143,6 +148,7 @@ static void mousedev_touchpad_event(struct input_dev *dev,
tmp = ((value - fx(2)) * 256 * FRACTION_DENOM) / size;
tmp += mousedev->frac_dx;
mousedev->packet.dx = tmp / FRACTION_DENOM;
+ mousedev->touch_dx += mousedev->packet.dx;
mousedev->frac_dx =
tmp - mousedev->packet.dx * FRACTION_DENOM;
}
@@ -158,6 +164,7 @@ static void mousedev_touchpad_event(struct input_dev *dev,
tmp = -((value - fy(2)) * 256 * FRACTION_DENOM) / size;
tmp += mousedev->frac_dy;
mousedev->packet.dy = tmp / FRACTION_DENOM;
+ mousedev->touch_dy += mousedev->packet.dy;
mousedev->frac_dy = tmp -
mousedev->packet.dy * FRACTION_DENOM;
}
@@ -320,6 +327,8 @@ static void mousedev_touchpad_touch(struct mousedev *mousedev, int value)
{
if (!value) {
if (mousedev->touch &&
+ abs(mousedev->touch_dx) < tap_move &&
+ abs(mousedev->touch_dy) < tap_move &&
time_before(jiffies,
mousedev->touch + msecs_to_jiffies(tap_time))) {
/*
@@ -336,6 +345,7 @@ static void mousedev_touchpad_touch(struct mousedev *mousedev, int value)
clear_bit(0, &mousedev_mix->packet.buttons);
}
mousedev->touch = mousedev->pkt_count = 0;
+ mousedev->touch_dx = mousedev->touch_dy = 0;
mousedev->frac_dx = 0;
mousedev->frac_dy = 0;
--
1.5.4.3
reply other threads:[~2008-09-05 1:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48C088B6.5020406@euromail.se \
--to=rydberg@euromail.se \
--cc=akpm@osdl.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).