Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.1:Update
xorg-x11-driver-input
xf86-input-synaptics-led-double-tap.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xf86-input-synaptics-led-double-tap.diff of Package xorg-x11-driver-input
From 72867306cc91d02e282c942ca93fa45f03440335 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Tue, 15 Jun 2010 16:54:07 +0200 Subject: [PATCH 4/7] Add tap-on-LED feature support Signed-off-by: Takashi Iwai <tiwai@suse.de> --- include/synaptics-properties.h | 3 + man/synaptics.man | 17 +++++++ src/properties.c | 26 +++++++++++ src/synaptics.c | 95 ++++++++++++++++++++++++++++++++++++++++- src/synapticsstr.h | 6 ++ tools/synclient.c | 1 6 files changed, 146 insertions(+), 2 deletions(-) --- a/include/synaptics-properties.h +++ b/include/synaptics-properties.h @@ -164,4 +164,7 @@ /* 8 bit (BOOL), led_status (on/off) */ #define SYNAPTICS_PROP_LED_STATUS "Synaptics LED Status" +/* 8 bit (BOOL), double-tap action on LED corner (on/off) */ +#define SYNAPTICS_PROP_LED_DOUBLE_TAP "Synaptics LED Dobule Tap" + #endif /* _SYNAPTICS_PROPERTIES_H_ */ --- a/man/synaptics.man +++ b/man/synaptics.man @@ -564,6 +564,19 @@ A "touch" event happens when the Z value goes above FingerHigh, and an "untouch" event happens when the Z value goes below FingerLow. . +.TP +.BI "Option \*qLEDDoubleTap\*q \*q" boolean \*q +. +Enables/disables the touchpad-control by double-tapping on the top-left +corner LED. +. +Some devices have an LED on the top-left corner to indicate the +touchpad state. User can double-tap on the LED to toggle the touchpad +state. This option controls whether this action is enabled or not. +The double-tap size is same as specified in MaxDoubleTapTime. +The default value is ON. +Property: "Synaptics LED Double Tap" +. .LP The MaxDoubleTapTime parameter has the same function as the MaxTapTime parameter, but for the second, third, etc tap in a tap sequence. @@ -945,6 +958,10 @@ .BI "Synaptics LED Status" 8 bit (BOOL), the light status of the embedded LED. +.TP 7 +.BI "Synaptics LED Double Tap" +8 bit (BOOL), enable/disable the double-tap on LED. + .SH "NOTES" Configuration through .I InputClass --- a/src/properties.c +++ b/src/properties.c @@ -96,6 +96,7 @@ Atom prop_device_node = 0; Atom prop_led = 0; Atom prop_led_status = 0; +Atom prop_led_double_tap = 0; static Atom InitAtom(DeviceIntPtr dev, char *name, int format, int nvalues, int *values) @@ -301,6 +302,8 @@ prop_led = InitAtom(pInfo->dev, SYNAPTICS_PROP_LED, 8, 1, ¶->has_led); prop_led_status = InitAtom(pInfo->dev, SYNAPTICS_PROP_LED_STATUS, 8, 1, ¶->led_status); + prop_led_double_tap = InitAtom(pInfo->dev, SYNAPTICS_PROP_LED_DOUBLE_TAP, 8, 1, ¶->led_double_tap); + /* only init product_id property if we actually know them */ if (priv->id_vendor || priv->id_product) { @@ -543,6 +546,19 @@ return BadValue; para->touchpad_off = off; + if (!checkonly && para->has_led && + para->led_status != para->touchpad_off) { + para->led_status = para->touchpad_off; + if (priv->proto_ops && priv->proto_ops->UpdateLED) + priv->proto_ops->UpdateLED(pInfo); + } + } else if (property == prop_led_double_tap) + { + if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER) + return BadMatch; + + para->led_double_tap = *(CARD8*)prop->data; + } else if (property == prop_gestures) { BOOL *gestures; @@ -715,3 +731,13 @@ return Success; } +void SynapticsToggleOffProperty(DeviceIntPtr dev, Bool off) +{ + uint8_t val; + + if (!prop_off) + return; + val = off; + XIChangeDeviceProperty(dev, prop_off, XA_INTEGER, 8, + PropModeReplace, 1, &val, FALSE); +} --- a/src/synaptics.c +++ b/src/synaptics.c @@ -135,6 +135,7 @@ void InitDeviceProperties(InputInfoPtr pInfo); int SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, BOOL checkonly); +void SynapticsToggleOffProperty(DeviceIntPtr dev, Bool off); const static struct { const char *name; @@ -588,6 +589,7 @@ pars->tap_and_drag_gesture = xf86SetBoolOption(opts, "TapAndDragGesture", TRUE); pars->resolution_horiz = xf86SetIntOption(opts, "HorizResolution", horizResolution); pars->resolution_vert = xf86SetIntOption(opts, "VertResolution", vertResolution); + pars->led_double_tap = xf86SetBoolOption(opts, "LEDDoubleTap", TRUE); /* Warn about (and fix) incorrectly configured TopEdge/BottomEdge parameters */ if (pars->top_edge > pars->bottom_edge) { @@ -875,6 +877,10 @@ xf86AddEnabledDevice(pInfo); dev->public.on = TRUE; + /* update LED */ + if (priv->proto_ops && priv->proto_ops->UpdateLED) + priv->proto_ops->UpdateLED(pInfo); + return Success; } @@ -1090,6 +1096,74 @@ return Success; } +#define LED_TOGGLE_X_AREA 0.10 +#define LED_TOGGLE_Y_AREA 0.08 + +static int +in_led_toggle_area(InputInfoPtr pInfo, struct SynapticsHwState *hw) +{ + SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private; + int click_led_x, click_led_y; + + click_led_x = (priv->maxx - priv->minx) * LED_TOGGLE_X_AREA + priv->minx; + click_led_y = (priv->maxy - priv->miny) * LED_TOGGLE_Y_AREA + priv->miny; + return (hw->x < click_led_x && hw->y < click_led_y); +} + +/* clicpad button toggle point: + * some devices have a LED at the upper-left corner, and double-tapping it + * toggles the touchpad enable/disable + */ +static int +handle_toggle_led(InputInfoPtr pInfo, struct SynapticsHwState *hw, int finger) +{ + SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private; + SynapticsParameters *para = &priv->synpara; + int diff; + + if (finger) { + if (!in_led_toggle_area(pInfo, hw)) { + /* outside the toggle area */ + priv->led_touch_state = FALSE; + priv->led_tapped = FALSE; + return finger; + } + if (!priv->led_touch_state) { + /* touch start */ + priv->led_touch_millis = hw->millis; + priv->led_touch_state = TRUE; + } + return 0; /* already processed; ignore this finger event */ + } + + if (!priv->led_touch_state) + return finger; /* nothing happened */ + + /* touch-released */ + priv->led_touch_state = FALSE; + diff = TIME_DIFF(priv->led_touch_millis + para->tap_time, hw->millis); + if (diff < 0) { /* non-tap? */ + priv->led_tapped = FALSE; + return finger; + } + if (priv->led_tapped) { + /* double-tapped? */ + diff = TIME_DIFF(priv->led_tap_millis + para->tap_time_2, hw->millis); + if (diff >= 0) { + para->touchpad_off = !para->touchpad_off; + if (priv->proto_ops && priv->proto_ops->UpdateLED) { + para->led_status = para->touchpad_off; + priv->proto_ops->UpdateLED(pInfo); + } + priv->prop_change_pending = 1; + priv->led_tapped = FALSE; + } + } else + priv->led_tapped = TRUE; + priv->led_tap_millis = hw->millis; + return 0; /* already processed; ignore this finger event */ +} + /* clickpad event handling */ static void handle_clickpad(InputInfoPtr pInfo, struct SynapticsHwState *hw) @@ -1250,6 +1324,7 @@ { InputInfoPtr pInfo = arg; SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private); + SynapticsParameters *para = &priv->synpara; struct SynapticsHwState hw; int delay; int sigstate; @@ -1260,6 +1335,13 @@ hw = priv->hwState; hw.millis = now; delay = HandleState(pInfo, &hw); + if (priv->prop_change_pending) + delay = MIN(10, delay); + + if (priv->prop_change_pending) { + SynapticsToggleOffProperty(pInfo->dev, para->touchpad_off); + priv->prop_change_pending = 0; + } /* * Workaround for wraparound bug in the TimerSet function. This bug is already @@ -2393,7 +2475,7 @@ SynapticsParameters *para = &priv->synpara; /* Clickpad handling for button area */ - if (priv->is_clickpad) + if (para->touchpad_off != 1 && priv->is_clickpad) handle_clickpad(pInfo, hw); /* Treat the first two multi buttons as up/down for now. */ @@ -2511,7 +2593,7 @@ update_shm(pInfo, hw); /* If touchpad is switched off, we skip the whole thing and return delay */ - if (para->touchpad_off == 1) + if (para->touchpad_off == 1 && !(para->has_led && para->led_double_tap)) return delay; /* apply hysteresis before doing anything serious. This cancels @@ -2555,6 +2637,15 @@ finger = SynapticsDetectFinger(priv, hw); } + if (para->has_led && para->led_double_tap) { + if (inside_active_area) + finger = handle_toggle_led(pInfo, hw, finger); + if (para->touchpad_off == 1) { + priv->finger_state = finger; + return delay; + } + } + /* tap and drag detection. Needs to be performed even if the finger is in * the dead area to reset the state. */ timeleft = HandleTapProcessing(priv, hw, finger, inside_active_area); --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -167,6 +167,7 @@ int hyst_x, hyst_y; /* x and y width of hysteresis box */ Bool has_led; /* has an embedded LED */ Bool led_status; /* Current status of LED (1=on) */ + Bool led_double_tap; /* double-tap period in ms for touchpad LED control */ } SynapticsParameters; @@ -248,6 +249,11 @@ Bool has_scrollbuttons; /* device has physical scrollbuttons */ Bool is_clickpad; /* is Clickpad device (one-button) */ struct SynapticsHwState prev_hw; /* previous h/w state (for clickpad) */ + int prop_change_pending; + Bool led_touch_state; + Bool led_tapped; + int led_touch_millis; + int led_tap_millis; enum TouchpadModel model; /* The detected model */ unsigned short id_vendor; /* vendor id */ --- a/tools/synclient.c +++ b/tools/synclient.c @@ -143,6 +143,7 @@ {"AreaTopEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 2}, {"AreaBottomEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 3}, {"LEDStatus", PT_BOOL, 0, 1, SYNAPTICS_PROP_LED_STATUS, 8, 0}, + {"LEDDoubleTap", PT_BOOL, 0, 1, SYNAPTICS_PROP_LED_DOUBLE_TAP, 8, 0}, { NULL, 0, 0, 0, 0 } };
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
