xserver-xorg-input-synaptics: Changes to 'debian-unstable'
ChangeLog | 44 +++++++++++++
configure.ac | 2
debian/changelog | 8 ++
debian/control | 2
debian/patches/02-do-not-use-synaptics-for-keyboards.patch | 43 +++++-------
debian/patches/03-bug-return-val.patch | 10 +-
src/eventcomm.c | 1
src/properties.c | 13 +++
src/synaptics.c | 9 ++
src/synapticsstr.h | 10 ++
10 files changed, 111 insertions(+), 31 deletions(-)
New commits:
commit 618602cd2bde02dc346eda66498846c68acde5dd
Author: Michele Cane <michele.cane@gmail.com>
Date: Tue Dec 10 13:42:57 2013 +0100
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index 5290a37..c4b7b97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-synaptics (1.7.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump Standard-Version to 3.9.5, no changes needed.
+ * Refresh patches.
-- Michele Cane <michele.cane@gmail.com> Tue, 10 Dec 2013 13:38:48 +0100
diff --git a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
index a7c70bf..b6741c4 100644
--- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
+++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
@@ -1,11 +1,11 @@
do not use the synaptics driver for devices advertising themselves as keyboards
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524130
-Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
+Index: xserver-xorg-input-synaptics.git/conf/11-x11-synaptics.fdi
===================================================================
---- xserver-xorg-input-synaptics.orig/conf/11-x11-synaptics.fdi 2009-11-21 13:15:39.064182104 +0900
-+++ xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi 2009-11-21 13:16:23.404256090 +0900
-@@ -2,27 +2,31 @@
+--- xserver-xorg-input-synaptics.git.orig/conf/11-x11-synaptics.fdi 2013-12-10 13:41:43.646594748 +0100
++++ xserver-xorg-input-synaptics.git/conf/11-x11-synaptics.fdi 2013-12-10 13:41:43.642594750 +0100
+@@ -9,27 +9,31 @@
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.touchpad">
@@ -15,21 +15,6 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
- <!-- EXAMPLES:
- Maximum movement of the finger for detecting a tap
- <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
--
-- Enable vertical scrolling when dragging along the right edge
-- <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
--
-- Enable vertical scrolling when dragging with two fingers anywhere on the touchpad
-- <merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge>
--
-- Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad
-- <merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge>
--
-- If on, circular scrolling is used
-- <merge key="input.x11_options.CircularScrolling" type="string">true</merge>
--
-- For other possible options, check CONFIGURATION DETAILS in synaptics man page
-- -->
+ <!-- do not use the synaptics driver for devices advertising
+ themselves as keyboards -->
+ <match key="info.capabilities" contains_not="input.keyboard">
@@ -39,19 +24,29 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
+ <!-- EXAMPLES:
+ Maximum movement of the finger for detecting a tap
+ <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
-+
+
+- Enable vertical scrolling when dragging along the right edge
+- <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
+ Enable vertical scrolling when dragging along the right edge
+ <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
-+
+
+- Enable vertical scrolling when dragging with two fingers anywhere on the touchpad
+- <merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge>
+ Enable vertical scrolling when dragging with two fingers anywhere on the touchpad
+ <merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge>
-+
+
+- Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad
+- <merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge>
+ Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad
+ <merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge>
-+
+
+- If on, circular scrolling is used
+- <merge key="input.x11_options.CircularScrolling" type="string">true</merge>
+ If on, circular scrolling is used
+ <merge key="input.x11_options.CircularScrolling" type="string">true</merge>
-+
+
+- For other possible options, check CONFIGURATION DETAILS in synaptics man page
+- -->
+ For other possible options, check CONFIGURATION DETAILS in synaptics man page
+ -->
+ </match>
diff --git a/debian/patches/03-bug-return-val.patch b/debian/patches/03-bug-return-val.patch
index 24219d6..098b8a5 100644
--- a/debian/patches/03-bug-return-val.patch
+++ b/debian/patches/03-bug-return-val.patch
@@ -1,8 +1,8 @@
-diff --git a/src/synaptics.c b/src/synaptics.c
-index eb38271..24d4674 100644
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -2461,7 +2461,9 @@ clickpad_guess_clickfingers(SynapticsPrivate * priv,
+Index: xserver-xorg-input-synaptics.git/src/synaptics.c
+===================================================================
+--- xserver-xorg-input-synaptics.git.orig/src/synaptics.c 2013-12-10 13:41:57.754590117 +0100
++++ xserver-xorg-input-synaptics.git/src/synaptics.c 2013-12-10 13:41:57.754590117 +0100
+@@ -2466,7 +2466,9 @@
uint32_t close_point = 0; /* 1 bit for each point close to another one */
int i, j;
commit e8da8476d3e1a7e5b9678decf9f94df6ca12f8e0
Author: Michele Cane <michele.cane@gmail.com>
Date: Tue Dec 10 13:41:02 2013 +0100
Bump Standard-Version to 3.9.5, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index 38399d5..5290a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-synaptics (1.7.2-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Bump Standard-Version to 3.9.5, no changes needed.
-- Michele Cane <michele.cane@gmail.com> Tue, 10 Dec 2013 13:38:48 +0100
diff --git a/debian/control b/debian/control
index 3bc30f3..f949cc8 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
quilt,
xutils-dev (>= 1:7.5+4),
libmtdev-dev [linux-any],
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
commit c684105c4d7f237b3a327ff15282a46bf73433d8
Author: Michele Cane <michele.cane@gmail.com>
Date: Tue Dec 10 13:39:39 2013 +0100
Bump ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 4509d8e..28c9c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+commit 88d926d12a1f5c06ee2825de5bc4b2222ec29c78
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Dec 9 11:28:23 2013 +1000
+
+ synaptics 1.7.2
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 61243ada3e1e10f6d32a899a6cc595efa244eb25
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Dec 4 07:58:26 2013 +1000
+
+ eventcomm: ungrab the device on DeviceOff
+
+ For symmetry, the kernel should ungrab when we close the fd.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+ [modified for the 1.7 branch which isn't using libevdev yet]
+
+ (cherry picked from commit 5d391e352f4e502ada6444a7ce860683e3480fbf)
+
+commit 09ac39309fbee01aa047dab1b0f577dc2571cdd1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Dec 5 09:31:11 2013 +1000
+
+ Add missing property handler for the pressure motion factor
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 29318c1d94510cfb6d5d712e912af111f99edb42)
+
+commit f4ddbde165843924195b08551d7d6d6200c44b23
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 19 11:08:43 2013 +1000
+
+ Disable driver scaling for input ABI 19.2
+
+ For absolute devices in relative mode, i.e. touchpads, the server now takes
+ device resolution into account. Doing so means that the driver mustn't
+ scale, so we deactivate those bits in the driver.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 0fb59b3487d57523a03f078a2061e2ea0cacbc7c)
+
commit 96cf04dce19e7c90bc05b8b3b192b5bfb97381d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 13 10:03:48 2013 +1000
diff --git a/debian/changelog b/debian/changelog
index 9374f76..38399d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.7.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Michele Cane <michele.cane@gmail.com> Tue, 10 Dec 2013 13:38:48 +0100
+
xserver-xorg-input-synaptics (1.7.1-2) unstable; urgency=low
* Add Breaks on kde-config-touchpad (<< 0.8.1-2~) because of #722058
commit 88d926d12a1f5c06ee2825de5bc4b2222ec29c78
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 9 11:28:23 2013 +1000
synaptics 1.7.2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 5dfbc4e..a9b8b2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.7.1],
+ [1.7.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit 61243ada3e1e10f6d32a899a6cc595efa244eb25
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 4 07:58:26 2013 +1000
eventcomm: ungrab the device on DeviceOff
For symmetry, the kernel should ungrab when we close the fd.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
[modified for the 1.7 branch which isn't using libevdev yet]
(cherry picked from commit 5d391e352f4e502ada6444a7ce860683e3480fbf)
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 258a538..a9a344b 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -206,6 +206,7 @@ static Bool
EventDeviceOffHook(InputInfoPtr pInfo)
{
UninitializeTouch(pInfo);
+ SYSCALL(ioctl(pInfo->fd, EVIOCGRAB, (pointer) 0));
return Success;
}
commit 09ac39309fbee01aa047dab1b0f577dc2571cdd1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 5 09:31:11 2013 +1000
Add missing property handler for the pressure motion factor
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 29318c1d94510cfb6d5d712e912af111f99edb42)
diff --git a/src/properties.c b/src/properties.c
index dd88fc7..797f1da 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -650,6 +650,19 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
para->press_motion_min_z = press[0];
para->press_motion_max_z = press[1];
}
+ else if (property == prop_pressuremotion_factor) {
+ float *press;
+
+ if (prop->size != 2 || prop->format != 32 || prop->type != float_type)
+ return BadMatch;
+
+ press = (float *) prop->data;
+ if (press[0] > press[1])
+ return BadValue;
+
+ para->press_motion_min_factor = press[0];
+ para->press_motion_max_factor = press[1];
+ }
else if (property == prop_grab) {
if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
return BadMatch;
commit f4ddbde165843924195b08551d7d6d6200c44b23
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 19 11:08:43 2013 +1000
Disable driver scaling for input ABI 19.2
For absolute devices in relative mode, i.e. touchpads, the server now takes
device resolution into account. Doing so means that the driver mustn't
scale, so we deactivate those bits in the driver.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0fb59b3487d57523a03f078a2061e2ea0cacbc7c)
diff --git a/src/synaptics.c b/src/synaptics.c
index eb38271..e391a98 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -133,9 +133,11 @@ static int DeviceOff(DeviceIntPtr);
static int DeviceClose(DeviceIntPtr);
static Bool QueryHardware(InputInfoPtr);
static void ReadDevDimensions(InputInfoPtr);
+#ifndef NO_DRIVER_SCALING
static void ScaleCoordinates(SynapticsPrivate * priv,
struct SynapticsHwState *hw);
static void CalculateScalingCoeffs(SynapticsPrivate * priv);
+#endif
static void SanitizeDimensions(InputInfoPtr pInfo);
void InitDeviceProperties(InputInfoPtr pInfo);
@@ -829,7 +831,10 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
set_default_parameters(pInfo);
+#ifndef NO_DRIVER_SCALING
CalculateScalingCoeffs(priv);
+#endif
+
priv->comm.buffer = XisbNew(pInfo->fd, INPUT_BUFFER_SIZE);
@@ -2863,7 +2868,9 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
* calculations that require unadjusted coordinates, for example edge
* detection.
*/
+#ifndef NO_DRIVER_SCALING
ScaleCoordinates(priv, hw);
+#endif
}
dx = dy = 0;
@@ -2987,6 +2994,7 @@ QueryHardware(InputInfoPtr pInfo)
return TRUE;
}
+#ifndef NO_DRIVER_SCALING
static void
ScaleCoordinates(SynapticsPrivate * priv, struct SynapticsHwState *hw)
{
@@ -3016,3 +3024,4 @@ CalculateScalingCoeffs(SynapticsPrivate * priv)
priv->vert_coeff = 1;
}
}
+#endif
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 428befa..a9901a2 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -28,6 +28,14 @@
#define LogMessageVerbSigSafe xf86MsgVerb
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 19
+#if GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 2
+/* as of 19.2, the server takes device resolution into account when scaling
+ relative events from abs device, so we must not scale in synaptics. */
+#define NO_DRIVER_SCALING 1
+#endif
+#endif
+
#ifdef DBG
#undef DBG
#endif
@@ -250,8 +258,10 @@ struct _SynapticsPrivateRec {
int prev_z; /* previous z value, for palm detection */
int prevFingers; /* previous numFingers, for transition detection */
int avg_width; /* weighted average of previous fingerWidth values */
+#ifndef NO_DRIVER_SCALING
double horiz_coeff; /* normalization factor for x coordintes */
double vert_coeff; /* normalization factor for y coordintes */
+#endif
int minx, maxx, miny, maxy; /* min/max dimensions as detected */
int minp, maxp, minw, maxw; /* min/max pressure and finger width as detected */
Reply to: