From a915739887477b28d924ecc8417ee107d125bd6c Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 6 Sep 2009 18:48:27 +0000 Subject: Switched to xorg-server-1.6.99.900.tar.gz --- xorg-server/miext/rootless/rootlessWindow.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'xorg-server/miext/rootless/rootlessWindow.c') diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 5ce26bd2f..e273d0e38 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -48,8 +48,6 @@ extern int darwinMainScreenX, darwinMainScreenY; #endif #include "fb.h" -#define AppleWMNumWindowLevels 5 - #include "rootlessCommon.h" #include "rootlessWindow.h" @@ -105,12 +103,6 @@ current_time_in_seconds (void) return t; } */ -static inline Bool -rootlessHasRoot (ScreenPtr pScreen) -{ - return WINREC (WindowTable[pScreen->myNum]) != NULL; -} - void RootlessNativeWindowStateChanged (WindowPtr pWin, unsigned int state) { @@ -147,7 +139,7 @@ void RootlessNativeWindowMoved (WindowPtr pWin) { mask = CWX | CWY; /* pretend we're the owner of the window! */ - err = dixLookupClient(&pClient, pWin->drawable.id, NullClient, DixUnknownAccess); + err = dixLookupClient(&pClient, pWin->drawable.id, serverClient, DixUnknownAccess); if(err != Success) { ErrorF("RootlessNativeWindowMoved(): Failed to lookup window: 0x%x\n", (unsigned int)pWin->drawable.id); return; @@ -486,6 +478,7 @@ RootlessEnsureFrame(WindowPtr pWin) winRec->is_reorder_pending = FALSE; winRec->pixmap = NULL; winRec->wid = NULL; + winRec->level = 0; SETWINREC(pWin, winRec); -- cgit v1.2.3