diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-13 16:08:12 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-14 08:47:06 +1000 |
| commit | fee18d8567efd2e5abf6b29eb1ae9ee0e3858013 (patch) | |
| tree | 90c1b8cfca6e272914439c4fdc22687e38965ed9 /src/properties.c | |
| parent | c546779b32d8be23475b3b062e3ebc9235365c0d (diff) | |
Soft buttons are only available on clickpad devices, disable them otherwise.
If the clickpad support is runtime enabled/disabled, the property
appears/disappears accordingly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'src/properties.c')
| -rw-r--r-- | src/properties.c | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/src/properties.c b/src/properties.c index 5cd3088..783b516 100644 --- a/src/properties.c +++ b/src/properties.c @@ -151,6 +151,24 @@ InitFloatAtom(DeviceIntPtr dev, char *name, int nvalues, float *values) return atom; } +static void +InitSoftButtonProperty(InputInfoPtr pInfo) +{ + SynapticsPrivate *priv = (SynapticsPrivate *) pInfo->private; + SynapticsParameters *para = &priv->synpara; + int values[8]; + + values[0] = para->softbutton_areas[0][0]; + values[1] = para->softbutton_areas[0][1]; + values[2] = para->softbutton_areas[0][2]; + values[3] = para->softbutton_areas[0][3]; + values[4] = para->softbutton_areas[1][0]; + values[5] = para->softbutton_areas[1][1]; + values[6] = para->softbutton_areas[1][2]; + values[7] = para->softbutton_areas[1][3]; + prop_softbutton_areas = InitAtom(pInfo->dev, SYNAPTICS_PROP_SOFTBUTTON_AREAS, 32, 8, values); +} + void InitDeviceProperties(InputInfoPtr pInfo) { @@ -301,15 +319,8 @@ InitDeviceProperties(InputInfoPtr pInfo) values[3] = para->area_bottom_edge; prop_area = InitAtom(pInfo->dev, SYNAPTICS_PROP_AREA, 32, 4, values); - values[0] = para->softbutton_areas[0][0]; - values[1] = para->softbutton_areas[0][1]; - values[2] = para->softbutton_areas[0][2]; - values[3] = para->softbutton_areas[0][3]; - values[4] = para->softbutton_areas[1][0]; - values[5] = para->softbutton_areas[1][1]; - values[6] = para->softbutton_areas[1][2]; - values[7] = para->softbutton_areas[1][3]; - prop_softbutton_areas = InitAtom(pInfo->dev, SYNAPTICS_PROP_SOFTBUTTON_AREAS, 32, 8, values); + if (para->clickpad) + InitSoftButtonProperty(pInfo); values[0] = para->hyst_x; values[1] = para->hyst_y; @@ -407,9 +418,20 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, para->tap_time_2 = timeouts[1]; para->click_time = timeouts[2]; } else if (property == prop_clickpad) { + BOOL value; + if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER) return BadMatch; + value = *(BOOL*)prop->data; + if (!para->clickpad && value && !prop_softbutton_areas) + InitSoftButtonProperty(pInfo); + else if (para->clickpad && !value && prop_softbutton_areas) + { + XIDeleteDeviceProperty(dev, prop_softbutton_areas, FALSE); + prop_softbutton_areas = 0; + } + para->clickpad = *(BOOL*)prop->data; } else if (property == prop_tap_fast) { |