Hello community, here is the log from the commit of package xf86-input-wacom for openSUSE:Factory checked in at 2013-06-25 07:38:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old) and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-wacom" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes 2013-03-24 21:51:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-wacom.new/xf86-input-wacom.changes 2013-06-25 14:47:18.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 20 09:32:12 UTC 2013 - [email protected] + +- Update to version 0.21.0: + + Handle DEVICE_ABORT on input ABI 19.1 + + Add support for touchscreens direct touch devices + + Add support for Fujitsu Lifebook T902 +- Remove U_Consolidate-calls-to-wcmEvent-into-one-statement.patch + and U_Consolidate-calls-to-wcmEvent-into-one-statement.patch + (merged). +- Simplify wacom udev rules (based on Fedora) + +------------------------------------------------------------------- Old: ---- U_Consolidate-calls-to-wcmEvent-into-one-statement.patch U_Resume-button-events-for-pucks.patch xf86-input-wacom-0.20.0.tar.bz2 New: ---- xf86-input-wacom-0.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.gziSK5/_old 2013-06-25 14:47:18.000000000 +0200 +++ /var/tmp/diff_new_pack.gziSK5/_new 2013-06-25 14:47:18.000000000 +0200 @@ -23,7 +23,7 @@ %endif Name: xf86-input-wacom -Version: 0.20.0 +Version: 0.21.0 Release: 0 Summary: Wacom input driver for the Xorg X server License: GPL-2.0+ @@ -31,8 +31,6 @@ Url: http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Xf86-input-wacom Source0: http://downloads.sourceforge.net/project/linuxwacom/xf86-input-wacom/%{name}-%{version}.tar.bz2 Source1: 65-xorg-wacom.rules -Patch0: U_Consolidate-calls-to-wcmEvent-into-one-statement.patch -Patch1: U_Resume-button-events-for-pucks.patch BuildRequires: pkg-config # For directory ownership BuildRequires: udev @@ -75,8 +73,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure --with-xorg-conf-dir=/etc/X11/xorg.conf.d ++++++ 65-xorg-wacom.rules ++++++ --- /var/tmp/diff_new_pack.gziSK5/_old 2013-06-25 14:47:18.000000000 +0200 +++ /var/tmp/diff_new_pack.gziSK5/_new 2013-06-25 14:47:18.000000000 +0200 @@ -1,4 +1,13 @@ -ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet" -ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="FUJ*", ENV{NAME}="Serial Wacom Tablet" -ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom" -ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom" +ACTION!="add|change", GOTO="wacom_end" + +# Match all serial wacom tablets with a serial ID starting with WACf +# Notes: We assign NAME though we shouldn't, but currently the server requires it +# We assign the lot to subsystem pnp too because server reads NAME from +# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" +# will do and the ENV{NAME} can be removed. +SUBSYSTEM=="tty|pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet" +SUBSYSTEM=="tty|pnp", ATTR{id}=="FUJ*", ENV{NAME}="Serial Wacom Tablet" +SUBSYSTEMS=="tty|pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}" +SUBSYSTEMS=="tty|pnp", ATTRS{id}=="FUJ*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{x11_driver}="wacom", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}" + +LABEL="wacom_end" ++++++ xf86-input-wacom-0.20.0.tar.bz2 -> xf86-input-wacom-0.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/ChangeLog new/xf86-input-wacom-0.21.0/ChangeLog --- old/xf86-input-wacom-0.20.0/ChangeLog 2013-03-04 18:46:48.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/ChangeLog 2013-04-29 22:18:17.000000000 +0200 @@ -1,3 +1,147 @@ +commit 5c6bd8d45ca2358d42fdd028112e724c691774ba +Author: Jason Gerecke <[email protected]> +Date: Fri Apr 19 18:14:59 2013 -0700 + + wacom 0.20.99.1 + + Signed-off-by: Jason Gerecke <[email protected]> + +commit 8d804cdf31bfbf9ec46ee15ab1a58e63f770c2b8 +Author: Jason Gerecke <[email protected]> +Date: Thu Apr 18 14:51:37 2013 -0700 + + Fix const warnings in wcmSetActionProperty + + CC wcmXCommand.lo + ../../src/wcmXCommand.c: In function 'wcmSetActionProperty': + ../../src/wcmXCommand.c:460:23: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] + case BadMatch: msg = "BadMatch"; break; + ^ + ../../src/wcmXCommand.c:461:23: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] + case BadValue: msg = "BadValue"; break; + ^ + ../../src/wcmXCommand.c:462:17: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] + default: msg = "UNKNOWN"; break; + ^ + Signed-off-by: Jason Gerecke <[email protected]> + +commit 135e6f60df1398f2c5145535f68e06703ccd77b4 +Author: Jason Gerecke <[email protected]> +Date: Thu Apr 18 14:47:17 2013 -0700 + + Remove unused variable + + src/wcmUSB.c:451:14: warning: unused variable 'private' [-Wunused-variable] + wcmUSBData* private = common->private; + + Signed-off-by: Jason Gerecke <[email protected]> + +commit dfe4d23ef30db20e726605599c1c6bed2aa20a3a +Author: Peter Hutterer <[email protected]> +Date: Tue Mar 26 11:39:55 2013 +1000 + + Correct comment for Sample and Suppress property + + The data in the property is actually the other way round. Oops. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit ad952fe2800c875b2f0b4663358d454d793ce57f +Author: Ping Cheng <[email protected]> +Date: Fri Mar 8 17:04:42 2013 -0800 + + add support for 0x10d + + It is a Wacom device found in Fujitsu Lifebook T902. + + Signed-off-by: Stephan Frank <[email protected]> + Acked-by: Ping Cheng <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Reviewed-by: Jason Gerecke <[email protected]> + +commit 7a1aadb24b6573809d7324f2549bed749ad1a7f2 +Author: Ping Cheng <[email protected]> +Date: Thu Mar 7 14:11:30 2013 -0800 + + Resume button events for pucks + + wcmBTNChannel was statically assigned to PAD_CHANNEL by commit 1f9bf45b, which + excluded button events for CURSOR tools. This patch allows usbParseBTNEvent + to process button events for both CURSOR and PAD tools. + + wcmBTNChannel is removed from wcmUSBData since we do not need it anymore. + + Signed-off-by: Ping Cheng <[email protected]> + Reviewed-by: Jason Gerecke <[email protected]> + +commit c3b4e869924291ee1ec72a2f02fc1986873efe92 +Author: Jan Alexander Steffens (heftig) <[email protected]> +Date: Mon Mar 4 18:33:03 2013 +0100 + + Make touchscreens (WCM_LCD) direct touch devices + + Tested with a tablet pc, allowing finger scrolling in GTK3. + + Signed-off-by: Jan Alexander Steffens (heftig) <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Tested-by: Jason Gerecke <[email protected]> + +commit 9077b12cd6ef7a9772aaea00b52baad64471e4e4 +Author: Ping Cheng <[email protected]> +Date: Tue Mar 5 16:46:27 2013 -0800 + + Consolidate calls to wcmEvent into one statement + + The extra wcmEvent call was to deal with generic PAD events received + without motion events in the same packet. Those PAD events would be + filtered out by the device type retrieving code later. + + Signed-off-by: Ping Cheng <[email protected]> + Acked-by: Chris Bagwell <[email protected]> + Reviewed-by: Jason Gerecke <[email protected]> + +commit db17462c0e85f880647f23a0e8bbfd4d20a38303 +Author: Ping Cheng <[email protected]> +Date: Tue Mar 5 16:45:45 2013 -0800 + + Clean up device_type initialization for tool on tablet + + usbInitToolType retrieves device type from the kernel when tool + is on the tablet at X server startup. No need to do it again later. + + Since kernel does not have a specific device type for PAD, we have + to check the actual events to set its type. + + Signed-off-by: Ping Cheng <[email protected]> + Acked-by: Chris Bagwell <[email protected]> + Reviewed-by: Jason Gerecke <[email protected]> + +commit 6f9826217f50df8e315d3a7d694a4daf62f32c38 +Author: Ping Cheng <[email protected]> +Date: Tue Mar 5 16:44:52 2013 -0800 + + Update MAX_CHANNELS definition + + Make room to report pen and touch events simultaneously + + Signed-off-by: Ping Cheng <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Reviewed-by: Jason Gerecke <[email protected]> + +commit 1bca5eefa22afcce1ebe33812e7d17872ceeafca +Author: Peter Hutterer <[email protected]> +Date: Tue Mar 5 09:41:47 2013 +1000 + + Handle DEVICE_ABORT on input ABI 19.1 + + And do nothing. + + USB devices are handled by the kernel, so we don't need to reset the HW. + ISDV4 devices don't get reset on normal shutdown anyway, so we don't need to + do anything here either. + + Signed-off-by: Peter Hutterer <[email protected]> + commit ab53739dafee0e0f4a534220501bd067193ff109 Author: Jason Gerecke <[email protected]> Date: Mon Mar 4 09:46:17 2013 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/configure new/xf86-input-wacom-0.21.0/configure --- old/xf86-input-wacom-0.20.0/configure 2013-03-04 18:46:35.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/configure 2013-04-29 21:59:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xf86-input-wacom 0.20.0. +# Generated by GNU Autoconf 2.69 for xf86-input-wacom 0.21.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-wacom' PACKAGE_TARNAME='xf86-input-wacom' -PACKAGE_VERSION='0.20.0' -PACKAGE_STRING='xf86-input-wacom 0.20.0' +PACKAGE_VERSION='0.21.0' +PACKAGE_STRING='xf86-input-wacom 0.21.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1432,7 +1432,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-input-wacom 0.20.0 to adapt to many kinds of systems. +\`configure' configures xf86-input-wacom 0.21.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1503,7 +1503,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-wacom 0.20.0:";; + short | recursive ) echo "Configuration of xf86-input-wacom 0.21.0:";; esac cat <<\_ACEOF @@ -1640,7 +1640,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-wacom configure 0.20.0 +xf86-input-wacom configure 0.21.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2055,7 +2055,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-wacom $as_me 0.20.0, which was +It was created by xf86-input-wacom $as_me 0.21.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2924,7 +2924,7 @@ # Define the identity of the package. PACKAGE='xf86-input-wacom' - VERSION='0.20.0' + VERSION='0.21.0' cat >>confdefs.h <<_ACEOF @@ -19060,7 +19060,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-wacom $as_me 0.20.0, which was +This file was extended by xf86-input-wacom $as_me 0.21.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19126,7 +19126,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xf86-input-wacom config.status 0.20.0 +xf86-input-wacom config.status 0.21.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/configure.ac new/xf86-input-wacom-0.21.0/configure.ac --- old/xf86-input-wacom-0.20.0/configure.ac 2013-03-04 18:45:49.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/configure.ac 2013-04-29 21:59:05.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-wacom], - [0.20.0], + [0.21.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-wacom]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/include/wacom-properties.h new/xf86-input-wacom-0.21.0/include/wacom-properties.h --- old/xf86-input-wacom-0.20.0/include/wacom-properties.h 2012-10-16 21:09:58.000000000 +0200 +++ new/xf86-input-wacom-0.21.0/include/wacom-properties.h 2013-04-18 23:45:21.000000000 +0200 @@ -72,7 +72,7 @@ /* 32 bit, 1 value */ #define WACOM_PROP_PRESSURE_THRESHOLD "Wacom Pressure Threshold" -/* 32 bit, 2 values, sample, suppress */ +/* 32 bit, 2 values, suppress, sample */ #define WACOM_PROP_SAMPLE "Wacom Sample and Suppress" /* BOOL, 1 value */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/wcmUSB.c new/xf86-input-wacom-0.21.0/src/wcmUSB.c --- old/xf86-input-wacom-0.20.0/src/wcmUSB.c 2013-02-26 18:26:42.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/src/wcmUSB.c 2013-04-20 03:16:52.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. <[email protected]> - * Copyright 2002-2010 by Ping Cheng, Wacom. <[email protected]> + * Copyright 2002-2013 by Ping Cheng, Wacom. <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,7 +32,6 @@ typedef struct { int wcmLastToolSerial; - int wcmBTNChannel; int wcmDeviceType; Bool wcmPenTouch; Bool wcmUseMT; @@ -292,6 +291,7 @@ { WACOM_VENDOR_ID, 0xEF, 100000, 100000, &usbTabletPC }, /* TabletPC 0xEF */ { WACOM_VENDOR_ID, 0x100,100000, 100000, &usbTabletPC }, /* TabletPC 0x100 */ { WACOM_VENDOR_ID, 0x101,100000, 100000, &usbTabletPC }, /* TabletPC 0x101 */ + { WACOM_VENDOR_ID, 0x10D,100000, 100000, &usbTabletPC }, /* TabletPC 0x10D */ { WACOM_VENDOR_ID, 0x4001,100000, 100000, &usbTabletPC }, /* TabletPC 0x4001 */ /* IDs from Waltop's driver, available http://www.waltop.com.tw/download.asp?lv=0&id=2. @@ -448,7 +448,6 @@ { WacomDevicePtr priv = (WacomDevicePtr)pInfo->private; WacomCommonPtr common = priv->common; - wcmUSBData* private = common->private; WacomDeviceState *ds; int channel = PAD_CHANNEL; @@ -460,8 +459,6 @@ ds->device_type = PAD_ID; ds->device_id = PAD_DEVICE_ID; ds->serial_num = channel; - - private->wcmBTNChannel = channel; } int usbWcmGetRanges(InputInfoPtr pInfo) @@ -1223,25 +1220,6 @@ (&common->wcmChannel[private->wcmMTChannel])->dirty |= change; } -static struct -{ - unsigned long device_type; - unsigned long tool_key; -} wcmTypeToKey [] = -{ - { STYLUS_ID, BTN_TOOL_PEN }, - { STYLUS_ID, BTN_TOOL_PENCIL }, - { STYLUS_ID, BTN_TOOL_BRUSH }, - { STYLUS_ID, BTN_TOOL_AIRBRUSH }, - { ERASER_ID, BTN_TOOL_RUBBER }, - { CURSOR_ID, BTN_TOOL_MOUSE }, - { CURSOR_ID, BTN_TOOL_LENS }, - { TOUCH_ID, BTN_TOOL_DOUBLETAP }, - { TOUCH_ID, BTN_TOOL_TRIPLETAP }, - { PAD_ID, BTN_FORWARD }, - { PAD_ID, BTN_0 } -}; - static void usbParseKeyEvent(WacomCommonPtr common, struct input_event *event, int channel_number) { @@ -1434,6 +1412,8 @@ } if (nkeys >= usbdata->npadkeys) change = 0; + else if (!ds->device_type) /* expresskey pressed at startup */ + ds->device_type = PAD_ID; } channel->dirty |= change; @@ -1625,9 +1605,9 @@ ds = &common->wcmChannel[channel].work; dslast = common->wcmChannel[channel].valid.state; - /* no device type? tool was on the tablet at startup, force type and - proximity */ + /* no device type? */ if (!ds->device_type && private->wcmDeviceType) { + /* tool was on tablet at startup, force type and proximity */ ds->device_type = private->wcmDeviceType; ds->proximity = 1; } @@ -1668,56 +1648,15 @@ } else if (event->type == EV_KEY) { - usbParseKeyEvent(common, event, channel); - usbParseBTNEvent(common, event, private->wcmBTNChannel); + /* Button events can be from puck or expresskeys */ + int btn_channel = (ds->device_type == CURSOR_ID) ? + channel : PAD_CHANNEL; - /* send PAD events now for generic devices. Otherwise, - * they are filtered out when there are no motion events. - */ - if ((common->wcmProtocolLevel == WCM_PROTOCOL_GENERIC) - && (common->wcmChannel[private->wcmBTNChannel].dirty)) - { - DBG(10, common, "Dirty flag set on channel %d; " - "sending event.\n", private->wcmBTNChannel); - common->wcmChannel[private->wcmBTNChannel].dirty = FALSE; - wcmEvent(common, private->wcmBTNChannel, - &common->wcmChannel[private->wcmBTNChannel].work); - } + usbParseKeyEvent(common, event, channel); + usbParseBTNEvent(common, event, btn_channel); } } /* next event */ - /* device type unknown? Tool may be on the tablet when X starts. */ - if (!ds->device_type && !dslast.proximity) - { - unsigned long keys[NBITS(KEY_MAX)] = { 0 }; - int rc; - - if (!ds->proximity) { - DBG(3, common, "Unknown out-of-prox device leaving prox. Ignoring.\n"); - return; - } - - /* Retrieve the type by asking a resend from the kernel */ - rc = ioctl(common->fd, EVIOCGKEY(sizeof(keys)), keys); - if (rc == -1) - { - LogMessageVerbSigSafe(X_ERROR, 0, - "%s: failed to retrieve key bits\n", - pInfo->name); - return; - } - - for (i = 0; i < ARRAY_SIZE(wcmTypeToKey); i++) - { - if (ISBITSET(keys, wcmTypeToKey[i].tool_key)) - { - ds->device_type = wcmTypeToKey[i].device_type; - ds->proximity = 1; - break; - } - } - } - /* DTF720 and DTF720a don't support eraser */ if (((common->tablet_id == 0xC0) || (common->tablet_id == 0xC2)) && (ds->device_type == ERASER_ID)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/wcmValidateDevice.c new/xf86-input-wacom-0.21.0/src/wcmValidateDevice.c --- old/xf86-input-wacom-0.20.0/src/wcmValidateDevice.c 2013-02-26 18:16:41.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/src/wcmValidateDevice.c 2013-04-18 23:45:21.000000000 +0200 @@ -269,6 +269,7 @@ case 0x100: /* TPC with MT */ case 0x101: /* TPC with MT */ + case 0x10D: /* TPC with MT */ case 0x4001: /* TPC with MT */ case 0xE2: /* TPC with 2FGT */ case 0xE3: /* TPC with 2FGT */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/wcmXCommand.c new/xf86-input-wacom-0.21.0/src/wcmXCommand.c --- old/xf86-input-wacom-0.20.0/src/wcmXCommand.c 2013-02-26 18:37:27.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/src/wcmXCommand.c 2013-04-20 03:16:52.000000000 +0200 @@ -455,7 +455,7 @@ rc = wcmCheckActionProperty(priv, property, prop); if (rc != Success) { - char *msg = NULL; + const char *msg = NULL; switch (rc) { case BadMatch: msg = "BadMatch"; break; case BadValue: msg = "BadValue"; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/xf86Wacom.c new/xf86-input-wacom-0.21.0/src/xf86Wacom.c --- old/xf86-input-wacom-0.20.0/src/xf86Wacom.c 2013-02-26 18:16:41.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/src/xf86Wacom.c 2013-04-18 23:45:21.000000000 +0200 @@ -422,7 +422,10 @@ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 16 if (IsTouch(priv)) { - if (!InitTouchClassDeviceStruct(pInfo->dev, common->wcmMaxContacts, XIDependentTouch, 2)) { + if (!InitTouchClassDeviceStruct(pInfo->dev, common->wcmMaxContacts, + TabletHasFeature(common, WCM_LCD) ? XIDirectTouch : XIDependentTouch, + 2)) + { xf86Msg(X_ERROR, "Unable to init touch class device struct!\n"); return FALSE; } @@ -858,7 +861,10 @@ } pWcm->public.on = FALSE; break; - +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901 + case DEVICE_ABORT: + break; +#endif default: xf86Msg(X_ERROR, "%s: invalid mode=%d. This is an X server bug.\n", pInfo->name, what); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-wacom-0.20.0/src/xf86WacomDefs.h new/xf86-input-wacom-0.21.0/src/xf86WacomDefs.h --- old/xf86-input-wacom-0.20.0/src/xf86WacomDefs.h 2013-02-26 18:26:42.000000000 +0100 +++ new/xf86-input-wacom-0.21.0/src/xf86WacomDefs.h 2013-04-18 23:45:21.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright 1995-2002 by Frederic Lepied, France. <[email protected]> - * Copyright 2002-2010 by Ping Cheng, Wacom. <[email protected]> + * Copyright 2002-2013 by Ping Cheng, Wacom. <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -397,9 +397,9 @@ #define TILT_REQUEST_FLAG 1 #define TILT_ENABLED_FLAG 2 -#define MAX_CHANNELS 17 +#define MAX_FINGERS 16 +#define MAX_CHANNELS (MAX_FINGERS+2) /* one channel for stylus/mouse. The other one for pad */ #define PAD_CHANNEL (MAX_CHANNELS-1) -#define MAX_FINGERS (MAX_CHANNELS-1) typedef struct { int wcmZoomDistance; /* minimum distance for a zoom touch gesture */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
