From: Kamal Mostafa <kamal@canonical.com>
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Henrik Rydberg <rydberg@euromail.se>
Cc: Dudley Du <dudl@cypress.com>, David Solda <dso@cypress.com>,
Troy Abercrombia <ta@cypress.com>,
Kamal Mostafa <kamal@canonical.com>,
Kyle Fazzari <git@status.e4ward.com>,
Mario Limonciello <mario_limonciello@dell.com>,
Tim Gardner <tim.gardner@canonical.com>,
Herton Krzesinski <herton.krzesinski@canonical.com>
Subject: [PATCH v4 4/4] input: Cypress PS/2 Trackpad simulated multitouch (disabled)
Date: Tue, 4 Dec 2012 18:24:05 -0800 [thread overview]
Message-ID: <1354674245-25768-5-git-send-email-kamal@canonical.com> (raw)
In-Reply-To: <1354674245-25768-1-git-send-email-kamal@canonical.com>
This feature is disabled by default; enable with CYPRESS_SIMULATED_MT.
Instead of SEMI_MT, present a full mt interface with simulated contact
positions for >=3 fingers. Enables e.g. multi-finger tap and drag for
old userspace applications which only count the contact positions.
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
drivers/input/mouse/cypress_ps2.c | 18 ++++++++++++++++++
drivers/input/mouse/cypress_ps2.h | 16 ++++++++++++++--
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c
index fab4d18..088cdb8 100644
--- a/drivers/input/mouse/cypress_ps2.c
+++ b/drivers/input/mouse/cypress_ps2.c
@@ -408,7 +408,9 @@ static int cypress_set_input_params(struct input_dev *input,
if (ret < 0)
return ret;
+#if ( CYPRESS_SIMULATED_MT != 1 )
__set_bit(INPUT_PROP_SEMI_MT, input->propbit);
+#endif
if (cytp->tp_res_x && cytp->tp_res_y) {
input_abs_set_res(input, ABS_X, cytp->tp_res_x);
@@ -531,6 +533,22 @@ static int cypress_parse_packet(struct psmouse *psmouse,
((packet[5] & 0x0f) << 8) | packet[7];
if (cytp->mode & CYTP_BIT_ABS_PRESSURE)
report_data->contacts[1].z = report_data->contacts[0].z;
+#if ( CYPRESS_SIMULATED_MT == 1 )
+ /* simulate contact positions for >2 fingers */
+ if ( report_data->contact_cnt >= 3 ) {
+ int i;
+ for ( i=1; i<report_data->contact_cnt; i++ ) {
+ report_data->contacts[i].x =
+ report_data->contacts[0].x
+ + 100*(i)*((i%2)?-1:1);
+ report_data->contacts[i].y =
+ report_data->contacts[0].y;
+ if (cytp->mode & CYTP_BIT_ABS_PRESSURE)
+ report_data->contacts[i].z =
+ report_data->contacts[0].z;
+ }
+ }
+#endif
}
report_data->left = (header_byte & BTN_LEFT_BIT) ? 1 : 0;
diff --git a/drivers/input/mouse/cypress_ps2.h b/drivers/input/mouse/cypress_ps2.h
index a74f985..c38cb6f 100644
--- a/drivers/input/mouse/cypress_ps2.h
+++ b/drivers/input/mouse/cypress_ps2.h
@@ -133,8 +133,20 @@
#define RESP_REMOTE_BIT 0x40
#define RESP_SMBUS_BIT 0x80
-#define CYTP_MAX_CONTACTS 2
-#define CYTP_MAX_MT_SLOTS 2
+/*
+ * CYPRESS_SIMULATED_MT
+ * set to 1 for simulated multitouch (up to CTYP_MAX_CONTACTS fingers)
+ * set to 0 for SEMI_MT (2 fingers only)
+ */
+#define CYPRESS_SIMULATED_MT 0
+
+#if ( CYPRESS_SIMULATED_MT == 1 )
+# define CYTP_MAX_CONTACTS 5
+# define CYTP_MAX_MT_SLOTS 16
+#else
+# define CYTP_MAX_CONTACTS 2
+# define CYTP_MAX_MT_SLOTS 2
+#endif
enum cytp_type {
CYTP_STG,
--
1.7.10.4
next prev parent reply other threads:[~2012-12-05 2:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-05 2:24 [PATCH v4 0/4] Cypress PS/2 Trackpad driver Kamal Mostafa
2012-12-05 2:24 ` [PATCH v4 1/4] input: increase struct ps2dev cmdbuf[] to 8 bytes Kamal Mostafa
2012-12-05 2:24 ` [PATCH v4 2/4] input: Cypress PS/2 Trackpad psmouse driver Kamal Mostafa
2012-12-05 20:07 ` Henrik Rydberg
2012-12-06 0:15 ` Kamal Mostafa
2012-12-05 2:24 ` [PATCH v4 3/4] input: Cypress PS/2 Trackpad link into psmouse-base Kamal Mostafa
2012-12-05 2:24 ` Kamal Mostafa [this message]
2012-12-05 20:13 ` [PATCH v4 4/4] input: Cypress PS/2 Trackpad simulated multitouch (disabled) Henrik Rydberg
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=1354674245-25768-5-git-send-email-kamal@canonical.com \
--to=kamal@canonical.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dso@cypress.com \
--cc=dudl@cypress.com \
--cc=git@status.e4ward.com \
--cc=herton.krzesinski@canonical.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mario_limonciello@dell.com \
--cc=rydberg@euromail.se \
--cc=ta@cypress.com \
--cc=tim.gardner@canonical.com \
/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).