xserver-xorg-input-synaptics: Changes to 'debian-unstable'
.gitignore | 26
COMPATIBILITY | 309 -
COPYING | 37
ChangeLog | 21
FILES | 13
INSTALL | 58
INSTALL.DE | 103
INSTALL.FR | 105
LICENSE | 280 -
Makefile | 177
Makefile.am | 26
NEWS | 9
README | 104
README.alps | 77
TODO | 1
Xincludes/README.xincludes | 1
Xincludes/usr/X11R6/include/X11/Xalloca.h | 138
Xincludes/usr/X11R6/include/X11/Xdefs.h | 110
Xincludes/usr/X11R6/include/X11/Xfuncproto.h | 80
Xincludes/usr/X11R6/include/X11/Xfuncs.h | 92
Xincludes/usr/X11R6/include/X11/extensions/XI.h | 275 -
Xincludes/usr/X11R6/include/X11/extensions/XIproto.h | 1530 -------
Xincludes/usr/X11R6/lib/Server/include/XIstubs.h | 101
Xincludes/usr/X11R6/lib/Server/include/bstore.h | 23
Xincludes/usr/X11R6/lib/Server/include/bstorestr.h | 75
Xincludes/usr/X11R6/lib/Server/include/colormap.h | 235 -
Xincludes/usr/X11R6/lib/Server/include/cursor.h | 156
Xincludes/usr/X11R6/lib/Server/include/dix.h | 1096 -----
Xincludes/usr/X11R6/lib/Server/include/dixstruct.h | 267 -
Xincludes/usr/X11R6/lib/Server/include/gc.h | 232 -
Xincludes/usr/X11R6/lib/Server/include/globals.h | 52
Xincludes/usr/X11R6/lib/Server/include/input.h | 535 --
Xincludes/usr/X11R6/lib/Server/include/inputstr.h | 317 -
Xincludes/usr/X11R6/lib/Server/include/mipointer.h | 162
Xincludes/usr/X11R6/lib/Server/include/misc.h | 282 -
Xincludes/usr/X11R6/lib/Server/include/miscstruct.h | 73
Xincludes/usr/X11R6/lib/Server/include/opaque.h | 81
Xincludes/usr/X11R6/lib/Server/include/os.h | 856 ---
Xincludes/usr/X11R6/lib/Server/include/pixmap.h | 123
Xincludes/usr/X11R6/lib/Server/include/pixmapstr.h | 83
Xincludes/usr/X11R6/lib/Server/include/property.h | 83
Xincludes/usr/X11R6/lib/Server/include/propertyst.h | 76
Xincludes/usr/X11R6/lib/Server/include/region.h | 53
Xincludes/usr/X11R6/lib/Server/include/regionstr.h | 437 --
Xincludes/usr/X11R6/lib/Server/include/resource.h | 326 -
Xincludes/usr/X11R6/lib/Server/include/screenint.h | 170
Xincludes/usr/X11R6/lib/Server/include/scrnintstr.h | 996 ----
Xincludes/usr/X11R6/lib/Server/include/validate.h | 42
Xincludes/usr/X11R6/lib/Server/include/window.h | 362 -
Xincludes/usr/X11R6/lib/Server/include/xf86.h | 389 -
Xincludes/usr/X11R6/lib/Server/include/xf86Module.h | 197
Xincludes/usr/X11R6/lib/Server/include/xf86Opt.h | 82
Xincludes/usr/X11R6/lib/Server/include/xf86Version.h | 31
Xincludes/usr/X11R6/lib/Server/include/xf86Xinput.h | 191
Xincludes/usr/X11R6/lib/Server/include/xf86_OSproc.h | 266 -
Xincludes/usr/X11R6/lib/Server/include/xf86_ansic.h | 342 -
Xincludes/usr/X11R6/lib/Server/include/xf86_libc.h | 658 ---
Xincludes/usr/X11R6/lib/Server/include/xf86str.h | 994 ----
Xincludes/usr/X11R6/lib/Server/include/xisb.h | 64
Xincludes/usr/X11R6/lib64 | 1
alps.patch | 561 --
alpscomm.c | 253 -
alpscomm.h | 27
autogen.sh | 12
configure.ac | 108
debian/11-x11-synaptics.fdi | 16
debian/changelog | 61
debian/control | 17
debian/copyright | 47
debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch | 10
debian/patches/02-scandir-dev-input.patch | 113
debian/patches/03-escape-dashes-in-manpages.patch | 13
debian/patches/04-delibcwrap.patch | 159
debian/patches/05-Fix-crash-on-kernels-with-extended-keymap-space.patch | 48
debian/patches/series | 4
debian/rules | 104
debian/watch | 2
debian/xfree86-driver-synaptics.README.Debian | 7
debian/xserver-xorg-input-synaptics.README.Debian | 11
debian/xserver-xorg-input-synaptics.dirs | 2
debian/xserver-xorg-input-synaptics.docs | 8
debian/xserver-xorg-input-synaptics.install | 3
debian/xserver-xorg-input-synaptics.manpages | 2
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 104
debian/xsfbs/xsfbs.sh | 405 -
docs/README.alps | 77
docs/trouble-shooting.txt | 152
eventcomm.c | 318 -
eventcomm.h | 28
fdi/11-x11-synaptics.fdi | 31
fdi/Makefile.am | 21
freebsd_mouse.h | 55
include/Makefile.am | 23
include/synaptics-properties.h | 145
include/synaptics.h | 157
linux_input.h | 82
man/Makefile.am | 68
man/synaptics.man | 829 +++
man/synclient.man | 142
man/syndaemon.man | 78
manpages/synaptics.5 | 587 --
manpages/synclient.1 | 135
manpages/syndaemon.1 | 66
pc_keyb.c.diff.2.4.3 | 57
ps2comm.c | 751 ---
ps2comm.h | 82
psmcomm.c | 171
psmcomm.h | 8
script/usbhid | 43
script/usbmouse | 18
src/Makefile.am | 48
src/alpscomm.c | 268 +
src/alpscomm.h | 33
src/eventcomm.c | 423 +
src/eventcomm.h | 36
src/properties.c | 597 ++
src/ps2comm.c | 764 +++
src/ps2comm.h | 103
src/psmcomm.c | 183
src/psmcomm.h | 29
src/synaptics.c | 2185 ++++++++++
src/synapticsstr.h | 151
src/synproto.h | 112
synaptics.c | 2018 ---------
synaptics.h | 253 -
synaptics.spec | 59
synclient.c | 353 -
syndaemon.c | 320 -
synproto.h | 95
tools/Makefile.am | 31
tools/synclient.c | 762 +++
tools/syndaemon.c | 646 ++
trouble-shooting.txt | 152
xorg-synaptics.pc.in | 6
136 files changed, 8792 insertions(+), 21319 deletions(-)
New commits:
commit 765ff122693f4a1793fa1deb789866fbcdcbcdc2
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 9 01:34:42 2009 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index e5d50c9..b037995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-input-synaptics (1.1.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.1.0-1) unstable; urgency=low
* New upstream release.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Thu, 09 Apr 2009 01:32:18 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Apr 2009 01:34:19 +0100
xserver-xorg-input-synaptics (0.99.3-3) experimental; urgency=low
commit e03bae7aeb0e56c0f709cd858b3767de55528a36
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 9 01:32:57 2009 +0100
update changelog
diff --git a/debian/changelog b/debian/changelog
index 79fbc21..e5d50c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Apr 2009 01:32:18 +0100
+
xserver-xorg-input-synaptics (0.99.3-3) experimental; urgency=low
[ Julien Cristau ]
commit 82de65f8304ba896e17ce16099632d367a2a596f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 9 11:47:06 2009 +1000
synaptics 1.1.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 2131f47..df11400 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-synaptics],
- 1.0.99.4,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-synaptics)
commit a0a0475b39a1abb67bfcc34723a222799132a33d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 9 11:38:00 2009 +1000
man: remove some pointless ( and ) around "float" options.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/synaptics.man b/man/synaptics.man
index fd6a4be..b18fb8d 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -199,14 +199,14 @@ Motion Always"
.BI "Option \*qMinSpeed\*q \*q" float \*q
Minimum speed factor. Property: "Synaptics Move Speed"
.TP
-.BI "Option \*qMaxSpeed\fR (\*q \*q" float \*q)
+.BI "Option \*qMaxSpeed\*q \*q" float \*q
Maximum speed factor. Property: "Synaptics Move Speed"
.TP
-.BI "Option \*qAccelFactor\fR (\*q \*q" float \*q)
+.BI "Option \*qAccelFactor\*q \*q" float \*q
Acceleration factor for normal pointer movements. Property: "Synaptics Move
Speed"
.TP
-.BI "Option \*qTrackstickSpeed\fR (\*q \*q" float \*q)
+.BI "Option \*qTrackstickSpeed\*q \*q" float \*q
Speed scale when in trackstick emulation mode. Property: "Synaptics Move Speed"
.TP
.BI "Option \*qPressureMotionMinZ\*q \*q" integer \*q
@@ -348,7 +348,7 @@ Set to 0 to disable. Property: "Synaptics Click Action"
.BI "Option \*qCircularScrolling\*q \*q" boolean \*q
If on, circular scrolling is used. Property: "Synaptics Circular Scrolling"
.TP
-.BI "Option \*qCircScrollDelta\fR (\*q \*q" float \*q)
+.BI "Option \*qCircScrollDelta\*q \*q" float \*q
Move angle (radians) of finger to generate a scroll event. Property: "Synaptics
Circular Scrolling Distance"
.TP
@@ -389,7 +389,7 @@ Palm Dimensions"
Minimum finger pressure at which touch is considered a palm. Property:
"Synaptics Palm Dimensions"
.TP
-.BI "Option \*qCoastingSpeed\fR (\*q \*q" float \*q)
+.BI "Option \*qCoastingSpeed\*q \*q" float \*q
Coasting threshold scrolling speed.
.
0 disables coasting. Property: "Synaptics Coasting Speed"
commit 5acb71723a7fe837f7312adb5b8320dda87649f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 9 11:28:02 2009 +1000
man: device properties are now supported, should be stated as such.
This includes listing supported properties and de-emphasizing the need for
SHM.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/synaptics.man b/man/synaptics.man
index a6f9e95..fd6a4be 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -68,9 +68,6 @@ taps for example.)
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
section only covers configuration details specific to this driver.
-.
-If you have the SHMConfig parameter enabled, these parameters can also
-be changed at runtime with the synclient(1) program.
.PP
The following driver
.B Options
@@ -93,23 +90,24 @@ psm FreeBSD psm driver
.TE
.TP 7
.BI "Option \*qSHMConfig\*q \*q" boolean \*q
-Switch on/off shared memory for configuration. This enables the driver to be
-configured at runtime. Note that this is considered a security risk since any
-user can access the configuration.
+Switch on/off shared memory for run-time configuration. Note that this is
+considered a security risk since any user can access the configuration. This
+option is not needed with synaptics 1.0 or later. See section
+.B Device Properties.
.TP 7
.BI "Option \*qLeftEdge\*q \*q" integer \*q
-X coordinate for left edge.
+X coordinate for left edge. Property: "Synaptics Edges"
.TP 7
.BI "Option \*qRightEdge\*q \*q" integer \*q
X coordinate for right edge. If this option is set,
.BI SpecialScrollAreaRight
-is ignored.
+is ignored. Property: "Synaptics Edges"
.TP 7
.BI "Option \*qTopEdge\*q \*q" integer \*q
-Y coordinate for top edge.
+Y coordinate for top edge. Property: "Synaptics Edges"
.TP 7
.BI "Option \*qBottomEdge\*q \*q" integer \*q
-Y coordinate for bottom edge.
+Y coordinate for bottom edge. Property: "Synaptics Edges"
.TP 7
.BI "Option \*qSpecialScrollAreaRight\*q \*q" boolean \*q
Some touchpads have a scroll region on the right edge. Disable this option if
@@ -117,135 +115,157 @@ you have one but don't want use it as scroll wheel region.
.TP 7
.BI "Option \*qFingerLow\*q \*q" integer \*q
When finger pressure drops below this value, the driver counts it as a
-release.
+release. Property: "Synaptics Finger"
.TP 7
.BI "Option \*qFingerHigh\*q \*q" integer \*q
When finger pressure goes above this value, the driver counts it as a
-touch.
+touch. Property: "Synaptics Finger"
.TP 7
.BI "Option \*qFingerPress\*q \*q" integer \*q
When finger pressure goes above this value, the driver counts it as a
press.
.
Currently a press is equivalent to putting the touchpad in trackstick
-emulation mode.
+emulation mode. Property: "Synaptics Finger"
.TP 7
.BI "Option \*qMaxTapTime\*q \*q" integer \*q
-Maximum time (in milliseconds) for detecting a tap.
+Maximum time (in milliseconds) for detecting a tap. Property: "Synaptics Tap
+Durations"
.TP 7
.BI "Option \*qBMaxTapMove\*q \*q" integer \*q
-Maximum movement of the finger for detecting a tap.
+Maximum movement of the finger for detecting a tap. Property: "Synaptics Tap
+Move"
.TP 7
.BI "Option \*qMaxDoubleTapTime\*q \*q" integer \*q
-Maximum time (in milliseconds) for detecting a double tap.
+Maximum time (in milliseconds) for detecting a double tap. Property:
+"Synaptics Tap Durations"
.TP 7
.BI "Option \*qClickTime\*q \*q" integer \*q
-The duration of the mouse click generated by tapping.
+The duration of the mouse click generated by tapping. Property: "Synaptics Tap
+Durations"
.TP 7
.BI "Option \*qFastTaps\*q \*q" boolean \*q
Makes the driver react faster to a single tap, but also makes double
-clicks caused by double tapping slower.
+clicks caused by double tapping slower. Property: "Synaptics Tap FastTap"
.TP 7
.BI "Option \*qVertEdgeScroll\*q \*q" boolean \*q
-Enable vertical scrolling when dragging along the right edge.
+Enable vertical scrolling when dragging along the right edge. Property:
+"Synaptics Edge Scrolling"
.TP 7
.BI "Option \*qHorizEdgeScroll\*q \*q" boolean \*q
-Enable horizontal scrolling when dragging along the bottom edge.
+Enable horizontal scrolling when dragging along the bottom edge. Property:
+"Synaptics Edge Scrolling"
.TP 7
.BI "Option \*qCornerCoasting\*q \*q" boolean \*q
Enable edge scrolling to continue while the finger stays in an edge corner.
+Property: "Synaptics Edge Scrolling"
.TP 7
.BI "Option \*qVertTwoFingerScroll\*q \*q" boolean \*q
Enable vertical scrolling when dragging with two fingers anywhere on
-the touchpad.
+the touchpad. Property: "Synaptics Two-Finger Scrolling"
.TP 7
.BI "Option \*qHorizTwoFingerScroll\*q \*q" boolean \*q
Enable horizontal scrolling when dragging with two fingers anywhere on
-the touchpad.
+the touchpad. Property: "Synaptics Two-Finger Scrolling"
.TP 7
.BI "Option \*qVertScrollDelta\*q \*q" integer \*q
-Move distance of the finger for a scroll event.
+Move distance of the finger for a scroll event. Property: "Synaptics Scrolling
+Distance"
.TP 7
.BI "Option \*qHorizScrollDelta\*q \*q" integer \*q
-Move distance of the finger for a scroll event.
+Move distance of the finger for a scroll event. Property: "Synaptics Scrolling
+Distance"
.TP 7
.BI "Option \*qEdgeMotionMinZ\*q \*q" integer \*q
-Finger pressure at which minimum edge motion speed is set.
+Finger pressure at which minimum edge motion speed is set. Property:
+"Synaptics Edge Motion Pressure"
.TP
.BI "Option \*qEdgeMotionMaxZ\*q \*q" integer \*q
-Finger pressure at which maximum edge motion speed is set.
+Finger pressure at which maximum edge motion speed is set. Property:
+"Synaptics Edge Motion Pressure"
.TP
.BI "Option \*qEdgeMotionMinSpeed\*q \*q" integer \*q
-Slowest setting for edge motion speed.
+Slowest setting for edge motion speed. Property: "Synaptics Edge Motion Speed"
.TP
.BI "Option \*qEdgeMotionMaxSpeed\*q \*q" integer \*q
-Fastest setting for edge motion speed.
+Fastest setting for edge motion speed. Property: "Synaptics Edge Motion Speed"
.TP
.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.
+If off, egde motion is used only when dragging. Property: "Synaptics Edge
+Motion Always"
.TP
.BI "Option \*qMinSpeed\*q \*q" float \*q
-Minimum speed factor.
+Minimum speed factor. Property: "Synaptics Move Speed"
.TP
.BI "Option \*qMaxSpeed\fR (\*q \*q" float \*q)
-Maximum speed factor.
+Maximum speed factor. Property: "Synaptics Move Speed"
.TP
.BI "Option \*qAccelFactor\fR (\*q \*q" float \*q)
-Acceleration factor for normal pointer movements.
+Acceleration factor for normal pointer movements. Property: "Synaptics Move
+Speed"
.TP
.BI "Option \*qTrackstickSpeed\fR (\*q \*q" float \*q)
-Speed scale when in trackstick emulation mode.
+Speed scale when in trackstick emulation mode. Property: "Synaptics Move Speed"
.TP
.BI "Option \*qPressureMotionMinZ\*q \*q" integer \*q
-Finger pressure at which minimum pressure motion factor is applied.
+Finger pressure at which minimum pressure motion factor is applied. Property:
+"Synaptics Pressure Motion"
.TP
.BI "Option \*qPressureMotionMaxZ\*q \*q" integer \*q
-Finger pressure at which maximum pressure motion factor is applied.
+Finger pressure at which maximum pressure motion factor is applied. Property:
+"Synaptics Pressure Motion"
.TP
.BI "Option \*qPressureMotionMinFactor\*q \*q" integer \*q
-Lowest setting for pressure motion factor.
+Lowest setting for pressure motion factor. Property: "Synaptics Pressure
+Motion Factor"
.TP
.BI "Option \*qPressureMotionMaxFactor\*q \*q" integer \*q
-Greatest setting for pressure motion factor.
+Greatest setting for pressure motion factor. Property: "Synaptics Pressure
+Motion Factor"
.TP
.BI "Option \*qUpDownScrolling\*q \*q" boolean \*q
If on, the up/down buttons generate button 4/5 events.
.
If off, the up button generates a double click and the down button
-generates a button 2 event.
+generates a button 2 event. Property: "Synaptics Button Scrolling"
.TP
.BI "Option \*qLeftRightScrolling\*q \*q" boolean \*q
If on, the left/right buttons generate button 6/7 events.
.
-If off, the left/right buttons both generate button 2 events.
+If off, the left/right buttons both generate button 2 events. Property:
+"Synaptics Button Scrolling"
.TP
.BI "Option \*qUpDownScrollRepeat\*q \*q" boolean \*q
If on, and the up/down buttons are used for scrolling
(\fBUpDownScrolling\fR), these buttons will send auto-repeating 4/5 events,
with the delay between repeats determined by \fBScrollButtonRepeat\fR.
+Property: "Synaptics Button Scrolling Repeat"
.TP
.BI "Option \*qLeftRightScrollRepeat\*q \*q" boolean \*q
If on, and the left/right buttons are used for scrolling
(\fBLeftRightScrolling\fR), these buttons will send auto-repeating 6/7 events,
with the delay between repeats determined by \fBScrollButtonRepeat\fR.
+Property: "Synaptics Button Scrolling Repeat"
.TP
.BI "Option \*qScrollButtonRepeat\*q \*q" integer \*q
The number of milliseconds between repeats of button events 4-7 from the
-up/down/left/right scroll buttons.
+up/down/left/right scroll buttons. Property: "Synaptics Button Scrolling Time"
.TP
.BI "Option \*qEmulateMidButtonTime\*q \*q" integer \*q
-Maximum time (in milliseconds) for middle button emulation.
+Maximum time (in milliseconds) for middle button emulation. Property:
+"Synaptics Middle Button Timeout"
.TP
.BI "Option \*qEmulateTwoFingerMinZ\*q \*q" integer \*q
For touchpads not capable of detecting multiple fingers (Alps), this sets the
-Z pressure threshold to emulate a two finger press.
+Z pressure threshold to emulate a two finger press. Property: "Synaptics
+Two-Finger Pressure"
.TP
.BI "Option \*qEmulateTwoFingerMinW\*q \*q" integer \*q
Some touchpads report a two-finger touch as wide finger. This sets the finger
width threshold to emulate a two finger press. This feature works best with
-(\fBPalmDetect\fR) off.
+(\fBPalmDetect\fR) off. Property: "Synaptics Two-Finger Width"
.TP
.BI "Option \*qTouchpadOff\*q \*q" integer \*q
Switch off the touchpad.
@@ -257,77 +277,80 @@ l l.
1 Touchpad is switched off
2 Only tapping and scrolling is switched off
.TE
+Property: "Synaptics Off"
.TP
.BI "Option \*qGuestMouseOff\*q \*q" boolean \*q
-Switch on/off guest mouse (often a stick).
+Switch on/off guest mouse (often a stick). Property: "Synaptics Guestmouse
+Off"
.TP
.BI "Option \*qLockedDrags\*q \*q" boolean \*q
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, or until
-LockedDragTimeout expires.
+LockedDragTimeout expires. Property: "Synaptics Locked Drags"
.TP
.BI "Option \*qLockedDragTimeout\*q \*q" integer \*q
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.
+released from the touchpad. Property: "Synaptics Locked Drags Timeout"
.TP
.BI "Option \*qRTCornerButton\*q \*q" integer \*q
.
Which mouse button is reported on a right top corner tap.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Tap Action"
.TP
.BI "Option \*qRBCornerButton\*q \*q" integer \*q
Which mouse button is reported on a right bottom corner tap.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Tap Action"
.TP
.BI "Option \*qLTCornerButton\*q \*q" integer \*q
Which mouse button is reported on a left top corner tap.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Tap Action"
.TP
.BI "Option \*qLBCornerButton\*q \*q" integer \*q
Which mouse button is reported on a left bottom corner tap.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Tap Action"
.TP
.BI "Option \*qTapButton1\*q \*q" integer \*q
Which mouse button is reported on a non-corner one-finger tap.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Tap Action"
.TP
.BI "Option \*qTapButton2\*q \*q" integer \*q
Which mouse button is reported on a non-corner two-finger tap.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Tap Action"
.TP
.BI "Option \*qTapButton3\*q \*q" integer \*q
Which mouse button is reported on a non-corner three-finger tap.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Tap Action"
.TP
.BI "Option \*qClickFinger1\*q \*q" integer \*q
Which mouse button is reported when left-clicking with one finger.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Click Action"
.TP
.BI "Option \*qClickFinger2\*q \*q" integer \*q
Which mouse button is reported when left-clicking with two fingers.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Click Action"
.TP
.BI "Option \*qClickFinger3\*q \*q" integer \*q
Which mouse button is reported when left-clicking with three fingers.
.
-Set to 0 to disable.
+Set to 0 to disable. Property: "Synaptics Click Action"
.TP
.BI "Option \*qCircularScrolling\*q \*q" boolean \*q
-If on, circular scrolling is used.
+If on, circular scrolling is used. Property: "Synaptics Circular Scrolling"
.TP
.BI "Option \*qCircScrollDelta\fR (\*q \*q" float \*q)
-Move angle (radians) of finger to generate a scroll event.
+Move angle (radians) of finger to generate a scroll event. Property: "Synaptics
+Circular Scrolling Distance"
.TP
.BI "Option \*qCircScrollTrigger\*q \*q" integer \*q
Trigger region on the touchpad to start circular scrolling
@@ -343,33 +366,37 @@ l l.
7 Left Edge
8 Top Left Corner
.TE
+Property: "Synaptics Circular Scrolling Trigger"
.TP
.BI "Option \*qCircularPad\*q \*q" boolean \*q
.
Instead of being a rectangle, the edge is the ellipse enclosed by the
Left/Right/Top/BottomEdge parameters.
.
-For circular touchpads.
+For circular touchpads. Property: "Synaptics Circular Pad"
.TP
.BI "Option \*qPalmDetect\*q \*q" boolean \*q
If palm detection should be enabled.
.
Note that this also requires hardware/firmware support from the
-touchpad.
+touchpad. Property: "Synaptics Palm Detection"
.TP
.BI "Option \*qPalmMinWidth\*q \*q" integer \*q
-Minimum finger width at which touch is considered a palm.
+Minimum finger width at which touch is considered a palm. Property: "Synaptics
+Palm Dimensions"
.TP
.BI "Option \*qPalmMinZ\*q \*q" integer \*q
-Minimum finger pressure at which touch is considered a palm.
+Minimum finger pressure at which touch is considered a palm. Property:
+"Synaptics Palm Dimensions"
.TP
.BI "Option \*qCoastingSpeed\fR (\*q \*q" float \*q)
Coasting threshold scrolling speed.
.
-0 disables coasting.
+0 disables coasting. Property: "Synaptics Coasting Speed"
.TP
.BI "Option \*qSingleTapTimeout\*q \*q" integer \*q
-Timeout after a tap to recognize it as a single tap.
+Timeout after a tap to recognize it as a single tap. Property: "Synaptics Tap
+Durations"
.TP
.BI "Option \*qGrabEventDevice\*q \*q" boolean \*q
If GrabEventDevice is true, the driver will grab the event device for
@@ -614,6 +641,158 @@ and finger movement distance.
Trackstick mode is exited when the finger pressure drops below
FingerLow or when the finger is moved further than MaxTapMove away
from the initial position.
+
+.SH "DEVICE PROPERTIES"
+Synaptics 1.0 and higher support input device properties if the driver is
+running on X server 1.6 or higher. On these driver versions, Option
+"SHMConfig" is not needed to enable run-time configuration. The synclient tool
+shipped with synaptics version 1.1 uses input device properties by default.
+.
+Properties supported:
+.TP 7
+.BI "Synaptics Edges"
+32 bit, 4 values, left, right, top, bottom.
+
+.TP 7
+.BI "Synaptics Finger"
+32 bit, 3 values, low, high, press.
+
+.TP 7
+.BI "Synaptics Tap Time"
+32 bit.
+
+.TP 7
+.BI "Synaptics Tap Move"
+32 bit.
+
+.TP 7
+.BI "Synaptics Tap Durations"
+32 bit, 3 values, single touch timeout, max tapping time for double taps,
+duration of a single click.
+
+.TP 7
+.BI "Synaptics Tap FastTap"
+8 bit (BOOL).
+
+.TP 7
+.BI "Synaptics Middle Button Timeout"
+32 bit.
+
+.TP 7
+.BI "Synaptics Two-Finger Pressure"
+32 bit.
+
+.TP 7
+.BI "Synaptics Two-Finger Width"
+32 bit.
+
+.TP 7
+.BI "Synaptics Scrolling Distance"
+32 bit, 2 values, vert, horiz.
+
+.TP 7
+.BI "Synaptics Edge Scrolling"
+8 bit (BOOL), 3 values, vertical, horizontal, corner.
+
+.TP 7
+.BI "Synaptics Two-Finger Scrolling"
+8 bit (BOOL), 2 values, vertical, horizontal.
+
+.TP 7
+.BI "Synaptics Move Speed"
+FLOAT, 4 values, min, max, accel, trackstick.
+
+.TP 7
+.BI "Synaptics Edge Motion Pressure"
+32 bit, 2 values, min, max.
+
+.TP 7
+.BI "Synaptics Edge Motion Speed"
+32 bit, 2 values, min, max.
+
+.TP 7
+.BI "Synaptics Edge Motion Always"
+8 bit (BOOL).
+
+.TP 7
+.BI "Synaptics Button Scrolling"
+8 bit (BOOL), 2 values, updown, leftright.
+
+.TP 7
+.BI "Synaptics Button Scrolling Repeat"
+8 bit (BOOL), 2 values, updown, leftright.
+
+.TP 7
+.BI "Synaptics Button Scrolling Time"
+32 bit.
+
+.TP 7
+.BI "Synaptics Off"
+8 bit, valid values (0, 1, 2).
+
+.TP 7
+.BI "Synaptics Guestmouse Off"
+8 bit (BOOL).
+
+.TP 7
+.BI "Synaptics Locked Drags"
+8 bit (BOOL).
+
+.TP 7
+.BI "Synaptics Locked Drags Timeout"
+32 bit.
+
+.TP 7
+.BI "Synaptics Tap Action"
+8 bit, up to MAX_TAP values (see synaptics.h), 0 disables an element. order:
+RT, RB, LT, LB, F1, F2, F3.
+
+.TP 7
+.BI "Synaptics Click Action"
+8 bit, up to MAX_CLICK values (see synaptics.h), 0 disables an element.
+order: Finger 1, 2, 3.
+
+.TP 7
+.BI "Synaptics Circular Scrolling"
+8 bit (BOOL).
+
+.TP 7
+.BI "Synaptics Circular Scrolling Distance"
+FLOAT.
+
+.TP 7
+.BI "Synaptics Circular Scrolling Trigger"
+8 bit, valid values 0..8 (inclusive) order: any edge, top, top + right,
+right, right + bottom, bottom, bottom + left, left, left + top.
+
+.TP 7
+.BI "Synaptics Circular Pad"
+8 bit (BOOL).
+
+.TP 7
+.BI "Synaptics Palm Detection"
+8 bit (BOOL).
+
+.TP 7
+.BI "Synaptics Palm Dimensions"
+32 bit, 2 values, width, z.
+
+.TP 7
+.BI "Synaptics Coasting Speed"
+FLOAT.
+
+.TP 7
+.BI "Synaptics Pressure Motion"
+32 bit, 2 values, min, max.
+
+.TP 7
+.BI "Synaptics Pressure Motion Factor"
+FLOAT, 2 values, min, max.
+
+.TP 7
+.BI "Synaptics Grab Event Device"
+8 bit (BOOL).
+
.SH "NOTES"
There is an example hal policy file in
.I ${sourcecode}/fdi/11-x11-synaptics.fdi
commit 18b25ae7fa6438f85c49f41c1c11ed8ac84df47e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 5 11:54:57 2009 +1000
Bump to 1.0.99.4
diff --git a/configure.ac b/configure.ac
index 51097e5..2131f47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-synaptics],
- 1.0.99.3,
+ 1.0.99.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-synaptics)
commit 4d5a41ca574b1462889d4423cfdbc008132aa9c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 5 11:47:41 2009 +1000
include xorg-server.h from all driver source files.
This fixes the 64-bit issues with 1.0.99.3. Not having xorg-server.h included
in time means we miss out on _XSERVER64, which leads to different sizes of the
LocalDeviceRec struct in the driver and the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/alpscomm.c b/src/alpscomm.c
index 5a17af7..908f949 100644
--- a/src/alpscomm.c
+++ b/src/alpscomm.c
@@ -32,6 +32,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include "alpscomm.h"
#include "synproto.h"
#include "synaptics.h"
diff --git a/src/eventcomm.c b/src/eventcomm.c
index c917c80..c7c5018 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -28,6 +28,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include "eventcomm.h"
#include <errno.h>
#include <sys/types.h>
diff --git a/src/properties.c b/src/properties.c
index 681f77f..0861ae0 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -27,6 +27,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include "xf86Module.h"
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
diff --git a/src/ps2comm.c b/src/ps2comm.c
index 7dceb04..6c62918 100644
--- a/src/ps2comm.c
+++ b/src/ps2comm.c
@@ -36,6 +36,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include "ps2comm.h"
#include "synproto.h"
#include "synaptics.h"
diff --git a/src/psmcomm.c b/src/psmcomm.c
index dcdde74..c29a8df 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -38,6 +38,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include "psmcomm.h"
#include <errno.h>
#include <string.h>
diff --git a/src/synaptics.c b/src/synaptics.c
index ec85fba..ddefecf 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -58,6 +58,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include <unistd.h>
#include <misc.h>
#include <xf86.h>
@@ -72,7 +73,6 @@
#include "mipointer.h"
#endif
-#include "xorg-server.h"
#include "synaptics.h"
#include "synapticsstr.h"
#include "synaptics-properties.h"
commit 2a93e92d493050398f993fda50c5e7a445a946de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 4 15:20:07 2009 +1000
Bump to 1.0.99.3
diff --git a/configure.ac b/configure.ac
index a465fd3..51097e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-synaptics],
- 1.0.99.2,
+ 1.0.99.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-synaptics)
commit c719553dac875824b2d2a8f7714a89998ab4828d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 4 15:18:39 2009 +1000
Don't auto-include xorg-server.h in config.h
config.h is needed by synclient/syndaemon, and including xorg-server.h leads
to funny results on 64 bit machines. Not "ha ha" funny though.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index f0397c4..a465fd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,6 @@ AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-AH_TOP([#include "xorg-server.h"])
-
AC_MSG_CHECKING([which optional backends will be build])
case "${host}" in
*linux*)
diff --git a/src/synaptics.c b/src/synaptics.c
index 1fe8805..ec85fba 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -72,6 +72,7 @@
#include "mipointer.h"
#endif
+#include "xorg-server.h"
#include "synaptics.h"
#include "synapticsstr.h"
#include "synaptics-properties.h"
commit 07f0588bbd85655ba7d2ef4d2a3f4a62ddb638bc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 4 15:03:40 2009 +1000
synclient: don't print driver's package version info.
synclient is not the driver. If you want to know the driver's version, look in
the log file. After all, synclient would only print the one it was compiled
with anyway, not the one of the driver.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/tools/synclient.c b/tools/synclient.c
index ff7292c..40279d4 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -217,7 +217,6 @@ shm_show_hw_info(SynapticsSHM *synshm)
printf(" This is normal if you are running linux kernel 2.6.\n");
printf(" Check the kernel log for touchpad hardware information.\n");
}
- printf("Driver version: %d\n", (PACKAGE_VERSION_MAJOR*10000+PACKAGE_VERSION_MINOR*100+PACKAGE_VERSION_PATCHLEVEL));
}
static void
commit 020142e57cbf709bd694112c32522a040042544d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 4 12:15:58 2009 +1000
Reply to: