aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winwin32rootlesswindow.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-28 15:43:29 +0000
committermarha <marha@users.sourceforge.net>2011-01-28 15:43:29 +0000
commitb3be16ace28c0a51052c3b76162efbab811abf84 (patch)
tree72aca06573b4901ee11033a54c837ae857b94481 /xorg-server/hw/xwin/winwin32rootlesswindow.c
parent3dc6a410655083df5831c5b607c2bb0626446aca (diff)
parentc4d402326310d620866b1ad82ef0691526e2c311 (diff)
downloadvcxsrv-b3be16ace28c0a51052c3b76162efbab811abf84.tar.gz
vcxsrv-b3be16ace28c0a51052c3b76162efbab811abf84.tar.bz2
vcxsrv-b3be16ace28c0a51052c3b76162efbab811abf84.zip
Enabled ROOTLESS option in dix (currenlty not really used)
Diffstat (limited to 'xorg-server/hw/xwin/winwin32rootlesswindow.c')
-rw-r--r--xorg-server/hw/xwin/winwin32rootlesswindow.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/xorg-server/hw/xwin/winwin32rootlesswindow.c b/xorg-server/hw/xwin/winwin32rootlesswindow.c
index 60e1f8bea..bfb35e70f 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswindow.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswindow.c
@@ -230,23 +230,18 @@ winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv,
/* Get current window placement */
GetWindowPlacement (pRLWinPriv->hWnd, &wndPlace);
+#ifdef XWIN_MULTIWINDOWINTWM
if (winIsInternalWMRunning(pScreenInfo))
{
if (!pRLWinPriv->pFrame->win->overrideRedirect)
fDecorate = TRUE;
}
-#if 0
- if (wndPlace.showCmd == SW_HIDE)
- return;//showCmd = SWP_HIDEWINDOW;
- else
- showCmd = SWP_SHOWWINDOW;
-#else
+#endif
if (wndPlace.showCmd == SW_HIDE)
return;
if (IsWindowVisible (pRLWinPriv->hWnd))
showCmd = SWP_SHOWWINDOW;
-#endif
showCmd |= SWP_NOMOVE | SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER;
@@ -388,7 +383,7 @@ winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv,
}
}
-
+#ifdef XWIN_MULTIWINDOWINTWM
/*
* winIsInternalWMRunning (winScreenInfoPtr pScreenInfo)
*/
@@ -397,7 +392,7 @@ winIsInternalWMRunning (winScreenInfoPtr pScreenInfo)
{
return pScreenInfo->fInternalWM && !pScreenInfo->fAnotherWMRunning;
}
-
+#endif
/*
* winMWExtWMRestackWindows