diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-05 14:27:36 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-20 14:28:57 +1000 |
| commit | 707afdbda2dede1080b456c62713e42b249d7543 (patch) | |
| tree | 8107965ed6c6b32a634f4b55f08464c22aff95f0 | |
| parent | fc9042441abce778fc6931b325ef87145a66fa28 (diff) | |
| download | xf86-input-wacom-707afdbda2dede1080b456c62713e42b249d7543.tar.gz | |
xsetwacom: fix button mapping for button clicks.
Misplaced scanf caused button mappings to always be 0 if no + or - was
specified or the button number was < 10.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pinglinux@gmail.com>
(cherry picked from commit 6d5a4bea3319901ab872550ddfd703d601b873e9)
| -rw-r--r-- | tools/xsetwacom.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 9fe75b8..0f136b6 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -1205,9 +1205,6 @@ static int special_map_button(Display* dpy, int argc, char **argv, unsigned long if (is_valid_keyword(btn)) break; - if (sscanf(btn, "%d", &button) != 1) - return nitems; - switch (btn[0]) { case '+': need_press = 1; break; @@ -1219,6 +1216,10 @@ static int special_map_button(Display* dpy, int argc, char **argv, unsigned long } else need_press = need_release = 1; + if (sscanf(btn, "%d", &button) != 1) + return nitems; + + TRACE("Button map %d [%s,%s]\n", abs(button), need_press ? "press" : "", need_release ? "release" : ""); |