Hello community, here is the log from the commit of package xorg-x11-driver-input checked in at Thu Dec 7 21:33:52 CET 2006. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-11-20 16:06:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-12-05 11:32:33.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Dec 5 11:28:10 CET 2006 - sndirsch@suse.de + +- updated evdev driver to release 1.1.4 + * key: use os bell-ringing function. Use the OS bell-ringing + function to ding the bell. + * support new DIX motion history API. Use the DIX motion history + if we have ABI version 1 or higher. + * brain: call xf86DeleteInput when removing device. Call + xf86DeleteInput from evdevRemoveDevice, so it also gets removed + from xf86InputDevs in the DDX. + * key: remove usage of OS keyboard layer for bell. Right now, + bell is a no-op. + * fix InitValuatorClassDeviceStruct call. "I don't know how the + last parameter got there. Sorry." + * pass maxval correctly to xf86InitValuatorAxisDeviceStruct. + Pass a maxval of -1 (i.e., fill this in appropriately), rather + than 0 (0). + * pass number of axes to InitValuatorClassDeviceStruct. This is + now required with the input-hotplug server. + * prune device list on DEVICE_CLOSE. Remove a device from the + device list when we get DEVICE_CLOSE. + * remove XFree86LOADER usage. Build evdevModuleData, et al, + unconditionally. + +------------------------------------------------------------------- Old: ---- xf86-input-evdev-1.1.3.tar.bz2 New: ---- xf86-input-evdev-1.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.OqSstF/_old 2006-12-07 21:33:35.000000000 +0100 +++ /var/tmp/diff_new_pack.OqSstF/_new 2006-12-07 21:33:35.000000000 +0100 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 17 +Release: 19 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -30,7 +30,7 @@ Source6: xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2 Source7: xf86-input-elo2300-X11R7.1-1.1.0.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.4.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 @@ -118,6 +118,28 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-input +* Tue Dec 05 2006 - sndirsch@suse.de +- updated evdev driver to release 1.1.4 + * key: use os bell-ringing function. Use the OS bell-ringing + function to ding the bell. + * support new DIX motion history API. Use the DIX motion history + if we have ABI version 1 or higher. + * brain: call xf86DeleteInput when removing device. Call + xf86DeleteInput from evdevRemoveDevice, so it also gets removed + from xf86InputDevs in the DDX. + * key: remove usage of OS keyboard layer for bell. Right now, + bell is a no-op. + * fix InitValuatorClassDeviceStruct call. "I don't know how the + last parameter got there. Sorry." + * pass maxval correctly to xf86InitValuatorAxisDeviceStruct. + Pass a maxval of -1 (i.e., fill this in appropriately), rather + than 0 (0). + * pass number of axes to InitValuatorClassDeviceStruct. This is + now required with the input-hotplug server. + * prune device list on DEVICE_CLOSE. Remove a device from the + device list when we get DEVICE_CLOSE. + * remove XFree86LOADER usage. Build evdevModuleData, et al, + unconditionally. * Mon Nov 20 2006 - sndirsch@suse.de - moved mousedrv back to man4 directory (Bug #222582) * Fri Nov 17 2006 - sndirsch@suse.de ++++++ xf86-input-evdev-1.1.3.tar.bz2 -> xf86-input-evdev-1.1.4.tar.bz2 ++++++ ++++ 16034 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.4/ChangeLog --- old/xf86-input-evdev-1.1.3/ChangeLog 2006-10-14 00:25:00.000000000 +0200 +++ new/xf86-input-evdev-1.1.4/ChangeLog 2006-11-02 02:44:06.000000000 +0100 @@ -1,3 +1,72 @@ +commit 5a5457e69c719980334cb662e5abcb77cd09bc7a +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Nov 2 03:42:57 2006 +0200 + + bump to 1.1.4 + +commit 3fc70342aaba5f95d01b6e51164ae207532fa8f4 +Merge: 1a8cea3... ef01c2e... +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Nov 2 03:42:14 2006 +0200 + + Merge branch 'input-hotplug' + +commit 1a8cea3dc4d8336b61a071a52479e71d7dd619d4 +Merge: 51d21a3... 4c72fb7... +Author: Daniel Stone <daniel@fooishbar.org> +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 <daniel@fooishbar.org> +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 <daniel@fooishbar.org> +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 <daniel@fooishbar.org> +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 <daniel@fooishbar.org> +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 <daniel@fooishbar.org> +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 <ajax@benzedrine.nwnk.net> +Date: Fri Oct 13 18:25:10 2006 -0400 + + Bump to 1.1.3 + +commit 77cbbc20b60fd564f8add39bfb840c85d5cad51d +Author: Daniel Stone <daniel@fooishbar.org> +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 <dparsons@debian.org> Date: Fri Oct 6 10:56:24 2006 +1000 @@ -25,6 +94,13 @@ Fix compilation. +commit 63f7edf7862032221e25de3c59fee1158d616597 +Merge: 7b91f92... 771eee9... +Author: Zephaniah E. Hull <warp@agamemnon.b5> +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 <warp@agamemnon.b5> Date: Sun Jul 23 22:40:51 2006 -0400 @@ -32,6 +108,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 <daniel@fooishbar.org> +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 <warp@agamemnon.b5> Date: Wed Jul 19 23:06:23 2006 -0400 @@ -40,6 +123,27 @@ This might solve some problems, but should at least prevent some odd behavior. +commit 7b91f9277afb4bd9e557f9600bd92c68dd2435c9 +Author: Daniel Stone <daniel@fooishbar.org> +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 <daniel@fooishbar.org> +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 <daniel.stone@nokia.com> +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 <warp@agamemnon.b5> Date: Thu Jul 13 11:59:25 2006 -0400 @@ -96,6 +200,13 @@ Set pInfo->fd to -1 when we close it in EvdevProc. +commit 51d21a369416bb0a45a2894e83a1cb092cc307d8 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sun Jul 9 18:08:50 2006 +0100 + + remove XFree86LOADER usage + Build evdevModuleData, et al, unconditionally. + commit 4645247d45b1653c56d8c99d5685960159e464be Author: Adam Jackson <ajax@nwnk.net> 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/configure.ac new/xf86-input-evdev-1.1.4/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.4/configure.ac 2006-11-02 02:42:33.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-evdev], - 1.1.3, + 1.1.4, [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/src/evdev.c new/xf86-input-evdev-1.1.4/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.4/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.4/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.4/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_axes.c new/xf86-input-evdev-1.1.4/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.4/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.4/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.4/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_key.c new/xf86-input-evdev-1.1.4/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.4/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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de