Hello community,
here is the log from the commit of package x11-input-wacom
checked in at Mon Dec 17 12:10:22 CET 2007.
--------
--- x11-input-wacom/x11-input-wacom.changes 2007-10-10 19:03:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2007-11-05 18:38:36.000000000 +0100
@@ -1,0 +2,18 @@
+Mon Nov 5 18:35:03 CET 2007 - dkukawka@suse.de
+
+- added patch:
+ * linuxwacom-fix-multitouch.diff: Fix new feature MultiTouch
+ on Tablet PCs as e.g. Lenovo X61t. Now at least the stylus/
+ cursor of the pen works again. There are still problems with
+ the eraser.
+ Added new xorg.conf option "MultiTouch" "off" which allow to
+ disable the multitouch feature completely.
+
+-------------------------------------------------------------------
+Sat Nov 3 18:20:50 CET 2007 - dkukawka@suse.de
+
+- updated to: development release 0.7.9-1
+- added patch: linuxwacom-0.7.9-1.diff
+ * fixes build with xorg-server 1.4
+
+-------------------------------------------------------------------
Old:
----
linuxwacom-0.7.8-3.tar.bz2
New:
----
linuxwacom-0.7.9-1.diff
linuxwacom-0.7.9-1.tar.bz2
linuxwacom-fix-multitouch.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.I32243/_old 2007-12-17 12:09:32.000000000 +0100
+++ /var/tmp/diff_new_pack.I32243/_new 2007-12-17 12:09:32.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package x11-input-wacom (Version 0.7.8)
+# spec file for package x11-input-wacom (Version 0.7.9)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,6 +11,7 @@
# norootforbuild
Name: x11-input-wacom
+%define revision 1
BuildRequires: gtk2-devel ncurses ncurses-devel tk-devel update-desktop-files
%ifnarch s390 s390x
BuildRequires: xorg-x11-server-sdk
@@ -18,13 +19,15 @@
License: GPL v2 or later
Url: http://linuxwacom.sourceforge.net/
Group: System/X11/Utilities
-Version: 0.7.8
-Release: 41
+Version: 0.7.9
+Release: 1
Summary: X11 input module for wacom tablet
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o
-Source: linuxwacom-%{version}-3.tar.bz2
-Patch: linuxwacom-0.7.8-3.diff
-Patch2: linuxwacom-autoprobe.diff
+Source: linuxwacom-%{version}-%{revision}.tar.bz2
+Patch0: linuxwacom-0.7.8-3.diff
+Patch1: linuxwacom-autoprobe.diff
+Patch2: linuxwacom-0.7.9-1.diff
+Patch3: linuxwacom-fix-multitouch.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -73,9 +76,11 @@
Ping Cheng
%prep
-%setup -n linuxwacom-%{version}-3
-%patch
+%setup -n linuxwacom-%{version}-%{revision}
+%patch0
+%patch1
%patch2
+%patch3
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -148,7 +153,20 @@
/usr/%_lib/libwacomcfg.a
/usr/%_lib/libwacomcfg.la
/usr/%_lib/libwacomcfg.so
+
%changelog
+* Mon Nov 05 2007 - dkukawka@suse.de
+- added patch:
+ * linuxwacom-fix-multitouch.diff: Fix new feature MultiTouch
+ on Tablet PCs as e.g. Lenovo X61t. Now at least the stylus/
+ cursor of the pen works again. There are still problems with
+ the eraser.
+ Added new xorg.conf option "MultiTouch" "off" which allow to
+ disable the multitouch feature completely.
+* Sat Nov 03 2007 - dkukawka@suse.de
+- updated to: development release 0.7.9-1
+- added patch: linuxwacom-0.7.9-1.diff
+ * fixes build with xorg-server 1.4
* Wed Oct 10 2007 - mhopf@suse.de
- Added auto-dev scanning support.
* Sun Sep 30 2007 - sndirsch@suse.de
++++++ linuxwacom-0.7.9-1.diff ++++++
--- src/xdrv/wcmCommon.c_save 2007-11-03 18:36:17.000000000 +0100
+++ src/xdrv/wcmCommon.c 2007-11-03 18:46:51.000000000 +0100
@@ -47,7 +47,7 @@
****************************************************************************/
static void transPressureCurve(WacomDevicePtr pDev, WacomDeviceStatePtr pState);
-static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel,
+static void commonDispatchDevice(LocalDevicePtr local, WacomCommonPtr common, unsigned int channel,
const WacomChannelPtr pChannel, int suppress);
static void resetSampleCounter(const WacomChannelPtr pChannel);
static void sendAButton(LocalDevicePtr local, int button, int mask,
@@ -1190,7 +1190,7 @@
pChannel->valid.state = ds; /*save last raw sample */
if (pChannel->nSamples < common->wcmRawSample) ++pChannel->nSamples;
- commonDispatchDevice(common,channel,pChannel, suppress);
+ commonDispatchDevice(local,common,channel,pChannel, suppress);
resetSampleCounter(pChannel);
}
@@ -1233,7 +1233,7 @@
return type;
}
-static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel,
+static void commonDispatchDevice(LocalDevicePtr local, WacomCommonPtr common, unsigned int channel,
const WacomChannelPtr pChannel, int suppress)
{
LocalDevicePtr pDev = NULL;
++++++ linuxwacom-0.7.8-3.tar.bz2 -> linuxwacom-0.7.9-1.tar.bz2 ++++++
++++ 6842 lines of diff (skipped)
++++++ linuxwacom-fix-multitouch.diff ++++++
--- src/xdrv/wcmConfig.c 2007-11-05 17:42:58.000000000 +0100
+++ src/xdrv/wcmConfig.c 2007-11-05 17:51:50.000000000 +0100
@@ -548,6 +548,15 @@
common->wcmDevCls = &gWacomISDV4Device;
xf86Msg(X_CONFIG, "%s: forcing TabletPC ISD V4 protocol\n",
dev->identifier);
+
+ /* disable multitouch feature ... only available on TabletPCs */
+ s = xf86FindOptionValue(local->options, "MultiTouch");
+ if (s && (xf86NameCmp(s, "off") == 0)) {
+ common->wcmMultiTouch=0;
+ }
+ else {
+ common->wcmMultiTouch=1;
+ }
}
s = xf86FindOptionValue(local->options, "Rotate");
--- src/xdrv/xf86Wacom.h 2007-11-05 17:49:23.000000000 +0100
+++ src/xdrv/xf86Wacom.h 2007-11-05 17:50:43.000000000 +0100
@@ -491,6 +491,7 @@
int wcmProtocolLevel; /* 4 for Wacom IV, 5 for Wacom V */
float wcmVersion; /* ROM version */
int wcmForceDevice; /* force device type (used by ISD V4) */
+ int wcmMultiTouch; /* if the multitouch feature should be supported */
int wcmRotate; /* rotate screen (for TabletPC) */
int wcmThreshold; /* Threshold for button pressure */
WacomChannel wcmChannel[MAX_CHANNELS]; /* channel device state */
--- src/xdrv/wcmISDV4.c 2007-11-05 16:21:56.000000000 +0100
+++ src/xdrv/wcmISDV4.c 2007-11-05 18:20:38.000000000 +0100
@@ -99,7 +99,7 @@
{
/* set parameters */
common->wcmProtocolLevel = 4;
- common->wcmPktLength = 5; /* length of a packet
+ common->wcmPktLength = 9; /* length of a packet
* device packets are 9 bytes long,
* multitouch are only 5 */
common->wcmResolX = 2540; /* tablet X resolution in points/inch */
@@ -214,11 +214,18 @@
/* determine the type of message */
if (data[0] & 0x10)
{
- ismt = 1;
+ if (common->wcmMultiTouch == 0) {
+ lastismt = 0;
+ return 5;
+ }
+
common->wcmPktLength = 5;
+ ismt = 1;
}
else
{
+ /* set state back */
+ lastismt = 0;
common->wcmPktLength = 9;
if (common->buffer + common->bufpos - data < common->wcmPktLength)
{
@@ -232,8 +239,9 @@
else
{
/* Coordinate data bit check */
- if (data[0] & 0x40)
+ if (data[0] & 0x40) {
return common->wcmPktLength;
+ }
}
/* pick up where we left off, minus relative values */
ds = &common->wcmChannel[0].work;
--- src/wacom.4x_save 2007-11-05 18:30:27.000000000 +0100
+++ src/wacom.4x 2007-11-05 18:32:51.000000000 +0100
@@ -61,6 +61,11 @@
we only support serial Tablet PC. It is a special Wacom IV protocol,
called ISDV4 protocol. This option is mandatory for Tablet PC.
.TP 4
+.B Option \fI"MultiTouch"\fP \fI"off"\fP
+tells the driver to ignore MultiTouch events on newer Tablet PCs as e.g.
+on WACf008 devices. This option is only used if option "ForceDevice" is
+"ISDV4"
+.TP 4
.B Option \fI"Suppress"\fP \fI"Inumber"\fP
sets the position increment under which not to transmit coordinates.
This entry must be specified only in the first Wacom subsection if you have
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org