xserver-xorg-input-synaptics: Changes to 'debian-unstable'
ChangeLog | 189 +++++++++++++
README | 6
conf/11-x11-synaptics.fdi | 10
conf/50-synaptics.conf | 13
configure.ac | 2
debian/changelog | 14
debian/control | 2
debian/patches/02-do-not-use-synaptics-for-keyboards.patch | 8
debian/patches/03-man-no-hal.patch | 20 -
debian/patches/series | 1
include/synaptics-properties.h | 4
man/synaptics.man | 23 -
src/eventcomm.c | 1
src/synaptics.c | 2
src/synapticsstr.h | 2
tools/syndaemon.c | 37 +-
16 files changed, 268 insertions(+), 66 deletions(-)
New commits:
commit 2a7c235150a9cc4ac799f485fcd1de1bba0ee5a6
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:38:17 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 140e14a..4ca7896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.4.1-1) unstable; urgency=low
* New upstream release:
- Fix some typos in documentation (Closes: #622663).
@@ -10,7 +10,7 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
* Drop patch:
- 03-man-no-hal.patch, superseded by upstream commit e49d5d07c7.
- -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:38:13 +0200
xserver-xorg-input-synaptics (1.4.0-1) unstable; urgency=low
commit 87716e253322309a2bfcbd62288cc3b666f82de9
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:29:39 2011 +0200
Drop 03-man-no-hal.patch due to e49d5d07c7.
diff --git a/debian/changelog b/debian/changelog
index d7e90a2..140e14a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
* Refresh patch:
- 02-do-not-use-synaptics-for-keyboards.patch to cope with the lines
removed in d25ba5e11d.
+ * Drop patch:
+ - 03-man-no-hal.patch, superseded by upstream commit e49d5d07c7.
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
diff --git a/debian/patches/03-man-no-hal.patch b/debian/patches/03-man-no-hal.patch
deleted file mode 100644
index 0650598..0000000
--- a/debian/patches/03-man-no-hal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: xserver-xorg-input-synaptics/man/synaptics.man
-===================================================================
---- xserver-xorg-input-synaptics.orig/man/synaptics.man
-+++ xserver-xorg-input-synaptics/man/synaptics.man
-@@ -871,15 +871,6 @@
- 32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter.
-
- .SH "NOTES"
--There is an example hal policy file in
--.I ${sourcecode}/fdi/11-x11-synaptics.fdi
--which will enable the driver based on the information if the hardware
--is available. Feel free to copy it to
--.I /etc/hal/fdi/policy
--and customize it to your needs. You can pass custom options to the driver
--using x11_options properties. Note that this requires xorg-server-1.5 or
--higher.
--.LP
- If either of
- .BI "Protocol \*q" auto-dev \*q
- (default) or
diff --git a/debian/patches/series b/debian/patches/series
index c8a3753..d694f00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
#01-synaptics-dont-grab-if-not-on-current-VT.patch
02-do-not-use-synaptics-for-keyboards.patch
-03-man-no-hal.patch
commit 45d52fe1b75abdde8b5f4d492b98ce364b93422f
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:29:25 2011 +0200
Refresh 02-do-not-use-synaptics-for-keyboards.patch after d25ba5e11d.
diff --git a/debian/changelog b/debian/changelog
index bd6c239..d7e90a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
- Fix some typos in documentation (Closes: #622663).
- Fix “syndaemon consumes 100% CPU” (LP: #754470).
* Bump Standards-Version to 3.9.2 (no changes).
+ * Refresh patch:
+ - 02-do-not-use-synaptics-for-keyboards.patch to cope with the lines
+ removed in d25ba5e11d.
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
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 a756a5d..a7c70bf 100644
--- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
+++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch
@@ -5,7 +5,7 @@ Index: xserver-xorg-input-synaptics/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,30 +2,34 @@
+@@ -2,27 +2,31 @@
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.touchpad">
@@ -13,9 +13,6 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
- <!-- Arbitrary options can be passed to the driver using
- the input.x11_options property since xorg-server-1.5. -->
- <!-- EXAMPLES:
-- Switch on shared memory, enables the driver to be configured at runtime
-- <merge key="input.x11_options.SHMConfig" type="string">true</merge>
--
- Maximum movement of the finger for detecting a tap
- <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
-
@@ -40,9 +37,6 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi
+ <!-- Arbitrary options can be passed to the driver using
+ the input.x11_options property since xorg-server-1.5. -->
+ <!-- EXAMPLES:
-+ Switch on shared memory, enables the driver to be configured at runtime
-+ <merge key="input.x11_options.SHMConfig" type="string">true</merge>
-+
+ Maximum movement of the finger for detecting a tap
+ <merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
+
commit 51ba8d9f3196e7dc2858d6e4f1d1928010b5edbf
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:08:34 2011 +0200
Bump Standards-Version to 3.9.2 (no changes).
diff --git a/debian/changelog b/debian/changelog
index b349674..bd6c239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
* New upstream release:
- Fix some typos in documentation (Closes: #622663).
- Fix “syndaemon consumes 100% CPU” (LP: #754470).
+ * Bump Standards-Version to 3.9.2 (no changes).
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
diff --git a/debian/control b/debian/control
index e43293f..87ddf23 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
pkg-config,
quilt,
xutils-dev (>= 1:7.5+4)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
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 1f05b7bae49a50a76ddcb98f5c1880307a61ec4d
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:08:12 2011 +0200
Close bugs in changelog.
diff --git a/debian/changelog b/debian/changelog
index f745e3c..b349674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release:
+ - Fix some typos in documentation (Closes: #622663).
+ - Fix “syndaemon consumes 100% CPU” (LP: #754470).
-- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
commit 890e5cad84eb421b2d4eb2796b65c5962104144b
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jun 28 15:04:52 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 8ae4090..7111e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,192 @@
+commit a1c77348563d882a5da870d6884ee91434458689
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 28 14:47:04 2011 +1000
+
+ synaptics 1.4.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 65c8d5c703b2f9a65e3bf86b1ad35a0d439b46aa
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon May 23 10:18:22 2011 +1000
+
+ syndaemon: don't compare against a null-property. (#37459)
+
+ synaptics_property is not set, touchpad_off_prop is the property we need to
+ check against.
+
+ False check for (nprops != 0) instead of (nprops < 0) would result in
+ syndaemon always reporting a touchpad device, even if none are present.
+
+ X.Org Bug 37459 <http://bugs.freedesktop.org/show_bug.cgi?id=37459>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit be83094bd98c353b0ee7894eefcb1ae91e0cae30)
+
+commit 11b70094aa66a85bc06e5c160cdc15139df94cb7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon May 23 10:12:42 2011 +1000
+
+ syndaemon: fix abysimal indentation in dp_get_device.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit e4958186fae78770bc739be701b849f28c87cf11)
+
+commit ee216923ddaf4492c7e1eb026fa0b4f5e8ed5ec9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 19 09:45:10 2011 +1000
+
+ include: update documentation for capabilities property
+
+ pressure and width were added recently
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 0c8971c80c21d7541d9614ac67a8d4954d4859ec)
+
+commit 77ad03caf8070a25d21e37ae3b7602be6cffe3b1
+Author: Christoph Brill <egore911@egore911.de>
+Date: Tue May 17 08:08:08 2011 +0200
+
+ Update maintainer information
+
+ There is no distinct maintainer for synaptics but everything should go
+ to the list.
+ (cherry picked from commit 8ad40444596259b8b5b60ae4069e94875253c21a)
+
+commit f23b388478cf60ee53aa4ca435693fcc9f3324ec
+Author: Diego Elio Pettenò <flameeyes@gmail.com>
+Date: Sat May 14 03:34:26 2011 +0200
+
+ README: fix typos.
+
+ Signed-off-by: Christoph Brill <egore911@egore911.de>
+ (cherry picked from commit 0c0e3e3df6af54777e47550e555e76c787f6f0a4)
+
+commit ccdf11061a08d664f092493968f182ac8241052b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun May 8 11:56:25 2011 -0700
+
+ Fix "nose canellation" typo in man page
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit ec791423531a12129358a2e10b4f9b4721fcd761)
+
+commit de59d0368e427e5d1ed299b8769cbf15706801d7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Apr 18 14:18:22 2011 +1000
+
+ synaptics 1.4.0.901
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 27d04237d60ba0bcd0dafa30f9fd076e80e4d2f6
+Author: Chase Douglas <chase.douglas@canonical.com>
+Date: Fri Apr 15 15:29:57 2011 -0400
+
+ Drain XRecord connection of any events after handling replies
+
+ If the X server sends an event to the XRecord connection the event
+ will never be handled. This will cause the event queue to fill up in
+ Xlib and lead to syndaemon running away at 100% cpu usage.
+
+ This change drains any events from the connection. It's not a fix for
+ the underlying bug in the server or Xlib, but it does paper over the
+ issue for now.
+
+ https://bugs.launchpad.net/bugs/754470
+ http://bugs.freedesktop.org/show_bug.cgi?id=31921
+
+ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit bdc9c7cf9767bda77c690cb4211f6f6cb4567748)
+
+commit ae226ae5c90b9c6724e1f1cd44e6d223641e59fa
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Thu Apr 14 05:38:25 2011 +0200
+
+ Fix egde/edge typo in manpage and comments.
+
+ Debian bug #622663 <http://bugs.debian.org/622663>
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit fe05c60fee1f8fc24cc6cc2af7027d897607af2a)
+
+commit e783c187757b0412f53c8ec555d7f5bf7b10195b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 20:56:51 2011 +1000
+
+ eventcomm: add a missing break statement
+
+ If the EV_SYN wasn't SYN_REPORT, we'd fall through to key event processing,
+ which almost certainly won't do what we want and/or need.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+ (cherry picked from commit ecf42db47629cadc7a332398a1784bb0acbd6511)
+
+commit 92ff5f4318ca602a2cdf3deb1d859a7235163416
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:34:03 2011 +1000
+
+ conf: add a descriptive header with warning to example config file
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit b7acee2346494846e80d2fe25f699081a51c49a2)
+
+commit d25ba5e11d5b86978a576adaab539ca62311a881
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:40:50 2011 +1000
+
+ conf: remove SHM example from fdi
+
+ SHM is dead for configuration.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit bc01d6a88ae84a0b1e52b8feb93c168d5120cd58)
+
+commit 847131077636bc935e3b4d7c9f1c94e537c3f79b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:29:37 2011 +1000
+
+ man: add short blurb about InputClass configuration in servers 1.8
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 5f546777173dc78146025499d186fe97d31eaeac)
+
+commit e49d5d07c718df59802ac79511dcfcbd200dd9c7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 18 10:26:37 2011 +1000
+
+ man: update source path for fdi file and shorten description.
+
+ Don't describe what the example config file does in the man page, let the
+ file speak for itself. Point out that fdi files are for servers 1.5 - 1.7
+ only.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 86cab92b41443a5c9391b3bb20c93d902cf67961)
+
+commit a62aad0f94498ad7e80ee2408cb3e56860b8ccaf
+Author: Christoph Brill <egore911@egore911.de>
+Date: Wed Mar 9 23:25:05 2011 +0100
+
+ Add note about MatchDevicePath
+
+ This question seems to pop up very often. Add a note pointing to Peter's
+ blog entry describing the details of this misconfiguration.
+ (cherry picked from commit 0662e1c18122768549e51baf9ce3649c57ff0528)
+
+commit f963bc06f42b33e6f4452eab7dc10a4158cb0dd5
+Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
+Date: Mon Feb 28 16:38:19 2011 +0500
+
+ Fix typo (resx -> resy)
+
+ Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 3c598daec845ff6ef4ba0769ad78a0d562effe29)
+
commit de0dfb76444ad4160468d00515876c91a9fa20bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 4 12:36:24 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index 027a711..f745e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.4.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 28 Jun 2011 15:04:24 +0200
+
xserver-xorg-input-synaptics (1.4.0-1) unstable; urgency=low
* New upstream release:
commit a1c77348563d882a5da870d6884ee91434458689
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 28 14:47:04 2011 +1000
synaptics 1.4.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8558e5b..01ca49b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.4.0.901],
+ [1.4.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit 65c8d5c703b2f9a65e3bf86b1ad35a0d439b46aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 23 10:18:22 2011 +1000
syndaemon: don't compare against a null-property. (#37459)
synaptics_property is not set, touchpad_off_prop is the property we need to
check against.
False check for (nprops != 0) instead of (nprops < 0) would result in
syndaemon always reporting a touchpad device, even if none are present.
X.Org Bug 37459 <http://bugs.freedesktop.org/show_bug.cgi?id=37459>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit be83094bd98c353b0ee7894eefcb1ae91e0cae30)
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 327f479..6e62dc5 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -465,7 +465,6 @@ dp_get_device(Display *dpy)
XDeviceInfo *info = NULL;
int ndevices = 0;
Atom touchpad_type = 0;
- Atom synaptics_property = 0;
Atom *properties = NULL;
int nprops = 0;
int error = 0;
@@ -495,10 +494,10 @@ dp_get_device(Display *dpy)
while(nprops--)
{
- if (properties[nprops] == synaptics_property)
+ if (properties[nprops] == touchpad_off_prop)
break;
}
- if (!nprops)
+ if (nprops < 0)
{
fprintf(stderr, "No synaptics properties on device '%s'.\n",
info[ndevices].name);
commit 11b70094aa66a85bc06e5c160cdc15139df94cb7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 23 10:12:42 2011 +1000
syndaemon: fix abysimal indentation in dp_get_device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit e4958186fae78770bc739be701b849f28c87cf11)
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 47e0e6a..327f479 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -487,24 +487,24 @@ dp_get_device(Display *dpy)
properties = XListDeviceProperties(dpy, dev, &nprops);
if (!properties || !nprops)
{
- fprintf(stderr, "No properties on device '%s'.\n",
- info[ndevices].name);
- error = 1;
- goto unwind;
- }
+ fprintf(stderr, "No properties on device '%s'.\n",
+ info[ndevices].name);
+ error = 1;
+ goto unwind;
+ }
while(nprops--)
{
- if (properties[nprops] == synaptics_property)
- break;
- }
+ if (properties[nprops] == synaptics_property)
+ break;
+ }
if (!nprops)
{
- fprintf(stderr, "No synaptics properties on device '%s'.\n",
- info[ndevices].name);
- error = 1;
- goto unwind;
- }
+ fprintf(stderr, "No synaptics properties on device '%s'.\n",
+ info[ndevices].name);
+ error = 1;
+ goto unwind;
+ }
break; /* Yay, device is suitable */
}
commit ee216923ddaf4492c7e1eb026fa0b4f5e8ed5ec9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 19 09:45:10 2011 +1000
include: update documentation for capabilities property
pressure and width were added recently
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0c8971c80c21d7541d9614ac67a8d4954d4859ec)
diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
index bdb2112..77a1806 100644
--- a/include/synaptics-properties.h
+++ b/include/synaptics-properties.h
@@ -145,8 +145,8 @@
/* 8 bit (BOOL), 1 value, tap-and-drag */
#define SYNAPTICS_PROP_GESTURES "Synaptics Gestures"
-/* 8 bit (BOOL), 5 values (read-only), has_left, has_middle, has_right,
- * has_double, has_triple */
+/* 8 bit (BOOL), 7 values (read-only), has_left, has_middle, has_right,
+ * has_double, has_triple, has_pressure, has_width */
#define SYNAPTICS_PROP_CAPABILITIES "Synaptics Capabilities"
/* 32 bit unsigned, 2 values, vertical, horizontal in units/millimeter */
commit 77ad03caf8070a25d21e37ae3b7602be6cffe3b1
Author: Christoph Brill <egore911@egore911.de>
Date: Tue May 17 08:08:08 2011 +0200
Update maintainer information
There is no distinct maintainer for synaptics but everything should go
to the list.
(cherry picked from commit 8ad40444596259b8b5b60ae4069e94875253c21a)
diff --git a/README b/README
index dbc4d13..65f1999 100644
--- a/README
+++ b/README
@@ -122,7 +122,7 @@ Authors
Many people have contributed to this driver. Look at the top of
synaptics.c and ps2comm.c for details.
-The current maintainer is Christoph Brill <egore911@egore911.de>.
+The current maintainer is X.org development team <xorg-devel@lists.x.org>.
Contacts
commit f23b388478cf60ee53aa4ca435693fcc9f3324ec
Author: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Sat May 14 03:34:26 2011 +0200
README: fix typos.
Signed-off-by: Christoph Brill <egore911@egore911.de>
(cherry picked from commit 0c0e3e3df6af54777e47550e555e76c787f6f0a4)
diff --git a/README b/README
index e2bc57a..dbc4d13 100644
--- a/README
+++ b/README
@@ -138,9 +138,9 @@ Please submit bug reports to the Xorg bugzilla:
The master development code repository can be found at:
- git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptcis
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics
- http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptcis
+ http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics
For patch submission instructions, see:
commit ccdf11061a08d664f092493968f182ac8241052b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun May 8 11:56:25 2011 -0700
Fix "nose canellation" typo in man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit ec791423531a12129358a2e10b4f9b4721fcd761)
diff --git a/man/synaptics.man b/man/synaptics.man
index cd80641..cb5f4c6 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -728,7 +728,7 @@ active, scrolling will stop, and circular scrolling will not start,
when the finger leaves the corner.
.SS Noise cancellation
-The synaptics has a built-in nose canellation based on hysteresis. This means
+The synaptics has a built-in noise cancellation based on hysteresis. This means
that incoming coordinates actually shift a box of predefined dimensions such
that it covers the incoming coordinate, and only the boxes own center is used
as input. Obviously, the smaller the box the better, but the likelyhood of
commit de59d0368e427e5d1ed299b8769cbf15706801d7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 18 14:18:22 2011 +1000
synaptics 1.4.0.901
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index c057ffb..8558e5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.4.0],
+ [1.4.0.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit 27d04237d60ba0bcd0dafa30f9fd076e80e4d2f6
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 15 15:29:57 2011 -0400
Drain XRecord connection of any events after handling replies
If the X server sends an event to the XRecord connection the event
will never be handled. This will cause the event queue to fill up in
Xlib and lead to syndaemon running away at 100% cpu usage.
This change drains any events from the connection. It's not a fix for
the underlying bug in the server or Xlib, but it does paper over the
issue for now.
https://bugs.launchpad.net/bugs/754470
http://bugs.freedesktop.org/show_bug.cgi?id=31921
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit bdc9c7cf9767bda77c690cb4211f6f6cb4567748)
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 9779935..47e0e6a 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -421,6 +421,14 @@ void record_main_loop(Display* display, double idle_time) {
XRecordProcessReplies(dpy_data);
+ /* If there are any events left over, they are in error. Drain them
+ * from the connection queue so we don't get stuck. */
+ while (XEventsQueued(dpy_data, QueuedAlready) > 0) {
+ XEvent event;
+ XNextEvent(dpy_data, &event);
+ fprintf(stderr, "bad event received, major opcode %d\n", event.type);
+ }
+
if (!ignore_modifier_keys && cbres.key_event) {
disable_event = 1;
}
commit ae226ae5c90b9c6724e1f1cd44e6d223641e59fa
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Apr 14 05:38:25 2011 +0200
Fix egde/edge typo in manpage and comments.
Debian bug #622663 <http://bugs.debian.org/622663>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit fe05c60fee1f8fc24cc6cc2af7027d897607af2a)
diff --git a/man/synaptics.man b/man/synaptics.man
index 07327c5..cd80641 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -190,7 +190,7 @@ Fastest setting for edge motion speed. Property: "Synaptics Edge Motion Speed"
.BI "Option \*qEdgeMotionUseAlways\*q \*q" boolean \*q
If on, edge motion is also used for normal movements.
.
-If off, egde motion is used only when dragging. Property: "Synaptics Edge
+If off, edge motion is used only when dragging. Property: "Synaptics Edge
Motion Always"
.TP
.BI "Option \*qMinSpeed\*q \*q" float \*q
@@ -640,7 +640,7 @@ For a pressure value between PressureMotionMinZ and
PressureMotionMaxZ, the factor is increased linearly.
.
.SS Edge motion
-When hitting an egde, movement can be automatically continued.
+When hitting an edge, movement can be automatically continued.
.
If EdgeMotionUseAlways is false, edge motion is only used when
dragging.
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 066b3f3..87253c8 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -125,7 +125,7 @@ typedef struct _SynapticsParameters
int edge_motion_max_z; /* finger pressure at which maximum edge motion speed is set */
int edge_motion_min_speed; /* slowest setting for edge motion speed */
int edge_motion_max_speed; /* fastest setting for edge motion speed */
- Bool edge_motion_use_always; /* If false, egde motion is used only when dragging */
+ Bool edge_motion_use_always; /* If false, edge motion is used only when dragging */
Bool updown_button_scrolling; /* Up/Down-Button scrolling or middle/double-click */
Bool leftright_button_scrolling; /* Left/right-button scrolling, or two lots of middle button */
commit e783c187757b0412f53c8ec555d7f5bf7b10195b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 18 20:56:51 2011 +1000
eventcomm: add a missing break statement
If the EV_SYN wasn't SYN_REPORT, we'd fall through to key event processing,
which almost certainly won't do what we want and/or need.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
(cherry picked from commit ecf42db47629cadc7a332398a1784bb0acbd6511)
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 1a31c54..7a3959b 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -341,6 +341,7 @@ EventReadHwState(InputInfoPtr pInfo,
*hwRet = *hw;
return TRUE;
}
+ break;
case EV_KEY:
v = (ev.value ? TRUE : FALSE);
switch (ev.code) {
commit 92ff5f4318ca602a2cdf3deb1d859a7235163416
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 18 10:34:03 2011 +1000
conf: add a descriptive header with warning to example config file
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b7acee2346494846e80d2fe25f699081a51c49a2)
diff --git a/conf/11-x11-synaptics.fdi b/conf/11-x11-synaptics.fdi
index d191f41..d487f09 100644
--- a/conf/11-x11-synaptics.fdi
+++ b/conf/11-x11-synaptics.fdi
@@ -1,4 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Example fdi file that assigns the synaptics driver to any touchpad in
+ the system.
+
+ DO NOT EDIT THIS FILE, your distribution will likely overwrite
+ it when updating. Copy (and rename) this file into
+ /etc/hal/fdi/policy first before adding options.
+ -->
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.touchpad">
diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf
index d5da0cb..ff0342d 100644
--- a/conf/50-synaptics.conf
+++ b/conf/50-synaptics.conf
@@ -1,3 +1,12 @@
+# Example xorg.conf.d snippet that assigns the touchpad driver
+# to all touchpads. See xorg.conf.d(5) for more information on
+# InputClass.
+# DO NOT EDIT THIS FILE, your distribution will likely overwrite
+# it when updating. Copy (and rename) this file into
+# /etc/X11/xorg.conf.d first.
+# Additional options may be added in the form of
+# Option "OptionName" "value"
+#
Section "InputClass"
Identifier "touchpad catchall"
Driver "synaptics"
commit d25ba5e11d5b86978a576adaab539ca62311a881
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 18 10:40:50 2011 +1000
conf: remove SHM example from fdi
SHM is dead for configuration.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit bc01d6a88ae84a0b1e52b8feb93c168d5120cd58)
diff --git a/conf/11-x11-synaptics.fdi b/conf/11-x11-synaptics.fdi
index 46ad7b9..d191f41 100644
--- a/conf/11-x11-synaptics.fdi
+++ b/conf/11-x11-synaptics.fdi
@@ -6,9 +6,6 @@
<!-- Arbitrary options can be passed to the driver using
the input.x11_options property since xorg-server-1.5. -->
<!-- EXAMPLES:
- Switch on shared memory, enables the driver to be configured at runtime
- <merge key="input.x11_options.SHMConfig" type="string">true</merge>
-
Maximum movement of the finger for detecting a tap
<merge key="input.x11_options.MaxTapMove" type="string">2000</merge>
commit 847131077636bc935e3b4d7c9f1c94e537c3f79b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 18 10:29:37 2011 +1000
man: add short blurb about InputClass configuration in servers 1.8
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 5f546777173dc78146025499d186fe97d31eaeac)
diff --git a/man/synaptics.man b/man/synaptics.man
index f34a82a..07327c5 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -928,6 +928,12 @@ right button, two-finger detection, three-finger detection, pressure detection,
32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter.
.SH "NOTES"
+Configuration through
+.I InputClass
+sections is recommended in X servers 1.8 and later. See xorg.conf.d(5) for
+more details. An example xorg.conf.d snippet is provided in
+.I ${sourcecode}/conf/50-synaptics.conf
+.LP
Configuration through hal fdi files is recommended in X servers 1.5, 1.6 and
1.7. An example hal policy file is provided in
.I ${sourcecode}/conf/11-x11-synaptics.fdi
commit e49d5d07c718df59802ac79511dcfcbd200dd9c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 18 10:26:37 2011 +1000
man: update source path for fdi file and shorten description.
Don't describe what the example config file does in the man page, let the
file speak for itself. Point out that fdi files are for servers 1.5 - 1.7
only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 86cab92b41443a5c9391b3bb20c93d902cf67961)
diff --git a/man/synaptics.man b/man/synaptics.man
index 0a35883..f34a82a 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -928,14 +928,9 @@ right button, two-finger detection, three-finger detection, pressure detection,
32 bit unsigned, 2 values (read-only), vertical, horizontal in units/millimeter.
.SH "NOTES"
-There is an example hal policy file in
-.I ${sourcecode}/fdi/11-x11-synaptics.fdi
-which will enable the driver based on the information if the hardware
-is available. Feel free to copy it to
-.I /etc/hal/fdi/policy
-and customize it to your needs. You can pass custom options to the driver
-using x11_options properties. Note that this requires xorg-server-1.5 or
-higher.
+Configuration through hal fdi files is recommended in X servers 1.5, 1.6 and
+1.7. An example hal policy file is provided in
+.I ${sourcecode}/conf/11-x11-synaptics.fdi
.LP
If either of
.BI "Protocol \*q" auto-dev \*q
commit a62aad0f94498ad7e80ee2408cb3e56860b8ccaf
Author: Christoph Brill <egore911@egore911.de>
Date: Wed Mar 9 23:25:05 2011 +0100
Add note about MatchDevicePath
This question seems to pop up very often. Add a note pointing to Peter's
blog entry describing the details of this misconfiguration.
(cherry picked from commit 0662e1c18122768549e51baf9ce3649c57ff0528)
diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf
index 89bb557..d5da0cb 100644
--- a/conf/50-synaptics.conf
+++ b/conf/50-synaptics.conf
@@ -2,4 +2,8 @@ Section "InputClass"
Identifier "touchpad catchall"
Driver "synaptics"
MatchIsTouchpad "on"
+# This option is recommend on all Linux systems using evdev, but cannot be
+# enabled by default. See the following link for details:
+# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
+# MatchDevicePath "/dev/input/event*"
EndSection
commit f963bc06f42b33e6f4452eab7dc10a4158cb0dd5
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Mon Feb 28 16:38:19 2011 +0500
Fix typo (resx -> resy)
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 3c598daec845ff6ef4ba0769ad78a0d562effe29)
diff --git a/src/synaptics.c b/src/synaptics.c
index 56ce725..a7dd566 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -203,7 +203,7 @@ SynapticsDefaultDimensions(InputInfoPtr pInfo)
{
priv->miny = 1729;
priv->maxy = 4171;
- priv->resx = 0;
+ priv->resy = 0;
xf86Msg(X_PROBED,
"%s: invalid y-axis range. defaulting to %d - %d\n",
Reply to: