[Linuxwacom-devel] [PATCH 2/2] conf: Add new InputDevice matches based on USB and PnP ID

2014-07-24 Thread Jason Gerecke
If the kernel's HID driver is used rather than wacom.ko, its very possible that the device will not have "Wacom" anywhere in its device name. To ensure we are able to match Wacom tablets in this situation, we add matches based on the known USB and PnP IDs. Signed-off-by: Jason Ger

[Linuxwacom-devel] [PATCH 1/2] conf: Match Hanwang tablets in their own section

2014-07-24 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- conf/50-wacom.conf | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf index 1827cf0..95f10e9 100644 --- a/conf/50-wacom.conf +++ b/conf/50-wacom.conf @@ -1,6 +1,6 @@ Section "Input

[Linuxwacom-devel] [PATCH 0/4] Cross-device arbitration

2014-07-24 Thread Jason Gerecke
not suddenly able to trigger a gesture as soon as the touch device becomes active. Jason Gerecke (4): Remove unused function parameter Change function signature of commonDispatchDevice Support cross-device pointer arbitration Add new GESTURE_CANCEL_MODE and wcmCancelGesture functio

[Linuxwacom-devel] [PATCH 3/4] Support cross-device pointer arbitration

2014-07-24 Thread Jason Gerecke
arbitration occurs *after* we store the device state to pChannel->valid.state. The code in wcmTouchFilter.c assumes that states are not missing, and can become desynchronized from reality if (for example) a finger were to go out of prox without a corresponding state update. Signed-off-by: J

[Linuxwacom-devel] [PATCH 4/4] Add new GESTURE_CANCEL_MODE and wcmCancelGesture function

2014-07-24 Thread Jason Gerecke
. This is used by the arbitration logic to ensure that touches which accumulate in the valid.state list while a pen is in proximity do not suddenly trigger a gesture at the moment the pen leaves prox. Signed-off-by: Jason Gerecke --- src/wcmCommon.c | 1 + src/wcmTouchFilter.c | 32

[Linuxwacom-devel] [PATCH 2/4] Change function signature of commonDispatchDevice

2014-07-24 Thread Jason Gerecke
setting of 'priv' only for touch devices. Signed-off-by: Jason Gerecke --- src/wcmCommon.c | 138 1 file changed, 60 insertions(+), 78 deletions(-) diff --git a/src/wcmCommon.c b/src/wcmCommon.c index b928976..5bcd755 100644 -

Re: [Linuxwacom-devel] [PATCH 3/4] Support cross-device pointer arbitration

2014-08-12 Thread Jason Gerecke
On Tue, Aug 5, 2014 at 9:51 PM, Peter Hutterer wrote: > On Thu, Jul 24, 2014 at 12:04:02PM -0700, Jason Gerecke wrote: >> Currently pointer arbitration is taken care of through the use of >> a 'wcomPenInProx' variable in the WacomCommonRec. If two devices >>

Re: [Linuxwacom-devel] [PATCH 4/4] Add new GESTURE_CANCEL_MODE and wcmCancelGesture function

2014-08-12 Thread Jason Gerecke
On Tue, Aug 5, 2014 at 9:55 PM, Peter Hutterer wrote: > On Thu, Jul 24, 2014 at 12:04:03PM -0700, Jason Gerecke wrote: >> The new GESTURE_CANCEL_MODE is used to short-circuit the gesture >> recognition logic until all touches have been removed from the device. >> By using

Re: [Linuxwacom-devel] [PATCH 3/4] Support cross-device pointer arbitration

2014-08-13 Thread Jason Gerecke
On Wed, Aug 13, 2014 at 5:30 PM, Peter Hutterer wrote: > On Tue, Aug 12, 2014 at 11:49:37AM -0700, Jason Gerecke wrote: >> On Tue, Aug 5, 2014 at 9:51 PM, Peter Hutterer >> wrote: >> > On Thu, Jul 24, 2014 at 12:04:02PM -0700, Jason Gerecke wrote: >> >> Cu

[Linuxwacom-devel] [PATCH 4/4] Have direct input touch use server emulation to move pointer

2014-09-02 Thread Jason Gerecke
The X server provides pointer emulation for the first touch on direct-input (touchscreen) devices. To make use of this, we need to short-circuit our internal first-touch emulation and that the gesture engine immediately enters multitouch mode (but only for touchscreens!) Signed-off-by: Jason

[Linuxwacom-devel] [PATCH 1/4] Allow touch to grab and maintain pointer control from idle puck

2014-09-02 Thread Jason Gerecke
. Signed-off-by: Jason Gerecke --- src/wcmCommon.c | 15 ++- src/wcmISDV4.c | 3 +++ src/wcmUSB.c| 6 ++ src/xf86WacomDefs.h | 1 + 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 1be6977..7ffab2a 100644 --- a

[Linuxwacom-devel] [PATCH 0/4] RC2 Updates

2014-09-02 Thread Jason Gerecke
(which is to say, to have our driver work sensibly with XI2 touches on both direct and indirect devices). Jason Gerecke (4): Allow touch to grab and maintain pointer control from idle puck Revert "Unify wcmFingerMultitouch and wcmSendTouchEvent" Revert "Don't emulate a mous

[Linuxwacom-devel] [PATCH 3/4] Revert "Don't emulate a mouse when multitouch is enabled"

