[PATCH synaptics] Add 50-synaptics.conf snippet.
Peter Hutterer
peter.hutterer at who-t.net
Thu Apr 15 15:45:48 PDT 2010
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 at who-t.net>
---
Makefile.am | 2 +-
conf/11-x11-synaptics.fdi | 31 +++++++++++++++++++++++++++++++
conf/50-synaptics.conf | 6 ++++++
conf/Makefile.am | 30 ++++++++++++++++++++++++++++++
configure.ac | 10 +++++++++-
fdi/11-x11-synaptics.fdi | 31 -------------------------------
fdi/Makefile.am | 21 ---------------------
7 files changed, 77 insertions(+), 54 deletions(-)
create mode 100644 conf/11-x11-synaptics.fdi
create mode 100644 conf/50-synaptics.conf
create mode 100644 conf/Makefile.am
delete mode 100644 fdi/11-x11-synaptics.fdi
delete mode 100644 fdi/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 197b813..538bbc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
# 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.
-SUBDIRS = include src man tools fdi
+SUBDIRS = include src man tools conf
MAINTAINERCLEANFILES = ChangeLog INSTALL
pkgconfigdir = $(libdir)/pkgconfig
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..29818e8
--- /dev/null
+++ b/conf/50-synaptics.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+ Identifier "touchpad catchall"
+ Driver "synaptics"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+EndSection
diff --git a/conf/Makefile.am b/conf/Makefile.am
new file mode 100644
index 0000000..34c6f5f
--- /dev/null
+++ b/conf/Makefile.am
@@ -0,0 +1,30 @@
+# 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
+
diff --git a/configure.ac b/configure.ac
index 82500e9..53e1320 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,14 @@ fi
AM_CONDITIONAL(BUILD_TOOLS, [ test "$BUILD_TOOLS" = "yes" ])
AC_SUBST(BUILD_TOOLS)
+AC_ARG_WITH(xorg-conf-dir,
+ AC_HELP_STRING([--with-xorg-conf-dir=DIR],
+ [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]),
+ [XORG_CONF_DIR="$withval"],
+ [XORG_CONF_DIR="`$PKG_CONFIG --variable=sysconfigdir xorg-server`"])
+AC_SUBST(XORG_CONF_DIR)
+AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$XORG_CONF_DIR" != "x" && test "x$XORG_CONF_DIR" != "xno"])
+
# Checks for header files.
AC_HEADER_STDC
@@ -146,6 +154,6 @@ AC_OUTPUT([Makefile
src/Makefile
man/Makefile
tools/Makefile
- fdi/Makefile
+ conf/Makefile
include/Makefile
xorg-synaptics.pc])
diff --git a/fdi/11-x11-synaptics.fdi b/fdi/11-x11-synaptics.fdi
deleted file mode 100644
index 46ad7b9..0000000
--- a/fdi/11-x11-synaptics.fdi
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/fdi/Makefile.am b/fdi/Makefile.am
deleted file mode 100644
index e4f2815..0000000
--- a/fdi/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.
-
-EXTRA_DIST = 11-x11-synaptics.fdi
--
1.6.6.1
Cheers,
Peter
More information about the xorg-devel
mailing list