summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-02-28 11:18:12 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-03-01 12:15:46 +1000
commit6a862efd7f3d8504b600e9d67c2b9b43e41ee8d5 (patch)
tree5e8e5e66d46a57bff0ba80a6f399d194a85aeb31
parentef11021997c850d0d3e579777468ec6d52f28f20 (diff)
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>
-rw-r--r--tools/xsetwacom.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index 18caa15..0c24f2c 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -398,6 +398,15 @@ static param_t parameters[] =
.prop_flags = PROP_FLAG_READONLY
},
{
+ .name = "ToolID",
+ .desc = "Returns the tool ID of the current tool in proximity.",
+ .prop_name = WACOM_PROP_SERIALIDS,
+ .prop_format = 32,
+ .prop_offset = 4,
+ .arg_count = 1,
+ .prop_flags = PROP_FLAG_READONLY
+ },
+ {
.name = "ToolSerialPrevious",
.desc = "Returns the serial number of the previous device in proximity.",
.prop_name = WACOM_PROP_SERIALIDS,
@@ -2689,7 +2698,7 @@ static void test_parameter_number(void)
* deprecated them.
* Numbers include trailing NULL entry.
*/
- assert(ARRAY_SIZE(parameters) == 36);
+ assert(ARRAY_SIZE(parameters) == 37);
assert(ARRAY_SIZE(deprecated_parameters) == 17);
}