ChangeLog | 19 +++++++++++++++++++ configure.ac | 4 ++-- debian/changelog | 6 ++++++ dix/devices.c | 42 ------------------------------------------ 4 files changed, 27 insertions(+), 44 deletions(-)
New commits: commit ceb92cb1e0a385c30be3a4d4a8c2846afd03543e Author: Cyril Brulebois <[email protected]> Date: Tue Apr 19 03:08:22 2011 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index a979b15..0c367f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg-server (2:1.10.1-1) UNRELEASED; urgency=low +xorg-server (2:1.10.1-1) experimental; urgency=low * New upstream release. - -- Cyril Brulebois <[email protected]> Tue, 19 Apr 2011 03:07:39 +0200 + -- Cyril Brulebois <[email protected]> Tue, 19 Apr 2011 03:08:08 +0200 xorg-server (2:1.10.0.902-1) experimental; urgency=low commit 46b133ad49c8e94c33300feec00e3a056214c272 Author: Cyril Brulebois <[email protected]> Date: Tue Apr 19 03:07:49 2011 +0200 New upstream release. diff --git a/ChangeLog b/ChangeLog index 8f0a412..63ab294 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +commit a73311f8304193f9245fb077f173bf1e1d52e040 +Author: Jeremy Huddleston <[email protected]> +Date: Fri Apr 15 17:58:57 2011 -0700 + + configure.ac: Bump verison to 1.10.1 + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 55f85d6cc28d737314f12958aac49d61b9476657 +Author: Jeremy Huddleston <[email protected]> +Date: Thu Apr 14 15:24:07 2011 -0700 + + Revert "dix: release all buttons and keys before reattaching a device (#34182)" + + This patch introduced a regression, reverting for the 1.10.1 release. See + https://bugs.freedesktop.org/show_bug.cgi?id=36146 + + This reverts commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a. + commit ec6e1e45627de2bb851f135df0507a360d0d99e6 Author: Jeremy Huddleston <[email protected]> Date: Fri Apr 8 16:36:32 2011 -0700 diff --git a/debian/changelog b/debian/changelog index 7ea3fbe..a979b15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.10.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <[email protected]> Tue, 19 Apr 2011 03:07:39 +0200 + xorg-server (2:1.10.0.902-1) experimental; urgency=low * New upstream release (1.10.1 rc2). commit a73311f8304193f9245fb077f173bf1e1d52e040 Author: Jeremy Huddleston <[email protected]> Date: Fri Apr 15 17:58:57 2011 -0700 configure.ac: Bump verison to 1.10.1 Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/configure.ac b/configure.ac index d5d3e3b..756733e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.10.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2011-04-08" +AC_INIT([xorg-server], 1.10.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2011-04-15" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 55f85d6cc28d737314f12958aac49d61b9476657 Author: Jeremy Huddleston <[email protected]> Date: Thu Apr 14 15:24:07 2011 -0700 Revert "dix: release all buttons and keys before reattaching a device (#34182)" This patch introduced a regression, reverting for the 1.10.1 release. See https://bugs.freedesktop.org/show_bug.cgi?id=36146 This reverts commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a. diff --git a/dix/devices.c b/dix/devices.c index 84284e7..55f22cb 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2380,46 +2380,6 @@ RecalculateMasterButtons(DeviceIntPtr slave) } /** - * Generate release events for all keys/button currently down on this - * device. - */ -static void -ReleaseButtonsAndKeys(DeviceIntPtr dev) -{ - EventListPtr eventlist = InitEventList(GetMaximumEventsNum()); - ButtonClassPtr b = dev->button; - KeyClassPtr k = dev->key; - int i, j, nevents; - - if (!eventlist) /* no release events for you */ - return; - - /* Release all buttons */ - for (i = 0; b && i < b->numButtons; i++) - { - if (BitIsOn(b->down, i)) - { - nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, NULL); - for (j = 0; j < nevents; j++) - mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL); - } - } - - /* Release all keys */ - for (i = 0; k && i < MAP_LENGTH; i++) - { - if (BitIsOn(k->down, i)) - { - nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i); - for (j = 0; j < nevents; j++) - mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL); - } - } - - FreeEventList(eventlist, GetMaximumEventsNum()); -} - -/** * Attach device 'dev' to device 'master'. * Client is set to the client that issued the request, or NULL if it comes * from some internal automatic pairing. @@ -2452,8 +2412,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) free(dev->spriteInfo->sprite); } - ReleaseButtonsAndKeys(dev); - oldmaster = dev->u.master; dev->u.master = master; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
