frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Make InputClass docs and comments match reality 

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@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dan Nicholson 2010-02-10 15:36:44 +10:00 committed by Peter Hutterer
parent a34812b090
commit 67bc278a51
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86Xinput.c
View File

@ -538,9 +538,9 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
} }
/* /*
* Merge in any InputClass configurations. Each InputClass section can * Merge in any InputClass configurations. Options in each InputClass
* add to the original device configuration as well as any previous * section have less priority than the original device configuration as
* InputClass sections. * well as any previous InputClass sections.
*/ */
static int static int
MergeInputClasses(IDevPtr idev, InputAttributes *attrs) MergeInputClasses(IDevPtr idev, InputAttributes *attrs)

2
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -1021,7 +1021,7 @@ The
entry specifies the name of the driver to use for this input device. entry specifies the name of the driver to use for this input device.
After all classes have been examined, the After all classes have been examined, the
.RI \*q inputdriver \*q .RI \*q inputdriver \*q
module from the final module from the first
.B Driver .B Driver
entry will be enabled when using the loadable server. entry will be enabled when using the loadable server.
.PP .PP