xserver: Branch 'master'
Daniel Stone
daniels at kemper.freedesktop.org
Sun Apr 8 13:38:53 EEST 2007
hw/xfree86/common/xf86Config.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
New commits:
diff-tree 4beeab8424774ea4c3142f29b90e33f1fc7cb154 (from 0a6ac992363343487dfe0a0fc985ea55bd448382)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Sun Apr 8 13:39:06 2007 +0300
XFree86: Treat evdev and vmmouse as mouse drivers (bug #10512, #10559)
When we see an evdev or vmmouse section, assume that it's a mouse, and
don't add a default mouse device. This will break users who have an
evdev keyboard section but no mouse, and want the mouse to get added
by default.
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 4db844e..cbeda0b 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1287,9 +1287,13 @@ checkCoreInputDevices(serverLayoutPtr se
* always synthesize a 'mouse' section configured to send core
* events, unless a 'void' section is found, in which case the user
* probably wants to run footless.
+ *
+ * If you're using an evdev keyboard and expect a default mouse
+ * section ... deal.
*/
for (i = servlayoutp->inputs; i->identifier && i->driver; i++) {
- if (!strcmp(i->driver, "void") || !strcmp(i->driver, "mouse")) {
+ if (!strcmp(i->driver, "void") || !strcmp(i->driver, "mouse") ||
+ !strcmp(i->driver, "vmmouse") || !strcmp(i->driver, "evdev")) {
found = 1; break;
}
}
More information about the xorg-commit
mailing list