Update to xserver 1.8. Tested by many. Ok oga@, todd@.

1 files changed, 15 insertions, 1 deletions

diff --git a/xserver/hw/xquartz/xpr/xpr.h b/xserver/hw/xquartz/xpr/xpr.h
index ab79a42cd..af1a90ca0 100644
--- a/xserver/hw/xquartz/xpr/xpr.h
+++ b/xserver/hw/xquartz/xpr/xpr.h
@@ -45,6 +45,20 @@ void xprHideWindows(Bool hide);
 
 Bool QuartzInitCursor(ScreenPtr pScreen);
 void QuartzSuspendXCursor(ScreenPtr pScreen);
-void QuartzResumeXCursor(ScreenPtr pScreen, int x, int y);
+void QuartzResumeXCursor(ScreenPtr pScreen);
+
+/* If we are rooted, we need the root window and desktop levels to be below
+ * the menubar (24) but above native windows.  Normal window level is 0.
+ * Floating window level is 3.  The rest are filled in as appropriate.
+ * See CGWindowLevel.h
+ */
+
+#include <X11/extensions/applewmconst.h>
+static const int normal_window_levels[AppleWMNumWindowLevels+1] = {
+0, 3, 4, 5, INT_MIN + 30, INT_MIN + 29,
+};
+static const int rooted_window_levels[AppleWMNumWindowLevels+1] = {
+20, 21, 22, 23, 19, 18,
+};
 
 #endif /* XPR_H */