xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 4b63f88b0ad5f6614fee5b7af4f97ce4581ab935
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
    (cherry picked from commit 1d479fa4f3bca9cbd81808a6c87582422fd2a257)

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);