2014-09-02 Thread Jason Gerecke
This reverts commit f38dd5736e2df7c3eec0338bd0c7bef8c562b979. --- src/wcmCommon.c | 8 +-- src/wcmTouchFilter.c | 59 ++-- 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 7ffab2a..943

[Linuxwacom-devel] [PATCH 2/4] Revert "Unify wcmFingerMultitouch and wcmSendTouchEvent"

2014-09-02 Thread Jason Gerecke
This reverts commit 67daf21bdb7b32c27818bffaf56849a522d23477. --- src/wcmTouchFilter.c | 71 +--- 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c index 08002e5..8a761c6 100644 --- a/src/wcmT

Re: [Linuxwacom-devel] Intuos PT M CTH680: Touch disabled -> Pad keys won't work ?

2014-09-03 Thread Jason Gerecke
I've not seen or been able to reproduce that behavior on my own (non-Ubunutu) box. Are you just using "xsetwacom set touch off" to disable touch? I'm not aware of any changes that would have affected that behavior, but go ahead and provide the version of both xf86-input-wacom (`xsetwacom -V`) and

[Linuxwacom-devel] [PATCH] Fix pointer jump when tool enters prox with filtered coordinate

2014-09-17 Thread Jason Gerecke
nt value from the kernel just in case it was filtered out. Other axes may be affected by this bug, but should not cause as many problems. Signed-off-by: Jason Gerecke --- src/wcmUSB.c | 22 ++ 1 file changed, 22 insertions(+) diff --git a/src/wcmUSB.c b/src/wcmUSB.c index

[Linuxwacom-devel] [PATCH] Set the active driver to NULL before uninitalizing the device

2014-09-17 Thread Jason Gerecke
ng uninitialized is considered 'active' and unset it if so. Signed-off-by: Jason Gerecke --- src/wcmConfig.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 138a769..5551087 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -236,6 +236,9 @@

[Linuxwacom-devel] [PATCH 04/13] scan-build: Logic error: Result of operation is garbage or undefined

2014-09-17 Thread Jason Gerecke
Assuming nitems is less than we expect, its possible for get_mapped_area to return before writing values to its in-parameters. This adds an additional verification to the returned data type. Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion

[Linuxwacom-devel] [PATCH 01/13] scan-build: Dead store: Dead assignment

2014-09-17 Thread Jason Gerecke
Value stored to 'max' is never read Value stored to 'min' is never read Signed-off-by: Jason Gerecke --- src/xf86Wacom.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c index de0438f..1c4a7d0 100644 --- a/src/xf86Wacom.c +++ b/src/x

[Linuxwacom-devel] [PATCH 07/13] scan-build: Logic error: Branch condition evaluates to a garbage value

2014-09-17 Thread Jason Gerecke
1 (line 88): 'attr_id' declared without an initial value 2 (line 96): ASSUME Loop condition is false. Execution continues on line 107 3 (line 107): Branch condition evaluates to a garbage value Signed-off-by: Jason Gerecke --- tools/isdv4-serial-inputattach.c | 2 +- 1 file changed, 1

[Linuxwacom-devel] [PATCH 13/13] Replace strjoinsplit

2014-09-17 Thread Jason Gerecke
There's not much to like about this function's implementation. The few scan-build warnings specific to this particular function suggested it should be put to pasture and replaced with something better. Signed-off-by: Jason Gerecke --- tools/xsetwa

[Linuxwacom-devel] [PATCH 12/13] scan-build: security: Potential insecure memory buffer bounds restriction in call 'strcat'

2014-09-17 Thread Jason Gerecke
sure that there's room for the null terminator that strcat itself will append. Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 805fba9..9c0f65b 100644 --- a/tools/xsetwacom.c

[Linuxwacom-devel] [PATCH 06/13] scan-build: Logic error: Dereference of null pointer

2014-09-17 Thread Jason Gerecke
a NULL dereference immediately afterwards. Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 276f7dd..5a5173d 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -1758,7 +

[Linuxwacom-devel] [PATCH 02/13] scan-build: Unix API: Allocator sizeof operand mismatch

2014-09-17 Thread Jason Gerecke
Result of 'calloc' is converted to a pointer of type 'unsigned long', which is incompatible with sizeof operand type 'long' Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xsetwacom.c b/t

[Linuxwacom-devel] [PATCH 03/13] scan-build: Memory Error: Memory leak

2014-09-17 Thread Jason Gerecke
strjoinsplit requires the caller to free memory Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 122f115..3148355 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -1289,6 +1289,7 @@ static

[Linuxwacom-devel] [PATCH 05/13] scan-build: Unix API: Undefined allocation of 0 bytes

