[PATCH 1/7] xfree86: Make InputClass docs and comments match reality

Peter Hutterer peter.hutterer at who-t.net
Tue Feb 9 21:36:44 PST 2010

From: Dan Nicholson <dbn.lists at gmail.com>

Drivers and options specified in InputClass sections work on a "first
match wins" strategy. Let's be consistent when documenting it.

Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
 hw/xfree86/common/xf86Xinput.c       |    6 +++---
 hw/xfree86/doc/man/xorg.conf.man.pre |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index fb0ee9c..6cbc23e 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -538,9 +538,9 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
- * Merge in any InputClass configurations. Each InputClass section can
- * add to the original device configuration as well as any previous
- * InputClass sections.
+ * Merge in any InputClass configurations. Options in each InputClass
+ * section have less priority than the original device configuration as
+ * well as any previous InputClass sections.
 static int
 MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 222530b..baabdb5 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1021,7 +1021,7 @@ The
 entry specifies the name of the driver to use for this input device.
 After all classes have been examined, the
 .RI \*q inputdriver \*q
-module from the final
+module from the first
 .B Driver
 entry will be enabled when using the loadable server.

More information about the xorg-devel mailing list