summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-12-10 15:22:43 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-12-10 15:56:12 +1000
commitb4fe899d1f23bf1c7caa44554b46ae64fbcf5be3 (patch)
tree354c2b7ec92e2f212d3d61e206a139e912d3e230
parent5f442c7fd5b6f490d2ec9d4dc4efef5bc3319b00 (diff)
downloadxf86-input-wacom-b4fe899d1f23bf1c7caa44554b46ae64fbcf5be3.tar.gz
xsetwacom: Be more flexible for multi-value properties.
xsetwacom set <device> PressCurve 1 2 3 4 is the same as xsetwacom set <device> PressCurve "1 2 3 4" Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--tools/xsetwacom.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index 77759b5..7e5e125 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -1394,6 +1394,8 @@ static void set(Display *dpy, int argc, char **argv)
long *n;
char *b;
int i;
+ char **values;
+ int nvals;
if (argc < 3)
{
@@ -1438,9 +1440,11 @@ static void set(Display *dpy, int argc, char **argv)
goto out;
}
- for (i = 0; i < argc - 2; i++)
+ values = strjoinsplit(argc - 2, &argv[2], &nvals);
+
+ for (i = 0; i < nvals; i++)
{
- val = atof(argv[i + 2]);
+ val = atof(values[i]);
switch(param->prop_format)
{
@@ -1469,6 +1473,9 @@ static void set(Display *dpy, int argc, char **argv)
PropModeReplace, data, nitems);
XFlush(dpy);
+ for (i = 0; i < nvals; i++)
+ free(values[i]);
+ free(values);
out:
XCloseDevice(dpy, dev);
free(data);