xserver: Branch 'xorg-server-1.6-apple' - 4 commits

[Jeremy Huddleston]

 Xext/xtest.c |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 28bb411360603942ac5fcd083da43b8cdb7bb028
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 17:25:27 2009 -0700

    1.6.3-apple1

diff --git a/configure.ac b/configure.ac
index b3ee404..593d850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,12 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.6.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.3-apple1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE="2009-8-25"
+RELEASE_DATE="2009-8-31"
 
 dnl this gets generated by autoheader, and thus contains all the defines.  we
 dnl don't ever actually use it, internally.
commit da64006eb55443fef2262130b3a998755eeec3ae
Merge: 7dcb9b1... 3044711...
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 17:14:04 2009 -0700

    Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple

commit 3044711412d0a08ba65a491bd2441c0c8980f5e2
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Aug 25 22:37:16 2009 -0700

    Bump version to 1.6.3.901 (1.6.4 RC1)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index b8a3385..9bb566c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,12 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE="2009-7-31"
+RELEASE_DATE="2009-8-25"
 
 dnl this gets generated by autoheader, and thus contains all the defines.  we
 dnl don't ever actually use it, internally.
commit d8e48deb212767c4dfce982e6cb9d1b1fce63b96
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Aug 25 22:29:25 2009 -0700

    Block signals while delivering XTest events (fixes bug 23100)
    
    XTest uses the same event list as all input devices, and input devices
    use it at SIGIO time. This causes mass confusion when a SIGIO event
    occurs in the middle of XTest event processing.
    
    The master branch has a much different fix, using a separate input
    queue which reduces latency that may be caused by XTest event queuing;
    it's a 'nicer' fix in some ways, but this simple fix should solve the
    problem.
    
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 9cfe8ca..e5ab7b4 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -384,6 +384,7 @@ ProcXTestFakeInput(client)
     if (screenIsSaved == SCREEN_SAVER_ON)
         dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 
+    OsBlockSignals();
     GetEventList(&events);
     switch(type) {
         case MotionNotify:
@@ -402,7 +403,6 @@ ProcXTestFakeInput(client)
             break;
     }
 
-    OsBlockSignals();
     for (i = 0; i < nevents; i++)
         mieqEnqueue(dev, (events+i)->event);
     OsReleaseSignals();