2014-09-17 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index fdecfb9..276f7dd 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -1210,7 +1210,10 @@ static char** strjoinsplit(int

[Linuxwacom-devel] [PATCH 11/13] scan-build: Logic error: Potential unintended use of sizeof() on pointer type

2014-09-17 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- src/wcmConfig.c | 2 +- src/wcmISDV4.c | 10 ++ src/wcmUSB.c| 6 +++--- src/xf86WacomDefs.h | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 138a769..c0cad90 100644 --- a

[Linuxwacom-devel] [PATCH 08/13] scan-build: Undefined or garbage value returned to caller

2014-09-17 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- tools/tools-shared.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tools-shared.c b/tools/tools-shared.c index af5041f..256673f 100644 --- a/tools/tools-shared.c +++ b/tools/tools-shared.c @@ -319,6 +319,7 @@ int query_tablet(int fd

[Linuxwacom-devel] [PATCH 09/13] scan-build: Function call argument is an uninitialized value

2014-09-17 Thread Jason Gerecke
The isdv4ParseTouchQuery and isdv4ParseTouchData functions return 0 and -1 if errors occur. At the moment, only the -1 case is being handled, which can result in the callers using uninitialized ISDV4TouchQueryReply or ISDV4TouchData results. Signed-off-by: Jason Gerecke --- src/wcmISDV4.c

[Linuxwacom-devel] [PATCH 10/13] scan-build: Logic error: Cast region with wrong size

2014-09-17 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 5a5173d..805fba9 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -1252,7 +1252,7 @@ static Bool parse_actions(Display *dpy

[Linuxwacom-devel] [PATCH 09/12] clang-warning: -Wunused-macros

2014-09-17 Thread Jason Gerecke
^ isdv4-serial-inputattach.c:22:9: warning: macro is not used [-Wunused-macros] #define WACOM_TOOLS ^ Signed-off-by: Jason Gerecke --- tools/isdv4-serial-debugger.c| 1 - tools/isdv4-serial-inputattach.c | 1 - tools/tools-shared.c | 1 - tools/xsetwacom.c

[Linuxwacom-devel] [PATCH 08/12] clang-warning: -Wunreachable-code-return

2014-09-17 Thread Jason Gerecke
../src/wcmUSB.c:1140:9: warning: 'return' will never be executed [-Wunreachable-code-return] return 0; ^ Signed-off-by: Jason Gerecke --- src/wcmUSB.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wcmUSB.c b/src/wcmUSB.c index d2c8511..f00cf45 100644

[Linuxwacom-devel] [PATCH 02/12] clang-warning: extra '; ' outside of a function

2014-09-17 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- src/wcmUSB.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 5332702..bb81175 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -80,9 +80,9 @@ static struct _WacomModel mname = \ .Start

[Linuxwacom-devel] [PATCH 01/12] Use '-isystem' instead of '-I' to quiet Clang's warnings

2014-09-17 Thread Jason Gerecke
Clang by default does not emit warnings for system headers, but most includes will be added with '-I' which doesn't count as a system header. This patch has them included with '-isystem' so that we can more easily see problems with *our* code. Signed-off-by: Jason Gerec

[Linuxwacom-devel] [PATCH 04/12] clang-warning: -Wconditional-uninitialized

2014-09-17 Thread Jason Gerecke
: warning: variable 'baudrate' may be uninitialized when used here [-Wconditional-uninitialized] set_serial_attr(fd, baudrate); ^~~~ Signed-off-by: Jason Gerecke --- src/xf86Wacom.c | 2 +- tools/isdv4-serial-inputattach.c | 6 +++--- tools/xs

[Linuxwacom-devel] [PATCH 10/12] clang-warning: -Wmissing-field-initializers

2014-09-17 Thread Jason Gerecke
^ xsetwacom.c:465:9: warning: missing field 'desc' initializer [-Wmissing-field-initializers] { NULL } ^ Signed-off-by: Jason Gerecke --- src/wcmISDV4.c | 1 + src/wcmTouchFilter.c | 12 ++-- tools/xsetwacom.c| 2 +- 3 files changed, 8 inser

[Linuxwacom-devel] [PATCH 05/12] clang-warning: -Wmissing-prototypes

2014-09-17 Thread Jason Gerecke
r function 'get_baud_rate' [-Wmissing-prototypes] int get_baud_rate(int fd) ^ isdv4-serial-inputattach.c:117:6: warning: no previous prototype for function 'sighandler' [-Wmissing-prototypes] void sighandler(int signum) ^ Signed-off-by: Jason Gerecke --- tools/isdv4-serial

[Linuxwacom-devel] [PATCH 07/12] clang-warning: -Wunreachable-code-break

2014-09-17 Thread Jason Gerecke
../src/wcmXCommand.c:439:5: warning: 'break' will never be executed [-Wunreachable-code-break] break; ^ Signed-off-by: Jason Gerecke --- src/wcmXCommand.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wcmXC

[Linuxwacom-devel] [PATCH 06/12] clang-warning: -Wdocumentation-unknown-command

2014-09-17 Thread Jason Gerecke
True on success or False otherwise. ^ Signed-off-by: Jason Gerecke --- src/wcmCommon.c | 2 +- src/wcmUSB.c| 2 +- src/wcmValidateDevice.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 0e1f29e..b938091 100644

[Linuxwacom-devel] [PATCH 12/12] gcc-warning: -Wunused-variable

2014-09-17 Thread Jason Gerecke
../src/wcmXCommand.c:90:13: warning: 'prop_tv_resolutions' defined but not used [-Wunused-variable] static Atom prop_tv_resolutions; ^ Signed-off-by: Jason Gerecke --- src/wcmXCommand.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wcmXCommand.c b/src/wcmXComma

[Linuxwacom-devel] [PATCH 11/12] clang-warning: -Wmissing-variable-declarations

2014-09-17 Thread Jason Gerecke
{ ^ isdv4-serial-debugger.c:44:5: warning: no previous extern declaration for non-static variable 'verbose' [-Wmissing-variable-declarations] int verbose = 0; ^ isdv4-serial-inputattach.c:41:5: warning: no previous extern declaration for non-static variable 'verbose'

[Linuxwacom-devel] [PATCH 03/12] clang-warning: enumeration value 'FORMAT_DEFAULT' not explicitly handled in switch

2014-09-17 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 26b3513..304f9fa 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -655,6 +655,7 @@ static void print_value(param_t *param, const char *msg

[Linuxwacom-devel] [PATCH 06/13 v2] scan-build: Logic error: Dereference of null pointer

2014-09-18 Thread Jason Gerecke
iately afterwards. Signed-off-by: Jason Gerecke --- Changes in v2: * Changed from a pre-decrement 'while' to a 'for' loop. The former wouldn't work right with ndevices == 0 and would have required a second 'Unable to locate device' error message.

Re: [Linuxwacom-devel] [PATCH 11/12] clang-warning: -Wmissing-variable-declarations

2014-09-18 Thread Jason Gerecke
On Thu, Sep 18, 2014 at 3:08 PM, Peter Hutterer wrote: > On Wed, Sep 17, 2014 at 07:11:35PM -0700, Jason Gerecke wrote: >> ../src/wcmConfig.c:701:16: warning: no previous extern declaration for >> non-static variable 'WACOM' [-Wmissing-variable-declarations

Re: [Linuxwacom-devel] [PATCH 11/12] clang-warning: -Wmissing-variable-declarations

2014-09-18 Thread Jason Gerecke
On Thu, Sep 18, 2014 at 5:50 PM, Peter Hutterer wrote: > On Thu, Sep 18, 2014 at 05:30:55PM -0700, Jason Gerecke wrote: > [...] >> >> diff --git a/tools/isdv4-serial-debugger.c b/tools/isdv4-serial-debugger.c >> >> index 6629cb6..03abd26 100644 >> &g

Re: [Linuxwacom-devel] [PATCH 01/12] Use '-isystem' instead of '-I' to quiet Clang's warnings

2014-09-18 Thread Jason Gerecke
On Thu, Sep 18, 2014 at 3:07 PM, Peter Hutterer wrote: > On Wed, Sep 17, 2014 at 07:11:25PM -0700, Jason Gerecke wrote: >> Clang by default does not emit warnings for system headers, but >> most includes will be added with '-I' which doesn't count as a >>

Re: [Linuxwacom-devel] [PATCH 11/12] clang-warning: -Wmissing-variable-declarations

2014-09-18 Thread Jason Gerecke
On Thu, Sep 18, 2014 at 6:15 PM, Peter Hutterer wrote: > On Thu, Sep 18, 2014 at 06:10:49PM -0700, Jason Gerecke wrote: >> On Thu, Sep 18, 2014 at 5:50 PM, Peter Hutterer >> wrote: >> > On Thu, Sep 18, 2014 at 05:30:55PM -0700, Jason Gerecke wrote: >> > [...]

[Linuxwacom-devel] [PATCH] Strengthen condition that pad may never be arbitrated pointer control

2014-09-19 Thread Jason Gerecke
the touch, and only while it remains held. This patch strengthens the condition that the pad may never be granted control by making it the first thing checked. Signed-off-by: Jason Gerecke --- src/wcmCommon.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wcm

[Linuxwacom-devel] [PATCH] Reset wcmGestureState to current device state upon gesture start

2014-09-19 Thread Jason Gerecke
undesired "catch up" effect due to the large built-up delta. To work around this, when a gesture starts, we reset the wcmGestureState so that the functions are working with a clean slate and do not see the large delta. Signed-off-by: Jason Gerecke --- src/wcmTouchFil

[Linuxwacom-devel] [PATCH 3/3] Change 3.17 branch dependency to CONFIG_HID_WACOM

2014-10-03 Thread Jason Gerecke
Kernel 3.17 migrates the wacom.ko driver from the USB tree to the HID tree and now uses the CONFIG_HID_WACOM flag. --- 3.17/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.17/Makefile.in b/3.17/Makefile.in index eaf3a90..3ef0c9d 100644 --- a/3.17/Makefile.in +

[Linuxwacom-devel] [PATCH 2/3] Fix compile issues with older drivers

2014-10-03 Thread Jason Gerecke
* Add missing semicolon to 0x4004 definition (2.6.38) * Remove duplicate device definition (2.6.30) * Add missing closing brace (2.6.30) Signed-off-by: Jason Gerecke --- 2.6.30/wacom_wac.c | 3 +-- 2.6.38/wacom_wac.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/2.6.30

[Linuxwacom-devel] [PATCH 1/3] Fix compile issues with 3.17 backports

2014-10-03 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 2.6.36/wacom_sys.c | 4 ++-- 2.6.38/wacom_sys.c | 6 +++--- 3.7/wacom_sys.c| 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.6.36/wacom_sys.c b/2.6.36/wacom_sys.c index 14962d7..6fb0d10 100644 --- a/2.6.36/wacom_sys.c +++ b/2.6.36

[Linuxwacom-devel] [PATCH] Use backwards-compatible battery name only for first tablet

2014-10-03 Thread Jason Gerecke
name only if it has not already been registered and use the new behavior otherwise. Fixes SF bug #248 Signed-off-by: Jason Gerecke --- 2.6.38/wacom_sys.c | 15 ++- 2.6.38/wacom_wac.h | 1 + 3.7/wacom_sys.c| 15 ++- 3.7/wacom_wac.h| 1 + 4 files changed, 30 inser

Re: [Linuxwacom-devel] 0.26.1 release?

2014-10-09 Thread Jason Gerecke
On Thu, Oct 9, 2014 at 6:41 AM, Ron wrote: > > Hi, > > The SF downloads appear to be showing a 0.26.1 release tarball, > but I'm not seeing a version bump commit, or tag in the SF git > repo. Did someone just forget to push, or did the primary git > tree move again while I wasn't looking ;? > > [

[Linuxwacom-devel] [PATCH] data: Tweak header information for 21UX2

2014-11-03 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- data/cintiq-21ux2.tablet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet index 6e780a2..d09461e 100644 --- a/data/cintiq-21ux2.tablet +++ b/data/cintiq-21ux2.tablet @@ -1,5 +1,5 @@ # Wacom

[Linuxwacom-devel] [PATCH] data: Add Cintiq Companion

2014-11-03 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- data/cintiq-companion.tablet | 44 +++ data/layouts/cintiq-companion.svg | 234 ++ 2 files changed, 278 insertions(+) create mode 100644 data/cintiq-companion.tablet create mode 100644 data/layouts/cintiq

Re: [Linuxwacom-devel] [PATCH] Prevent occasional Pen/Eraser misdetection

2014-11-17 Thread Jason Gerecke
On Fri, Nov 14, 2014 at 1:09 AM, Robert Miller wrote: > Hi! I've never submitted a patch to anything before so I hope I'm not > wasting your time, but I found a bug while using my cintiq companion hybrid > and I traced it to linux_wacom. > > I'm on Ubuntu 14.04, and the device I'm testing with is

[Linuxwacom-devel] [PATCH] Ensure input device fd gets closed after use

2014-12-05 Thread Jason Gerecke
Fixes a minor error in commit 52fe01c which results in the driver invalidating an fd prior to (potentially) closing it. This reversed order causes us to leak the fd and can result in eventual exhasution. Fixes SF #263 Signed-off-by: Jason Gerecke --- src/xf86Wacom.c | 2 +- 1 file changed, 1

[Linuxwacom-devel] [PATCH] Allow xsetwacom to recognize 'insert' as a key

2014-12-05 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 5a35ee8..d1b6242 100644 --- a/tools/xsetwacom.c +++ b/tools/xsetwacom.c @@ -593,6 +593,8 @@ static struct modifier specialkeys[] = { {&quo

Re: [Linuxwacom-devel] [PATCH] Ensure input device fd gets closed after use

2014-12-08 Thread Jason Gerecke
On Sun, Dec 7, 2014 at 4:59 PM, Peter Hutterer wrote: > On Fri, Dec 05, 2014 at 01:39:26PM -0800, Jason Gerecke wrote: >> Fixes a minor error in commit 52fe01c which results in the driver >> invalidating an fd prior to (potentially) closing it. This reversed >> order causes

Re: [Linuxwacom-devel] [PATCH] Allow xsetwacom to recognize 'insert' as a key

2014-12-08 Thread Jason Gerecke
On Sun, Dec 7, 2014 at 4:59 PM, Peter Hutterer wrote: > On Fri, Dec 05, 2014 at 01:39:25PM -0800, Jason Gerecke wrote: >> Signed-off-by: Jason Gerecke > > Reviewed-by: Peter Hutterer > > >> --- >> tools/xsetwacom.c | 2 ++ >> 1 file changed, 2 insertions(

Re: [Linuxwacom-devel] Patch: Non-linear and non-parametric calibration

2014-12-15 Thread Jason Gerecke
On Sat, Dec 13, 2014 at 11:33 PM, Feng Yu wrote: > Greetings. > > Recently I purchased a x230 tablet; it has an on-screen digitizer. My first > stylus computer and I was quite excited. > > I was pretty sad when I figured that no matter how I calibrated the stylus, > in much of the screen the stylu

[Linuxwacom-devel] [PATCH input-wacom] Fix 2.6.36 compilation

2014-12-22 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 2.6.36/wacom_sys.c | 2 +- 2.6.36/wacom_wac.c | 2 +- 2.6.36/wacom_wac.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/2.6.36/wacom_sys.c b/2.6.36/wacom_sys.c index 4e84089..4ea452f 100644 --- a/2.6.36/wacom_sys.c +++ b/2.6.36/wacom_sys.c

[Linuxwacom-devel] [PATCH input-wacom 03/13] HID: wacom: Add support for the Cintiq Companion

2014-12-22 Thread Jason Gerecke
The Wacom Cintiq Companion shares the same sensor than the Cintiq Companion Hybrid, with the exception of the different PIDs. Signed-off-by: Benjamin Tissoires Signed-off-by: Jiri Kosina --- 3.17/wacom_wac.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/3.17/wacom_wac.c b/3.17

[Linuxwacom-devel] [PATCH input-wacom 01/10] HID: wacom - make sure touch_input is valid before using it

2014-12-22 Thread Jason Gerecke
From: Ping Cheng touch_input is stored in wacom_shared for pen data to report touch switch status. It is possible, although we didn't see it happen on Linux yet, that pen data is procesed before touch interface is fully probed. As a by-product of this patch, it fixes the FreeBSD issue reported b

[Linuxwacom-devel] [PATCH input-wacom 00/13] Updates for-3.18

2014-12-22 Thread Jason Gerecke
if !CONFIG_PM Jason Gerecke (4): HID: wacom: Add support for the Cintiq Companion Backport: Add support for the Cintiq Companion Backport: make the WL connection friendly for the desktop Backport: Fix compilation of generic HID handling patch under 3.17 Ping Cheng (1): Input: wacom

[Linuxwacom-devel] [PATCH input-wacom 06/13] Backport: make the WL connection friendly for the desktop

2014-12-22 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 2.6.38/wacom_sys.c | 4 3.7/wacom_sys.c| 4 2 files changed, 8 insertions(+) diff --git a/2.6.38/wacom_sys.c b/2.6.38/wacom_sys.c index 51376e7..8a1a41f 100644 --- a/2.6.38/wacom_sys.c +++ b/2.6.38/wacom_sys.c @@ -1192,6 +1192,10 @@ static int

[Linuxwacom-devel] [PATCH input-wacom 01/13] Input: wacom - cleanup multitouch code when touch_max is 2

2014-12-22 Thread Jason Gerecke
Reviewed-by: Jason Gerecke Signed-off-by: Dmitry Torokhov --- 3.17/wacom_wac.c | 28 +++- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c index 1ac6719..803318f 100644 --- a/3.17/wacom_wac.c +++ b/3.17/wacom_wac.c @@ -1325,9

[Linuxwacom-devel] [PATCH input-wacom 09/10] HID: wacom: Update maximum X/Y accounding to outbound offset

2014-12-22 Thread Jason Gerecke
From: Ping Cheng Defined outbound offset for DTU and Cintiq. But didn't update the relevant maximum values. Oops... Signed-off-by: Ping Cheng Signed-off-by: Jiri Kosina --- 3.17/wacom_wac.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/3.17/wacom_wac.c

[Linuxwacom-devel] [PATCH input-wacom 06/10] HID: wacom: fix freeze on open when autosuspend is on

2014-12-22 Thread Jason Gerecke
From: Benjamin Tissoires Since the conversion from USB to HID (in v3.17), some people reported a freeze on boot with the wacom driver. Hans managed to get a stacktrace: [ 240.272331] Call Trace: [ 240.272338] [] ? usb_hcd_submit_urb+0xa9/0xb10 [ 240.272347] [] schedule+0x29/0x70 [ 240.2723

[Linuxwacom-devel] [PATCH input-wacom 04/10] HID: wacom - Cleanup input_capabilities for Graphire 4 and Bamboo Fun

2014-12-22 Thread Jason Gerecke
From: Ping Cheng Graphire 4 only has two tablet buttons; Bamboo Fun touch ring is only for PAD. Signed-off-by: Ping Cheng Reviewed-by: Benjamin Tissoires Signed-off-by: Jiri Kosina --- 3.17/wacom_wac.c | 5 - 1 file changed, 5 deletions(-) diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac

[Linuxwacom-devel] [PATCH input-wacom 07/10] HID: wacom: add defines for new Cintiq and DTU outbound tracking

2014-12-22 Thread Jason Gerecke
From: Ping Cheng There are screen to tablet offsets for newer Cintiq and DTU models. These offsets serve as outbound tracking for those display tablets. Use defines instead of hardcoded numbers for the offsets. Signed-off-by: Ping Cheng Signed-off-by: Jiri Kosina --- 3.17/wacom_wac.c | 37 ++

[Linuxwacom-devel] [PATCH input-wacom 09/13] HID: wacom: split out input allocation and registration

2014-12-22 Thread Jason Gerecke
splits the allocation and registration, but do not change where we allocate the input. This will come in a later patch. Signed-off-by: Benjamin Tissoires Acked-by: Jason Gerecke Signed-off-by: Jiri Kosina --- 3.17/wacom_sys.c | 96 +--- 3.17

[Linuxwacom-devel] [PATCH input-wacom 02/10] Backport: make sure touch_input is valid before using it

2014-12-22 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 2.6.38/wacom_wac.c | 7 +-- 3.7/wacom_wac.c| 7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c index 6dd2a51..c58abcc 100644 --- a/2.6.38/wacom_wac.c +++ b/2.6.38/wacom_wac.c @@ -1312,7

[Linuxwacom-devel] [PATCH input-wacom 05/13] HID: wacom: make the WL connection friendly for the desktop

2014-12-22 Thread Jason Gerecke
From: Benjamin Tissoires Currently, tablets connected to the WL receiver all share the same VID/PID. There is no way for the user space to know which one is which besides parsing the name. We can force the PID to be set to the actual hardware. This way, the input device will have the correct PID

[Linuxwacom-devel] [PATCH input-wacom 11/13] HID: wacom: implement generic HID handling for pen generic devices

2014-12-22 Thread Jason Gerecke
ore to parse the incoming reports. (Note that this can be easily backported by directly setting the .claimed flag to HID_CLAIMED_DRIVER even if hid-core does not support HID_CONNECT_DRIVER) Signed-off-by: Benjamin Tissoires Acked-by: Jason Gerecke Signed-off-by: Jiri Kosina --- 3.17/waco

[Linuxwacom-devel] [PATCH input-wacom 00/10] Backports for-3.19

2014-12-22 Thread Jason Gerecke
Backports several bugfix patches that are destined for Linux 3.19. Benjamin Tissoires (1): HID: wacom: fix freeze on open when autosuspend is on Jason Gerecke (3): Backport: make sure touch_input is valid before using it Backport: add defines for new Cintiq and DTU outbound tracking

[Linuxwacom-devel] [PATCH input-wacom 08/10] Backport: add defines for new Cintiq and DTU outbound tracking

2014-12-22 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 2.6.30/wacom_wac.c | 22 +- 2.6.36/wacom_wac.c | 31 ++- 2.6.38/wacom_wac.c | 37 ++--- 3.7/wacom_wac.c| 37 ++--- 4 files changed, 87 insertions

[Linuxwacom-devel] [PATCH input-wacom 07/13] HID: wacom: fix timeout on probe for some wacoms

2014-12-22 Thread Jason Gerecke
From: Benjamin Tissoires Some Wacom tablets (at least the ISDv4 found in the Lenovo X230) timeout during probe while retrieving the input reports. The only time this information is valuable is during the feature_mapping stage, so we can ask for it there and discard the generic input reports retri

[Linuxwacom-devel] [PATCH input-wacom 10/13] HID: wacom: move allocation of inputs earlier

2014-12-22 Thread Jason Gerecke
From: Benjamin Tissoires This allows to have the input devices ready in while parsing the reports descriptor. Signed-off-by: Benjamin Tissoires Acked-by: Jason Gerecke Signed-off-by: Jiri Kosina --- 3.17/wacom_sys.c | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff

[Linuxwacom-devel] [PATCH input-wacom 04/13] Backport: Add support for the Cintiq Companion

2014-12-22 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 2.6.38/wacom_wac.c | 9 + 3.7/wacom_wac.c| 10 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c index 223b744..6dd2a51 100644 --- a/2.6.38/wacom_wac.c +++ b/2.6.38/wacom_wac.c

[Linuxwacom-devel] [PATCH input-wacom 13/13] HID: wacom: implement the finger part of the HID generic handling

2014-12-22 Thread Jason Gerecke
From: Benjamin Tissoires Signed-off-by: Benjamin Tissoires Acked-by: Jason Gerecke Signed-off-by: Jiri Kosina --- 3.17/wacom_sys.c | 39 -- 3.17/wacom_wac.c | 120 +++ 3.17/wacom_wac.h | 8 3 files changed, 164

[Linuxwacom-devel] [PATCH input-wacom 10/10] Backport: Update maximum X/Y accounding to outbound offset

2014-12-22 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 2.6.30/wacom_wac.c | 14 +++--- 2.6.36/wacom_wac.c | 14 +++--- 2.6.38/wacom_wac.c | 18 +- 3.7/wacom_wac.c| 18 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/2.6.30/wacom_wac.c b/2.6.30

[Linuxwacom-devel] [PATCH input-wacom 03/10] HID: wacom - return ENODEV for failed wacom_setup_pad_input_capabilities

2014-12-22 Thread Jason Gerecke
From: Ping Cheng ENODEV indicates no device is added. Hence, the associated pad input device is simply freed. Signed-off-by: Ping Cheng Reviewed-by: Benjamin Tissoires Signed-off-by: Jiri Kosina --- 3.17/wacom_wac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3

[Linuxwacom-devel] [PATCH input-wacom 05/10] HID: wacom - Bamboo pen-only tablet does not support PAD

2014-12-22 Thread Jason Gerecke
From: Ping Cheng Bamboo models do not support HID_DG_CONTACTMAX. Plus, Bamboo pen-only has touch descriptor. This leads to some complications in the code. This patch also fixes duplicated PAD interfeaces for Intuos Pen models. Signed-off-by: Ping Cheng Reviewed-by: Benjamin Tissoires Signed-

[Linuxwacom-devel] [PATCH input-wacom 02/13] Input: wacom - fix compiler warning if !CONFIG_PM

2014-12-22 Thread Jason Gerecke
From: Geert Uytterhoeven If CONFIG_PM is not set: drivers/hid/wacom_sys.c:1436: warning: ‘wacom_reset_resume’ defined but not used Protect the unused functions by #ifdef CONFIG_PM to fix this. Signed-off-by: Geert Uytterhoeven Reviewed-by: Benjamin Tissoires Signed-off-by: Dmitry Torokhov -

[Linuxwacom-devel] [PATCH input-wacom 08/13] HID: wacom: rename failN with some meaningful information

2014-12-22 Thread Jason Gerecke
From: Benjamin Tissoires When we have to deal with new elements in probe, having the exit labels named sequencially is a pain to maintain. Put a meaningful name instead so that we do not have to renumber them on inserts. Signed-off-by: Benjamin Tissoires Acked-by: Jason Gerecke Signed-off-by

[Linuxwacom-devel] [PATCH input-wacom 12/13] Backport: Fix compilation of generic HID handling patch under 3.17

2014-12-22 Thread Jason Gerecke
From: Jason Gerecke As suggested in the prior patch, we manually set hdev->claimed with the necessary flag value (which is hardcoded since HID_CLAIMED_DRIVER is not available in 3.17) Signed-off-by: Jason Gerecke --- 3.17/wacom.h | 1 + 3.17/wacom_sys.c | 4 2 files changed

Re: [Linuxwacom-devel] [PATCH input-wacom 01/10] HID: wacom - make sure touch_input is valid before using it

2014-12-23 Thread Jason Gerecke
ree, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three,/ So you look at the sixty-fours On Tue, Dec 23, 2014 at 2:15 AM, Jiri Kosina wrote: > On Mon, 22 Dec 2014, Jason Gerecke wrote: > >> From: Ping Cheng >> >> to

Re: [Linuxwacom-devel] Wacom Bamboo PAD CTH-301 (0x318)

2015-01-08 Thread Jason Gerecke
I do not have a Bamboo Pad, but I've heard that people have had success getting it to work using the steps described at [1]. Unfortunately, the workaround stopped working in Linux 3.17, so please check that first. [1]: http://thottingal.in/blog/2014/10/26/howto-wacom-bamboo-cth301k-in-debian/ Jas

[Linuxwacom-devel] [PATCH] xsetwacom: Use effective XKB group number in keysym_to_keycode

2015-01-12 Thread Jason Gerecke
$ setxkbmap us -option Fixes: http://sourceforge.net/p/linuxwacom/bugs/269/ Signed-off-by: Jason Gerecke --- tools/xsetwacom.c | 46 ++ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c index 3d6b417..ec5d24e 100644

[Linuxwacom-devel] [PATCH input-wacom 01/11] HID: wacom: Report ABS_TILT_{X, Y} as signed values

2015-01-12 Thread Jason Gerecke
to support signed tilt values in late-2012 (2f2acec). Signed-off-by: Jason Gerecke Reviewed-by: Ping Cheng Signed-off-by: Jiri Kosina Signed-off-by: Jason Gerecke --- 3.17/wacom_wac.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/3.17/wacom_wac.c b/3.17

[Linuxwacom-devel] [PATCH input-wacom 02/11] HID: wacom: Add angular resolution data to some ABS axes

2015-01-12 Thread Jason Gerecke
values and range by at least 10x would reduce the error in the resolution to acceptable levels, but the xf86-input-wacom driver is not able to use pre-scaled values for these axes at this time. Signed-off-by: Jason Gerecke Reviewed-by: Ping Cheng Signed-off-by: Jiri Kosina Signed-off-by: Jason

[Linuxwacom-devel] [PATCH input-wacom 00/11] Linux 3.19 backports

2015-01-12 Thread Jason Gerecke
The following patches have been merged by linus into his 3.19 tree and need to be applied to input-wacom as well. Benjamin Tissoires (1): HID: wacom: re-add accidentally dropped Lenovo PID Jason Gerecke (7): HID: wacom: Report ABS_TILT_{X,Y} as signed values HID: wacom: Add angular

[Linuxwacom-devel] [PATCH input-wacom 08/11] HID: wacom: Add support for DTU-1031X

2015-01-12 Thread Jason Gerecke
From: Ping Cheng Signed-off-by: Ping Cheng Signed-off-by: Jiri Kosina Signed-off-by: Jason Gerecke --- 3.17/wacom_wac.c | 7 +++ 3.17/wacom_wac.h | 1 + 2 files changed, 8 insertions(+) diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c index 734c223..0692f31 100644 --- a/3.17/wacom_wac.c

[Linuxwacom-devel] [PATCH input-wacom 05/11] HID: make hid_report_len as a static inline function in hid.h

2015-01-12 Thread Jason Gerecke
: David Herrmann Signed-off-by: Jiri Kosina Signed-off-by: Jason Gerecke --- 3.17/wacom_sys.c | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c index d523e91..8b841e5 100644 --- a/3.17/wacom_sys.c +++ b/3.17/wacom_sys.c @@ -1321,12 +1321,6

[Linuxwacom-devel] [PATCH input-wacom 03/11] HID: wacom: PAD is independent with pen/touch

2015-01-12 Thread Jason Gerecke
: Jiri Kosina Signed-off-by: Jason Gerecke --- 3.17/wacom_sys.c | 8 +--- 3.17/wacom_wac.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c index e0db952..d523e91 100644 --- a/3.17/wacom_sys.c +++ b/3.17/wacom_sys.c @@ -1128,7 +1128,7

[Linuxwacom-devel] [PATCH input-wacom 06/11] Backport: make hid_report_len as a static inline function in hid.h

2015-01-12 Thread Jason Gerecke
Signed-off-by: Jason Gerecke --- 3.17/wacom_sys.c | 12 1 file changed, 12 insertions(+) diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c index 8b841e5..40a70f3 100644 --- a/3.17/wacom_sys.c +++ b/3.17/wacom_sys.c @@ -1321,6 +1321,14 @@ static void wacom_calculate_res(struct

[Linuxwacom-devel] [PATCH input-wacom 09/11] Backport: Add support for DTU-1031X

2015-01-12 Thread Jason Gerecke
From: Jason Gerecke Signed-off-by: Jason Gerecke --- 2.6.30/wacom_wac.c | 5 + 2.6.30/wacom_wac.h | 1 + 2.6.36/wacom_wac.c | 7 +++ 2.6.36/wacom_wac.h | 1 + 2.6.38/wacom_wac.c | 7 +++ 2.6.38/wacom_wac.h | 1 + 3.7/wacom_wac.c| 7 +++ 3.7/wacom_wac.h| 1 + 8 files

[Linuxwacom-devel] [PATCH input-wacom 11/11] HID: wacom: Report input events for each finger on generic devices

2015-01-12 Thread Jason Gerecke
contact; when such a field is encountered all the stored contact data will be reported. Signed-off-by: Jason Gerecke Reviewed-by: Benjamin Tissoires Signed-off-by: Jiri Kosina Signed-off-by: Jason Gerecke --- 3.17/wacom_wac.c | 86 ++-- 3.17

<    2   3   4   5   6   7   8   9   10   11   >