Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xf86-input-wacom for
openSUSE:Factory checked in at 2021-05-10 15:36:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-wacom"
Mon May 10 15:36:36 2021 rev:35 rq:891261 version:0.40.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes
2020-08-28 21:15:43.424160016 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-wacom.new.2988/xf86-input-wacom.changes
2021-05-10 15:38:59.329660306 +0200
@@ -1,0 +2,12 @@
+Thu May 6 14:00:28 UTC 2021 - Ferdinand Thiessen <[email protected]>
+
+- Update to version 0.40.0:
+ * Add support for "Wacom One Pen Display 13"
+ * Recognize pad devices which only have softkeys
+ * Support the keycodes sent by the hardware buttons
+ * Support new Cintiqs for older kernels
+ * Stop pointer movement when panscrolling in relative mode
+ * Better explanation of the "ToolSerials" option
+ * Minor other improvements
+
+-------------------------------------------------------------------
Old:
----
xf86-input-wacom-0.39.0.tar.bz2
New:
----
xf86-input-wacom-0.40.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.fIhdIQ/_old 2021-05-10 15:38:59.705658767 +0200
+++ /var/tmp/diff_new_pack.fIhdIQ/_new 2021-05-10 15:38:59.709658749 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xf86-input-wacom
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: xf86-input-wacom
-Version: 0.39.0
+Version: 0.40.0
Release: 0
Summary: Wacom input driver for the Xorg X server
License: GPL-2.0-or-later
++++++ xf86-input-wacom-0.39.0.tar.bz2 -> xf86-input-wacom-0.40.0.tar.bz2 ++++++
++++ 21371 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/ChangeLog new/xf86-input-wacom-0.40.0/ChangeLog
--- old/xf86-input-wacom-0.39.0/ChangeLog 2019-12-23 02:13:40.000000000
+0100
+++ new/xf86-input-wacom-0.40.0/ChangeLog 2021-02-03 16:21:59.000000000
+0100
@@ -1,3 +1,211 @@
+commit 9d7e3bf42052694c799da1e16ad7f60c913a492f
+Author: Jason Gerecke <[email protected]>
+Date: Wed Feb 3 06:46:54 2021 -0800
+
+ wacom 0.40.0
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit abffe85e3a873c63237b96e5d3d40172805f3822
+Author: Jason Gerecke <[email protected]>
+Date: Tue Feb 2 14:49:29 2021 -0800
+
+ Recognize pad devices which only have softkeys (e.g. Cintiq Pro 32)
+
+ Devices like the Cintiq Pro 32 have pad devices that have no ExpressKeys.
+ This prevents them from being recognized as a pad by the driver. When
+ the device is connected, an `Invalid type 'pad' for this device`
+ message would be logged.
+
+ This has not been an issue in the past since there is nothing for the
+ device to do without any ExpressKeys. Now that the driver is capable
+ of forwarding the various softkeys as fixed-function keyboard events,
+ however, it would be good to ensure that these kinds of devices are
+ detected properly.
+
+ Recognizing the device as a pad only requires us to expand on the list
+ of tools that are known identifiers. Since we want softkey-only pads to
+ be recognized, the two softkeys to the list. One or both of the keys
+ should be present on devices like the Cintiq Pro 32, allowing the pad
+ to be recognized as such.
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit a93666436303b89d11eff7fd0e5de93d76a1e2d9
+Author: Peter Hutterer <[email protected]>
+Date: Thu Jan 17 15:20:45 2019 +1000
+
+ Support the keycodes sent by the hardware buttons
+
+ Forward the pad keys as keycodes KEY_PROG1-4. The evdev code has the right
+ meaning, but we cannot route those keys (>255) so we just map them to
+ KEY_PROG1-4 instead. This way we can in the future add a xkeyboard-config
+ option to assign something to those keys.
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 2f5f1096ee877a72f7d9585e56c98e07e8ed00b6
+Author: Russell Haley <[email protected]>
+Date: Mon Aug 24 01:17:27 2020 -0500
+
+ Stop pointer movement when panscrolling in relative mode
+
+ Always stop pointer movement when a panscroll button is pressed in
+ relative mode, instead of only when the pen is down. This keeps the
+ pointer from "walking" when the user lifts the pen and scrolls
+ repeatedly.
+
+ Fixes: https://github.com/linuxwacom/xf86-input-wacom/issues/139
+ Signed-off-by: Russell Haley <[email protected]>
+
+commit 252bdda1ff71d1a167adfd0246464df536805746
+Author: vintagepc <[email protected]>
+Date: Fri Jun 5 17:36:52 2020 -0400
+
+ Better explanation of the "ToolSerials" option
+
+ For https://github.com/linuxwacom/xf86-input-wacom/issues/128
+
+commit 120dca3ae7dbcad382e148b2edde160e2020874a
+Author: Jason Gerecke <[email protected]>
+Date: Thu Jan 21 13:25:10 2021 -0800
+
+ Remove Travis integration
+
+ Now that we've integrated with Github Actions, Travis is no longer
+ necessary. Notably this does mean the loss of ppc64le testing, but
+ it isn't a high priority target, and we will have lost that testing
+ anyway once our free Travis credits run out...
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit 065aec968f7a89dd74987b8eb50ab4615f0c4347
+Author: Jason Gerecke <[email protected]>
+Date: Fri Jan 15 11:35:30 2021 -0800
+
+ Add workflow for automated testing via Github Actions
+
+ We've been using Travis for our automated tests, but that service is
+ becoming more difficult to use (open source projects have to periodically
+ request free credits to keep running). Github itself can be used as a
+ replacement by using its "Actions" infrastructure to execute various
+ defined workflows.
+
+ This commit ports the Travis script into Github syntax. Most everything
+ was translated without issue, but support for the ppc64le architecture
+ is notably missing. This is not a critical target for us, however, so
+ we ignore it for the time being.
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit d56107e19a57bf3cf44e266a394da43397a8841a
+Author: Jason Gerecke <[email protected]>
+Date: Fri Jan 15 10:24:10 2021 -0800
+
+ gitignore: Add a few more entries
+
+ Ignore the announce and sig files generated as part of the release process.
+ Also ignore the version info generated as part of the compile process.
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit 2dc5769aaa91e8f61620a027af21b4e0b7ac1cc8
+Author: Jason Gerecke <[email protected]>
+Date: Wed Dec 2 13:51:44 2020 -0800
+
+ tools: update rules to handle bind/unbind events
+
+ Summary: we expect add, change or remove but kernel 4.12 added bind and
+ unbind. These events were previously discarded by udevd. Our rules should
+ handle any event *but* remove, so update as suggested in the announce email
+ linked below.
+
+ For a longer explanation, see the system 247rc2 announcement
+
https://lists.freedesktop.org/archives/systemd-devel/2020-November/045570.html
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit f9cc6a1dda10c1e8cdd1c68a7873c4d90665cb06
+Author: Jason Gerecke <[email protected]>
+Date: Mon Nov 30 08:32:28 2020 -0800
+
+ Increase size of event queue to 128
+
+ The size of the event queue defines how many kernel events we can keep
+ track of before seeing a SYN_REPORT. If we are ever asked to handle
+ more than this limit, data is dropped with unpredictable consequences.
+ Our previous queue size of 32 was usually sufficient but could still
+ be bumped into in edge-cases. Updating 8 or more touch contacts at the
+ same time could sometimes cause the queue to run out of space, for
+ example.
+
+ This commit bumps the queue size up to 128. This should be more than
+ enough for all current devices (some of which can track up to 16 contacts).
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit a7f88f9c0194c8ecaffb81b073f3620b8b90b014
+Author: Jason Gerecke <[email protected]>
+Date: Mon Nov 30 08:32:11 2020 -0800
+
+ Remove duplicate MAX_USB_EVENTS definition
+
+ A definition of this macro already exists in wcmUSB.c and is not used
+ in any other file. There's no need for this duplicate to exist.
+
+ Signed-off-by: Jason Gerecke <[email protected]>
+
+commit 9b7d679ebe1f12eb61814dcd9aba6f7cbdedbb57
+Author: Peter Hutterer <[email protected]>
+Date: Mon Oct 19 16:25:05 2020 +1000
+
+ travis CI: order ppc64le after amd64
+
+ https://docs.travis-ci.com/user/multi-cpu-architectures/ says that
"explicitly
+ included builds inherit the first value in an array" and the example there
+ matches our configuration.
+
+ Moving ppc64le to after amd64 means the coverity job we have is now (again)
+ run on amd64 only, fixing the current test case failures - Coverity doesn't
+ support ppc64le.
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 9bf6954aaee05ebc32d86ca8297d8bcbe927c46f
+Author: kishorkunal-raj <[email protected]>
+Date: Mon Sep 21 07:40:38 2020 +0000
+
+ Adding ppc64le architecture to support on travis-ci
+
+commit a4372a2e6083312defc9eef2806ebea98f02fa1a
+Merge: 095ba9c 304ee7e
+Author: Jason Gerecke <[email protected]>
+Date: Mon Aug 3 08:26:00 2020 -0700
+
+ Merge pull request #137 from Pinglinux/for-cintiq-16-2
+
+ Support new Cintiqs for older kernels
+
+ Reviewed-by: Jason Gerecke <[email protected]>
+
+commit 304ee7eefc355176334518449a363e65afb341b2
+Author: Ping Cheng <[email protected]>
+Date: Wed Jul 29 13:29:47 2020 -0700
+
+ Support new Cintiqs for older kernels
+
+ Kernels older than 2.6.38 do not report INPUT_PROP_DIRECT
+
+ Signed-off-by: Ping Cheng <[email protected]>
+
+commit 095ba9c48e8cf8a96970e211ed734ba5883a0025
+Author: Aaron Armstrong Skomra <[email protected]>
+Date: Tue Jan 7 11:24:15 2020 -0800
+
+ Add new "Wacom One Pen Display 13" PID
+
+ Signed-off-by: Aaron Armstrong Skomra <[email protected]>
+
commit 0fb1699b48a36a564ce3b928d90be27f896c220a
Author: Jason Gerecke <[email protected]>
Date: Fri Dec 20 10:42:31 2019 -0800
@@ -7,7 +215,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit a3b03e8638c037132fdf0927c7e488ec80967a5c
-Merge: 3b338312eb27 a2f52bd6b338
+Merge: 3b33831 a2f52bd
Author: Jason Gerecke <[email protected]>
Date: Mon Dec 16 13:01:39 2019 -0800
@@ -29,7 +237,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit 3b338312eb275f2d9a602805931fa47d863a0209
-Merge: b40122dd49ca 5113d18300bf
+Merge: b40122d 5113d18
Author: Jason Gerecke <[email protected]>
Date: Mon Nov 4 09:14:40 2019 -0800
@@ -65,7 +273,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit b40122dd49ca2cdd2d2608f30e5340d5c963187d
-Merge: 17028f68f5ca 2a7af30793f9
+Merge: 17028f6 2a7af30
Author: Jason Gerecke <[email protected]>
Date: Wed Oct 23 13:50:18 2019 -0700
@@ -113,7 +321,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit 76878df9a7bbcead2375a19fd1683f830e6941bb
-Merge: 3a4b96139e27 af2fafdff96b
+Merge: 3a4b961 af2fafd
Author: Jason Gerecke <[email protected]>
Date: Wed Oct 9 14:04:22 2019 -0700
@@ -185,7 +393,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit 3a4b96139e27a593c869fe28999211d6c90142eb
-Merge: ef943197cc91 3eb70aeb87a2
+Merge: ef94319 3eb70ae
Author: Jason Gerecke <[email protected]>
Date: Thu Sep 12 15:07:01 2019 -0700
@@ -206,7 +414,7 @@
Signed-off-by: Ping Cheng <[email protected]>
commit ef943197cc912f782412dcbe02aac92a8fb4d61f
-Merge: 0ac49a26d252 a38074dcfb23
+Merge: 0ac49a2 a38074d
Author: Jason Gerecke <[email protected]>
Date: Mon Sep 9 14:43:45 2019 -0700
@@ -392,7 +600,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit 0ac49a26d25279b7777239066aff8e1f5f23bd4b
-Merge: 299e830bb7fc bde3339eb056
+Merge: 299e830 bde3339
Author: Jason Gerecke <[email protected]>
Date: Tue Sep 3 13:29:39 2019 -0700
@@ -497,7 +705,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit daafdda6e90d9c36ad8f56be1f03d0b402595f30
-Merge: 4e065272eaed 6a95129703b4
+Merge: 4e06527 6a95129
Author: Jason Gerecke <[email protected]>
Date: Mon Jul 29 11:51:45 2019 -0700
@@ -506,7 +714,7 @@
Remove and replace references to Sourceforge
commit 4e065272eaed6ab27fe17627712fdb7ecd697fa5
-Merge: 2248962cf153 030d272d5d60
+Merge: 2248962 030d272
Author: Jason Gerecke <[email protected]>
Date: Tue Jul 16 10:29:05 2019 -0700
@@ -535,7 +743,7 @@
Signed-off-by: Lance Geroso <[email protected]>
commit 2248962cf15334c6f61a82ab4efedfcd2e85a741
-Merge: b164be0e372a 5089f0c886bd
+Merge: b164be0 5089f0c
Author: Ping Cheng <[email protected]>
Date: Thu Jun 20 16:06:35 2019 -0700
@@ -581,7 +789,7 @@
Signed-off-by: Aaron Armstrong Skomra <[email protected]>
commit a3e880ec34e7e9ef01098a899a4b1eb113b82b51
-Merge: 5fc2d91ead58 365739656df5
+Merge: 5fc2d91 3657396
Author: Ping Cheng <[email protected]>
Date: Wed Jun 12 13:11:10 2019 -0700
@@ -590,7 +798,7 @@
Fix issues with Microsoft Surface Go tablet
commit 5fc2d91ead58c8a5ae38f5cfe92de1d214aba5d7
-Merge: d0a68b873e01 dbb07c56366a
+Merge: d0a68b8 dbb07c5
Author: Ping Cheng <[email protected]>
Date: Wed May 29 12:06:04 2019 -0700
@@ -3968,7 +4176,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit 3deb7c7a3b001f1178cfb339efc5e3d6d8de181a
-Merge: 084ee1f41a94 c49463f7caa5
+Merge: 084ee1f c49463f
Author: Peter Hutterer <[email protected]>
Date: Thu Mar 20 08:23:56 2014 +1000
@@ -6280,7 +6488,7 @@
Signed-off-by: Jason Gerecke <[email protected]>
commit 9f32b03930802040ba1001258d824aefafd003d0
-Merge: 1a8db01e8965 7a875941c326
+Merge: 1a8db01 7a87594
Author: Peter Hutterer <[email protected]>
Date: Fri Jul 13 16:17:39 2012 +1000
@@ -6916,7 +7124,7 @@
Reviewed-by: Jason Gerecke <[email protected]>
commit 60b4c868ac5baf5dba82c8c9146dfac068c06eef
-Merge: e7564c941e8a 28abd26ba937
+Merge: e7564c9 28abd26
Author: Jason Gerecke <[email protected]>
Date: Thu Mar 1 09:48:50 2012 -0800
@@ -7788,7 +7996,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit fb11287b1ca76a838e2fdde67d6267d8dd5979b4
-Merge: 259616580c1e a9c7b56aa139
+Merge: 2596165 a9c7b56
Author: Peter Hutterer <[email protected]>
Date: Thu Sep 8 14:14:39 2011 +1000
@@ -8199,7 +8407,7 @@
Reviewed-by: Ping Cheng <[email protected]>
commit aa4e458e50150bfc976afcb32034f0a30a404bf1
-Merge: f8e6ccc0a494 a8829f06de49
+Merge: f8e6ccc a8829f0
Author: Peter Hutterer <[email protected]>
Date: Thu Jun 30 16:22:53 2011 +1000
@@ -8233,7 +8441,7 @@
Signed-off-by: Chris Bagwell <[email protected]>
commit f8e6ccc0a494d6bf82afbd81698baa2f78436cd6
-Merge: 006bc892fa13 7fe557d404a2
+Merge: 006bc89 7fe557d
Author: Peter Hutterer <[email protected]>
Date: Wed Jun 29 08:54:16 2011 +1000
@@ -8730,7 +8938,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 74a53cf8aa9ded9978d8f085446871d266dd4bf4
-Merge: 0d7790b80ded ec23bdd01334
+Merge: 0d7790b ec23bdd
Author: Peter Hutterer <[email protected]>
Date: Tue Apr 19 16:04:25 2011 +1000
@@ -10126,7 +10334,7 @@
Reviewed-by: Chris Bagwell <[email protected]>
commit a3b6e2079155c5774baabcd9e3c53b3336536e49
-Merge: 43c82c3139ef 69d3e9387105
+Merge: 43c82c3 69d3e93
Author: Peter Hutterer <[email protected]>
Date: Mon Mar 14 15:42:00 2011 +1000
@@ -10163,7 +10371,7 @@
Acked-by: Ping Cheng <[email protected]>
commit abfcc2ac187a4a7131503c0aa80e166ca384034e
-Merge: 857ef8159451 90ba05056578
+Merge: 857ef81 90ba050
Author: Peter Hutterer <[email protected]>
Date: Fri Mar 11 09:31:23 2011 +1000
@@ -10439,7 +10647,7 @@
Acked-by: Ping Cheng <[email protected]>
commit c4007437dcd7b24d949b80fb49e5e8e0699b4201
-Merge: a8c95a7975ff abb4144f6ec1
+Merge: a8c95a7 abb4144
Author: Peter Hutterer <[email protected]>
Date: Mon Mar 7 13:11:56 2011 +1000
@@ -10969,7 +11177,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit b667dd01313bfbc5c76326de61d7fc659076581c
-Merge: 244b5ad8f88d 79b3945d3ab3
+Merge: 244b5ad 79b3945
Author: Peter Hutterer <[email protected]>
Date: Fri Feb 18 10:07:06 2011 +1000
@@ -11184,14 +11392,14 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 0f9a1371a2498e0c74ecdf381d28b5bc3adfaa25
-Merge: 32babb0c89db b49d98a27dc1
+Merge: 32babb0 b49d98a
Author: Peter Hutterer <[email protected]>
Date: Thu Feb 10 13:12:47 2011 +1000
Merge branch 'test-suite'
commit 32babb0c89db59a73890ae5a989b65fd128486f5
-Merge: bf9ba5f101a2 868d768e9144
+Merge: bf9ba5f 868d768
Author: Peter Hutterer <[email protected]>
Date: Wed Feb 9 09:51:54 2011 +1000
@@ -12096,7 +12304,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit d00f555a73c7b0e0ba86fc4c88593441fe7cb107
-Merge: e9acf4029532 b46c5fc0af5f
+Merge: e9acf40 b46c5fc
Author: Peter Hutterer <[email protected]>
Date: Wed Jan 12 10:03:39 2011 +1000
@@ -12348,7 +12556,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 13734c86be023f2a26c586458e191f2127343a7c
-Merge: 0f20c2c71e2a 44c6f74b67bb
+Merge: 0f20c2c 44c6f74
Author: Peter Hutterer <[email protected]>
Date: Fri Jan 7 11:15:11 2011 +1000
@@ -12439,7 +12647,7 @@
Reviewed-by: Gaetan Nadon <[email protected]>
commit 68351dab43e800b503025ef2f06c794d40bc259b
-Merge: 2b9eb3db9c7c 6f5f29b49a6e
+Merge: 2b9eb3d 6f5f29b
Author: Peter Hutterer <[email protected]>
Date: Tue Dec 21 16:59:52 2010 +1000
@@ -13560,7 +13768,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 791de526725abebfa33e1b41097c3e60b500f7f1
-Merge: fd6185880c0f c6dcc3a1f78b
+Merge: fd61858 c6dcc3a
Author: Peter Hutterer <[email protected]>
Date: Thu Nov 4 09:21:53 2010 +1000
@@ -13609,7 +13817,7 @@
Acked-by: Jon Neal <[email protected]>
commit 75bfb52f6c36afe9354061de92538c7966d784b9
-Merge: ab71355f6e25 09445a03c765
+Merge: ab71355 09445a0
Author: Peter Hutterer <[email protected]>
Date: Fri Oct 29 15:25:26 2010 +1000
@@ -13722,7 +13930,7 @@
Reviewed-by: Chris Bagwell <[email protected]>
commit 8d69f6ec166e6165652ec2379a6c9405d5607278
-Merge: f27cb29c088b cdfedc95017c
+Merge: f27cb29 cdfedc9
Author: Peter Hutterer <[email protected]>
Date: Thu Oct 28 14:49:03 2010 +1000
@@ -14589,7 +14797,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 0ff60c02ed5e3e0b16cc3b214e6d81890cc706f7
-Merge: 9f5a39c56d0b 3299bf3b4bde
+Merge: 9f5a39c 3299bf3
Author: Peter Hutterer <[email protected]>
Date: Mon Aug 9 10:39:04 2010 +1000
@@ -14933,7 +15141,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit d45d6dbaefe03b466a9a631f400d8e252efbb754
-Merge: bcc477d08b93 03a1f3ccce1a
+Merge: bcc477d 03a1f3c
Author: Peter Hutterer <[email protected]>
Date: Mon Jul 26 14:33:09 2010 +1000
@@ -15244,7 +15452,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit fc649a2f7c5ee774974481d9c4ea46460f7a402f
-Merge: 00f56eda2c1e ef45111bb2e2
+Merge: 00f56ed ef45111
Author: Peter Hutterer <[email protected]>
Date: Wed Jul 14 13:01:10 2010 +1000
@@ -15483,7 +15691,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit e7bbe77a021a379756957fdb8d722092826e365e
-Merge: b97a670276ac ef82a62b771a
+Merge: b97a670 ef82a62
Author: Peter Hutterer <[email protected]>
Date: Thu Jun 24 15:21:43 2010 +1000
@@ -16178,7 +16386,7 @@
Reviewed-by: Ping Cheng <[email protected]>
commit 52d95845b0912cc4d72c6abcb99fc4bed82e489e
-Merge: fb46bef0b542 b42bdad2a799
+Merge: fb46bef b42bdad
Author: Peter Hutterer <[email protected]>
Date: Thu Jun 10 15:09:02 2010 +1000
@@ -16316,7 +16524,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 0862aa3d74378abbf9f23289ab864a4d07305d0d
-Merge: 370cd8bcce46 7581a5f62697
+Merge: 370cd8b 7581a5f
Author: Peter Hutterer <[email protected]>
Date: Thu Jun 3 14:02:37 2010 +1000
@@ -16635,7 +16843,7 @@
Reviewed-by: Ping Cheng <[email protected]>
commit a36262f30418c5b57d9dd21aafe0b95d81bbf7d7
-Merge: 6569c0577b04 8916bf839dff
+Merge: 6569c05 8916bf8
Author: Peter Hutterer <[email protected]>
Date: Mon May 31 10:54:56 2010 +1000
@@ -17621,7 +17829,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 3055024b89c5b274a6c7d2cf128ec390fe0ffad3
-Merge: fb458cabf079 70e490a5e7a1
+Merge: fb458ca 70e490a
Author: Peter Hutterer <[email protected]>
Date: Fri Mar 19 11:36:28 2010 +1000
@@ -17754,7 +17962,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 6f98912927116fcf0067e30f010778b0e838f268
-Merge: 4c2d47db27f9 d8d70c12395f
+Merge: 4c2d47d d8d70c1
Author: Peter Hutterer <[email protected]>
Date: Tue Mar 16 16:03:32 2010 +1000
@@ -17988,7 +18196,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 836d30f6eee0e82b7ef874de0deb491ec0b17645
-Merge: 701521e9ce99 c1457421d417
+Merge: 701521e c145742
Author: Peter Hutterer <[email protected]>
Date: Mon Mar 1 09:58:09 2010 +1000
@@ -19500,7 +19708,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 70a1a852f62d9439cbd3ca09ca500cc95716d88a
-Merge: bffe7c23591c 3977da27de92
+Merge: bffe7c2 3977da2
Author: Peter Hutterer <[email protected]>
Date: Mon Dec 14 09:01:42 2009 +1000
@@ -21087,7 +21295,7 @@
Signed-off-by: Peter Hutterer <[email protected]>
commit 10e0036f5b398b08ddddcea1ace534e1188e1abe
-Merge: afdf5565895a 3718c605520f
+Merge: afdf556 3718c60
Author: Peter Hutterer <[email protected]>
Date: Wed Oct 14 10:51:29 2009 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/compile new/xf86-input-wacom-0.40.0/compile
--- old/xf86-input-wacom-0.39.0/compile 2019-05-01 17:24:17.000000000 +0200
+++ new/xf86-input-wacom-0.40.0/compile 2021-02-03 16:21:53.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/conf/wacom.rules
new/xf86-input-wacom-0.40.0/conf/wacom.rules
--- old/xf86-input-wacom-0.39.0/conf/wacom.rules 2019-03-07
22:01:39.000000000 +0100
+++ new/xf86-input-wacom-0.40.0/conf/wacom.rules 2021-02-01
22:17:35.000000000 +0100
@@ -1,4 +1,4 @@
-ACTION!="add|change", GOTO="wacom_end"
+ACTION=="remove", 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/config.h.in new/xf86-input-wacom-0.40.0/config.h.in
--- old/xf86-input-wacom-0.39.0/config.h.in 2019-12-20 19:42:47.000000000
+0100
+++ new/xf86-input-wacom-0.40.0/config.h.in 2021-02-03 16:21:53.000000000
+0100
@@ -12,12 +12,15 @@
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
@@ -36,6 +39,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
@@ -69,7 +75,9 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
#undef STDC_HEADERS
/* Enable unit tests */
@@ -79,35 +87,86 @@
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
+/* Enable general extensions on macOS. */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
-/* Enable threading extensions on Solaris. */
+/* Identify the host operating system as Minix.
+ This macro does not affect the system headers' behavior.
+ A future release of Autoconf may stop defining this macro. */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+ Enable NetBSD compatibility extensions on Minix. */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+ Oddly enough, this does nothing on OpenBSD. */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009. */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+/* Enable X/Open extensions. Define to 500 only if necessary
+ to make mbstate_t available. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
#endif
/* Version number of package */
#undef VERSION
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
- this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
#include "config-ver.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/configure.ac
new/xf86-input-wacom-0.40.0/configure.ac
--- old/xf86-input-wacom-0.39.0/configure.ac 2019-12-20 19:42:22.000000000
+0100
+++ new/xf86-input-wacom-0.40.0/configure.ac 2021-02-03 16:18:52.000000000
+0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-wacom],
- [0.39.0],
+ [0.40.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' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/m4/libtool.m4
new/xf86-input-wacom-0.40.0/m4/libtool.m4
--- old/xf86-input-wacom-0.39.0/m4/libtool.m4 2019-05-01 17:24:14.000000000
+0200
+++ new/xf86-input-wacom-0.40.0/m4/libtool.m4 2021-02-03 16:21:47.000000000
+0100
@@ -728,7 +728,6 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/m4/ltversion.m4
new/xf86-input-wacom-0.40.0/m4/ltversion.m4
--- old/xf86-input-wacom-0.39.0/m4/ltversion.m4 2019-05-01 17:24:14.000000000
+0200
+++ new/xf86-input-wacom-0.40.0/m4/ltversion.m4 2021-02-03 16:21:47.000000000
+0100
@@ -12,11 +12,11 @@
# serial 4221 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce])
+m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce-dirty])
m4_define([LT_PACKAGE_REVISION], [2.4.6.42])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6.42-b88ce'
+[macro_version='2.4.6.42-b88ce-dirty'
macro_revision='2.4.6.42'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/man/wacom.man
new/xf86-input-wacom-0.40.0/man/wacom.man
--- old/xf86-input-wacom-0.39.0/man/wacom.man 2019-11-04 18:05:25.000000000
+0100
+++ new/xf86-input-wacom-0.40.0/man/wacom.man 2021-02-01 22:17:35.000000000
+0100
@@ -233,9 +233,13 @@
.B Option \fI"ToolSerials"\fP \fI"number[,type[,label]][;...]"\fP
sets the list of serial numbered devices that need to be hotplugged for a
physical
device. The 'type' option may be any of "pen", "airbrush", "artpen", or
"cursor".
-This option is only available on wacom V devices (Intuos series and Cintiq
21U).
-To see which serial number belongs to a device, you need to run the utility
program,
-xsetwacom, that comes with this driver.
+This option is only available on wacom V devices which are capable of
reporting a
+serial number. To see if a connected device is supported, or to identify
+which serial number belongs to a device, you need to run the utility program,
+xsetwacom, that comes with this driver. In layman's terms, this option will
add
+additional X devices for this specific tool's tip (and eraser, if applicable).
+This is useful for programs like gimp (which remembers tools based on the X
device) to recall
+additional drawing tool selections for an airbrush+eraser, art pen, extra pen,
etc.
.TP 4
.B Option \fI"Threshold"\fP \fI"number"\fP
sets the pressure threshold used to generate a button 1 events of stylus.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/missing new/xf86-input-wacom-0.40.0/missing
--- old/xf86-input-wacom-0.39.0/missing 2019-05-01 17:24:17.000000000 +0200
+++ new/xf86-input-wacom-0.40.0/missing 2021-02-03 16:21:53.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/src/wcmCommon.c
new/xf86-input-wacom-0.40.0/src/wcmCommon.c
--- old/xf86-input-wacom-0.39.0/src/wcmCommon.c 2019-11-04 18:05:25.000000000
+0100
+++ new/xf86-input-wacom-0.40.0/src/wcmCommon.c 2021-02-02 23:20:24.000000000
+0100
@@ -195,6 +195,47 @@
}
+static void wcmSendKeys (InputInfoPtr pInfo, unsigned int current, unsigned
int previous)
+{
+ unsigned int mask, idx;
+ WacomDevicePtr priv = (WacomDevicePtr) pInfo->private;
+
+ DBG(6, priv, "current=%d previous=%d\n", current, previous);
+
+ for (idx = 0, mask = 0x1;
+ mask && (mask <= current || mask <= previous);
+ idx++, mask <<= 1)
+ {
+ if ((mask & previous) != (mask & current))
+ {
+ int key = 0;
+ int state = !!(mask & current);
+
+ switch (idx) {
+ /* Note: the evdev keycodes are > 255 and
+ * get dropped by the server. So let's remap
+ * those to KEY_PROG1-3 instead */
+ case IDX_KEY_CONTROLPANEL:
+ key = KEY_PROG1;
+ break;
+ case IDX_KEY_ONSCREEN_KEYBOARD:
+ key = KEY_PROG2;
+ break;
+ case IDX_KEY_BUTTONCONFIG:
+ key = KEY_PROG3;
+ break;
+ case IDX_KEY_INFO:
+ key = KEY_PROG4;
+ break;
+ default:
+ break;
+ }
+ if (key)
+ wcmEmitKeycode(pInfo->dev, key + 8, state);
+ }
+ }
+}
+
void wcmEmitKeycode (DeviceIntPtr keydev, int keycode, int state)
{
xf86PostKeyboardEvent (keydev, keycode, state);
@@ -600,6 +641,8 @@
wcmSendButtons(pInfo, ds, ds->buttons, first_val,
num_vals, valuators);
}
+ wcmSendKeys(pInfo, ds->keys, priv->oldState.keys);
+
if (priv->oldState.proximity && !ds->proximity)
xf86PostProximityEventP(pInfo->dev, 0, first_val, num_vals,
VCOPY(valuators, num_vals));
@@ -640,7 +683,7 @@
/* Move the cursor to where it should be before sending button
events */
if(!(priv->flags & BUTTONS_ONLY_FLAG) &&
- !(priv->flags & SCROLLMODE_FLAG && priv->oldState.buttons &
1))
+ !(priv->flags & SCROLLMODE_FLAG && (!is_absolute(pInfo) ||
priv->oldState.buttons & 1)))
{
xf86PostMotionEventP(pInfo->dev, is_absolute(pInfo),
first_val, num_vals,
@@ -772,9 +815,14 @@
*/
if(!priv->oldState.proximity)
{
+ int old_key_state = priv->oldState.keys;
+
wcmUpdateOldState(pInfo, ds, x, y);
priv->oldState.proximity = 0;
priv->oldState.buttons = 0;
+
+ /* keys can happen without proximity */
+ priv->oldState.keys = old_key_state;
}
valuators[0] = x;
@@ -835,6 +883,7 @@
if (dsOrig->proximity != dsNew->proximity) goto out;
if (dsOrig->buttons != dsNew->buttons) goto out;
+ if (dsOrig->keys != dsNew->keys) goto out;
if (dsOrig->stripx != dsNew->stripx) goto out;
if (dsOrig->stripy != dsNew->stripy) goto out;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/src/wcmUSB.c
new/xf86-input-wacom-0.40.0/src/wcmUSB.c
--- old/xf86-input-wacom-0.39.0/src/wcmUSB.c 2019-12-19 20:11:38.000000000
+0100
+++ new/xf86-input-wacom-0.40.0/src/wcmUSB.c 2021-02-02 23:20:24.000000000
+0100
@@ -28,7 +28,7 @@
#include <sys/utsname.h>
#include <linux/version.h>
-#define MAX_USB_EVENTS 32
+#define MAX_USB_EVENTS 128
typedef struct {
int wcmLastToolSerial;
@@ -240,6 +240,7 @@
{ WACOM_VENDOR_ID, 0x382, 100000, 100000, &usbCintiq, "DTK2451"
},
{ WACOM_VENDOR_ID, 0x37D, 100000, 100000, &usbCintiq, "DTH2452"
},
{ WACOM_VENDOR_ID, 0x37E, 100000, 100000, &usbCintiq, "DTH2452"
}, /* Touch */
+ { WACOM_VENDOR_ID, 0x3A6, 100000, 100000, &usbCintiq, "Wacom One Pen
Display 13" },
{ WACOM_VENDOR_ID, 0x41, 100000, 100000, &usbIntuos2, "Intuos2 4x5"
},
{ WACOM_VENDOR_ID, 0x42, 100000, 100000, &usbIntuos2, "Intuos2 6x8"
},
@@ -1637,7 +1638,18 @@
case BTN_FORWARD:
ds->buttons = mod_buttons(ds->buttons, 4, event->value);
break;
-
+ case KEY_CONTROLPANEL:
+ ds->keys = mod_buttons(ds->keys, IDX_KEY_CONTROLPANEL,
event->value);
+ break;
+ case KEY_ONSCREEN_KEYBOARD:
+ ds->keys = mod_buttons(ds->keys,
IDX_KEY_ONSCREEN_KEYBOARD, event->value);
+ break;
+ case KEY_BUTTONCONFIG:
+ ds->keys = mod_buttons(ds->keys, IDX_KEY_BUTTONCONFIG,
event->value);
+ break;
+ case KEY_INFO:
+ ds->keys = mod_buttons(ds->keys, IDX_KEY_INFO,
event->value);
+ break;
default:
for (nkeys = 0; nkeys < usbdata->npadkeys; nkeys++)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/src/wcmValidateDevice.c
new/xf86-input-wacom-0.40.0/src/wcmValidateDevice.c
--- old/xf86-input-wacom-0.39.0/src/wcmValidateDevice.c 2019-12-19
20:11:38.000000000 +0100
+++ new/xf86-input-wacom-0.40.0/src/wcmValidateDevice.c 2021-02-03
15:45:39.000000000 +0100
@@ -123,14 +123,14 @@
static struct
{
const char* type;
- __u16 tool[3]; /* tool array is terminated by 0 */
+ __u16 tool[5]; /* tool array is terminated by 0 */
} wcmType [] =
{
{ "stylus", { BTN_TOOL_PEN, 0 } },
{ "eraser", { BTN_TOOL_RUBBER, 0 } },
{ "cursor", { BTN_TOOL_MOUSE, 0 } },
{ "touch", { BTN_TOOL_DOUBLETAP, BTN_TOOL_FINGER, 0 } },
- { "pad", { BTN_FORWARD, BTN_0, 0 } }
+ { "pad", { BTN_FORWARD, BTN_0, KEY_CONTROLPANEL,
KEY_ONSCREEN_KEYBOARD, 0 } }
};
/* validate tool type for device/product */
@@ -271,6 +271,9 @@
case 0xC7: /* DTU1931 */
case 0xCE: /* DTU2231 */
case 0xF0: /* DTU1631 */
+
+ /* Wacom One display tablet */
+ case 0x3A6: /* DTC133 */
TabletSetFeature(priv->common, WCM_LCD);
break;
@@ -330,6 +333,10 @@
case 0x352:/* Cintiq Pro 32 */
case 0x37C:/* Cintiq Pro 24 Pen-Only */
case 0x390:/* Cintiq 16 */
+ case 0x391:/* Cintiq 22 */
+ case 0x396:/* DTK-1660E */
+ case 0x3AE:/* Cintiq 16 */
+ case 0x3B0:/* DTK-1660E */
TabletSetFeature(priv->common, WCM_ROTATION);
/* fall-through */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/src/xf86WacomDefs.h
new/xf86-input-wacom-0.40.0/src/xf86WacomDefs.h
--- old/xf86-input-wacom-0.39.0/src/xf86WacomDefs.h 2019-12-19
20:11:38.000000000 +0100
+++ new/xf86-input-wacom-0.40.0/src/xf86WacomDefs.h 2021-02-02
23:20:24.000000000 +0100
@@ -26,7 +26,6 @@
#include <wacom-util.h>
#include <asm/types.h>
#include <linux/input.h>
-#define MAX_USB_EVENTS 32
/* vendor IDs on the kernel device */
#define WACOM_VENDOR_ID 0x056a
@@ -211,6 +210,11 @@
#define STRIP_RIGHT_UP 2
#define STRIP_RIGHT_DN 3
+#define IDX_KEY_CONTROLPANEL 1
+#define IDX_KEY_ONSCREEN_KEYBOARD 2
+#define IDX_KEY_BUTTONCONFIG 3
+#define IDX_KEY_INFO 4
+
/******************************************************************************
* WacomDeviceState
*****************************************************************************/
@@ -237,6 +241,7 @@
int proximity;
int sample; /* wraps every 24 days */
int time;
+ unsigned int keys; /* bitmask for IDX_KEY_CONTROLPANEL, etc. */
};
static const struct _WacomDeviceState OUTPROX_STATE = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/test-driver new/xf86-input-wacom-0.40.0/test-driver
--- old/xf86-input-wacom-0.39.0/test-driver 2019-05-01 17:24:18.000000000
+0200
+++ new/xf86-input-wacom-0.40.0/test-driver 2021-02-03 16:21:53.000000000
+0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-wacom-0.39.0/version new/xf86-input-wacom-0.40.0/version
--- old/xf86-input-wacom-0.39.0/version 2019-12-23 02:13:40.000000000 +0100
+++ new/xf86-input-wacom-0.40.0/version 2021-02-03 16:21:59.000000000 +0100
@@ -1 +1 @@
-0.39.0
+0.40.0
