xserver-xorg-input-mouse: Changes to 'upstream-unstable'
configure.ac | 2 +-
man/Makefile.am | 1 -
man/mousedrv.man | 3 ++-
src/mouse.c | 12 +-----------
4 files changed, 4 insertions(+), 14 deletions(-)
New commits:
commit 9192640066e3917062cb3ee1c761a83196bfb721
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:26:52 2008 -0400
mouse 1.3.0
diff --git a/configure.ac b/configure.ac
index c6fd7b6..0f07cd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.2.3,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
commit d6ceabc1b58d752cb2af03519c15012206904f70
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:10:03 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index 54f3afd..ceca076 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 78272e117ceea12b8863f31688da66b20e160311
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 3 13:27:02 2008 -0800
Update Emulate3Button default in mouse man page to cover Emulate3ButtonsSoft
diff --git a/man/mousedrv.man b/man/mousedrv.man
index a7d4e67..26ba680 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -78,7 +78,8 @@ cannot be auto-detected, the default value is 3. The maximum number is 24.
.BI "Option \*qEmulate3Buttons\*q \*q" boolean \*q
Enable/disable the emulation of the third (middle) mouse button for mice
which only have two physical buttons. The third button is emulated by
-pressing both buttons simultaneously. Default: off
+pressing both buttons simultaneously. Default: on, until a press of a
+physical button 3 is detected.
.TP 7
.BI "Option \*qEmulate3Timeout\*q \*q" integer \*q
Sets the timeout (in milliseconds) that the driver waits before deciding
commit 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 16:45:45 2007 +1030
Bug #13144: Don't flush buttons, release events can cause paste events.
diff --git a/src/mouse.c b/src/mouse.c
index ff52d2b..bd98a80 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1853,26 +1853,17 @@ MouseConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
/**********************************************************************
*
- * FlushButtons -- send button up events for sanity.
+ * FlushButtons -- reset button states.
*
**********************************************************************/
static void
FlushButtons(MouseDevPtr pMse)
{
-
- /* If no button down is pending xf86PostButtonEvent()
- * will discard them. So we are on the safe side. */
-
int i, blocked;
pMse->lastButtons = 0;
pMse->lastMappedButtons = 0;
-
- blocked = xf86BlockSIGIO ();
- for (i = 1; i <= 5; i++)
- xf86PostButtonEvent(pMse->device,0,i,0,0,0);
- xf86UnblockSIGIO (blocked);
}
/**********************************************************************
commit 76a2231f87551f7c1943df18bc537b9b15987562
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 11:59:12 2007 -0500
Don't sleep(0.3) on shutdown.
diff --git a/src/mouse.c b/src/mouse.c
index 293af74..ff52d2b 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1825,7 +1825,6 @@ MouseProc(DeviceIntPtr device, int what)
}
}
device->public.on = FALSE;
- usleep(300000);
break;
}
return Success;
Reply to: