diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-07-24 12:12:45 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-07-28 09:05:07 +0930 |
| commit | 47160edec7f0d9129576d83f1593a5549879a893 (patch) | |
| tree | ea1aff417f3efd0ceac79efd3a82d1901d3238c9 | |
| parent | f30b0823dbfc5902e54b337b5b6b570ebf216584 (diff) | |
xfree86: warn some more about potential missing input devices.
Put out a warning if xorg.conf has InputDevice sections, but these aren't
referenced in the used ServerLayout. This is only performed if AllowEmptyInput
is enabled.
The reason behind this is that the server used to auto-add the first
mouse/keyboard sections if none where referenced. Now, with HAL and AEI
enabled by default, setups that relied on this auto-adding break and are left
without input devices. The least we can do is warn them.
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index f1ac5ec46..4b4a9a8fd 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -2479,6 +2479,16 @@ checkInput(serverLayoutPtr layout) { "\tThe server relies on HAL to provide the list of input " "devices.\n\tIf no devices become available, reconfigure " "HAL.\n"); + if (!layout->inputs || !*layout->inputs) + { + /* No input device specified in ServerLayout. */ + if (xf86configptr->conf_input_lst && + xf86configptr->conf_input_lst->inp_identifier) + xf86Msg(X_WARNING, "Input devices specified in xorg.conf, but" + " not referenced in ServerLayout.\n\tThese devices" + " will NOT be available.\n"); + } + } } |