Hello community, here is the log from the commit of package xf86-input-wacom for openSUSE:Factory checked in at 2013-03-24 21:40:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old) and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-input-wacom", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes 2013-01-25 09:41:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-wacom.new/xf86-input-wacom.changes 2013-03-24 21:51:58.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Mar 23 19:58:06 UTC 2013 - sndirsch@suse.com + +- update to release 0.20.0 +- U_Resume-button-events-for-pucks.patch + * Resume button events for pucks (bnc#809182) +- U_Consolidate-calls-to-wcmEvent-into-one-statement.patch + * required for previous patch + +------------------------------------------------------------------- Old: ---- xf86-input-wacom-0.19.0.tar.bz2 New: ---- U_Consolidate-calls-to-wcmEvent-into-one-statement.patch U_Resume-button-events-for-pucks.patch xf86-input-wacom-0.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.Muh3tl/_old 2013-03-24 21:52:00.000000000 +0100 +++ /var/tmp/diff_new_pack.Muh3tl/_new 2013-03-24 21:52:00.000000000 +0100 @@ -23,7 +23,7 @@ %endif Name: xf86-input-wacom -Version: 0.19.0 +Version: 0.20.0 Release: 0 Summary: Wacom input driver for the Xorg X server License: GPL-2.0+ @@ -31,6 +31,8 @@ Url: http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Xf86-input-... 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 @@ -73,6 +75,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure --with-xorg-conf-dir=/etc/X11/xorg.conf.d ++++++ U_Consolidate-calls-to-wcmEvent-into-one-statement.patch ++++++

From 9077b12cd6ef7a9772aaea00b52baad64471e4e4 Mon Sep 17 00:00:00 2001 From: Ping Cheng <pinglinux@gmail.com> Date: Tue, 5 Mar 2013 16:46:27 -0800 Subject: [PATCH 2/4] 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 <pingc@wacom.com> Acked-by: Chris Bagwell <chris@cnpbagwell.com> Reviewed-by: Jason Gerecke <killertofu@gmail.com> --- src/wcmUSB.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 48a1f95..980dac3 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -1653,19 +1653,6 @@ static void usbDispatchEvents(InputInfoPtr pInfo) { usbParseKeyEvent(common, event, channel); usbParseBTNEvent(common, event, private->wcmBTNChannel); - - /* 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); - } } } /* next event */ -- 1.7.10.4 ++++++ U_Resume-button-events-for-pucks.patch ++++++

From 7a1aadb24b6573809d7324f2549bed749ad1a7f2 Mon Sep 17 00:00:00 2001 From: Ping Cheng <pinglinux@gmail.com> Date: Thu, 7 Mar 2013 14:11:30 -0800 Subject: [PATCH 3/4] 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 <pingc@wacom.com> Reviewed-by: Jason Gerecke <killertofu@gmail.com> --- src/wcmUSB.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 980dac3..db7c045 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -32,7 +32,6 @@ typedef struct { int wcmLastToolSerial; - int wcmBTNChannel; int wcmDeviceType; Bool wcmPenTouch; Bool wcmUseMT; @@ -460,8 +459,6 @@ static void usbWcmInitPadState(InputInfoPtr pInfo) ds->device_type = PAD_ID; ds->device_id = PAD_DEVICE_ID; ds->serial_num = channel; - - private->wcmBTNChannel = channel; } int usbWcmGetRanges(InputInfoPtr pInfo) @@ -1651,8 +1648,12 @@ static void usbDispatchEvents(InputInfoPtr pInfo) } else if (event->type == EV_KEY) { + /* Button events can be from puck or expresskeys */ + int btn_channel = (ds->device_type == CURSOR_ID) ? + channel : PAD_CHANNEL; + usbParseKeyEvent(common, event, channel); - usbParseBTNEvent(common, event, private->wcmBTNChannel); + usbParseBTNEvent(common, event, btn_channel); } } /* next event */ -- 1.7.10.4 ++++++ xf86-input-wacom-0.19.0.tar.bz2 -> xf86-input-wacom-0.20.0.tar.bz2 ++++++ ++++ 20839 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org