Instead of allowing zero arguments to map the tablet to the entire
desktop, we require the use of the keyword "desktop" to accomplish
this. This is to make it easier to figure out the user's intent
later on when we introduce KeepShape.
Signed-off-by: Jason Gerecke <killert...@gmail.com>
---
Changes from v3:
* Corresponds to patch v3 5/7
* Remove unnecessary braces
man/xsetwacom.man | 16 ++++++++--------
tools/xsetwacom.c | 14 ++++----------
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/man/xsetwacom.man b/man/xsetwacom.man
index 10832ad..dc0995f 100644
--- a/man/xsetwacom.man
+++ b/man/xsetwacom.man
@@ -120,14 +120,14 @@ device is unbound and will react to any tool of the
matching type.
Default: 0
.TP
\fBMapToOutput\fR [output]
-Map the tablet's input area to the given output (e.g. "VGA1"), or the entire
-desktop if no output is provided. Output names may either be the name of
-a head available through the XRandR extension, or an X11 geometry string of
-the form WIDTHxHEIGHT+X+Y. To switch to the next available output, the "next"
-keyword is also supported. This will cycle between the individual monitors
-connected to the system, and then the entire desktop. Users of the NVIDIA
-binary driver should use the output names "HEAD-0" and "HEAD-1" until the
-driver supports XRandR 1.2 or later.
+Map the tablet's input area to a given output (e.g. "VGA1"). Output names may
+either be the name of a head available through the XRandR extension, or an
+X11 geometry string of the form WIDTHxHEIGHT+X+Y. To switch to the next
+available output, the "next" keyword is also supported. This will cycle
+between the individual monitors connected to the system, and then the entire
+desktop. The mapping may be reset to the entire desktop at any time with the
+output name "desktop". Users of the NVIDIA binary driver should use the output
+names "HEAD-0" and "HEAD-1" until the driver supports XRandR 1.2 or later.
The output mapping configuration is a onetime setting and does not track output
reconfigurations; the command needs to be re-run whenever the output
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index c9c090c..722e32c 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -2271,17 +2271,9 @@ static void set_output(Display *dpy, XDevice *dev,
param_t *param, int argc, cha
unsigned int width, height;
int flags = XParseGeometry(argv[0], &x, &y, &width, &height);
- if (argc == 0)
- {
- float matrix[9] = { 1, 0, 0,
- 0, 1, 0,
- 0, 0, 1};
- _set_matrix_prop(dpy, dev, matrix);
- return;
- }
- else if (argc != param->arg_count)
+ if (argc != param->arg_count)
{
- fprintf(stderr, "'%s' requires exactly 0 or %d value(s).\n",
param->name,
+ fprintf(stderr, "'%s' requires exactly %d value(s).\n",
param->name,
param->arg_count);
return;
}
@@ -2290,6 +2282,8 @@ static void set_output(Display *dpy, XDevice *dev,
param_t *param, int argc, cha
set_output_area(dpy, dev, x, y, width, height);
else if (strcasecmp(argv[0], "next") == 0)
set_output_next(dpy, dev);
+ else if (strcasecmp(argv[0], "desktop") == 0)
+ set_output_desktop(dpy, dev);
else if (!need_xinerama(dpy))
set_output_xrandr(dpy, dev, argv[0]);
else if (convert_value_from_user(param, argv[0], &head_no))
--
1.7.6
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
