X Strike Force X.Org X11 SVN commit: r140 - trunk/debian/local
Author: dnusinow
Date: 2005-06-04 14:59:29 -0500 (Sat, 04 Jun 2005)
New Revision: 140
Modified:
trunk/debian/local/dexconf
Log:
Merge updates to dexconf that include multiplex mouse fix
Modified: trunk/debian/local/dexconf
===================================================================
--- trunk/debian/local/dexconf 2005-06-04 18:55:45 UTC (rev 139)
+++ trunk/debian/local/dexconf 2005-06-04 19:59:29 UTC (rev 140)
@@ -350,16 +350,28 @@
fi
printf "EndSection\n" >&4
-# Only write this stanza -- designed for USB pointers -- if the Configured
-# Mouse isn't USB. This isn't a problem even on systems without
-# CONFIG_INPUT_MOUSEDEV, because this is not the core pointer, and failure to
-# open it is not harmful.
+# Set up an additional mouse device which points at the Linux kernel's
+# multiplexed input subsystem node.
#
-# Also don't write this stanza if the Configured Mouse is the GPM repeater.
-# We have no way of knowing what device GPM is repeating for, and it might be
-# a USB mouse.
-if [ "$MOUSE_PORT" != "/dev/input/mice" ] \
- && [ "$MOUSE_PORT" != "/dev/gpmdata" ]; then
+# We only write this stanza if the Configured Mouse is *not*:
+# Linux 2.4: USB
+# Linux 2.6: USB, PS/2, serial
+#
+# Configuring a mouse device on /dev/input/mice isn't a problem even on systems
+# without CONFIG_INPUT_MOUSEDEV (i.e., without that device node), because this
+# is not the core pointer, and failure to open it is not harmful.
+#
+# We also don't write this stanza if the Configured Mouse is the GPM repeater.
+# We have no way of knowing what device GPM is repeating for, and it might be a
+# device multiplexed into /dev/input/mice.
+#
+# Finally, we don't write this stanza if this is not Linux.
+#
+# TODO: Change this if statement to reflect the 2.4 vs. 2.6 logic above; sadly,
+# we probably also need an init script to rewrite XF86Config-4 on system boot
+# for people who switch back and forth between these kernels, or some people
+# will get "doubled" mouse events. Sigh.
+if ! has_multiplexed_mouse; then
cat >&4 <<SECTION
Section "InputDevice"
Identifier "Generic Mouse"
@@ -491,7 +503,7 @@
InputDevice "Generic Keyboard"
InputDevice "Configured Mouse"
SECTION
-if has_multiplexed_mouse; then
+if ! has_multiplexed_mouse; then
printf "\tInputDevice\t\"Generic Mouse\"\n" >&4
fi
if [ -n "$LAPTOP" ]; then
Reply to: