The driver has no say whether a key is to be sent as core event or not, the
attachment of the device will decide this (since X server 1.7).
To let users know that their old configurations may not do the same thing,
print a notice.

Signed-off-by: Peter Hutterer <[email protected]>
---
 tools/xsetwacom.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index 0f8fc05..3aea33d 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -1194,6 +1194,7 @@ static int is_modifier(const char* modifier)
 
 static int special_map_keystrokes(int argc, char **argv, unsigned long *ndata, 
unsigned long* data);
 static int special_map_button(int argc, char **argv, unsigned long *ndata, 
unsigned long* data);
+static int special_map_core(int argc, char **argv, unsigned long *ndata, 
unsigned long *data);
 
 /* Valid keywords for the --set ButtonX options */
 struct keywords {
@@ -1202,9 +1203,24 @@ struct keywords {
 } keywords[] = {
        {"key", special_map_keystrokes},
        {"button", special_map_button},
+       {"core", special_map_core},
        { NULL, NULL }
 };
 
+/* the "core" keyword isn't supported anymore, we just have this here to
+   tell people that. */
+static int special_map_core(int argc, char **argv, unsigned long *ndata, 
unsigned long *data)
+{
+       static int once_only = 1;
+       if (once_only)
+       {
+               printf ("Note: The \"core\" keyword is not supported anymore 
and "
+                       "will be ignored.\n");
+               once_only = 0;
+       }
+       return 0;
+}
+
 static inline int is_valid_keyword(const char *keyword)
 {
        struct keywords *kw = keywords;
-- 
1.7.0.1


------------------------------------------------------------------------------

_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to