Age | Commit message (Collapse) | Author | Files | Lines |
|
Currently there is a single file, xorg.conf, for configuring the server.
This works fine most of the time, but it becomes a problem when packages
or system services need to adjust the configuration. Instead, allow
multiple configuration files to live in a directory. Typically this will
be /etc/X11/xorg.conf.d.
Files with a suffix of .conf will be read and added to the server
configuration after xorg.conf. The server won't fall back to using the
auto configuration unless there is no config file and there are no files
in the config directory.
Right now this uses a simpler search template than the config file
search path by not using the command line or environment variable
parameters. The matching code was refactored a bit to make this more
coherent. Any DDX wanting to read the config files will need to call
xf86initConfigFiles before opening/reading them. This is to allow
xf86openConfigFile without xf86openConfigDirFiles and vice-versa.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
AllowMouseOpenFail description changed to reflect actual behaviour
and point to AllowEmptyInput for previously described behaviour.
Update default DPMS mode timeouts to match new defaults set
in April 2009 by commit d52fddefaeb43f15b677eefbea4a288a9948373b
Update autoloaded module list to match ModuleDefaults in xf86Config.c
Update module subdir list to match stdSubdirs in loadmod.c
Add xorg.conf options that were added to the code:
- XkbDir option added in February 2009
by commit 76f18b94bd2719a8199334742d021c4d0806187d
- DRI2 option added in April 2008
by 35982bc109d424c464551ab22ec90af69908c884
Remove xorg.conf options that were removed from the code:
- XkbDisable option was removed in January 2009
by commit 40877c6680863bd6a8475f2bb0c54df55bcf0b0e
- PciProbe/Config options were removed in August 2008
by commit fdf7c747a8e1bc59dfb31b7f90dd5eab2687315b
- EstimateSizesAggressively was removed in August 2008
by commit cd1e8f26147919227e7624ac4c6b313d972a4d35
- loadable font modules were removed in July 2008
by commit affec10635343668839994ea2bac16c1d4524200
- ModInDev options were removed in December 2008
by commit 6de6ffff35ac03d49fa61de195d4a0605e0ef8bf
(Also strips some trailing whitespaces to make git happier.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
the prefix. Noticed wrong path to man pages on both Ubuntu and on
NetBSD with pkgsrc.
|
|
|
|
|