Hello community,
here is the log from the commit of package xorg-x11-driver-input
checked in at Wed Oct 3 01:18:08 CEST 2007.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2007-09-21 00:01:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2007-09-29 12:18:46.319639000 +0200
@@ -1,0 +2,17 @@
+Sat Sep 29 12:22:08 CEST 2007 - sndirsch@suse.de
+
+- bumped version to 7.3
+
+-------------------------------------------------------------------
+Sat Sep 29 08:45:35 CEST 2007 - sndirsch@suse.de
+
+- xf86-input-vmmouse 12.4.3
+ * updates to reflect the latest input ABI changes
+ * adds an embedded version string in a .modinfo segment (when
+ compiled with gcc) that can be read by the linux kernel
+ 'modinfo' tool.
+ * fixes a global symbol collision with the svga driver
+- xf86-input-evdev 1.1.5
+ * input-hotplug support
+
+-------------------------------------------------------------------
Old:
----
xf86-input-evdev-1.1.3.tar.bz2
xf86-input-vmmouse-12.4.1.tar.bz2
New:
----
xf86-input-evdev-1.1.5.tar.bz2
xf86-input-vmmouse-12.4.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.TM7463/_old 2007-10-03 01:17:38.000000000 +0200
+++ /var/tmp/diff_new_pack.TM7463/_new 2007-10-03 01:17:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-driver-input (Version 7.2)
+# spec file for package xorg-x11-driver-input (Version 7.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
#!BuildIgnore: xorg-x11-Mesa xorg-x11-Mesa-devel
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
-Version: 7.2
-Release: 108
+Version: 7.3
+Release: 1
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -30,7 +30,7 @@
Source6: xf86-input-dynapro-1.1.1.tar.bz2
Source7: xf86-input-elo2300-1.1.1.tar.bz2
Source8: xf86-input-elographics-1.1.0.tar.bz2
-Source9: xf86-input-evdev-1.1.3.tar.bz2
+Source9: xf86-input-evdev-1.1.5.tar.bz2
Source10: xf86-input-fpit-X11R7.1-1.1.0.tar.bz2
Source11: xf86-input-hyperpen-X11R7.1-1.1.0.tar.bz2
Source12: xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2
@@ -47,7 +47,7 @@
Source23: xf86-input-summa-X11R7.1-1.1.0.tar.bz2
Source24: xf86-input-tek4957-X11R7.1-1.1.0.tar.bz2
Source25: xf86-input-ur98-X11R7.1-1.1.0.tar.bz2
-Source26: xf86-input-vmmouse-12.4.1.tar.bz2
+Source26: xf86-input-vmmouse-12.4.3.tar.bz2
Source27: xf86-input-void-1.1.1.tar.bz2
Source28: xf86-input-aiptek-1.2.tar.gz
Patch1: xf86-input-magictouch.diff
@@ -134,6 +134,17 @@
/usr/%{_lib}/xorg/modules/input/
%{_mandir}/man4/*
%changelog
+* Sat Sep 29 2007 - sndirsch@suse.de
+- bumped version to 7.3
+* Sat Sep 29 2007 - sndirsch@suse.de
+- xf86-input-vmmouse 12.4.3
+ * updates to reflect the latest input ABI changes
+ * adds an embedded version string in a .modinfo segment (when
+ compiled with gcc) that can be read by the linux kernel
+ 'modinfo' tool.
+ * fixes a global symbol collision with the svga driver
+- xf86-input-evdev 1.1.5
+ * input-hotplug support
* Fri Sep 21 2007 - sndirsch@suse.de
- xf86-input-calcomp.diff
* out of bounds warning (Bug #326967)
++++++ xf86-input-evdev-1.1.3.tar.bz2 -> xf86-input-evdev-1.1.5.tar.bz2 ++++++
++++ 16866 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/ChangeLog new/xf86-input-evdev-1.1.5/ChangeLog
--- old/xf86-input-evdev-1.1.3/ChangeLog 2006-10-14 00:25:00.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/ChangeLog 2006-12-16 00:43:16.000000000 +0100
@@ -1,3 +1,85 @@
+commit e1fe72e7fe663a479a5be1b5e16ecbba52f511a8
+Author: Daniel Stone
+Date: Sat Dec 16 01:42:18 2006 +0200
+
+ bump to 1.1.5
+
+commit 9f3be57929048950ad0e03cfef44b5336c38aab3
+Author: Daniel Stone
+Date: Wed Dec 6 18:50:15 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+ Make ChangeLog hook as safe as possible.
+
+commit 5a5457e69c719980334cb662e5abcb77cd09bc7a
+Author: Daniel Stone
+Date: Thu Nov 2 03:42:57 2006 +0200
+
+ bump to 1.1.4
+
+commit 3fc70342aaba5f95d01b6e51164ae207532fa8f4
+Merge: 1a8cea3... ef01c2e...
+Author: Daniel Stone
+Date: Thu Nov 2 03:42:14 2006 +0200
+
+ Merge branch 'input-hotplug'
+
+commit 1a8cea3dc4d8336b61a071a52479e71d7dd619d4
+Merge: 51d21a3... 4c72fb7...
+Author: Daniel Stone
+Date: Thu Nov 2 03:42:13 2006 +0200
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev
+
+commit ef01c2ef65fa64cb213dc3adfa30c75635d1fe03
+Author: Daniel Stone
+Date: Thu Nov 2 03:41:48 2006 +0200
+
+ key: use os bell-ringing function
+ Use the OS bell-ringing function to ding the bell.
+
+commit 036b457c1b3f7d2d174da890cb8598d907181f8e
+Author: Daniel Stone
+Date: Wed Oct 25 02:22:46 2006 +0300
+
+ support new DIX motion history API
+ Use the DIX motion history if we have ABI version 1 or higher.
+
+commit 79eb7dcac8cdbecc07be08737388a8a6574e3d76
+Merge: d7f686b... 63f7edf...
+Author: Daniel Stone
+Date: Tue Oct 17 11:32:39 2006 +0300
+
+ Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug
+
+commit d7f686bfa3e773cfc7740c707da9fc64196e143c
+Merge: ec09e0d... 4c72fb7...
+Author: Daniel Stone
+Date: Tue Oct 17 11:31:58 2006 +0300
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug
+
+commit ec09e0d55dd14164cc46a68a71d439cc550df063
+Author: Daniel Stone
+Date: Sun Oct 15 19:37:46 2006 +0300
+
+ brain: call xf86DeleteInput when removing device
+ Call xf86DeleteInput from evdevRemoveDevice, so it also gets removed from
+ xf86InputDevs in the DDX.
+
+commit 4c72fb7b769b78cfa2b4cc39eb03fdacd2b5039c
+Author: Adam Jackson
+Date: Fri Oct 13 18:25:10 2006 -0400
+
+ Bump to 1.1.3
+
+commit 77cbbc20b60fd564f8add39bfb840c85d5cad51d
+Author: Daniel Stone
+Date: Sun Oct 8 16:14:12 2006 +0300
+
+ key: remove usage of OS keyboard layer for bell
+ Right now, bell is a no-op.
+
commit 5c5ef3fbd6eb0b668139df3ff5eda67766e86dcd
Author: Drew Parsons
Date: Fri Oct 6 10:56:24 2006 +1000
@@ -25,6 +107,13 @@
Fix compilation.
+commit 63f7edf7862032221e25de3c59fee1158d616597
+Merge: 7b91f92... 771eee9...
+Author: Zephaniah E. Hull
+Date: Tue Jul 25 16:00:44 2006 -0400
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug
+
commit 771eee968282e308d997adfa78bd39e7429d2c1c
Author: Zephaniah E. Hull
Date: Sun Jul 23 22:40:51 2006 -0400
@@ -32,6 +121,13 @@
Replace the old two buffer approach to handling rel emulation of abs axes,
should help with some of the reported jitter problems.
+commit e4681504487151553894ae0d513b9e833d2597d1
+Author: Daniel Stone
+Date: Fri Jul 21 14:38:12 2006 -0400
+
+ fix InitValuatorClassDeviceStruct call
+ I don't know how the last parameter got there. Sorry.
+
commit fa03de438ea0ae0f07424235f4972e73ff88ef17
Author: Zephaniah E. Hull
Date: Wed Jul 19 23:06:23 2006 -0400
@@ -40,6 +136,27 @@
This might solve some problems, but should at least prevent some odd behavior.
+commit 7b91f9277afb4bd9e557f9600bd92c68dd2435c9
+Author: Daniel Stone
+Date: Wed Jul 19 19:45:27 2006 -0400
+
+ pass maxval correctly to xf86InitValuatorAxisDeviceStruct
+ Pass a maxval of -1 (i.e., fill this in appropriately), rather than 0 (0).
+
+commit 7defeb0aefb216d203b495a53a6d1d505f7dece4
+Author: Daniel Stone
+Date: Wed Jul 19 19:43:08 2006 -0400
+
+ pass number of axes to InitValuatorClassDeviceStruct
+ This is now required with the input-hotplug server.
+
+commit 1cb568c0a6c18ec62ebb89ca21a22a77c78cad24
+Author: Daniel Stone
+Date: Wed Jul 19 19:41:54 2006 -0400
+
+ prune device list on DEVICE_CLOSE
+ Remove a device from the device list when we get DEVICE_CLOSE.
+
commit dc88668839f4613d60526aa78aed3e74eebe64ad
Author: Zephaniah E. Hull
Date: Thu Jul 13 11:59:25 2006 -0400
@@ -96,6 +213,13 @@
Set pInfo->fd to -1 when we close it in EvdevProc.
+commit 51d21a369416bb0a45a2894e83a1cb092cc307d8
+Author: Daniel Stone
+Date: Sun Jul 9 18:08:50 2006 +0100
+
+ remove XFree86LOADER usage
+ Build evdevModuleData, et al, unconditionally.
+
commit 4645247d45b1653c56d8c99d5685960159e464be
Author: Adam Jackson
Date: Thu Jun 22 21:16:44 2006 +0000
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/config.h.in new/xf86-input-evdev-1.1.5/config.h.in
--- old/xf86-input-evdev-1.1.3/config.h.in 2006-10-14 00:05:45.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/config.h.in 2006-12-16 00:43:08.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/configure.ac new/xf86-input-evdev-1.1.5/configure.ac
--- old/xf86-input-evdev-1.1.3/configure.ac 2006-10-14 00:04:50.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/configure.ac 2006-12-16 00:42:12.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 1.1.3,
+ 1.1.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/Makefile.am new/xf86-input-evdev-1.1.5/Makefile.am
--- old/xf86-input-evdev-1.1.3/Makefile.am 2006-10-12 00:23:37.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/Makefile.am 2006-12-06 17:49:59.000000000 +0100
@@ -28,6 +28,6 @@
.PHONY: ChangeLog
ChangeLog:
- git-log > ChangeLog
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/src/evdev_axes.c new/xf86-input-evdev-1.1.5/src/evdev_axes.c
--- old/xf86-input-evdev-1.1.3/src/evdev_axes.c 2006-10-12 00:23:37.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/src/evdev_axes.c 2006-11-02 02:42:14.000000000 +0100
@@ -672,8 +672,14 @@
return Success;
if (!InitValuatorClassDeviceStruct(device, axes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
+ GetMotionHistory,
+ GetMotionHistorySize(),
+#else
miPointerGetMotionEvents,
- miPointerGetMotionBufferSize(), 0))
+ miPointerGetMotionBufferSize(),
+#endif
+ 0))
return !Success;
for (i = 0; i < axes; i++) {
@@ -684,7 +690,9 @@
if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
return !Success;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86MotionHistoryAllocate (pInfo);
+#endif
return Success;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/src/evdev_brain.c new/xf86-input-evdev-1.1.5/src/evdev_brain.c
--- old/xf86-input-evdev-1.1.3/src/evdev_brain.c 2006-10-12 00:23:37.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/src/evdev_brain.c 2006-11-02 02:42:14.000000000 +0100
@@ -462,6 +462,24 @@
return TRUE;
}
+void
+evdevRemoveDevice (evdevDevicePtr pEvdev)
+{
+ evdevDriverPtr driver;
+ evdevDevicePtr *device;
+
+ for (driver = evdev_drivers; driver; driver = driver->next) {
+ for (device = &driver->devices; *device; device = &(*device)->next) {
+ if (*device == pEvdev) {
+ *device = pEvdev->next;
+ xf86DeleteInput(pEvdev->pInfo, 0);
+ pEvdev->next = NULL;
+ return;
+ }
+ }
+ }
+}
+
Bool
evdevGetBits (int fd, evdevBitsPtr bits)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/src/evdev.c new/xf86-input-evdev-1.1.5/src/evdev.c
--- old/xf86-input-evdev-1.1.3/src/evdev.c 2006-10-12 00:23:37.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/src/evdev.c 2006-11-02 02:42:14.000000000 +0100
@@ -214,6 +214,9 @@
EvdevKeyOff (device);
}
+ if (what == DEVICE_CLOSE)
+ evdevRemoveDevice(pEvdev);
+
device->public.on = FALSE;
break;
}
@@ -238,10 +241,12 @@
else
return !Success;
break;
+#if 0
case SendCoreEvents:
case DontSendCoreEvents:
xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
break;
+#endif
default:
return !Success;
}
@@ -268,7 +273,9 @@
pInfo->device_control = EvdevProc;
pInfo->read_input = EvdevReadInput;
pInfo->switch_mode = EvdevSwitchMode;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
pInfo->motion_history_proc = xf86GetMotionEvents;
+#endif
pInfo->conf_idev = driver->dev;
pInfo->private = device;
@@ -459,8 +466,6 @@
0
};
-#ifdef XFree86LOADER
-
static void
EvdevUnplug(pointer p)
{
@@ -496,4 +501,3 @@
EvdevPlug,
EvdevUnplug
};
-#endif /* XFree86LOADER */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/src/evdev.h new/xf86-input-evdev-1.1.5/src/evdev.h
--- old/xf86-input-evdev-1.1.3/src/evdev.h 2006-10-12 00:23:37.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/src/evdev.h 2006-11-02 02:42:14.000000000 +0100
@@ -252,6 +252,7 @@
Bool evdevStart (InputDriverPtr drv);
Bool evdevNewDriver (evdevDriverPtr driver);
Bool evdevGetBits (int fd, evdevBitsPtr bits);
+void evdevRemoveDevice (evdevDevicePtr device);
int EvdevBtnInit (DeviceIntPtr device);
int EvdevBtnOn (DeviceIntPtr device);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.3/src/evdev_key.c new/xf86-input-evdev-1.1.5/src/evdev_key.c
--- old/xf86-input-evdev-1.1.3/src/evdev_key.c 2006-10-12 00:23:37.000000000 +0200
+++ new/xf86-input-evdev-1.1.5/src/evdev_key.c 2006-11-02 02:42:14.000000000 +0100
@@ -238,10 +238,11 @@
* So use the system bell for now.
*/
static void
-EvdevKbdBell (int percent, DeviceIntPtr device, pointer ctrl, int unused)
+EvdevKbdBell (int percent, DeviceIntPtr device, pointer arg, int unused)
{
- xf86SoundKbdBell(percent, ((KeybdCtrl*) ctrl)->bell_pitch,
- ((KeybdCtrl*) ctrl)->bell_duration);
+ KeybdCtrl *ctrl = arg;
+
+ xf86OSRingBell(percent, ctrl->bell_pitch, ctrl->bell_duration);
}
static void
++++++ xf86-input-vmmouse-12.4.1.tar.bz2 -> xf86-input-vmmouse-12.4.3.tar.bz2 ++++++
++++ 6968 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.4.1/config.h.in new/xf86-input-vmmouse-12.4.3/config.h.in
--- old/xf86-input-vmmouse-12.4.1/config.h.in 2007-02-27 20:35:37.000000000 +0100
+++ new/xf86-input-vmmouse-12.4.3/config.h.in 2007-09-11 05:42:24.000000000 +0200
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.4.1/configure.ac new/xf86-input-vmmouse-12.4.3/configure.ac
--- old/xf86-input-vmmouse-12.4.1/configure.ac 2007-02-28 03:03:07.000000000 +0100
+++ new/xf86-input-vmmouse-12.4.3/configure.ac 2007-09-26 01:11:38.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.4.1,
+ 12.4.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.4.1/man/vmmouse.man new/xf86-input-vmmouse-12.4.3/man/vmmouse.man
--- old/xf86-input-vmmouse-12.4.1/man/vmmouse.man 2006-07-01 08:18:52.000000000 +0200
+++ new/xf86-input-vmmouse-12.4.3/man/vmmouse.man 2007-07-09 22:46:08.000000000 +0200
@@ -1,228 +1,47 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,v 1.5 2002/12/17 20:55:21 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH MOUSE __drivermansuffix__ __vendorversion__
+.TH VMMOUSE __drivermansuffix__ __vendorversion__
.SH NAME
-mouse \- Mouse input driver
+vmmouse \- VMware Mouse input driver
.SH SYNOPSIS
.nf
.B "Section \*qInputDevice\*q"
.BI " Identifier \*q" idevname \*q
-.B " Driver \*qmouse\*q"
-.BI " Option \*qProtocol\*q \*q" protoname \*q
-.BI " Option \*qDevice\*q \*q" devpath \*q
+.B " Driver \*qvmmouse\*q"
\ \ ...
.B EndSection
.fi
.SH DESCRIPTION
-.B mouse
+.B vmmouse
is an XFree86 input driver for mice. The driver supports most available
mouse types and interfaces. USB mice are only supported on some OSs,
and the level of support for PS/2 mice depends on the OS.
.PP
The
-.B mouse
+.B vmmouse
driver functions as a pointer input device, and may be used as the
X server's core pointer. Multiple mice are supported by multiple
instances of this driver.
-.SH SUPPORTED HARDWARE
-There is a detailed list of hardware that the
-.B mouse
-driver supports in the
-.I README.mouse
-document. This can be found
-in __projectroot__/lib/X11/doc/, or online at
-http://www.xfree86.org/current/mouse.html.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
section only covers configuration details specific to this driver.
.PP
-The driver can auto-detect the mouse type on some platforms On some
-platforms this is limited to plug and play serial mice, and on some the
-auto-detection works for any mouse that the OS's kernel driver supports.
-On others, it is always necessary to specify the mouse protocol in the
-config file. The
-.I README.mouse
-document contains some detailed information about this.
-.PP
-The following driver
-.B Options
-are supported:
-.TP 7
-.BI "Option \*qProtocol\*q \*q" string \*q
-Specify the mouse protocol. Valid protocol types include:
-.PP
-.RS 12
-Auto, Microsoft, MouseSystems, MMSeries, Logitech, MouseMan, MMHitTab,
-GlidePoint, IntelliMouse, ThinkingMouse, AceCad, PS/2, ImPS/2,
-ExplorerPS/2, ThinkingMousePS/2, MouseManPlusPS/2, GlidePointPS/2,
-NetMousePS/2, NetScrollPS/2, BusMouse, SysMouse, WSMouse, USB, Xqueue.
-.RE
-.PP
-.RS 7
-Not all protocols are supported on all platforms. The "Auto" platform
-specifies that protocol auto-detection should be attempted. There is no
-default protocol setting, and specifying this option is mandatory.
-.RE
-.TP 7
-.BI "Option \*qDevice\*q \*q" string \*q
-Specifies the device through which the mouse can be accessed. A common
-setting is "/dev/mouse", which is often a symbolic link to the real
-device. This option is mandatory, and there is no default setting.
-.TP 7
-.BI "Option \*qButtons\*q \*q" integer \*q
-Specifies the number of mouse buttons. In cases where the number of buttons
-cannot be auto-detected, the default value is 3.
-.TP 7
-.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
-.TP 7
-.BI "Option \*qEmulate3Timeout\*q \*q" integer \*q
-Sets the timeout (in milliseconds) that the driver waits before deciding
-if two buttons where pressed "simultaneously" when 3 button emulation is
-enabled. Default: 50.
-.TP 7
-.BI "Option \*qChordMiddle\*q \*q" boolean \*q
-Enable/disable handling of mice that send left+right events when the middle
-button is used. Default: off.
-.TP 7
-.BI "Option \*qEmulateWheel\*q \*q" boolean \*q
-Enable/disable "wheel" emulation. Wheel emulation means emulating button
-press/release events when the mouse is moved while a specific real button
-is pressed. Wheel button events (typically buttons 4 and 5) are
-usually used for scrolling. Wheel emulation is useful for getting wheel-like
-behaviour with trackballs. It can also be useful for mice with 4 or
-more buttons but no wheel. See the description of the
-.BR EmulateWheelButton ,
-.BR EmulateWheelInertia ,
-.BR XAxisMapping ,
-and
-.B YAxisMapping
-options below. Default: off.
-.TP 7
-.BI "Option \*qEmulateWheelButton\*q \*q" integer \*q
-Specifies which button must be held down to enable wheel emulation mode.
-While this button is down, X and/or Y pointer movement will generate button
-press/release events as specified for the
-.B XAxisMapping
-and
-.B YAxisMapping
-settings. Default: 4.
-.TP 7
-.BI "Option \*qEmulateWheelInertia\*q \*q" integer \*q
-Specifies how far (in pixels) the pointer must move to generate button
-press/release events in wheel emulation mode. Default: 50.
-.TP 7
-.BI "Option \*qXAxisMapping\*q \*q" "N1 N2" \*q
-Specifies which buttons are mapped to motion in the X direction in wheel
-emulation mode. Button number
-.I N1
-is mapped to the negative X axis motion and button number
-.I N2
-is mapped to the positive X axis motion. Default: no mapping.
-.TP 7
-.BI "Option \*qYAxisMapping\*q \*q" "N1 N2" \*q
-Specifies which buttons are mapped to motion in the Y direction in wheel
-emulation mode. Button number
-.I N1
-is mapped to the negative Y axis motion and button number
-.I N2
-is mapped to the positive Y axis motion. Default: "4 5".
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*qX\*q"
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*qY\*q"
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*q" "N1 N2" \*q
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*q" "N1 N2 N3 N4" \*q
-Set the mapping for the Z axis (wheel) motion to buttons or another axis
-.RB ( X
-or
-.BR Y ).
-Button number
-.I N1
-is mapped to the negative Z axis motion and button number
-.I N2
-is mapped to the positive Z axis motion. For mice with two wheels,
-four button numbers can be specified, with the negative and positive motion
-of the second wheel mapped respectively to buttons number
-.I N3
-and
-.IR N4 .
-Default: no mapping.
-.TP 7
-.BI "Option \*qFlipXY\*q \*q" boolean \*q
-Enable/disable swapping the X and Y axes. This transformation is applied
-after the
-.BR InvX ,
-.B InvY
-and
-.BR AngleOffset
-transformations. Default: off.
-.TP 7
-.BI "Option \*qInvX\*q \*q" boolean \*q
-Invert the X axis. Default: off.
-.TP 7
-.BI "Option \*qInvY\*q \*q" boolean \*q
-Invert the Y axis. Default: off.
-.TP 7
-.BI "Option \*qAngleOffset\*q \*q" integer \*q
-Specify a clockwise angular offset (in degrees) to apply to the pointer
-motion. This transformation is applied before the
-.BR FlipXY ,
-.B InvX
-and
-.B InvY
-transformations. Default: 0.
-.TP 7
-.BI "Option \*qSampleRate\*q \*q" integer \*q
-Sets the number of motion/button events the mouse sends per second. Setting
-this is only supported for some mice, including some Logitech mice and
-some PS/2 mice on some platforms. Default: whatever the mouse is
-already set to.
-.TP 7
-.BI "Option \*qResolution\*q \*q" integer \*q
-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 \*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 buttton down at the
-same time they move a mouse cursor. Button numbers occur in pairs,
-with the lock button number occurring first, followed by the button
-number that is the target of the lock button.
-.TP 7
-.BI "Option \*qDragLockButtons\*q \*q" "M1" \*q
-Sets a \*qmaster drag lock button\*q that acts as a \*qMeta Key\*q
-indicating that the next button pressed is to be
-\*qdrag locked\*q.
-.TP 7
-.BI "Option \*qClearDTR\*q \*q" boolean \*q
-Enable/disable clearing the DTR line on the serial port used by the mouse.
-Some dual-protocol mice require the DTR line to be cleared to operate
-in the non-default protocol. This option is for serial mice only.
-Default: off.
-.TP 7
-.BI "Option \*qClearRTS\*q \*q" boolean \*q
-Enable/disable clearing the RTS line on the serial port used by the mouse.
-Some dual-protocol mice require the RTS line to be cleared to operate
-in the non-default protocol. This option is for serial mice only.
-Default: off.
-.TP 7
-.BI "Option \*qBaudRate\*q \*q" integer \*q
-Set the baud rate to use for communicating with a serial mouse. This
-option should rarely be required because the default is correct for almost
-all situations. Valid values include: 300, 1200, 2400, 4800, 9600, 19200.
-Default: 1200.
-.PP
-There are some other options that may be used to control various parameters
-for serial port communication, but they are not documented here because
-the driver sets them correctly for each mouse protocol type.
+The driver will automatically detect if the vmmouse device is present and if
+it is not, it will load the regular
+.B mouse
+driver and attempt to fall back to it. There are no
+.B vmmouse
+specific options, but if you set
+.B mouse(__drivermansuffix__)
+options, they will be passed on.
+.PP
+See the
+.B mouse(__drivermansuffix__)
+man page for details on these options.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
-README.mouse.
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__),
+mouse(__drivermansuffix__)
+.SH AUTHORS
+Copyright (c) 1999-2007 VMware, Inc.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-vmmouse-12.4.1/src/vmmouse.c new/xf86-input-vmmouse-12.4.3/src/vmmouse.c
--- old/xf86-input-vmmouse-12.4.1/src/vmmouse.c 2007-02-28 03:03:22.000000000 +0100
+++ new/xf86-input-vmmouse-12.4.3/src/vmmouse.c 2007-09-26 01:11:47.000000000 +0200
@@ -77,11 +77,41 @@
#include "vmmouse_client.h"
/*
+ * This is the only way I know to turn a #define of an integer constant into
+ * a constant string.
+ */
+#define VMW_INNERSTRINGIFY(s) #s
+#define VMW_STRING(str) VMW_INNERSTRINGIFY(str)
+
+/*
+ * So that the file compiles unmodified when dropped into an xfree source tree.
+ */
+#ifndef XORG_VERSION_CURRENT
+#define XORG_VERSION_CURRENT XF86_VERSION_CURRENT
+#endif
+
+/*
* Version constants
*/
#define VMMOUSE_MAJOR_VERSION 12
#define VMMOUSE_MINOR_VERSION 4
-#define VMMOUSE_PATCHLEVEL 1
+#define VMMOUSE_PATCHLEVEL 3
+#define VMMOUSE_DRIVER_VERSION \
+ (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
+#define VMMOUSE_DRIVER_VERSION_STRING \
+ VMW_STRING(VMMOUSE_MAJOR_VERSION) "." VMW_STRING(VMMOUSE_MINOR_VERSION) \
+ "." VMW_STRING(VMMOUSE_PATCHLEVEL)
+
+/*
+ * Standard four digit version string expected by VMware Tools installer.
+ * As the driver's version is only {major, minor, patchlevel}, simply append an
+ * extra zero for the fourth digit.
+ */
+#ifdef __GNUC__
+const char vm_mouse_version[] __attribute__((section(".modinfo"),unused)) =
+ "version=" VMMOUSE_DRIVER_VERSION_STRING ".0";
+#endif
+
/*****************************************************************************
* static function header
@@ -323,7 +353,9 @@
pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
pInfo->device_control = VMMouseDeviceControl;
pInfo->read_input = VMMouseReadInput;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
pInfo->motion_history_proc = xf86GetMotionEvents;
+#endif
pInfo->control_proc = VMMouseControlProc;
pInfo->close_proc = VMMouseCloseProc;
pInfo->switch_mode = VMMouseSwitchMode;
@@ -753,8 +785,18 @@
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);
@@ -762,7 +804,9 @@
/* Y valuator */
xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, 1);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86MotionHistoryAllocate(pInfo);
+#endif
xf86Msg(X_INFO, "VMWARE(0): VMMOUSE DEVICE_INIT\n");
#ifdef EXTMOUSEDEBUG
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org