X Strike Force XFree86 SVN commit: r1855 - in branches/debconf-overhaul/debian: . local
Author: branden
Date: 2004-09-22 17:28:23 -0500 (Wed, 22 Sep 2004)
New Revision: 1855
Modified:
branches/debconf-overhaul/debian/local/dexconf
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Update comments regarding /dev/input/mice multiplexing and Linux 2.6;
thanks to Jeff Bailey and others for their comments and counsel.
Modified: branches/debconf-overhaul/debian/local/dexconf
===================================================================
--- branches/debconf-overhaul/debian/local/dexconf 2004-09-22 21:36:13 UTC (rev 1854)
+++ branches/debconf-overhaul/debian/local/dexconf 2004-09-22 22:28:23 UTC (rev 1855)
@@ -294,14 +294,27 @@
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.
+# 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 [ "$MOUSE_PORT" != "/dev/input/mice" ] \
&& [ "$MOUSE_PORT" != "/dev/gpmdata" ]; then
cat >&4 <<SECTION
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 21:36:13 UTC (rev 1854)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 22:28:23 UTC (rev 1855)
@@ -1266,14 +1266,6 @@
trace "$func(): not prompting for mouse autodetection; reconfiguring"
fi
- # XXX: commented out until BR knows for sure that this is correct
- # If using Linux kernel 2.6, force /dev/input/mice to be the default.
- # if dpkg --compare-versions "$(uname -r)" gt "2.6"; then
- # trace "$func(): Linux 2.6 or later detected; forcing default mouse port" \
- # "to /dev/input/mice"
- # default_port="/dev/input/mice"
- # fi
-
db_subst xserver-xfree86/config/inputdevice/mouse/port choices \
"$mouse_port_choices"
auto_answer db_input "$PRIORITY" \
Reply to: