summaryrefslogtreecommitdiff
path: root/config/x11-input.fdi
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-07 13:13:57 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-07 13:58:47 +0930
commit26188875de1ccc84ac60bfb251e3ec43de2b9e22 (patch)
tree42dd302d736d472dbe7c086965438ce384c1a788 /config/x11-input.fdi
parent9e0d73fd8a43647b648ec5b2f0bcaae30c03259c (diff)
config: deprecate (and ignore) the use of input.xkb.whatever options.
These options are still sent by some HAL implementations (e.g. HAL on FC8), and may overwrite the options set in the x11-input.fdi file. For a more detailed description of why see Bug #13037, comment 42. X.Org Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037#c42>
Diffstat (limited to 'config/x11-input.fdi')
-rw-r--r--config/x11-input.fdi16
1 files changed, 9 insertions, 7 deletions
diff --git a/config/x11-input.fdi b/config/x11-input.fdi
index f2e2d50ab..85d7a1fe1 100644
--- a/config/x11-input.fdi
+++ b/config/x11-input.fdi
@@ -26,19 +26,21 @@
Do not specify "input.x11_options.Device" since "input.device"
will be used automatically.
- Legacy Keys
+
+ XKB configuration:
+ "input.x11_options.XkbRules"
+ "input.x11_options.XkbModel"
+ "input.x11_options.XkbLayout"
+ "input.x11_options.XkbVariant"
+ "input.x11_options.XkbOptions"
+
+ Legacy Keys (deprecated and ignored by the server):
"input.xkb.rules"
"input.xkb.model"
"input.xkb.layout"
"input.xkb.variant"
"input.xkb.options"
- These keys are deprecated. Use these instead:
- "input.x11_options.XkbRules"
- "input.x11_options.XkbModel"
- "input.x11_options.XkbLayout"
- "input.x11_options.XkbVariant"
- "input.x11_options.XkbOptions"
See the evdev documentation for more information.