xserver-xorg-input-mouse: Changes to 'upstream-experimental'
.cvsignore | 19 -----------------
.gitignore | 20 ++++++++++++++++++
COPYING | 49 ++++++++++++++++++++++++++++++++++++--------
README | 55 +++++++++++++++++++++++++++++++------------------
configure.ac | 2 -
man/Makefile.am | 1
man/mousedrv.man | 14 ++++++++++--
src/mouse.c | 61 +++++++++++++++++++++++++++++++++++++++----------------
src/mousePriv.h | 2 +
9 files changed, 155 insertions(+), 68 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;
commit 0352a4db368eaab2df5fa77d4003e1363b3ea4fb
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Oct 3 14:06:50 2007 +0200
Bumped version to 1.2.3.
diff --git a/configure.ac b/configure.ac
index a3689d3..c6fd7b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
commit f42ea3027c13046dfa7a603737b476fbf2833764
Author: Fredrik Rinnestam <fredrik@obra.se>
Date: Wed Sep 19 23:24:13 2007 +0200
Bug #12145: Don't confine the pointer to one screen in zaphod mode.
Fix ported from evdev's b4a5a20476f7bc77d54a860d7cdd81c223bdb81f.
diff --git a/src/mouse.c b/src/mouse.c
index f3abc23..293af74 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1740,10 +1740,10 @@ MouseProc(DeviceIntPtr device, int what)
);
/* X valuator */
- xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 0, -1, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, 0);
/* Y valuator */
- xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 1, -1, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, 1);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86MotionHistoryAllocate(pInfo);
commit 53bdd4db01f05595beb37e68842118eb649308d3
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Tue May 29 12:14:00 2007 -0800
Bug #11089: xf86-input-mouse COPYING file
X.Org Bugzilla #11089 <https://bugs.freedesktop.org/show_bug.cgi?id=11089>
diff --git a/COPYING b/COPYING
index 7f33cbf..17ba88f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,45 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+Copyright 1993 by David Dawes <dawes@xfree86.org>
+Copyright 2002 by SuSE Linux AG, Author: Egbert Eich
+Copyright 1994-2002 by The XFree86 Project, Inc.
+Copyright 2002 by Paul Elliott
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of copyright holders not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission. The copyright holders
+make no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or
+implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 1998 by Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Kazutaka YOKOTA not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Kazutaka YOKOTA makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+KAZUTAKA YOKOTA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KAZUTAKA YOKOTA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
commit 111081a2f15b416c2fd05b667bca3b3982f93245
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Aug 1 15:55:51 2007 +0200
bump to 1.2.2
diff --git a/configure.ac b/configure.ac
index c572797..a3689d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
commit 8d329a4a23cdaa970e41fa33ee2babc4687189f2
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Wed Jul 25 19:22:27 2007 +0200
Fix typo in mousedrv.man
Reported by "A. Costa" <agcosta@gis.net> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432060
diff --git a/man/mousedrv.man b/man/mousedrv.man
index 714fb05..a7d4e67 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -167,7 +167,7 @@ Default: "4 5".
.TP 7
.BI "Option \*qButtonMapping\*q \*q" "N1 N2 [...]" \*q
Specifies how physical mouse buttons are mapped to logical buttons.
-Physcial button 1 is mapped to logical button
+Physical button 1 is mapped to logical button
.IR N1 ,
physical button 2 to
.IR N2 ,
commit c7c012d8bf735dfa894146b379a2e1fd55f57fca
Author: Drew Parsons <dparsons@debian.org>
Date: Thu Jun 14 00:24:07 2007 +1000
Update version using PACKAGE_VERSION_*
diff --git a/src/mouse.c b/src/mouse.c
index d11c9ba..f3abc23 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -3811,7 +3811,7 @@ static XF86ModuleVersionInfo xf86MouseVersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 1, 1,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
commit e567cb0792ea3dc2cd68c46628332c1f8bbb173d
Author: Jürgen Appel <jappel@linux01.gwdg.de>
Date: Mon Apr 23 15:54:08 2007 +0200
Added "Sensitivity" option. Use for slowing down high resolution mice.
diff --git a/man/mousedrv.man b/man/mousedrv.man
index 231935c..714fb05 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -210,6 +210,15 @@ Sets the resolution of the device in counts per inch. Setting this is
only supported for some mice, including some PS/2 mice on some platforms.
Default: whatever the mouse is already set to.
.TP 7
+.BI "Option \*qSensitivity\*q \*q" float \*q
+Mouse movements are multiplied by this float before being processed. Use this
+mechanism to slow down high resolution mice. Because values bigger than 1.0
+will result in not all pixels on the screen being accessible, you should better
+use mouse acceleration (see
+.BR "man xset" )
+for speeding up low resolution mice.
+Default: 1.0
+.TP 7
.BI "Option \*qDragLockButtons\*q \*q" "L1 B2 L3 B4" \*q
Sets \*qdrag lock buttons\*q that simulate holding a button down, so
that low dexterity people do not have to hold a button down at the
diff --git a/src/mouse.c b/src/mouse.c
index aea0e55..d11c9ba 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -213,7 +213,8 @@ typedef enum {
OPTION_VMIN,
OPTION_DRAGLOCKBUTTONS,
OPTION_DOUBLECLICK_BUTTONS,
- OPTION_BUTTON_MAPPING
+ OPTION_BUTTON_MAPPING,
+ OPTION_SENSITIVITY
} MouseOpts;
#ifdef XFree86LOADER
@@ -257,6 +258,7 @@ static const OptionInfoRec mouseOptions[] = {
{ OPTION_DRAGLOCKBUTTONS, "DragLockButtons",OPTV_STRING, {0}, FALSE },
{ OPTION_DOUBLECLICK_BUTTONS,"DoubleClickButtons", OPTV_STRING, {0}, FALSE },
{ OPTION_BUTTON_MAPPING, "ButtonMapping", OPTV_STRING, {0}, FALSE },
+ { OPTION_SENSITIVITY, "Sensitivity", OPTV_REAL, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
#endif
@@ -799,6 +801,12 @@ MouseHWOptions(InputInfoPtr pInfo)
xf86Msg(X_CONFIG, "%s: Resolution: %d\n", pInfo->name,
pMse->resolution);
}
+
+ if (mPriv->sensitivity
+ = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0)) {
+ xf86Msg(X_CONFIG, "%s: Sensitivity: %g\n", pInfo->name,
+ mPriv->sensitivity);
+ }
}
static void
@@ -2365,10 +2373,13 @@ MousePostEvent(InputInfoPtr pInfo, int truebuttons,
int dx, int dy, int dz, int dw)
{
MouseDevPtr pMse;
+ mousePrivPtr mousepriv;
int zbutton = 0, wbutton = 0, zbuttoncount = 0, wbuttoncount = 0;
int i, b, buttons = 0;
pMse = pInfo->private;
+ mousepriv = (mousePrivPtr)pMse->mousePriv;
+
if (pMse->protocolID == PROT_MMHIT)
b = reverseBits(hitachMap, truebuttons);
else
@@ -2458,6 +2469,15 @@ MousePostEvent(InputInfoPtr pInfo, int truebuttons,
dy = tmp;
}
+ /* Accumulate the scaled dx, dy in the private variables
+ fracdx,fracdy and return the integer number part */
+ if (mousepriv) {
+ mousepriv->fracdx += mousepriv->sensitivity*dx;
+ mousepriv->fracdy += mousepriv->sensitivity*dy;
+ mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
+ mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
+ }
+
/* If mouse wheel movement has to be mapped on a button, we need to
* loop for button press and release events. */
do {
diff --git a/src/mousePriv.h b/src/mousePriv.h
index 262d029..79dcdd1 100644
--- a/src/mousePriv.h
+++ b/src/mousePriv.h
@@ -64,6 +64,8 @@ typedef struct {
int acc;
CARD32 pnpLast;
Bool disablePnPauto;
+ float fracdx,fracdy;
+ float sensitivity;
} mousePrivRec, *mousePrivPtr;
/* mouse proto flags */
commit 4666e5f14b2cb63f5cd7c863331fe69658c989df
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 26 13:36:15 2007 -0800
renamed: .cvsignore -> .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2df4a8d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+*~
commit 92a8e2a39d7c9d6bfdaa0a5ac0118599008638ff
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 26 13:35:42 2007 -0800
Update text version of README to match sgml
Oops - forgot to regen text when the sgml changes were checked in for
commit 28c5410df7ba8af07b994c0907519e869c9df750
diff --git a/README b/README
index 0ba8f7b..1f54753 100644
--- a/README
+++ b/README
@@ -55,7 +55,7 @@
[1m1. Introduction[0m
- This document describes mouse support in X.org Foundation's X11R6.8
+ This document describes mouse support in X.org Foundation's Xorg
server.
Mouse configuration has often been mysterious task for novice users.
@@ -67,8 +67,9 @@
[1m2. Supported Hardware[0m
- The X.org Foundation X server supports three classes of mice: serial,
- bus and PS/2 mice.
+ The X.org Foundation X server supports four classes of mice: serial,
+ bus and PS/2 mice, and additional mouse types supported by
+ specific operating systems, such as USB mice.
[1mSerial mouse[0m
@@ -112,9 +113,9 @@
[1mUSB mouse[0m
USB (Universal Serial Bus) ports are present on most modern
computers. Several devices can be plugged into this bus,
- including mices and keyboards.
+ including mice and keyboards.
- The server includes support for USB mices on some systems.
+ The server includes support for USB mice on some systems.
Many mice nowadays can be used both as a serial mouse and as a PS/2
mouse. They has a logic to distinguish which interface it is
@@ -247,7 +248,7 @@
device. Refer to the [4mwsmouse(4)[24m manual page for kernel configuration
informations.
- This driver also provides support for USB mices. See the [4mums(4)[24m manual
+ This driver also provides support for USB mice. See the [4mums(4)[24m manual
page for details.
@@ -273,7 +274,7 @@
emulates the bus mouse. Specify the "BusMouse" protocol for any PS/2
mouse regardless of the brand of the mouse when using this device.
- XFree86 3.3.6 support USB mices on OpenBSD 2.6 and later though the
+ XFree86 3.3.6 support USB mice on OpenBSD 2.6 and later though the
generic Human Interface Device (hid) /dev/uhid*. Select the "usb"
protocol and the /dev/uhid* instance corresponding to your mouse as
the device name.
@@ -298,13 +299,22 @@
[1m3.14. Solaris[0m
- Testing has been done with Solaris 2.5.1, 2.6, 7, 8, 9 and pre-release
- versions of Solaris 10. Logitech and Microsoft bus mice have not been
- tested, but might work with the /dev/logi and /dev/msm devices.
+ Testing has been done with Solaris 2.5.1, 2.6, 7, 8, 9 and 10.
+
+ On Solaris 10 1/06 and later versions with "virtual mouse" support,
+ all PS/2 and USB mice connected to the system can be accessed via
+ the /dev/mouse device using the VUID protocol, including USB mice
+ plugged in after the X server is started. On older releases or
+ to address mice individually, specific devices and protocols may
+ be used.
+
+ Logitech and Microsoft bus mice have not been tested, but might work
+ with the /dev/logi and /dev/msm devices.
+
Standard 2 and 3 button PS/2 mice work with the "PS/2" protocol type
and the /dev/kdmouse device. USB mice work with the "VUID" protocol
- type and the /dev/mouse device. The PnP serial mouse support (the
- "Auto" protocol) has been tested and does not work. The "Auto"
+ type and the /dev/mouse device. The PnP serial mouse support via the
+ "Auto" protocol has been tested and does not work. The "Auto"
protocol can however detect PS/2 and USB mice correctly.
Additional USB mice can be connected using the "VUID" protocol type
@@ -343,10 +353,11 @@
connector of the mouse. The serial mouse has a D-Sub female 9- or
25-pin connector. The bus mice have either a D-Sub male 9-pin
connector or a round DIN 9-pin connector. The PS/2 mouse is equipped
- with a small, round DIN 6-pin connector. Some mice come with adapters
- with which the connector can be converted to another. If you are to
- use such an adapter, remember that the connector at the very end of
- the mouse/adapter pair is what matters.
+ with a small, round DIN 6-pin connector. USB mice have a thin
+ rectangular connector. Some mice come with adapters with which the
+ connector can be converted to another. If you are to use such an
+ adapter, remember that the connector at the very end of the mouse/adapter
+ pair is what matters.
The next thing to decide is a device node to use for the given
interface. For the bus and PS/2 mice, there is little choice; your OS
@@ -455,14 +466,14 @@
work with the "IntelliMouse" protocol, you have to use it as
a regular 2- or 3-button serial mouse.
- If the "Auto" protocol is specified and the mouse seems working,
- but you find that not all features of the mouse is available, that
+ If the "Auto" protocol is specified and the mouse seems to be working,
+ but you find that not all features of the mouse are available, that
is because the X server does not have native support for that model
of mouse and is using a ``compatible'' protocol according to PnP
information.
If you suspect this is the case with your mouse, please enter a
- bugreport in bugzilla.freedesktop.org, using the xorg product.
+ bug report at http://bugzilla.freedesktop.org, using the xorg product.
[1mUSB mouse[0m
@@ -520,7 +531,7 @@
- [1m5.2. ZAxisMappping[0m
+ [1m5.2. ZAxisMapping[0m
This option maps the Z axis (wheel) motion to buttons or to another
axis.
@@ -1153,7 +1164,11 @@
5 Wheel Negative Move Button 4
6 Wheel Positive Move Button 5
+ Starting in the Xorg 6.9 release, you can also achieve this in your
+ configuration file by adding this to the "InputDevice" section in
+ xorg.conf:
+ Option "ButtonMapping" "1 6 3 2 4 5"
For the MS IntelliMouse Explorer which as a wheel and 5 buttons, you
may have the following InputDevice section.
commit e355dc2e04b1b4756d4ad8553794b4e97210000c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 30 19:57:28 2006 +0200
bump to 1.2.1
diff --git a/configure.ac b/configure.ac
index 7916731..c572797 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
commit fb347fb74e1a50fa900f225d13eee1aa829fa2f9
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 23 18:17:33 2006 +0100
Work around race condition during VT switch.
https://bugzilla.novell.com/show_bug.cgi?id=219946
diff --git a/src/mouse.c b/src/mouse.c
index a68e886..aea0e55 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1166,6 +1166,9 @@ MouseReadInput(InputInfoPtr pInfo)
pBufP = pMse->protoBufTail;
pBuf = pMse->protoBuf;
+ if (pInfo->fd == -1)
+ return;
+
/*
* Set blocking to -1 on the first call because we know there is data to
* read. Xisb automatically clears it after one successful read so that
commit 7a866ae143c3638d6b1e3836d48f16e300e90b09
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:47:12 2006 +0200
bump to 1.2.0
diff --git a/configure.ac b/configure.ac
index c524c35..7916731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.1.2,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
commit ddc0db4fe85e2b8de31ad67a6d4f97808bce018f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 00:07:01 2006 +0200
port to new motion history api, add right number of args to IPDS
Use new motion history API from the DIX if available, and also use the
right number of args to InitPointerDeviceStruct, depending on the ABI
version.
diff --git a/src/mouse.c b/src/mouse.c
index d3eb62a..a68e886 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -983,8 +983,10 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
pInfo->device_control = MouseProc;
pInfo->read_input = MouseReadInput;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
pInfo->motion_history_proc = xf86GetMotionEvents;
pInfo->history_size = 0;
+#endif
pInfo->control_proc = NULL;
pInfo->close_proc = NULL;
pInfo->switch_mode = NULL;
@@ -1713,8 +1715,18 @@ MouseProc(DeviceIntPtr device, int what)
InitPointerDeviceStruct((DevicePtr)device, map,
min(pMse->buttons, MSE_MAXBUTTONS),
- miPointerGetMotionEvents, pMse->Ctrl,
- miPointerGetMotionBufferSize());
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ miPointerGetMotionEvents,
+#else
+ GetMotionHistory,
+#endif
+ pMse->Ctrl,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ miPointerGetMotionBufferSize()
+#else
+ GetMotionHistorySize(), 2
+#endif
+ );
/* X valuator */
xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
@@ -1722,7 +1734,9 @@ MouseProc(DeviceIntPtr device, int what)
/* Y valuator */
xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, 1);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86MotionHistoryAllocate(pInfo);
+#endif
#ifdef EXTMOUSEDEBUG
ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom,
Reply to: