diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-02-13 14:55:12 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-02-18 07:51:47 +1000 |
| commit | 4f543ce1d6ae9ca11086a3009d149505590584a8 (patch) | |
| tree | 11284938d9bab5937b4f1dd4354ff9472ab7d882 /src/properties.c | |
| parent | 5d8cdaf4b1552c12fe6626059b9af4a6da6491e9 (diff) | |
Revert "Drop circular pad support"
This reverts commit 3b02e7fd81da4b100fb9ac32378f6d50f54cf0e2.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Conflicts:
man/synaptics.man
src/synaptics.c
Acked-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/properties.c')
| -rw-r--r-- | src/properties.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/properties.c b/src/properties.c index 0041544..886d8c2 100644 --- a/src/properties.c +++ b/src/properties.c @@ -295,6 +295,9 @@ InitDeviceProperties(InputInfoPtr pInfo) prop_circscroll_trigger = InitAtom(pInfo->dev, SYNAPTICS_PROP_CIRCULAR_SCROLLING_TRIGGER, 8, 1, ¶->circular_trigger); + prop_circpad = + InitAtom(pInfo->dev, SYNAPTICS_PROP_CIRCULAR_PAD, 8, 1, + ¶->circular_pad); prop_palm = InitAtom(pInfo->dev, SYNAPTICS_PROP_PALM_DETECT, 8, 1, ¶->palm_detect); @@ -666,6 +669,12 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, para->circular_trigger = trigger; } + else if (property == prop_circpad) { + if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER) + return BadMatch; + + para->circular_pad = *(BOOL *) prop->data; + } else if (property == prop_palm) { if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER) return BadMatch; |