xserver: Branch 'xorg-server-1.4-apple' - 3 commits

[Jeremy Huddleston]

 configure.ac                |    2 +-
 dix/window.c                |    1 -
 hw/xquartz/X11Application.m |    6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ab0a4ad82114054e73d2c6310f4ef5cccd99de66
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Feb 24 19:46:33 2009 -0800

    1.4.2-apple34

diff --git a/configure.ac b/configure.ac
index 9178cdc..4447b00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple33, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple34, [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
commit 1d479fa4f3bca9cbd81808a6c87582422fd2a257
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Feb 24 18:54:16 2009 -0800

    XQuartz: Comment out the background pointer interaction that seems to be causing CPU spinning on some configurations

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 7bf4d71..b82c89f 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1059,6 +1059,11 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
                 pDev = darwinTabletCurrent;
             }
 
+/* Seems this has somehow triggered 100% CPU usage while X11.app is in the
+ * background on some obscure HW configurations.
+ * http://xquartz.macosforge.org/trac/ticket/241
+ */
+#if 0
 /* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
 #ifdef XPLUGIN_VERSION
 #if XPLUGIN_VERSION > 0
@@ -1079,6 +1084,7 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
             }
 #endif
 #endif
+#endif
             
             DarwinSendPointerEvents(pDev, ev_type, ev_button, pointer_x, pointer_y,
                                     pressure, tilt_x, tilt_y);
commit f1ce588fd13beb7472d486ffc32135cebe4510c0
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Feb 24 18:51:02 2009 -0800

    XQuartz: Nuke an include that snuck in with the APPGROUP cherry-pick

diff --git a/dix/window.c b/dix/window.c
index b2d8cd8..fdfc1f3 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -123,7 +123,6 @@ Equipment Corporation.
 #include "dixevents.h"
 #include "globals.h"
 
-#include "privates.h"
 #include "xace.h"
 
 /******