diff options
| author | Julien Cristau <jcristau@debian.org> | 2009-09-27 14:45:47 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2009-12-30 19:05:44 +0000 |
| commit | 435f27667f84269768efecde34de4af2b2d43376 (patch) | |
| tree | 308b00d27cd065fb19d8aec663e0b7cf0b0e54e3 /hw/xfree86/common/xf86Config.c | |
| parent | b8b12e41c453c3bf94b11e7a18934d3b6e1869bf (diff) | |
config: add libudev input-hotplug backend
Add a backend using libudev for input hotplug, and disable the hal and
dbus backends if this one is enabled.
XKB configuration happens using xkb{rules,model,layout,variant,options}
properties (case-insensitive) on the device. We fill in InputAttributes
to allow configuration through InputClass in Xorg.
Requires udev 148 for the input_id helper and ID_INPUT* properties.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xfree86/common/xf86Config.c')
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 56ab2ee46..1abc182da 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1461,12 +1461,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) } if (xf86Info.allowEmptyInput && !(foundPointer && foundKeyboard)) { -#ifdef CONFIG_HAL - xf86Msg(X_INFO, "The server relies on HAL to provide the list of " +#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) + const char *config_backend; +#if defined(CONFIG_HAL) + config_backend = "HAL"; +#else + config_backend = "udev"; +#endif + xf86Msg(X_INFO, "The server relies on %s to provide the list of " "input devices.\n\tIf no devices become available, " - "reconfigure HAL or disable AutoAddDevices.\n"); + "reconfigure %s or disable AutoAddDevices.\n", + config_backend, config_backend); #else - xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n" + xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n" "\tTry disabling AllowEmptyInput.\n"); #endif } |