different patch below (I did not quite like that the original patch
mangled device's capability field and how it was reusing 'middle' field
for different things)? It should apply on top of patch that
I am attaching. I hope I did not screw it up too much,
Thanks a lot.
--
Dmitry
Input: synaptics - add support for ClickPad devices
From: Takashi Iwai <tiwai@suse.de>
The new device is a button-less "clickable" touchpad, the touchpad click
is signaled the same way middle button click is signalled on touchpads
that have SYN_CAP_MIDDLE_BUTTON capability.
The touchpad will be working in what Synaptics calls "ClickZone" mode
where left, right and middle buttons are emulated as clicks in the
bottom button zone, depending on the touch position. Dragging can be
done by keeping the button down and touching the main area again.
Unfortunately the device does not signal clicks when main area is
touched first.
Due to the fact that there is no known capability bits for ClickPads we
are forced to match on product ID.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/input/mouse/synaptics.c | 59 ++++++++++++++++++++++++++++++++++-----
drivers/input/mouse/synaptics.h | 2 +
2 files changed, 53 insertions(+), 8 deletions(-)
@@ -41,6 +41,15 @@
#define YMIN_NOMINAL 1408
#define YMAX_NOMINAL 4448
+/*
+ * Left and right ClickPad button ranges; the gap between them is reserved
+ * for middle button.
+ */
+#define CLICKPAD_LEFT_BTN_X \
+ ((XMAX_NOMINAL - XMIN_NOMINAL) * 2 / 5 + XMIN_NOMINAL)
+#define CLICKPAD_RIGHT_BTN_X \
+ ((XMAX_NOMINAL - XMIN_NOMINAL) * 3 / 5 + XMIN_NOMINAL)
+
/*****************************************************************************
* Stuff we need even when we do not want native Synaptics support
@@ -330,20 +339,52 @@ static void synaptics_parse_new_hw(unsigned char buf[],
struct synaptics_data *priv,
struct synaptics_hw_state *hw)
{
- hw->x = (((buf[3] & 0x10) << 8) | ((buf[1] & 0x0f) << 8) | buf[4]);
- hw->y = (((buf[3] & 0x20) << 7) | ((buf[1] & 0xf0) << 4) | buf[5]);
+ int x = (((buf[3] & 0x10) << 8) | ((buf[1] & 0x0f) << 8) | buf[4]);
+ int y = (((buf[3] & 0x20) << 7) | ((buf[1] & 0xf0) << 4) | buf[5]);
hw->z = buf[2];
hw->w = (((buf[0] & 0x30) >> 2) |
((buf[0] & 0x04) >> 1) |
((buf[3] & 0x04) >> 2));
- hw->left = buf[0] & 0x01;
- hw->right = buf[0] & 0x02;
+ if (SYN_CAP_CLICKPAD(priv->ext_cap)) {
+ int click = (buf[0] ^ buf[3]) & 0x01;
+
+ if (click && y < YMIN_NOMINAL) {
+ /*
+ * User pressed in ClickZone; report new button
+ * state but use old coordinates and don't report
+ * any pressure to prevent pointer movement.
+ */
+ hw->left = x < CLICKPAD_LEFT_BTN_X;
+ hw->right = x > CLICKPAD_RIGHT_BTN_X;
+ hw->middle = x >= CLICKPAD_LEFT_BTN_X &&
+ x <= CLICKPAD_RIGHT_BTN_X;
+ hw->z = 0;
+
+ } else {
+ /*
+ * Finger is outside of the ClickZone - report
+ * current coordinates.
+ */
+ hw->x = x;
+ hw->y = y;
+
+ if (!click)
+ hw->left = hw->right = hw->middle = 0;
+ }
+
+ } else {
+ hw->x = x;
+ hw->y = y;
+
+ hw->left = buf[0] & 0x01;
+ hw->right = buf[0] & 0x02;
- if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
- hw->middle = (buf[0] ^ buf[3]) & 0x01;
- hw->scroll = hw->w == 2 ? (signed char)(buf[1]) : 0;
+ if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) {
+ hw->middle = (buf[0] ^ buf[3]) & 0x01;
+ hw->scroll = hw->w == 2 ? (signed char)(buf[1]) : 0;
+ }
}
if (SYN_CAP_FOUR_BUTTON(priv->capabilities)) {
@@ -476,8 +517,10 @@ static void synaptics_process_packet(struct psmouse *psmouse)
input_report_key(dev, BTN_TOOL_TRIPLETAP, num_fingers == 3);
}
- if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities))
+ if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities) ||
+ SYN_CAP_CLICKPAD(priv->ext_cap)) {
input_report_key(dev, BTN_MIDDLE, hw.middle);
+ }
if (SYN_CAP_FOUR_BUTTON(priv->capabilities)) {
input_report_key(dev, BTN_FORWARD, hw.up);
@@ -48,6 +48,8 @@
#define SYN_CAP_VALID(c) ((((c) & 0x00ff00) >> 8) == 0x47)
#define SYN_EXT_CAP_REQUESTS(c) (((c) & 0x700000) >> 20)
#define SYN_CAP_MULTI_BUTTON_NO(ec) (((ec) & 0x00f000) >> 12)
+#define SYN_CAP_PRODUCT_ID(ec) (((ec) & 0xff0000) >> 16)
+#define SYN_CAP_CLICKPAD(ec) (SYN_CAP_PRODUCT_ID(ec) == 0xe4)
/* synaptics modes query bits */
#define SYN_MODE_ABSOLUTE(m) ((m) & (1 << 7))