.cvsignore | 19
.gitignore | 20
ChangeLog | 572
++++++++--
README | 55
config.guess | 32
config.sub | 16
configure | 20
configure.ac | 2
debian/changelog | 10
debian/patches/01_work_around_race_condition_during_VT_switch.patch | 22
debian/patches/series | 2
man/mousedrv.man | 9
src/mouse.c | 45
src/mousePriv.h | 2
14 files changed, 659 insertions(+), 167 deletions(-)
New commits:
commit 15c9a80c5d83326cf288c15a55d7af858e7d650b
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Thu Jun 14 00:48:38 2007 +1000
Upload new version 1.2.1 (+git) to unstable.
Includes 01_work_around_race_condition_during_VT_switch.patch.
autoreconf as well.
Latest git includes Sensitivity option.
diff --git a/ChangeLog b/ChangeLog
index b0ff392..f0471e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,112 +1,536 @@
-2006-05-15 Matthias Hopf <[EMAIL PROTECTED]>
+commit c7c012d8bf735dfa894146b379a2e1fd55f57fca
+Author: Drew Parsons <[EMAIL PROTECTED]>
+Date: Thu Jun 14 00:24:07 2007 +1000
- * configure.ac,src/mouse.c:
- Bump to 1.1.1.
+ Update version using PACKAGE_VERSION_*
-2006-04-21 Matthias Hopf <[EMAIL PROTECTED]>
+commit e567cb0792ea3dc2cd68c46628332c1f8bbb173d
+Author: Jürgen Appel <[EMAIL PROTECTED]>
+Date: Mon Apr 23 15:54:08 2007 +0200
- * man/mouse.man:
- Fixed default for YAxisMapping.
- Changed default for ZAxisMapping. Added short explanation.
- * src/mouse.c: (MouseCommonOptions), (MouseReadInput):
- Autodetect (one way only) single wheel only for EXPS2.
- Use singlebit protocol for multiwheel EXPS2 mice.
+ Added "Sensitivity" option. Use for slowing down high resolution mice.
-2006-04-20 Matthias Hopf <[EMAIL PROTECTED]>
+commit 4666e5f14b2cb63f5cd7c863331fe69658c989df
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Feb 26 13:36:15 2007 -0800
- * src/mouse.c: (MousePostEvent):
- Overhaul of wheel processing. Does work correctly with multibit
- zaxis events now.
+ renamed: .cvsignore -> .gitignore
-2006-04-06 Adam Jackson <[EMAIL PROTECTED]>
+commit 92a8e2a39d7c9d6bfdaa0a5ac0118599008638ff
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Feb 26 13:35:42 2007 -0800
- * configure.ac:
- * src/mouse.c:
- * src/pnp.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ Update text version of README to match sgml
+
+ Oops - forgot to regen text when the sgml changes were checked in for
+ commit 28c5410df7ba8af07b994c0907519e869c9df750
-2006-03-09 Eric Anholt <[EMAIL PROTECTED]>
+commit e355dc2e04b1b4756d4ad8553794b4e97210000c
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Thu Nov 30 19:57:28 2006 +0200
- * src/mouse.c: (MouseCommonOptions):
- Coverity #875: Correct several memory leaks in options parsing.
+ bump to 1.2.1
-2006-02-28 Adam Jackson <[EMAIL PROTECTED]>
+commit fb347fb74e1a50fa900f225d13eee1aa829fa2f9
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Thu Nov 23 18:17:33 2006 +0100
- * configure.ac:
- * src/mouse.c:
- Bump to 1.0.4.
+ Work around race condition during VT switch.
+
+ https://bugzilla.novell.com/show_bug.cgi?id=219946
-2006-02-02 Matthias Hopf <[EMAIL PROTECTED]>
+commit 7a866ae143c3638d6b1e3836d48f16e300e90b09
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Thu Nov 2 04:47:12 2006 +0200
- * man/mouse.man:
- Fixed ButtonMapping default.
+ bump to 1.2.0
-2006-01-17 Matthias Hopf <[EMAIL PROTECTED]>
+commit ddc0db4fe85e2b8de31ad67a6d4f97808bce018f
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Thu Nov 2 00:07:01 2006 +0200
- * src/mouse.c: (MouseDoPostEvent):
- Bug #5071: EmulateWheelTimeout didn't work as anticipated.
+ 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.
-2006-01-09 Daniel Stone <[EMAIL PROTECTED]>
+commit 167dbbc2af6cad5d3b320e4e384bd78dd3450a5c
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Oct 13 18:28:46 2006 -0400
- * src/mouse.c:
- Remove #ifdef PNP_MOUSE blocks, as it was always defined in the
- monolith.
+ Bump to 1.1.2
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 40cfeffc5bea7ecdc20bbbe4db50fd725a62f29b
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Sun Aug 27 13:06:31 2006 +0300
- * configure.ac:
- Update package version for X11R7 release.
+ move manpage to mousedrv.man to avoid conflict with mouse.4
-2005-12-19 Alan Coopersmith <[EMAIL PROTECTED]>
+commit ac0dc7451be0a8aba703fd4d9a78e17544c40842
+Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
+Date: Sun Jul 9 20:01:26 2006 +0200
- * man/mouse.man:
- Update URL for mouse docs online.
- Add VUID to supported protocols (used on Solaris).
+ Bug #5285: added some missing includes, avoid redefinition of
+ NEED_XF86_TYPES.
- * README.sgml:
- Update docs for X11R6.9 & 7.0 releases.
- Add note about new ButtonMapping option.
- Explain changes due to "virtual mouse" support in Solaris 10.
- Change "mices" to "mice".
+commit 6dbc6ad05d147831a62b161e23f5da29101f2cfa
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Fri May 26 13:55:39 2006 +0000
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 1.1.1.
- * configure.ac:
- * src/mouse.c:
- Update package version number for final X11R7 release candidate.
- Bump driver version number.
+commit 12bd04878774154fe83d785418b87dd37b4f2f15
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Fri Apr 21 11:15:23 2006 +0000
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Fixed default for YAxisMapping. Changed default for ZAxisMapping. Added
+ short explanation.
+ Autodetect (one way only) single wheel only for EXPS2. Use singlebit
+ protocol for multiwheel EXPS2 mice.
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 2ce9bbe76c788fe7c41d2607577c867e5a3d9608
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Thu Apr 20 18:25:32 2006 +0000
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Overhaul of wheel processing. Does work correctly with multibit zaxis
+ events now.
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit 5e9624b3695cf37fff7986d1585e4227bad789f5
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Apr 7 17:59:54 2006 +0000
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit 270fe8e1ccd2f5af114e8292bee8c4d27a1d93ab
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon Apr 3 21:18:50 2006 +0000
-2005-11-29 Adam Jackson <[EMAIL PROTECTED]>
+ Coverity #875: Correct several memory leaks in options parsing.
- * configure.ac:
- Only build dlloader modules by default.
+commit abe3a020a70859f680163a8105cebeac42695f72
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Feb 28 19:44:45 2006 +0000
-2005-11-22 Daniel Stone <[EMAIL PROTECTED]>
+ Bump to 1.0.4.
- * configure.ac:
- Update dependency on xorg-server to >= 0.99.3, for MouseDriverRec
changes.
+commit 6de7233e0fdb63d4794df45d76391a4a6f04ec8d
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Thu Feb 2 11:53:50 2006 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Fixed ButtonMapping default.
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 9ec6a9a1c1b01e37ea60611160a4c15c2f308086
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Tue Jan 17 11:49:57 2006 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bug #5071: EmulateWheelTimeout didn't work as anticipated.
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit 745e3d38594938742f16508a61bd0ce9598fcf30
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Mon Jan 9 02:30:15 2006 +0000
+
+ Remove unconditionally-defined #ifdef PNP_MOUSE blocks.
+
+commit b9db086daae7aacae068e4db85575737ebe76f45
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Dec 21 02:29:57 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit d84b58ede20c31f4acbf886197c92b6f69d32da8
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Dec 19 16:25:51 2005 +0000
+
+ Stub COPYING files
+
+commit 28c5410df7ba8af07b994c0907519e869c9df750
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Dec 19 09:07:50 2005 +0000
+
+ Typo fixes, mailing list & url updates, and other changes to prepare for
+ X11R6.9 & 7.0 releases.
+
+commit c231bba8457cbe98c516f0ee90ebc2c4b5a936a9
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Dec 15 00:21:33 2005 +0000
+
+ Update package version number for final X11R7 release candidate. Bump
+ driver version number.
+
+commit c356477c8dab15a68fa6deb06181c28d2e9d1c54
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Mon Dec 12 06:59:54 2005 +0000
+
+ Bug #1752: When emulating 3 buttons in "auto" mode, timeout immediately
+ when a mouse movement is detected (Egbert Eich, Kean Johnston, Kevin
+ Martin).
+
+commit 4180beef7023dc3a860dd9895c986317326c5236
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Dec 6 22:48:31 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit bef647bfb75c9be08046ba041e775e2be483bc05
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:49:31 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit e8f1d1cc8f021c8034087c7d2d26a945fda41467
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:45:18 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC3.
+
+commit 1e537674ebd4df0b7245b4b2119bcf33be9d3f51
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Dec 2 02:16:06 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 7b4b12a977e4c84d861f103613245570f34d31ce
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Nov 29 23:29:56 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 1c95c00528b69db9a2345af0bcc871f63e2b8d89
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Nov 28 22:04:07 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 90cda6b6d1f9e8db9d77423943b663e3e010b06c
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Tue Nov 22 04:03:23 2005 +0000
+
+ Bump dependency on xorg-server to >= 0.99.3 for MouseDeviceRec changes.
+
+commit 4b37d5d1d2f80da983346e15e900fb07de7d2cf8
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon Nov 21 10:49:06 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 31c63c83f7dbe8c538d67d3f9a1e3064ea78e278
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Mon Nov 14 14:25:09 2005 +0000
+
+ Bug #4915: ButtonMapping default changed from one-to-one mapping to "1 2 3
+ 8 9 10 11...".
+
+commit 5bca72458c8f9637f9c8f0871bb2048d824c6974
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Mon Nov 14 14:19:52 2005 +0000
+
+ Bug #4915: Move buttonMapping initialization before calling OS specific
+ PreInit.
+
+commit f00e2a8c9689465f6e173e08d0b51407e19f385b
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Thu Nov 10 03:37:47 2005 +0000
+
+ Unrevert default ZAxisMapping change now that the default is back to "4 5 6
+ 7"
+
+commit 77975bfe30f984f45f908d22a0e9c8fa0311aef0
+Author: Kean Johnson <[EMAIL PROTECTED]>
+Date: Thu Nov 10 02:41:20 2005 +0000
+
+ Dont pass wheel mouse buttons as real buttons, map them as Z-Axis movement
+ on SCO and USL. Re-instate the ZAxisMapping default for the mouse
+ driver.
+
+commit aa6bdb84ec4d22f0916b1e471b89d056a684d7d4
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Nov 9 21:31:23 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit f8bf605528c78c1cb6670ee096837e5c04e1b61a
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Nov 9 21:15:12 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 75a30c52706057cd70407271eda647c699a5a66d
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Wed Nov 9 17:05:40 2005 +0000
+
+ Bug #4915: ButtonMapping option which allows to define arbitrary button
+ mappings (including left-handed mouse etc.). Fixed incorrect usage of
+ non-reversed, but ZAxisMapped buttons for state detection. Nuked unused
+ part of reverseMap.
+
+commit 2372fba8f5f6e8d3bfa48edc980f2186fc9e87ee
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Wed Nov 9 16:32:51 2005 +0000
+
+ Reflect changes in ZAxisMapping default.
+
+commit 823f49c8238595a377f7d0494d742f5e50d34eca
+Author: Kean Johnson <[EMAIL PROTECTED]>
+Date: Tue Nov 8 06:33:28 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit 640006296296b33dceaf33675a4db3335765aac6
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Nov 1 15:08:50 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 8dca995860193bc3132301f1b0f79ada06bffd4c
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 19 02:48:01 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 9dffd55847ebac6b381d8359ad67f056fb66cf2b
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Oct 18 00:01:52 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 08905305e064e8f20e5db529b850aaa87b578b2c
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Oct 17 22:57:29 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit bcabac6b1f0c39e20bca6e1abd4efe70d7eeac69
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Oct 17 00:08:59 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 34856ca1f73108ca19c20d9223457be328890dc1
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Tue Oct 4 20:01:02 2005 +0000
+
+ Check in generated README files
+
+commit 55e29446456e51ccdca57f348ed4660f65ab7dee
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Mon Oct 3 21:22:06 2005 +0000
+
+ - For all drivers that have a <driver>.sgml file, add code in their build
+ system to build the README file at make dist time
+ - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
+ will check if the required tools and files exist, and if so set a
+ conditional.
+ - util/modular/symlink.sh
+ - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
+ - Add all the README.<driver> to the list of excluded files
+ - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
+ it spew less warnings when the text file is built.
+
+commit 79a6d468c7995032988a3888324fddf798021553
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Wed Aug 31 23:38:47 2005 +0000
+
+ Fix EmulateWheelTimeout Option. Spotted by Richard Neill, bug 4291
+
+commit 70e4c1b572ea98e9cdf85b4c5ea3b63a89647d3d
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Fri Aug 26 07:12:34 2005 +0000
+
+ Extend Genius NetMouse support. (Debian #040)
+
+commit 8227eb1ff74c7c61690359e2af00a5a6c23b56e9
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Thu Aug 18 09:03:40 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 4b08d9746296a4d9fc756a059f2bfba3490192a6
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Aug 15 23:48:35 2005 +0000
+
+ Set ZAxisMapping default to "4 5 6 7".
+
+commit f355ef63c60adc7a72517ca71fdc9983f3881db9
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Wed Aug 10 14:07:23 2005 +0000
+
+ Don\'t lose existing CFLAGS in all the input drivers and some of the video
+ drivers
+
+commit fd37fdea221cdf13a26e075758c9d1b405da5c06
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Jul 29 21:22:41 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 0159c76ac33cc7072a5b30129b5b622053f23b08
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Jul 13 20:03:22 2005 +0000
+
+ Make the module dir configurable
+
+commit 84c284202386be7c46d60cfa8a58f031d05ac84f
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Jul 12 23:16:59 2005 +0000
+
+ Update driver to pass distcheck
+
+commit e955a67245f83da020632a2bf82c04c03a697322
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Tue Jul 12 06:15:09 2005 +0000
+
+ Build skeletons for input drivers. Should basically work.
+
+commit 5f673ca035ec1c3c4abdc162f50c864c89ed84d4
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Jul 11 02:38:00 2005 +0000
+
+ Prep input drivers for modularizing by adding guarded #include "config.h"
+
+commit c2bc3b67c121ffb1152333e268b675643f9f477f
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Fri Jul 1 22:43:23 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 25eb972e71e11208cd6426f5583d33490d82829d
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sat Jun 25 21:17:02 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit e9fd033c9c6903b681f1e82c3cd03098c3fbf2a4
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Mon May 9 23:41:06 2005 +0000
+
+ Bugzilla #2389: Document the maximum number of buttons a mouse can have.
+ Correct a missing period I noticed while I was here.
+
+commit 0367a3a65a30fa461a1f2c4facf28821dbf10a77
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Wed May 4 04:14:58 2005 +0000
+
+ Port X.Org to FreeBSD/powerpc. This makes a bit of math for sysmouse in
+ mouse.c explicitly signed, avoiding the need for -fsigned-chars. (Peter
+ Grehan, grehan at FreeBSD dot org)
+
+commit b538c125e4cd103c743ed26ec4d288d4a5b35b24
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Wed Apr 20 12:25:34 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 39eeceba31b6a8b42be175db472c92b4aebb82c6
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Oct 17 22:45:57 2004 +0000
+
+ - Fix DFP detection in r128 driver (bug 1386, Klaus Kusche)
+ - Fix EmulateWheelInertia defaults (bug 1115, Andrew Pimlott)
+
+commit a257b41d741b49268c55e739b6d793be3de6586a
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun Oct 17 20:29:35 2004 +0000
+
+ - Add interlaced support to S3 driver (bug 332, Leo Savernik)
+ - EmulateWheelTimeout (bug 323, Mathias Fröhlich)
+ - single button double-click (bug 322, Rob Brown)
+
+commit 1a49e855396dd927dc69c63c2a32e115fd8f504c
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Sep 3 16:18:23 2004 +0000
+
+ First set of documentation updates.
+ Include more correct fix for rootless interaction with damage (Bug #1168,
+ Keith Packard).
+
+commit 014853d848b04ce496afc8ff3f0273872e8f761a
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Jul 26 23:20:22 2004 +0000
+
+ - Change xf86config to xorgconfig
+ - Update Solaris mouse support information
+
+commit 4ef4fa01917112bd937b32793ade3230de0b0d4b
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Sat Jul 24 17:35:39 2004 +0000
+
+ Fix a problem with wsmouse driver loosing events on 64bit architectures
+ (XFree86 Bugzilla #1438, John Heasley). "To fix this, I've added a
+ mouse buffer (Xisb buffer) "scale" value to the MouseDevPtr type. If
+ set, it is used as structure size of which we want space for a few."
+
+commit 3fed730ac9f9b95503bc457d8688896cbda502f1
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Apr 23 19:54:04 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 3e37718d9046394e1f89df80c9280727681c2b59
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Sun Mar 14 08:33:52 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 2714a22dc4f13db3bf1a050d403cb3b2692a6d20
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed Mar 3 12:12:34 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit fb74889ec7baa2bf9162f43517d6db36414a5c32
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 13:36:00 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit be8481276bdfee635dd3e4da33e65780aa5b7660
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 09:23:34 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 53bc8cd30c7ef1f888db318ad174ff4f028ce634
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Dec 19 20:55:25 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit 8e2fe5d5a02c4c8da8f4ced432da6fe88272b975
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Tue Nov 25 19:28:48 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 92595648d1140139f0c0a42cbb2c548fc6864575
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit c9c7e96897229ba1d457a58f66121dd1f9210382
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ Initial revision
+
+commit 95b194f6e3456b46c2f994f4f6655fabfcf89c76
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 15:54:49 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index fab0aa3..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1219,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/configure b/configure
index 3b49fb9..4010c6e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-mouse 1.1.2.
+# Generated by GNU Autoconf 2.61 for xf86-input-mouse 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-mouse'
PACKAGE_TARNAME='xf86-input-mouse'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='xf86-input-mouse 1.1.2'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='xf86-input-mouse 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1422,7 +1422,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-mouse 1.1.2 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-mouse 1.2.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1492,7 +1492,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-mouse 1.1.2:";;
+ short | recursive ) echo "Configuration of xf86-input-mouse 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1604,7 +1604,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-mouse configure 1.1.2
+xf86-input-mouse configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1618,7 +1618,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-mouse $as_me 1.1.2, which was
+It was created by xf86-input-mouse $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2290,7 +2290,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-mouse'
- VERSION='1.1.2'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -21250,7 +21250,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-mouse $as_me 1.1.2, which was
+This file was extended by xf86-input-mouse $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21303,7 +21303,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-mouse config.status 1.1.2
+xf86-input-mouse config.status 1.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 89757f6..c905195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,17 @@
-xserver-xorg-input-mouse (1:1.1.2-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.2.1-1) unstable; urgency=low
+ [ Brice Goglin ]
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add a link to www.X.org and a reference to the xf86-input-mouse
module in the long description.
- * Add 01_work_around_race_condition_during_VT_switch.patch
- -- Brice Goglin <[EMAIL PROTECTED]> Wed, 25 Apr 2007 00:41:46 +0200
+ [ Drew Parsons ]
+ * New upstream version.
+ * Update to latest git while we're at it (adds "Sensitivity" option).
+
+ -- Drew Parsons <[EMAIL PROTECTED]> Thu, 14 Jun 2007 00:44:53 +1000
xserver-xorg-input-mouse (1:1.1.2-1) experimental; urgency=low
diff --git
a/debian/patches/01_work_around_race_condition_during_VT_switch.patch
b/debian/patches/01_work_around_race_condition_during_VT_switch.patch
deleted file mode 100644
index c41b01f..0000000
--- a/debian/patches/01_work_around_race_condition_during_VT_switch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit fb347fb74e1a50fa900f225d13eee1aa829fa2f9
-Author: Matthias Hopf <[EMAIL PROTECTED]>
-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
-
-Index: xserver-xorg-input-mouse/src/mouse.c
-===================================================================
---- xserver-xorg-input-mouse.orig/src/mouse.c 2007-04-25 00:26:29.000000000
+0200
-+++ xserver-xorg-input-mouse/src/mouse.c 2007-04-25 00:40:52.000000000
+0200
-@@ -1164,6 +1164,9 @@
- 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
diff --git a/debian/patches/series b/debian/patches/series
index 3073480..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_work_around_race_condition_during_VT_switch.patch
+
commit c7c012d8bf735dfa894146b379a2e1fd55f57fca
Author: Drew Parsons <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
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 }
};
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
