summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-08-25 10:22:40 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-05-20 14:28:56 +1000
commitc8667b262fee34da368307204d06516efad41d0e (patch)
treebdf0932c27c30e693407845cfc1ac6e1a1cf39b7
parent7d49aed124ca9bb06e3315e2cd14e8e30a51272e (diff)
downloadxf86-input-wacom-c8667b262fee34da368307204d06516efad41d0e.tar.gz
xsetwacom: support aboveof, belowof, leftof, rightof in xsetwacom TwinView.
I don't actually know what this is really supposed to do in the end, the driver does the same thing irrespective of whether leftof or rightof is specified. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Przemo Firszt <przemo@firszt.eu> Acked-by: Ping Cheng <pinglinux@gmail.com> Conflicts: tools/xsetwacom.c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--tools/xsetwacom.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index c792987..a0af022 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2009 - 2010 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1560,6 +1560,14 @@ static void set_twinview(Display *dpy, XDevice *dev, param_t* param, int argc, c
twinview = TV_LEFT_RIGHT;
else if (strcasecmp(argv[0], "vertical") == 0)
twinview = TV_ABOVE_BELOW;
+ else if (strcasecmp(argv[0], "belowof") == 0)
+ twinview = TV_ABOVE_BELOW;
+ else if (strcasecmp(argv[0], "aboveof") == 0)
+ twinview = TV_BELOW_ABOVE;
+ else if (strcasecmp(argv[0], "rightof") == 0)
+ twinview = TV_LEFT_RIGHT;
+ else if (strcasecmp(argv[0], "leftof") == 0)
+ twinview = TV_RIGHT_LEFT;
else
goto error;
@@ -1589,7 +1597,9 @@ static void set_twinview(Display *dpy, XDevice *dev, param_t* param, int argc, c
return;
error:
- fprintf(stderr, "Usage: xsetwacom rotate <device name> [NONE | CW | CCW | HALF]\n");
+ fprintf(stderr, "Usage: xsetwacom <device name> TwinView [<value>]\n");
+ fprintf(stderr, "Values: none, horizontal, vertical, belowof,"
+ "aboveof, leftof, rightof\n");
return;
}
@@ -1825,6 +1835,8 @@ static void get_twinview(Display *dpy, XDevice *dev, param_t *param, int argc, c
case TV_NONE: twinview = "none"; break;
case TV_ABOVE_BELOW: twinview = "vertical"; break;
case TV_LEFT_RIGHT: twinview = "horizontal"; break;
+ case TV_RIGHT_LEFT: twinview = "leftof"; break;
+ case TV_BELOW_ABOVE: twinview = "aboveof"; break;
default:
break;
}