From 707e415d477a16f4f492840ee9315d6b473ec64c Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sat, 23 Jan 2010 15:23:58 +0000 Subject: [PATCH] Allow a tap click when the right touchpad button is pressed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35265 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c | 4 ++-- src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c index 19d4eed7f4..80b4858f8b 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c @@ -198,7 +198,7 @@ move_to_movement(synaptics_cookie *cookie, touch_event *event, cookie->tap_delta_y += cookie->movement_maker.yDelta; if (cookie->tapdrag_started) { - movement->buttons = 0x01; // left button + movement->buttons = kLeftButton; movement->clicks = 0; cookie->valid_edge_motion = edge_motion(movement, event, @@ -321,7 +321,7 @@ event_to_movement(synaptics_cookie *cookie, touch_event *event, } } - if (event->buttons != 0) { + if (event->buttons & kLeftButton) { cookie->tap_clicks = 0; cookie->tapdrag_started = false; cookie->tap_started = false; diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.h b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.h index e5dc6b590b..2070e16554 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.h +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.h @@ -70,6 +70,13 @@ typedef struct { } touchpad_info; +enum button_ids +{ + kLeftButton = 0x01, + kRightButton = 0x02 +}; + + typedef struct { uint8 buttons; uint32 xPosition;