diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-28 15:14:06 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-20 14:28:59 +1000 |
| commit | 536403334b633c413aaf27db62a9c93420ca6ac2 (patch) | |
| tree | 838a5f0bb4093d8aeacd2f7467af4985174d23d8 | |
| parent | 8db388967a4756143c9e2d419b8e44ece8792a5f (diff) | |
| download | xf86-input-wacom-536403334b633c413aaf27db62a9c93420ca6ac2.tar.gz | |
xsetwacom: "core" as keyword is not supported, tell users so.
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 <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pinglinux@gmail.com>
(cherry picked from commit 20715a4a066435b1d785a5b5df50b96c7bc5dcb5)
Conflicts:
tools/xsetwacom.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | tools/xsetwacom.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index cf50dc0..891328f 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -1172,6 +1172,7 @@ out: } static int special_map_keystrokes(Display*, int argc, char **argv, unsigned long *ndata, unsigned long* data); static int special_map_button(Display*, int argc, char **argv, unsigned long *ndata, unsigned long* data); +static int special_map_core(Display*, int argc, char **argv, unsigned long *ndata, unsigned long *data); /* Valid keywords for the --set ButtonX options */ struct keywords { @@ -1180,9 +1181,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(Display *dpy, 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; |