xserver: Branch 'xorg-server-1.2-apple'

[Ben Byer]

 hw/darwin/quartz/xpr/xprFrame.c |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 4dcd9106a89ceb6c72546a12849be04660f574fd
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Tue Dec 4 15:25:40 2007 -0800

    added debug hook to disable fb code; create a file
    called /tmp/disable_fb.txt to try it

diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 1b0ba91..3245da0 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -31,6 +31,7 @@
 #include <dix-config.h>
 #endif
 
+#include <unistd.h>
 #include "xpr.h"
 #include "rootlessCommon.h"
 #include "Xplugin.h"
@@ -398,10 +399,19 @@ xprInit(ScreenPtr pScreen)
 {
     RootlessInit(pScreen, &xprRootlessProcs);
 
-    rootless_CopyBytes_threshold = xp_copy_bytes_threshold;
-    rootless_FillBytes_threshold = xp_fill_bytes_threshold;
-    rootless_CompositePixels_threshold = xp_composite_area_threshold;
-    rootless_CopyWindow_threshold = xp_scroll_area_threshold;
+    if(!access("/tmp/disable_fb.txt", F_OK)) {
+      // always use the xp functions, dammit
+      fprintf(stderr,"setting rootless thresholds to zero to disable fb usage\n");
+      rootless_CopyBytes_threshold = 0;
+      rootless_FillBytes_threshold = 0;
+      rootless_CompositePixels_threshold = 0;
+      rootless_CopyWindow_threshold = 0;
+    } else {
+      rootless_CopyBytes_threshold = xp_copy_bytes_threshold;
+      rootless_FillBytes_threshold = xp_fill_bytes_threshold;
+      rootless_CompositePixels_threshold = xp_composite_area_threshold;
+      rootless_CopyWindow_threshold = xp_scroll_area_threshold;
+    }
 
     no_configure_window = FALSE;