Bug#571023: /usr/bin/xsetwacom: xsetwacom --set|--get TwinView does not support leftof & aboveof

[Danya Alexeyevsky]

Package: xserver-xorg-input-wacom
Version: 0.10.3+20100109-1
Severity: normal
File: /usr/bin/xsetwacom
Tags: patch


The problem is completely described in subject.

Additional minor bug is that xsetwacom --set TwinView
gives errnoeous error message if given wrong arguments.

The attached patch seems to solve both problems for me.

Cheers,
-- Danya.


-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xserver-xorg-input-wacom depends on:
ii  libc6                         2.10.2-2   GNU C Library: Shared libraries
ii  libx11-6                      2:1.3.3-1  X11 client-side library
ii  libxi6                        2:1.3-2    X11 Input extension library
ii  xserver-xorg-core             2:1.7.4-2  Xorg X server - core server

xserver-xorg-input-wacom recommends no packages.

Versions of packages xserver-xorg-input-wacom suggests:
ii  xinput                        1.4.2-1    Runtime configuration and test of 

-- no debconf information

diff -u -r xf86-input-wacom-0.10.3+20100109.my/tools/xsetwacom.c xf86-input-wacom-0.10.3+20100109/tools/xsetwacom.c
--- xf86-input-wacom-0.10.3+20100109.my/tools/xsetwacom.c       2010-02-22 20:40:47.221083896 +0300
+++ xf86-input-wacom-0.10.3+20100109/tools/xsetwacom.c  2010-01-09 10:40:54.000000000 +0300
@@ -1495,14 +1495,10 @@
 
        if (strcasecmp(argv[0], "none") == 0)
                twinview = TV_NONE;
-       else if (strcasecmp(argv[0], "horizontal") == 0 || strcasecmp(argv[0], "rightof") == 0)
+       else if (strcasecmp(argv[0], "horizontal") == 0)
                twinview = TV_LEFT_RIGHT;
-       else if (strcasecmp(argv[0], "vertical") == 0 || strcasecmp(argv[0], "belowof") == 0)
+       else if (strcasecmp(argv[0], "vertical") == 0)
                twinview = TV_ABOVE_BELOW;
-       else if (strcasecmp(argv[0], "aboveof") == 0)
-               twinview = TV_BELOW_ABOVE;
-       else if (strcasecmp(argv[0], "leftof") == 0)
-               twinview = TV_RIGHT_LEFT;
        else
                goto error;
 
@@ -1532,9 +1528,7 @@
        return;
 
 error:
-       fprintf(stderr,
-               "Usage: xsetwacom TwinView <device name>"
-               " [none|horizontal|vertical|leftof|aboveof]\n");
+       fprintf(stderr, "Usage: xsetwacom rotate <device name> [NONE | CW | CCW | HALF]\n");
        return;
 }
 
@@ -1770,8 +1764,6 @@
                case TV_NONE: twinview = "none"; break;
                case TV_ABOVE_BELOW: twinview = "vertical"; break;
                case TV_LEFT_RIGHT: twinview = "horizontal"; break;
-               case TV_BELOW_ABOVE: twinview = "aboveof"; break;
-               case TV_RIGHT_LEFT: twinview = "leftof"; break;
                default:
                                    break;
        }