diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-08-09 12:14:00 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-20 14:28:58 +1000 |
| commit | cbb782d3f5c62b56ebe7cc54914ec597b2ae28bb (patch) | |
| tree | c9bffaba98eea4bf5966bcbbd1e56f6a2fc132e9 | |
| parent | 7bbaae88e645ec561adaa168deab9d9d1faa6d7f (diff) | |
| download | xf86-input-wacom-cbb782d3f5c62b56ebe7cc54914ec597b2ae28bb.tar.gz | |
xsetwacom: always update the parent property for wheel/strip actions.
With the new support for wheel actions, the actual action would be delayed
by one invocation, i.e. any action would always reflect the last xsetwacom
command, not the current one.
Caused by the driver now calls XIGetProperty() during the update but the
property hasn't actually set the value yet. Hack around this by always
updating the parent property, triggering a reload of all actions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit ba77b532e6c2a0b7b05ab129009c1f614b089c37)
| -rw-r--r-- | tools/xsetwacom.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 1ad2ceb..cf50dc0 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -1437,11 +1437,10 @@ static void special_map_buttons(Display *dpy, XDevice *dev, param_t* param, int PropModeReplace, (unsigned char*)data, nitems); - if (need_update) - XChangeDeviceProperty(dpy, dev, btnact_prop, XA_ATOM, 32, - PropModeReplace, - (unsigned char*)btnact_data, - btnact_nitems); + XChangeDeviceProperty(dpy, dev, btnact_prop, XA_ATOM, 32, + PropModeReplace, + (unsigned char*)btnact_data, + btnact_nitems); XFlush(dpy); } |