diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/miext/rootless/rootlessWindow.c | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/miext/rootless/rootlessWindow.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 73eb6d5c1..f3bbd21cf 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" @@ -107,12 +105,6 @@ current_time_in_seconds (void) return t; } */ -static inline Bool -rootlessHasRoot (ScreenPtr pScreen) -{ - return WINREC (WindowTable[pScreen->myNum]) != NULL; -} - #ifdef __APPLE__ void RootlessNativeWindowStateChanged (WindowPtr pWin, unsigned int state) @@ -150,7 +142,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; @@ -490,6 +482,7 @@ RootlessEnsureFrame(WindowPtr pWin) winRec->is_reorder_pending = FALSE; winRec->pixmap = NULL; winRec->wid = NULL; + winRec->level = 0; SETWINREC(pWin, winRec); |