diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2011-09-09 15:44:37 -0700 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2011-09-27 15:42:50 -0700 |
| commit | b1f0c9ac801e48de16c6afe3bf680565a4e5c5db (patch) | |
| tree | fd7d7953f447278b49c914d4069539a3e614c732 /tools | |
| parent | 6da898eba50a8499d770214684bd3d2d46033037 (diff) | |
Have 'MapToOutput' require the keyword "desktop" to do such
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.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xsetwacom.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 0852f81..f4bac5f 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -2303,17 +2303,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; } @@ -2322,6 +2314,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)) |