[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#311184: xserver-xfree86: mouse support broken since last-minute -13 upload to Sarge



severity 311184 grave
tags 311184 patch
thanks

After re-reviewing the new dexconf code, I've spotted the glaring bug here,
which I think should be treated as RC for sarge as it causes broken mouse
configs in a *majority* of cases by doing the exact opposite of what the
comments say it's supposed to.

The problematic code is:

  # Set up an additional mouse device which points at the Linux kernel's
  # multiplexed input subsystem node.
  #
  # We only write this stanza if the Configured Mouse is *not*:
  #   Linux 2.4: USB
  #   Linux 2.6: USB, PS/2, serial

  [...]

  if has_multiplexed_mouse; then

Well, has_multiplexed_mouse returns 0 if the configured mouse *is* USB
(etc), so the logic is exactly reversed.

Patch attached.  Sorry for not catching this on its way through, guys.

Thanks,
-- 
Steve Langasek
postmodern programmer
Index: debian/local/dexconf
===================================================================
--- debian/local/dexconf	(revision 2271)
+++ debian/local/dexconf	(working copy)
@@ -355,7 +355,7 @@
 # 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
+if ! has_multiplexed_mouse; then
   cat >&4 <<SECTION
 Section "InputDevice"
 	Identifier	"Generic Mouse"
@@ -458,7 +458,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
 printf "EndSection\n" >&4
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 2271)
+++ debian/changelog	(working copy)
@@ -30,6 +30,11 @@
     <URL: https://bugs.freedesktop.org/show_bug.cgi?id=830 >.  The DPMS fix
     also adds a header self-inclusion guard to dpms.h.
 
+  * Fix for horrible thinko in the mouse handling code added in -13,
+    which inverted the sense of the check for multiplexed mice --
+    resulting in writing out a second mouse config section precisely
+    when the comments say we shouldn't.  Closes: #311184
+
  -- Branden Robinson <branden@debian.org>  Wed, 25 May 2005 02:57:44 -0500
 
 xfree86 (4.3.0.dfsg.1-13) unstable; urgency=high

Attachment: signature.asc
Description: Digital signature


Reply to: