xserver-xorg-input-synaptics: Changes to 'debian-unstable'
COMPATIBILITY | 9 +
Makefile | 2
alpscomm.c | 2
debian/changelog | 20 +++
debian/control | 7 -
docs/tapndrag.dia | 318 ++++++++++++++++++++++++++++++++++++++++-----------
eventcomm.c | 44 +++++--
linux_input.h | 11 +
manpages/synaptics.5 | 28 ++++
ps2comm.c | 2
psmcomm.c | 2
synaptics.c | 80 ++++++++++--
synaptics.h | 7 -
synclient.c | 4
synproto.h | 3
15 files changed, 437 insertions(+), 102 deletions(-)
New commits:
commit 8996867e9b7336b716260f6795d5b80176ef9e7d
Author: Mattia Dongili <malattia@linux.it>
Date: Sun May 20 01:21:07 2007 +0900
Fix build dependencies
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/control b/debian/control
index 1c5e710..053e0cc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mattia Dongili <malattia@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, x11proto-core-dev
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, x11proto-core-dev, xserver-xorg-dev (>= 2:1.2.99.902), pkg-config
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
commit 736f0d850dd96b744f296bf3a8e13f2c07aab95e
Author: Mattia Dongili <malattia@linux.it>
Date: Sun May 20 00:52:29 2007 +0900
Added XS-Vcs-* fields
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/control b/debian/control
index 2f3854f..1c5e710 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mattia Dongili <malattia@debian.org>
Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, x11proto-core-dev
Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git
Package: xfree86-driver-synaptics
Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc
commit a822a1a3043e9376e74d46fa6c539a68db79d1f4
Author: Mattia Dongili <malattia@linux.it>
Date: Sun May 20 00:44:45 2007 +0900
Various bug closing due to the new version
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 359c7c6..91528d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,21 @@
xfree86-driver-synaptics (0.14.7~git20070517-1) unstable; urgency=low
- * git snapshot of the driver.
-
+ * git snapshot of the driver:
+ - from commit e6595886d7ae3a1730cd0d9f86fd0f305c0743c2
+ "[...] synaptics, alps and appletouch pads all work approximately
+ identically without requiring model-specific configuration"
+ (Closes: #351621) (Closes: #406499)
+ - from commit 88211ca60be7cc74015ad4158722e5950884bd78
+ "Don't match wacom tablets in the event device probing."
+ (Closes: #383711)
+ - from commit 473912f50ffd2b26bd2f638f9d87f86cf60e2dd6
+ "Add a config option to prevent the driver from grabbing the event
+ device for exclusive use" (Closes: #380705)
+ - from commit 2d06ab1d2b3170b6fa44b945376b2ad4cd682af9
+ "Allow to easily switch between move and scroll"
+ (Closes: #411266)
+ * set Maintaner to the XSF and me as Uploader
+
-- Mattia Dongili <malattia@debian.org> Thu, 17 May 2007 19:34:22 +0900
xfree86-driver-synaptics (0.14.6-2) unstable; urgency=low
commit c688ebfc1a0bed66b2669a9e761778fc95ba6e93
Author: Mattia Dongili <malattia@linux.it>
Date: Sun May 20 00:44:20 2007 +0900
set Maintaner to the XSF and me as Uploader
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/control b/debian/control
index bbd0ac2..2f3854f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: xfree86-driver-synaptics
Section: x11
Priority: optional
-Maintainer: Mattia Dongili <malattia@debian.org>
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Mattia Dongili <malattia@debian.org>
Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, libxi-dev, x11proto-core-dev
Standards-Version: 3.7.2
commit c5a5961edb65c2ab71d94af770741c85e0b4466d
Author: Mattia Dongili <malattia@linux.it>
Date: Sun May 20 00:17:11 2007 +0900
Use FHS compliant manpage dirs
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/Makefile b/Makefile
index 334f012..f953ed8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ VERSION_ID=($(VER_LEVEL_1)*10000+$(VER_LEVEL_2)*100+$(VER_LEVEL_3))
PREFIX ?= /usr/local
BINDIR = $(DESTDIR)$(PREFIX)/bin
-MANDIR = $(DESTDIR)$(PREFIX)/man
+MANDIR = $(DESTDIR)$(PREFIX)/share/man
ifeq ($(ARCH),)
ARCH = $(shell /bin/arch)
commit e7f641b8c6d09b11dd5c93086bbc5a0b135296ea
Author: Peter Osterlund <petero2@telia.com>
Date: Thu May 17 13:31:05 2007 +0200
Document the LockedDragTimeout parameter.
diff --git a/manpages/synaptics.5 b/manpages/synaptics.5
index 4954402..0304cf3 100644
--- a/manpages/synaptics.5
+++ b/manpages/synaptics.5
@@ -239,7 +239,13 @@ Switch on/off guest mouse (often a stick).
\fBLockedDrags\fR (Bool)
If off, a tap and drag gesture ends when you release the finger.
.
-If on, the gesture is active until you tap a second time.
+If on, the gesture is active until you tap a second time, or until
+LockedDragTimeout expires.
+.TP
+\fBLockedDragTimeout\fR (Integer)
+This parameter specifies how long it takes (in milliseconds) for the
+LockedDrags mode to be automatically turned off after the finger is
+released from the touchpad.
.TP
\fBRTCornerButton\fR (Integer)
.
commit adf4851a471963702df28522fa50cc9cab09302a
Author: Peter Osterlund <petero2@telia.com>
Date: Thu May 17 13:14:22 2007 +0200
Update the state machine diagram for locked drag timeout.
diff --git a/docs/tapndrag.dia b/docs/tapndrag.dia
index b50acb3..a411572 100644
--- a/docs/tapndrag.dia
+++ b/docs/tapndrag.dia
@@ -79,6 +79,12 @@
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -97,7 +103,7 @@
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="12.0013,7.89119"/>
+ <dia:point val="12.0013,7.94119"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -124,6 +130,12 @@
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -142,7 +154,7 @@
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="12.0013,14.3985"/>
+ <dia:point val="12.0013,14.4485"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -169,6 +181,12 @@
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -187,7 +205,7 @@
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="5.44128,20.8385"/>
+ <dia:point val="5.44128,20.8885"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -214,6 +232,12 @@
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -232,7 +256,7 @@
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="12.0013,27.993"/>
+ <dia:point val="12.0013,28.043"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -259,6 +283,12 @@
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -277,7 +307,7 @@
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="21.3937,14.3985"/>
+ <dia:point val="21.3937,14.4485"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -304,6 +334,12 @@
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -322,7 +358,7 @@
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="21.3937,27.993"/>
+ <dia:point val="21.3937,28.043"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -571,7 +607,7 @@
<dia:point val="5.49118,39.4412"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="5.44118,39.3912;17.2912,48.3912"/>
+ <dia:rectangle val="5.44118,39.3912;17.2912,49.9912"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="5.49118,39.4412"/>
@@ -580,7 +616,13 @@
<dia:real val="11.75"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="8.9"/>
+ <dia:real val="10.5"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -591,6 +633,7 @@ TO : Tap Timeout
TO2: Mouse click timeout
TO3: Double tap timeout
TO4: Single tap timeout
+TO5: Locked drag timeout
M : Finger movement
[U]: Generate button up event
[D]: Generate button down event
@@ -604,7 +647,7 @@ F : Fast taps enabled#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="5.84118,40.7412"/>
+ <dia:point val="5.84118,40.6912"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -615,12 +658,12 @@ F : Fast taps enabled#</dia:string>
</dia:composite>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O15">
+ <dia:object type="Standard - Text" version="1" id="O15">
<dia:attribute name="obj_pos">
<dia:point val="11.23,10.8357"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="11.055,10.1857;11.405,11.1857"/>
+ <dia:rectangle val="11.055,10.2357;11.405,11.1857"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -644,13 +687,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O16">
+ <dia:object type="Standard - Text" version="1" id="O16">
<dia:attribute name="obj_pos">
<dia:point val="8.4912,23.1912"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.9662,22.5412;9.0162,24.3412"/>
+ <dia:rectangle val="7.9662,22.5912;9.0162,24.3412"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -675,13 +721,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O17">
+ <dia:object type="Standard - Text" version="1" id="O17">
<dia:attribute name="obj_pos">
<dia:point val="17.0662,11.0357"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.8912,10.3857;17.2412,11.3857"/>
+ <dia:rectangle val="16.8912,10.4357;17.2412,11.3857"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -705,6 +754,9 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O18">
<dia:attribute name="obj_pos">
@@ -734,12 +786,12 @@ F : Fast taps enabled#</dia:string>
<dia:connection handle="1" to="O5" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O19">
+ <dia:object type="Standard - Text" version="1" id="O19">
<dia:attribute name="obj_pos">
<dia:point val="13.73,17.0857"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="12.3087,16.4145;15.13,18.2782"/>
+ <dia:rectangle val="12.33,16.4857;15.13,18.2357"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -764,13 +816,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O20">
+ <dia:object type="Standard - Text" version="1" id="O20">
<dia:attribute name="obj_pos">
<dia:point val="5.32686,26.1857"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="4.80186,25.5357;5.85186,27.3357"/>
+ <dia:rectangle val="4.80186,25.5857;5.85186,27.3357"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -795,13 +850,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O21">
+ <dia:object type="Standard - Text" version="1" id="O21">
<dia:attribute name="obj_pos">
<dia:point val="16.3912,13.6912"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.1662,13.0412;17.6162,14.0412"/>
+ <dia:rectangle val="15.1662,13.0912;17.6162,14.0412"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -825,13 +883,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O22">
+ <dia:object type="Standard - Text" version="1" id="O22">
<dia:attribute name="obj_pos">
<dia:point val="16.517,27.1577"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.292,26.5077;17.742,27.5077"/>
+ <dia:rectangle val="15.292,26.5577;17.742,27.5077"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -855,13 +916,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O23">
+ <dia:object type="Standard - Text" version="1" id="O23">
<dia:attribute name="obj_pos">
<dia:point val="1.24118,9.9412"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="0.36618,9.2912;2.11618,11.0912"/>
+ <dia:rectangle val="0.36618,9.3412;2.11618,11.0912"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -886,13 +950,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O24">
+ <dia:object type="Standard - Text" version="1" id="O24">
<dia:attribute name="obj_pos">
<dia:point val="24.4912,17.8412"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="23.4412,17.1912;25.5412,18.9912"/>
+ <dia:rectangle val="23.4412,17.2412;25.5412,18.9912"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -917,6 +984,9 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="UML - Usecase" version="0" id="O25">
<dia:attribute name="obj_pos">
@@ -934,6 +1004,12 @@ F : Fast taps enabled#</dia:string>
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -952,7 +1028,7 @@ F : Fast taps enabled#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="21.3937,33.7412"/>
+ <dia:point val="21.3937,33.7912"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -979,6 +1055,12 @@ F : Fast taps enabled#</dia:string>
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -997,7 +1079,7 @@ F : Fast taps enabled#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="21.3937,39.2912"/>
+ <dia:point val="21.3937,39.3412"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1064,12 +1146,12 @@ F : Fast taps enabled#</dia:string>
<dia:connection handle="1" to="O26" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O29">
+ <dia:object type="Standard - Text" version="1" id="O29">
<dia:attribute name="obj_pos">
- <dia:point val="19.8108,30.5912"/>
+ <dia:point val="20.15,30.7875"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="18.9358,29.9412;20.6858,30.9412"/>
+ <dia:rectangle val="19.275,30.1687;21.0438,31.175"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1083,7 +1165,7 @@ F : Fast taps enabled#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="19.8108,30.5912"/>
+ <dia:point val="20.15,30.7875"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1093,13 +1175,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O30">
+ <dia:object type="Standard - Text" version="1" id="O30">
<dia:attribute name="obj_pos">
<dia:point val="20.7108,36.3412"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="20.5358,35.6912;20.8858,36.6912"/>
+ <dia:rectangle val="20.5358,35.7412;20.8858,36.6912"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1123,13 +1208,16 @@ F : Fast taps enabled#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O31">
+ <dia:object type="Standard - Text" version="1" id="O31">
<dia:attribute name="obj_pos">
- <dia:point val="26.1108,32.1912"/>
+ <dia:point val="16.7608,32.1912"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="25.7608,31.5412;26.4608,34.1412"/>
+ <dia:rectangle val="16.392,31.5724;17.1108,34.1787"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1145,7 +1233,7 @@ M#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="26.1108,32.1912"/>
+ <dia:point val="16.7608,32.1912"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1155,19 +1243,22 @@ M#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O32">
<dia:attribute name="obj_pos">
- <dia:point val="22.5427,38.3341"/>
+ <dia:point val="20.2447,38.3341"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="22.0277,27.7765;25.0443,38.4047"/>
+ <dia:rectangle val="17.4488,27.7324;20.6882,38.4036"/>
</dia:attribute>
<dia:attribute name="bez_points">
- <dia:point val="22.5427,38.3341"/>
- <dia:point val="25.9687,35.2912"/>
- <dia:point val="25.6503,30.7412"/>
- <dia:point val="22.5427,28.4501"/>
+ <dia:point val="20.2447,38.3341"/>
+ <dia:point val="17.1,36.1875"/>
+ <dia:point val="16.101,30.8446"/>
+ <dia:point val="20.2447,28.4501"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
@@ -1183,8 +1274,8 @@ M#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O26" connection="2"/>
- <dia:connection handle="3" to="O5" connection="7"/>
+ <dia:connection handle="0" to="O26" connection="0"/>
+ <dia:connection handle="3" to="O5" connection="5"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O33">
@@ -1192,13 +1283,13 @@ M#</dia:string>
<dia:point val="23.0187,39.0412"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="12.9799,6.13572;30.4965,39.1017"/>
+ <dia:rectangle val="11.7002,5.51197;30.2716,39.1017"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="23.0187,39.0412"/>
<dia:point val="32.7991,36.6412"/>
- <dia:point val="35.9857,3.44119"/>
- <dia:point val="13.1503,6.93408"/>
+ <dia:point val="35.6,-1.25"/>
+ <dia:point val="12.0013,6.64119"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
@@ -1215,15 +1306,15 @@ M#</dia:string>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O26" connection="4"/>
- <dia:connection handle="3" to="O0" connection="2"/>
+ <dia:connection handle="3" to="O0" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O34">
+ <dia:object type="Standard - Text" version="1" id="O34">
<dia:attribute name="obj_pos">
- <dia:point val="29.4412,22.8412"/>
+ <dia:point val="31.1912,22.9412"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="28.9162,22.1912;29.9662,23.9912"/>
+ <dia:rectangle val="30.6662,22.3224;31.735,24.1287"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1238,7 +1329,7 @@ M#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="29.4412,22.8412"/>
+ <dia:point val="31.1912,22.9412"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1248,6 +1339,9 @@ M#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="UML - Usecase" version="0" id="O35">
<dia:attribute name="obj_pos">
@@ -1265,6 +1359,12 @@ M#</dia:string>
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
</dia:attribute>
@@ -1283,7 +1383,7 @@ M#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="12.0013,20.8885"/>
+ <dia:point val="12.0013,20.9385"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1299,16 +1399,22 @@ M#</dia:string>
<dia:point val="3.36628,12.7652"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="3.36628,12.7652;7.06628,15.2319"/>
+ <dia:rectangle val="3.36628,12.7652;7.36628,15.4319"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="3.36628,12.7652"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="3.7"/>
+ <dia:real val="4"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="2.46667"/>
+ <dia:real val="2.666666666666667"/>
+ </dia:attribute>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_colour">
+ <dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="text_outside">
<dia:boolean val="false"/>
@@ -1329,7 +1435,7 @@ Tap#</dia:string>
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="5.21628,13.8485"/>
+ <dia:point val="5.36628,13.9985"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -1340,12 +1446,12 @@ Tap#</dia:string>
</dia:composite>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O37">
+ <dia:object type="Standard - Text" version="1" id="O37">
<dia:attribute name="obj_pos">
<dia:point val="8.11628,16.7357"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="6.54128,16.0645;9.71253,18.7282"/>
+ <dia:rectangle val="6.54128,16.1357;9.69128,18.6857"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1371,6 +1477,9 @@ Tap#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O38">
<dia:attribute name="obj_pos">
@@ -1400,12 +1509,12 @@ Tap#</dia:string>
<dia:connection handle="1" to="O3" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O39">
+ <dia:object type="Standard - Text" version="1" id="O39">
<dia:attribute name="obj_pos">
<dia:point val="12.8407,23.2357"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="12.3157,22.5645;13.387,24.4282"/>
+ <dia:rectangle val="12.3157,22.6357;13.3657,24.3857"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1430,6 +1539,9 @@ Tap#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O40">
<dia:attribute name="obj_pos">
@@ -1459,12 +1571,12 @@ Tap#</dia:string>
<dia:connection handle="1" to="O0" connection="5"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O41">
+ <dia:object type="Standard - Text" version="1" id="O41">
<dia:attribute name="obj_pos">
<dia:point val="7.37686,9.76072"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="6.85186,9.11072;7.90186,10.9107"/>
+ <dia:rectangle val="6.85186,9.16072;7.90186,10.9107"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1489,6 +1601,9 @@ Tap#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O42">
<dia:attribute name="obj_pos">
@@ -1518,12 +1633,12 @@ Tap#</dia:string>
<dia:connection handle="1" to="O1" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="0" id="O43">
+ <dia:object type="Standard - Text" version="1" id="O43">
<dia:attribute name="obj_pos">
<dia:point val="8.77686,12.9857"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="8.25186,12.3357;9.30186,14.1357"/>
+ <dia:rectangle val="8.25186,12.3857;9.30186,14.1357"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -1548,6 +1663,9 @@ Tap#</dia:string>
</dia:attribute>
</dia:composite>
</dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
</dia:object>
<dia:object type="Standard - Arc" version="0" id="O44">
<dia:attribute name="obj_pos">
@@ -1577,5 +1695,69 @@ Tap#</dia:string>
<dia:connection handle="1" to="O36" connection="6"/>
</dia:connections>
</dia:object>
+ <dia:object type="Standard - BezierLine" version="0" id="O45">
+ <dia:attribute name="obj_pos">
+ <dia:point val="22.5427,32.7841"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="13.0488,6.13252;28.0767,32.8535"/>
+ </dia:attribute>
+ <dia:attribute name="bez_points">
+ <dia:point val="22.5427,32.7841"/>
+ <dia:point val="34.574,14.9804"/>
+ <dia:point val="24.7,6.1875"/>
+ <dia:point val="13.1503,6.93408"/>
+ </dia:attribute>
+ <dia:attribute name="corner_types">
+ <dia:enum val="0"/>
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:connections>
+ <dia:connection handle="0" to="O25" connection="2"/>
+ <dia:connection handle="3" to="O0" connection="2"/>
+ </dia:connections>
+ </dia:object>
+ <dia:object type="Standard - Text" version="1" id="O46">
+ <dia:attribute name="obj_pos">
+ <dia:point val="26.2,27.525"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="26.2,26.9063;27.3188,27.9125"/>
+ </dia:attribute>
+ <dia:attribute name="text">
+ <dia:composite type="text">
+ <dia:attribute name="string">
+ <dia:string>#TO5#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="font">
+ <dia:font family="sans" style="0" name="Helvetica"/>
+ </dia:attribute>
+ <dia:attribute name="height">
+ <dia:real val="0.8"/>
+ </dia:attribute>
+ <dia:attribute name="pos">
+ <dia:point val="26.2,27.525"/>
+ </dia:attribute>
+ <dia:attribute name="color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="alignment">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="valign">
+ <dia:enum val="3"/>
+ </dia:attribute>
+ </dia:object>
</dia:layer>
</dia:diagram>
commit 7bd1b53f8e2de13436b9f71196b4b69a969a2b9f
Author: Florian Loitsch <synaptics@florian.loitsch.com>
Date: Thu May 17 13:10:30 2007 +0200
Add a timeout to locked drags.
Instead of locking indefinitely, dragging is realeased after a
timeout. By default I've set it to 5 seconds to minimize changes to
previous configurations. For me a value of 450ms works best.
New Parameter: LockedDragTimeout
diff --git a/synaptics.c b/synaptics.c
index 6b0236a..d65dbd1 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -442,6 +442,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pars->touchpad_off = xf86SetIntOption(opts, "TouchpadOff", 0);
pars->guestmouse_off = xf86SetBoolOption(opts, "GuestMouseOff", FALSE);
pars->locked_drags = xf86SetBoolOption(opts, "LockedDrags", FALSE);
+ pars->locked_drag_time = xf86SetIntOption(opts, "LockedDragTimeout", 5000);
pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 2);
pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 3);
pars->tap_action[LT_TAP] = xf86SetIntOption(opts, "LTCornerButton", 0);
Reply to: