From: Rafi Rubin <rafi@seas.upenn.edu>
To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com,
jkosina@suse.cz, chatty@enac.fr
Cc: Rafi Rubin <rafi@seas.upenn.edu>
Subject: [PATCH 2/4] hid-ntrig.c: removed unnecessary tool switching
Date: Thu, 11 Feb 2010 22:14:06 -0500 [thread overview]
Message-ID: <1265944448-23436-2-git-send-email-rafi@seas.upenn.edu> (raw)
In-Reply-To: <1265944448-23436-1-git-send-email-rafi@seas.upenn.edu>
With the pen and touch split apart, we no longer need to inject
additional tool switching events.
Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
---
drivers/hid/hid-ntrig.c | 41 +----------------------------------------
1 files changed, 1 insertions(+), 40 deletions(-)
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index 38b2364..1bda3a4 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -27,9 +27,6 @@
struct ntrig_data {
__s32 x, y, id, w, h;
bool reading_a_point, found_contact_id;
- bool pen_active;
- bool finger_active;
- bool inverted;
};
/*
@@ -47,7 +44,6 @@ static int ntrig_input_mapping(struct hid_device *hdev, struct hid_input *hi,
return 0;
switch (usage->hid & HID_USAGE_PAGE) {
-
case HID_UP_GENDESK:
switch (usage->hid) {
case HID_GD_X:
@@ -111,6 +107,7 @@ static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *hi,
/* No special mappings needed for the pen */
if (field->application == HID_DG_PEN)
return 0;
+
if (usage->type == EV_KEY || usage->type == EV_REL
|| usage->type == EV_ABS)
clear_bit(usage->code, *bit);
@@ -136,18 +133,6 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
if (hid->claimed & HID_CLAIMED_INPUT) {
switch (usage->hid) {
-
- case HID_DG_INRANGE:
- if (field->application & 0x3)
- nd->pen_active = (value != 0);
- else
- nd->finger_active = (value != 0);
- return 0;
-
- case HID_DG_INVERT:
- nd->inverted = value;
- return 0;
-
case HID_GD_X:
nd->x = value;
nd->reading_a_point = 1;
@@ -171,32 +156,8 @@ static int ntrig_event (struct hid_device *hid, struct hid_field *field,
* to emit a normal (X, Y) position
*/
if (!nd->found_contact_id) {
- if (nd->pen_active && nd->finger_active) {
- input_report_key(input, BTN_TOOL_DOUBLETAP, 0);
- input_report_key(input, BTN_TOOL_DOUBLETAP, 1);
- }
- input_event(input, EV_ABS, ABS_X, nd->x);
- input_event(input, EV_ABS, ABS_Y, nd->y);
- }
- break;
- case HID_DG_TIPPRESSURE:
- /*
- * when in single touch mode, this is the last
- * report received in a pen event. We want
- * to emit a normal (X, Y) position
- */
- if (! nd->found_contact_id) {
- if (nd->pen_active && nd->finger_active) {
- input_report_key(input,
- nd->inverted ? BTN_TOOL_RUBBER : BTN_TOOL_PEN
- , 0);
- input_report_key(input,
- nd->inverted ? BTN_TOOL_RUBBER : BTN_TOOL_PEN
- , 1);
- }
input_event(input, EV_ABS, ABS_X, nd->x);
input_event(input, EV_ABS, ABS_Y, nd->y);
- input_event(input, EV_ABS, ABS_PRESSURE, value);
}
break;
case 0xff000002:
--
1.6.6.1
next prev parent reply other threads:[~2010-02-12 3:14 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-12 0:19 [PATCH 1/4] HID: hid-ntrig add multi input quirk and clean up Rafi Rubin
2010-02-12 0:19 ` [PATCH 2/4] hid-ntrig.c: removed unnecessary tool switching Rafi Rubin
2010-02-12 0:19 ` [PATCH 3/4] hid-ntrig.c Split multi and single touch Rafi Rubin
2010-02-12 0:19 ` [PATCH 4/4] hid-ntrig: Contact tracking Rafi Rubin
2010-02-12 0:42 ` [PATCH 3/4] hid-ntrig.c Split multi and single touch Dmitry Torokhov
2010-02-12 3:10 ` Rafi Rubin
2010-02-12 8:09 ` Dmitry Torokhov
2010-02-12 19:56 ` Rafi Rubin
2010-02-12 10:41 ` Jiri Kosina
2010-02-12 0:36 ` [PATCH 1/4] HID: hid-ntrig add multi input quirk and clean up Dmitry Torokhov
2010-02-12 0:45 ` Rafi Rubin
2010-02-12 1:03 ` Rafi Rubin
2010-02-12 1:20 ` Dmitry Torokhov
2010-02-12 0:37 ` Rafi Rubin
2010-02-12 3:14 ` Rafi Rubin
2010-02-12 3:14 ` Rafi Rubin [this message]
2010-02-12 3:14 ` [PATCH 3/4] hid-ntrig.c Split multi and single touch Rafi Rubin
2010-02-12 3:14 ` [PATCH 4/4] hid-ntrig: Contact tracking Rafi Rubin
2010-02-20 8:29 ` Mohamed Ikbel Boulabiar
[not found] ` <45cc95261002200025m378e1a80rec09bde5673a6060@mail.gmail.com>
2010-02-20 17:48 ` Rafi Rubin
2010-02-12 8:13 ` [PATCH 3/4] hid-ntrig.c Split multi and single touch Dmitry Torokhov
2010-02-12 23:16 ` Rafi Rubin
2010-02-13 2:13 ` [PATCH] hid-ntrig.c Multitouch cleanup and fix Rafi Rubin
2010-02-13 2:24 ` Rafi Rubin
2010-02-16 12:50 ` Jiri Kosina
2010-03-09 21:01 ` Henrik Rydberg
2010-03-09 21:17 ` Rafi Rubin
2010-03-09 21:19 ` Jiri Kosina
2010-03-09 22:03 ` Stéphane Chatty
2010-03-09 22:25 ` Henrik Rydberg
2010-03-09 22:42 ` Mohamed Ikbel Boulabiar
2010-03-09 23:08 ` Henrik Rydberg
2010-03-09 23:17 ` Dmitry Torokhov
2010-03-09 23:26 ` Henrik Rydberg
2010-03-11 4:30 ` Peter Hutterer
2010-03-11 5:36 ` Mohamed Ikbel Boulabiar
2010-03-11 6:25 ` Peter Hutterer
2010-03-11 9:42 ` Stéphane Chatty
2010-03-09 22:27 ` Dmitry Torokhov
2010-03-09 22:32 ` Rafi Rubin
2010-03-09 22:54 ` Stéphane Chatty
2010-03-09 22:12 ` Rafi Rubin
2010-03-09 22:39 ` Henrik Rydberg
2010-03-09 21:59 ` Henrik Rydberg
2010-03-09 22:11 ` Stéphane Chatty
2010-03-09 22:29 ` Henrik Rydberg
2010-03-09 22:44 ` Stéphane Chatty
2010-03-09 22:27 ` Rafi Rubin
2010-03-09 23:23 ` Henrik Rydberg
2010-03-09 23:38 ` Rafi Rubin
2010-03-09 23:42 ` Dmitry Torokhov
2010-03-10 0:32 ` Rafi Rubin
2010-03-10 3:47 ` Dmitry Torokhov
2010-03-10 4:40 ` Rafi Rubin
2010-03-10 8:38 ` [PATCH] hid: ntrig touch events rafi
2010-03-10 15:04 ` Jiri Kosina
2010-03-18 20:19 ` Rafi Rubin
2010-03-19 8:44 ` Jiri Kosina
2010-03-19 14:12 ` Rafi Rubin
2010-02-16 12:49 ` [PATCH 2/4] hid-ntrig.c: removed unnecessary tool switching Jiri Kosina
2010-02-12 3:15 ` [PATCH 1/4] HID: hid-ntrig add multi input quirk and clean up Rafi Rubin
2010-02-16 12:49 ` Jiri Kosina
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=1265944448-23436-2-git-send-email-rafi@seas.upenn.edu \
--to=rafi@seas.upenn.edu \
--cc=chatty@enac.fr \
--cc=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@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).