Extend length of wheel_actions array to 6

This array was apparently overlooked when adding support for the
second touch ring present on the 24HD.

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Change return type of 'test_flag_set' to void

Compiler complains that nothing is being returned, but nothing
*should* be returned.
wacom 0.13.99.1

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Export current tool ID in the property too

Previously, we exported old serial number, old tool ID and current serial
number. Export the current tool ID as well.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Tested-by: Bastien Nocera <hadess@hadess.net>
xsetwacom: ToolID is actually ToolType

ToolID should be the ID of the tool in proximity.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
xsetwacom: re-add ToolID with the current tool ID in proximity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
xsetwacom: fix compiler warning

xsetwacom.c: In function ‘set_output’:
xsetwacom.c:2359:6: warning: variable ‘success’ set but not used
[-Wunused-but-set-variable]

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Merge branch 'master' of git://people.freedesktop.org/~whot/xf86-input-wacom
wcmXCommand: Fix invalid array size for serial values.

Introduced in c21b6876b435bb34112956716fea14477ef9e8d7

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
wacom 0.13.99.2

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
wacom 0.14.0

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
man: fix typo in xsetwacom man page

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Don't share names of action atoms across properties

The names of action atoms are currently created without regard to
the property they will be stored in. This results in both e.g.
button 1 and StripLeftUp using atoms with the name "Wacom button
action 1". When setting either button 1 or StripLeftUp, we ask
the server for an atom named "Wacom button action 1" and in both
cases receive the *same* atom. This means button 1 is nothing
more than an alias for StripLeft up (and similarly for the other
actions which share the same name).

This patch uses the name of the property the action will be stored
in as the prefix to prevent this aliasing from occuring.
Check ioctl return value

Really, this shouldn't ever fail but at least it shuts up some static
analysers.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
Fix broken NULL check

This check was ok until 7958bb9b1ddef9e8238615fd1b3d15996f00effe, when more
code was moved here and it made no sense this way anymore. Change it to
return early in the case of NULL allocation.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
Don't pass NULL to fclose(3)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
Avoid buffer overrun

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
Plug minor memory leak

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
Don't dereference priv before checking it for NULL

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
conf: Only match tablet Waltop devices

Only match Waltop event devices classified as tablets.

Advanced Waltop tablets have on-the-frame controls such as multifunction
dials (controlling scrolling, zooming, volume and keyboard navigation) and
keyboard modifier buttons. These are represented as separate event devices
and are better handled by xf86-input-evdev.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>