From 41be604bacf259d8dbcd6d5641fc3e6bb113dafc Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Thu, 5 Aug 2010 19:42:03 +0200 Subject: grail-gesture: Allow more versatile input The current code does not allow input in hex form. This patch switches to use strtoull, allowing for a 32/64 bitmask to be specified on commandline. Signed-off-by: Henrik Rydberg --- test/grail-gesture.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/grail-gesture.c b/test/grail-gesture.c index f34bd6f..18c50c3 100644 --- a/test/grail-gesture.c +++ b/test/grail-gesture.c @@ -73,7 +73,7 @@ static void loop_device(struct grail *ge, int fd) int main(int argc, char *argv[]) { struct grail ge; - int fd; + int i, fd; if (argc < 3) { fprintf(stderr, "Usage: %s \n", argv[0]); @@ -85,11 +85,10 @@ int main(int argc, char *argv[]) ge.event = tp_event; ge.gesture = tp_gesture; - unsigned mask = atoi(argv[1]); - flag_mask[0] = (mask >> 0) & 255; - flag_mask[1] = (mask >> 8) & 255; - flag_mask[2] = (mask >> 16) & 255; - flag_mask[3] = (mask >> 24) & 255; + unsigned long mask = strtoull(argv[1], 0, 0); + for (i = 0; i < DIM_GRAIL_TYPE; i++) + if ((mask >> i) & 1) + grail_mask_set(flag_mask, i); fd = open(argv[2], O_RDONLY | O_NONBLOCK); if (fd < 0) { -- cgit v1.2.3