xserver-xorg-input-mouse: Changes to 'debian-experimental'
.gitignore | 76 +++
COPYING | 50 +-
ChangeLog | 414 +++++++++++++++++++
Makefile.am | 16
README | 340 +++++++---------
README.sgml | 1125 ------------------------------------------------------
configure.ac | 59 +-
debian/changelog | 7
debian/control | 2
man/Makefile.am | 65 +--
src/Makefile.am | 2
src/hurd_mouse.c | 4
src/lnx_mouse.c | 1
src/mouse.c | 29 -
src/pnp.c | 3
src/sco_mouse.c | 258 ------------
src/sun_mouse.c | 133 ++++--
src/xf86OSmouse.h | 3
18 files changed, 831 insertions(+), 1756 deletions(-)
New commits:
commit 74d23755e3a8c18e68f675ce9bb16e56176278e9
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Oct 18 15:32:44 2010 -0400
Bump xutils-dev requirement for new util-macros.
diff --git a/debian/changelog b/debian/changelog
index 71aa25d..cecd297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump xutils-dev requirement for new util-macros.
-- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 15:30:30 -0400
diff --git a/debian/control b/debian/control
index f517476..f097791 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
dpkg-dev (>= 1.14.17),
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5+4)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git
commit 6292397b05cee06924cfdf1e0f3dfcc88192eae7
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Oct 18 15:31:31 2010 -0400
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index d800f1f..27c275a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,417 @@
+commit 6d6c24768b2b347436a6d35c4aaa129227c7392e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Sep 8 23:11:19 2010 -0700
+
+ xf86-input-mouse 1.6.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4719334800b7eb88479acdcbbc176019ba9c5bd2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Sep 8 22:58:30 2010 -0700
+
+ Bring README a little closer to the current state of reality
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit cb11e9ca60e8ca2590c77f844bfd19e5278f518f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Aug 11 21:30:40 2010 -0700
+
+ MouseCtrl doesn't need to save values we never use
+
+ Makes it into a no-op, like evdev's PtrCtrl function, now that
+ mouse acceleration is completely handled in dix.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Patrick E. Kane <pekane52 at gmail.com>
+ Reviewed-by: Simon Thum <simon.thum@gmx.de>
+
+commit 374725ef73ca929f8a951061528d11ee796cb069
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Aug 11 20:21:33 2010 -0700
+
+ Sun's copyrights belong to Oracle now
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5b208a2b8d1032489a02c465830150422d1123cc
+Author: Henry Zhao <henry.zhao@oracle.com>
+Date: Wed Aug 11 20:16:44 2010 -0700
+
+ Check for NULL currentMode in vuidMouseSendScreenSize()
+
+ Fixes Sun bug 6920647:
+ Core dump in resume when monitor changed in suspend
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6920647
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b9d6d0309abdec7b384cb1f0958b9bcd60364e60
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Wed Jul 28 21:23:25 2010 +0200
+
+ Do not return the address of a local buffer
+
+ Make the const buffer returned by FindDevice a static const buffer, to avoid
+ letting be on the stack.
+
+ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+commit 75300d6ae5a5b2324224423c9f976cba50e47547
+Author: Patrick E. Kane <pekane52@gmail.com>
+Date: Fri Jul 16 11:13:20 2010 -0500
+
+ xf86-input-mouse: Update sun_mouse devPrivates code #29049
+
+ Update the sun_mouse devPrivates code to conform to the new API
+ (introducted by commit faeebead7bfcc78535757ca7acc1faf7554c03b7)
+ that requires the PrivateKey to be registered.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29049
+
+ Signed-off-by: Patrick E. Kane <pekane52@gmail.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+
+commit 112caa1724e139caeb91c792c394b21d1391b370
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:13:05 2010 -0300
+
+ Purge macro NEED_EVENTS
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b714882b0245a2d6078d8778156e88813761f2c4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 27 18:57:33 2010 -0400
+
+ config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+
+ The existing statement can now be removed from the configuration file.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1188152feee345b7a0f39513cd9d7b8bab938338
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 27 09:32:59 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ad78ef7a9488f7235032e106839224fc43f20e5f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 16:09:03 2010 -0400
+
+ config: let AC_PROG_SED find the best value for $SED
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9a9344e66d2e03ee44bf6fe6a1c1d97082a74c20
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 15:59:24 2010 -0400
+
+ README: keep the text version of README, discard the sgml version
+
+ The linuxdoc doc tool is deprecated.
+ README files are exclusively text files.
+ The file had not been updated for 5 years.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9711c050e6d2a7c7c89ddc26775d819b5bc41ad3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 14:29:32 2010 -0400
+
+ config: fix warnings, m4 quoting and layout
+
+ Fix some m4 quoting
+ Fix some autoconf warnings
+ Regroup statements per section
+ Add comments
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 86ddfe77024dbd94e99695a23ba77c2100b7e3e8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 14:08:04 2010 -0400
+
+ config: Upgrade X.Org macros to 1.4 for INSTALL file copying
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 349db3f68d7f727b965132ade5bcefd5da6ad399
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 14:01:28 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 59ace3b6fd3c1901e8025f4785c31d514aac3b3f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 14:00:41 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 540f1d8826aeee17235bd29c42144fe52213130c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 14:00:06 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements at the top.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 27d00be1f8ae04be0bcb73d2744731ded527e8e5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 13:58:03 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f76449cbe38d9f2e925d0af0cd0b1050168d86d1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 13:28:37 2010 -0400
+
+ config: optional extension check for inputproto not required
+
+ The check should be in PKG_CHECK_MODULES permanently.
+
+ The XORG_DRIVER_CHECK_EXT will add inputproto to PKG_CHECK_MODULES
+ only if the extension is available. By definition, this extension
+ is an integral part of the server and is always present.
+
+ The server always sets XINPUT macro to 1.
+ The conditional code was removed
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a4dfc92927c8e26aca58da11bae1e516238fd60a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 13:27:02 2010 -0400
+
+ config: remove extension check for unused RANDR extension
+
+ The randr protocol is not used, no randr*.h are included.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ecc0b614aa3077e4d73f1b1a567486f5540f3eb5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 13:12:34 2010 -0400
+
+ config: remove AH_TOP autoheader statement
+
+ The generated config.h does not need to include xorg-server.h
+ for the content it provides.
+ Add #include <xorg-server.h> in .[hc] files as needed.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4ef973d4c740a0b92e6b0d1afae1d6fca0386bd8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu May 13 13:08:00 2010 -0400
+
+ Remove unused SCO driver files
+
+ The SCO driver has never been enabled since its original commit
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0071e2eb6bd3c31be108b7cdbc415498c83ed1c6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Apr 28 18:18:14 2010 -0400
+
+ README: update text content from sgml content
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4fc24a0093d453944dc8d46aebe27b1671d45c77
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Apr 27 13:50:20 2010 -0400
+
+ README: fix linuxdoc content
+
+ defs.ent are located under X11 directory
+ ident tag is not a Linuxdoc tag
+ replace docbook email tag with linuxdoc email tag
+ replace <code> with <verb> which preserves tabs
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3ee9b720856efa240b70d38172706485f6420289
+Author: Márton Németh <nm127@freemail.hu>
+Date: Tue Apr 13 00:35:57 2010 -0700
+
+ Bug 10866 - serial Genius NetScroll+ autodetection
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=10866
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c74d482378a85eef26dd85fc191f602e0f7c667f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jan 20 17:47:20 2010 -0800
+
+ Solaris: Handle ENODEV & other errors from VUID protocol mice
+
+ Adapted code from keyboard fix for ENODEV to do the same thing for the mouse
+
+ Use normal read() calls for reading from the mouse so we can get the ENODEV
+ errors, instead of going through the Xisb*() wrappers, which are needed for
+ reading directly from serial ports (which this code never does since it's
+ only used with VUID mouse event streams from the kernel).
+
+ Fixes http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6844148
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit a2d158c290a831dffef3613ddb736c04377c51e7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Mar 9 13:12:10 2010 -0500
+
+ config: remove unused -I$(top_srcdir)/src directive
+
+ There are no sibling directories that need access to /src headers
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c9ebc0c532bf72e459ec93f6ff4198dfd7e32252
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 14:48:49 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 36cb94a9af364c18ccae774d79a8c1f937cb786f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Dec 15 22:01:02 2009 -0500
+
+ configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+ The sdkdir variable isn't use, so remove the statement.
+
+ Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 327ede732bd05185a459c195dbc9ceee250b3b71
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Dec 16 18:17:26 2009 -0800
+
+ Silence sed substitutions in make output
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit c6ff6c3bba57a5134b050bead65dd6a1ff2f42aa
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Dec 3 11:27:30 2009 +1000
+
+ Plug minor memory leak.
+
+ This change splits the DEVICE_CLOSE behaviour from the DEVICE_OFF behaviour.
+ This doesn't change functionality as the server guarantees DEVICE_OFF to be
+ called first and DEVICE_CLOSE thus becomes a noop anyway.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 6ac394cafc959980893553955e98827c7cb45119
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Nov 23 09:25:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 9705701af25089ba8896d706f13403416f632cb4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:41:41 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
+
+commit a80227b40dd710e13fb497f2f01a51afb0e5337c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit ad49b908b8b6aa7643325e8be75e0b0e5c7e764d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 12:54:20 2009 -0400
+
+ Several driver modules do not have a ChangeLog target in Makefile.am #23814
+
+ The git generated ChangeLog replaces the hand written one.
+ Update configure.ac to xorg-macros level 1.3.
+ Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+ Update Makefile.am to add ChangeLog target if missing
+ Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+ This is a pre-req for the INSTALL_CMD
+
+commit 034f5430549b0c713b0be302e067e4f1fd02c6fb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:16 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit 2b6dc8ccfe85356d309e3191cf5b942c6d4e0cd5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 12:09:46 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index ce8de3d..71aa25d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 15:30:30 -0400
+
xserver-xorg-input-mouse (1:1.5.0-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
commit 6d6c24768b2b347436a6d35c4aaa129227c7392e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Sep 8 23:11:19 2010 -0700
xf86-input-mouse 1.6.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 48ab33c..8c99ac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-mouse],
- [1.5.0],
+ [1.6.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-mouse])
AC_CONFIG_SRCDIR([Makefile.am])
commit 4719334800b7eb88479acdcbbc176019ba9c5bd2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Sep 8 22:58:30 2010 -0700
Bring README a little closer to the current state of reality
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/README b/README
index 984814f..8daf558 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
- Mouse Support in X11R7.5
- Kazutaka Yokota
- 17 December 2002
+ Mouse Support in xf86-input-mouse
+ Original version written by Kazutaka Yokota for XFree86 on 17 December 2002
+ Updated by Alan Coopersmith for X.Org releases
____________________________________________________________
Table of Contents
@@ -56,8 +56,10 @@
1. Introduction
- This document describes mouse support in X.Org Foundation's X11R7.5
- server.
+ This document describes mouse support in the xf86-input-mouse driver
+ for the Xorg X server. This driver is mainly used on non-Linux
+ operating systems such as BSD & Solaris, as modern Linux systems use
+ the xf86-input-evdev driver instead.
Mouse configuration has often been mysterious task for novice users.
However, once you learn several basics, it is straightforward to write
@@ -67,13 +69,13 @@
2. Supported Hardware
- The X.Org Foundation X server supports four classes of mice: serial,
+ The xf86-input-mouse driver supports four classes of mice: serial,
bus and PS/2 mice, and additional mouse types supported by specific
operating systems, such as USB mice.
Serial mouse
- The serial mouse has been the most popular pointing device for
+ The serial mouse was once the most popular pointing device for
PCs. There have been numerous serial mouse models from a number
of manufactures. Despite the wide range of variations, there
have been relatively few protocols (data format) with which the
@@ -92,14 +94,15 @@
integrated I/O cards may also have a bus mouse connector. Some
bus mice are known as `InPort mouse'.
- Note that some mouse manufactures have sold a package including
+ Note that some mouse manufacturers have sold a package including
a serial mouse and a serial interface card. Don't confuse this
type of products with the genuine bus mouse.
PS/2 mouse
- They are sometimes called `Mouse-port mouse'. The PS/2 mouse is
- becoming increasingly common and popular.
+ They are sometimes called `Mouse-port mouse'. The PS/2 mouse was
+ common for a generation after serial mice, and most laptops still
+ use the PS/2 protocol for built-in pointer devices.
The PS/2 mouse is an intelligent device and may have more than
three buttons and a wheel or a roller. The PS/2 mouse is
@@ -115,17 +118,16 @@
computers. Several devices can be plugged into this bus,
including mice and keyboards.
- The server includes support for USB mice on some systems.
+ This driver 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
- connected to. However, the mouse which is not marketed as compatible
- with both serial and PS/2 mouse interface lacks this logic and cannot
- be used in such a way, even if you can find an appropriate adapter
- with which you can connect the PS/2 mouse to a serial port or visa
- versa.
-
- X11R7.5 supports the mouse with a wheel, a roller or a knob. Its
+ mouse, or as both a PS/2 and a USB mouse. They have logic to distinguish
+ which interface it is connected to. However, a mouse which is not
+ marketed as compatible with both mouse interfaces lacks this logic and
+ cannot be used in such a way, even if you can find an appropriate adapter
+ with which you can connect the mouse to a different format port.
+
+ This driver supports a mouse with a wheel, a roller or a knob. Its
action is detected as the Z (third) axis motion of the mouse. As the
X server or clients normally do not use the Z axis movement of the
pointing device, a configuration option, "ZAxisMapping", is provided
@@ -155,7 +157,6 @@
NetBSD Ok Ok Ok SP*1 SP*1 SP*1
NetBSD/pc98 Ok ? Ok NA NA NA
OpenBSD Ok Ok Ok Ok*1 Ok*1 Ok*1
- OS/2 SP*2 SP*2 SP*2 SP*2 SP*2 ?
SCO Ok ? SP*1 SP*1 NA ?
Solaris 2.x Ok NA*1 ?*1 Ok Ok SP*1
SVR4 Ok NA*1 SP*1 SP*1 NA ?
@@ -165,8 +166,6 @@
SP: support is available in a different form
*1 Refer to the following sections for details.
- *2 X11R7.5/OS2 will support any type of mouse that the OS supports,
- whether it is serial, bus mouse, or PnP type.
@@ -303,7 +302,7 @@
3.14. Solaris
- Testing has been done with Solaris 2.5.1, 2.6, 7, 8, 9 and 10.
+ Testing has been done with Solaris 2.5.1, 2.6, 7, 8, 9, 10, and 11.
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
@@ -320,9 +319,9 @@
mice correctly.
Additional USB mice can be connected using the "VUID" protocol type
- and the appropriate "/dev/usb/hid" device with the Option
- "StreamsModule" "usbms" line included in the associated "InputDevice"
- section.
+ and the appropriate "/dev/usb/hid" device with the
+ Option "StreamsModule" "usbms"
+ line included in the associated "InputDevice" section.
@@ -346,7 +345,7 @@
4. Configuring Your Mouse
- Before using the xorgconfig program to set up mouse configuration, you
+ Before editing the xorg.conf file to set up mouse configuration, you
must identify the interface type, the device name and the protocol
type of your mouse. Blindly trying every possible combination of
mouse settings will lead you nowhere.
commit cb11e9ca60e8ca2590c77f844bfd19e5278f518f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Aug 11 21:30:40 2010 -0700
MouseCtrl doesn't need to save values we never use
Makes it into a no-op, like evdev's PtrCtrl function, now that
mouse acceleration is completely handled in dix.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Patrick E. Kane <pekane52 at gmail.com>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
diff --git a/src/mouse.c b/src/mouse.c
index 99d1f2b..a296021 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1546,26 +1546,14 @@ post_event:
/*
* MouseCtrl --
- * Alter the control parameters for the mouse. Note that all special
- * protocol values are handled by dix.
+ * Alter the control parameters for the mouse. Note that all
+ * settings are now handled by dix.
*/
static void
MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
{
- InputInfoPtr pInfo;
- MouseDevPtr pMse;
-
- pInfo = device->public.devicePrivate;
- pMse = pInfo->private;
-
-#ifdef EXTMOUSEDEBUG
- ErrorF("MouseCtrl pMse=%p\n", pMse);
-#endif
-
- pMse->num = ctrl->num;
- pMse->den = ctrl->den;
- pMse->threshold = ctrl->threshold;
+ /* This function intentionally left blank */
}
/*
diff --git a/src/xf86OSmouse.h b/src/xf86OSmouse.h
index 09b8525..33b2232 100644
--- a/src/xf86OSmouse.h
+++ b/src/xf86OSmouse.h
@@ -214,9 +214,6 @@ typedef struct _MouseDevRec {
int oldBaudRate;
int sampleRate;
int lastButtons;
- int threshold; /* acceleration */
- int num;
- int den;
int buttons; /* # of buttons */
int emulateState; /* automata state for 2 button mode */
Bool emulate3Buttons;
commit 374725ef73ca929f8a951061528d11ee796cb069
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Aug 11 20:21:33 2010 -0700
Sun's copyrights belong to Oracle now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index 8a618a6..844bdb1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,5 @@
-Copyright 2004-2005, 2008-2010 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 2004-2005, 2008-2010, Oracle and/or its affiliates.
+All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/man/Makefile.am b/man/Makefile.am
index c3b2b90..419175e 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-#
+#
drivermandir = $(DRIVER_MAN_DIR)
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index ada445d..42ab933 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2004-2005, 2008-2010 Sun Microsystems, Inc.
+ * Copyright (c) 2004-2005, 2008-2010, Oracle and/or its affiliates.
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
commit 5b208a2b8d1032489a02c465830150422d1123cc
Author: Henry Zhao <henry.zhao@oracle.com>
Date: Wed Aug 11 20:16:44 2010 -0700
Check for NULL currentMode in vuidMouseSendScreenSize()
Fixes Sun bug 6920647:
Core dump in resume when monitor changed in suspend
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6920647
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index ddcdd90..ada445d 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -469,6 +469,9 @@ static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse)
ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
int result;
+ if (!pScr->currentMode)
+ return;
+
if ((pVuidMse->absres.width != pScr->currentMode->HDisplay) ||
(pVuidMse->absres.height != pScr->currentMode->VDisplay))
{
commit b9d6d0309abdec7b384cb1f0958b9bcd60364e60
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Jul 28 21:23:25 2010 +0200
Do not return the address of a local buffer
Make the const buffer returned by FindDevice a static const buffer, to avoid
letting be on the stack.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index 222c8ad..4dac225 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -171,7 +171,7 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
static const char *
FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
{
- const char path[] = DEFAULT_MOUSE_DEV;
+ static const char path[] = DEFAULT_MOUSE_DEV;
int fd;
SYSCALL (fd = open(path, O_RDWR | O_NONBLOCK | O_EXCL));
commit 75300d6ae5a5b2324224423c9f976cba50e47547
Author: Patrick E. Kane <pekane52@gmail.com>
Date: Fri Jul 16 11:13:20 2010 -0500
xf86-input-mouse: Update sun_mouse devPrivates code #29049
Update the sun_mouse devPrivates code to conform to the new API
(introducted by commit faeebead7bfcc78535757ca7acc1faf7554c03b7)
that requires the PrivateKey to be registered.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29049
Signed-off-by: Patrick E. Kane <pekane52@gmail.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index f6e8dbb..ddcdd90 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -116,7 +116,13 @@ static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse);
static void vuidMouseAdjustFrame(int index, int x, int y, int flags);
static int vuidMouseGeneration = 0;
+
+#if HAS_DEVPRIVATEKEYREC
+static DevPrivateKeyRec vuidMouseScreenIndex;
+#else
static int vuidMouseScreenIndex;
+#endif /* HAS_DEVPRIVATEKEYREC */
+
#define vuidMouseGetScreenPrivate(s) ( \
dixLookupPrivate(&(s)->devPrivates, &vuidMouseScreenIndex))
#define vuidMouseSetScreenPrivate(s,p) \
@@ -542,6 +548,12 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
case DEVICE_INIT:
#ifdef HAVE_ABSOLUTE_MOUSE_SCALING
+
+#if HAS_DEVPRIVATEKEYREC
+ if (!dixRegisterPrivateKey(&vuidMouseScreenIndex, PRIVATE_SCREEN, 0))
+ return BadAlloc;
+#endif /* HAS_DEVPRIVATEKEYREC */
+
if (vuidMouseGeneration != serverGeneration) {
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
commit 112caa1724e139caeb91c792c394b21d1391b370
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:13:05 2010 -0300
Purge macro NEED_EVENTS
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index 9f87e79..222c8ad 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -21,7 +21,6 @@
*
*/
-#define NEED_EVENTS
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/src/mouse.c b/src/mouse.c
index c95be76..99d1f2b 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -52,7 +52,6 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/src/pnp.c b/src/pnp.c
index 6b6a68e..50d6b13 100644
--- a/src/pnp.c
+++ b/src/pnp.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "inputstr.h"
commit b714882b0245a2d6078d8778156e88813761f2c4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu May 27 18:57:33 2010 -0400
config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index a315549..48ab33c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,9 +45,6 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
XORG_WITH_LINT
-# Checks for programs.
-AC_PROG_INSTALL
-
# Obtain compiler/linker options from server and required extensions
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.5.99.901] xproto inputproto)
commit 1188152feee345b7a0f39513cd9d7b8bab938338
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu May 27 09:32:59 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 0cbac9d..a315549 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,14 +40,13 @@ AC_PROG_LIBTOOL
# Initialize X.Org macros
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
XORG_WITH_LINT
# Checks for programs.
AC_PROG_INSTALL
-AC_PROG_SED
# Obtain compiler/linker options from server and required extensions
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.5.99.901] xproto inputproto)
diff --git a/man/Makefile.am b/man/Makefile.am
index a2514d8..c3b2b90 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,22 +31,6 @@ EXTRA_DIST = mousedrv.man
CLEANFILES = $(driverman_DATA)
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
Reply to: