Add 50-synaptics.conf snippet.

If the server exports the sysconfigdir variable, install the
50-synaptics.conf snippet in the directory provided.

This patch also moves the fdi file from fdi/ into the new conf/ subdir to
have a single location for all config files.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>

3 files changed, 65 insertions, 0 deletions

diff --git a/conf/11-x11-synaptics.fdi b/conf/11-x11-synaptics.fdi
new file mode 100644
index 0000000..46ad7b9
--- /dev/null
+++ b/conf/11-x11-synaptics.fdi
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.capabilities" contains="input.touchpad">
+        <merge key="input.x11_driver" type="string">synaptics</merge>
+        <!-- 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>
+
+	Enable vertical scrolling when dragging along the right edge
+	<merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
+
+	Enable vertical scrolling when dragging with two fingers anywhere on the touchpad
+	<merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge>
+
+	Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad
+	<merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge>
+
+	If on, circular scrolling is used
+	<merge key="input.x11_options.CircularScrolling" type="string">true</merge>
+
+	For other possible options, check CONFIGURATION DETAILS in synaptics man page
+        -->
+    </match>
+  </device>
+</deviceinfo>
diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf
new file mode 100644
index 0000000..89bb557
--- /dev/null
+++ b/conf/50-synaptics.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+        Identifier "touchpad catchall"
+        Driver "synaptics"
+        MatchIsTouchpad "on"
+EndSection
diff --git a/conf/Makefile.am b/conf/Makefile.am
new file mode 100644
index 0000000..9a88895
--- /dev/null
+++ b/conf/Makefile.am
@@ -0,0 +1,29 @@
+#  Copyright 2005 Adam Jackson.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a
+#  copy of this software and associated documentation files (the "Software"),
+#  to deal in the Software without restriction, including without limitation
+#  on the rights to use, copy, modify, merge, publish, distribute, sub
+#  license, and/or sell copies of the Software, and to permit persons to whom
+#  the Software is furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice (including the next
+#  paragraph) shall be included in all copies or substantial portions of the
+#  Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+#  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+if HAS_XORG_CONF_DIR
+confdir = $(XORG_CONF_DIR)
+dist_conf_DATA = 50-synaptics.conf
+else
+
+EXTRA_DIST = 11-x11-synaptics.fdi
+
+endif