diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/mouse/synaptics.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index d349c4a5e3e8..865fc69e9bc3 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
@@ -445,12 +445,14 @@ static void synaptics_process_packet(struct psmouse *psmouse) | |||
445 | 445 | ||
446 | input_report_abs(dev, ABS_TOOL_WIDTH, finger_width); | 446 | input_report_abs(dev, ABS_TOOL_WIDTH, finger_width); |
447 | input_report_key(dev, BTN_TOOL_FINGER, num_fingers == 1); | 447 | input_report_key(dev, BTN_TOOL_FINGER, num_fingers == 1); |
448 | input_report_key(dev, BTN_TOOL_DOUBLETAP, num_fingers == 2); | ||
449 | input_report_key(dev, BTN_TOOL_TRIPLETAP, num_fingers == 3); | ||
450 | |||
451 | input_report_key(dev, BTN_LEFT, hw.left); | 448 | input_report_key(dev, BTN_LEFT, hw.left); |
452 | input_report_key(dev, BTN_RIGHT, hw.right); | 449 | input_report_key(dev, BTN_RIGHT, hw.right); |
453 | 450 | ||
451 | if (SYN_CAP_MULTIFINGER(priv->capabilities)) { | ||
452 | input_report_key(dev, BTN_TOOL_DOUBLETAP, num_fingers == 2); | ||
453 | input_report_key(dev, BTN_TOOL_TRIPLETAP, num_fingers == 3); | ||
454 | } | ||
455 | |||
454 | if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) | 456 | if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) |
455 | input_report_key(dev, BTN_MIDDLE, hw.middle); | 457 | input_report_key(dev, BTN_MIDDLE, hw.middle); |
456 | 458 | ||
@@ -543,12 +545,14 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) | |||
543 | set_bit(EV_KEY, dev->evbit); | 545 | set_bit(EV_KEY, dev->evbit); |
544 | set_bit(BTN_TOUCH, dev->keybit); | 546 | set_bit(BTN_TOUCH, dev->keybit); |
545 | set_bit(BTN_TOOL_FINGER, dev->keybit); | 547 | set_bit(BTN_TOOL_FINGER, dev->keybit); |
546 | set_bit(BTN_TOOL_DOUBLETAP, dev->keybit); | ||
547 | set_bit(BTN_TOOL_TRIPLETAP, dev->keybit); | ||
548 | |||
549 | set_bit(BTN_LEFT, dev->keybit); | 548 | set_bit(BTN_LEFT, dev->keybit); |
550 | set_bit(BTN_RIGHT, dev->keybit); | 549 | set_bit(BTN_RIGHT, dev->keybit); |
551 | 550 | ||
551 | if (SYN_CAP_MULTIFINGER(priv->capabilities)) { | ||
552 | set_bit(BTN_TOOL_DOUBLETAP, dev->keybit); | ||
553 | set_bit(BTN_TOOL_TRIPLETAP, dev->keybit); | ||
554 | } | ||
555 | |||
552 | if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) | 556 | if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities)) |
553 | set_bit(BTN_MIDDLE, dev->keybit); | 557 | set_bit(BTN_MIDDLE, dev->keybit); |
554 | 558 | ||