Skip to content

N
nx-libs
Commit 5327a85b authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

NXwindow.c: mark NX changes

many functions are almost identical to dix. Mark the minimal changes.
parent aab723ea
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 0 deletions
nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
View file @ 5327a85b
...@@ -308,6 +308,7 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh) ...@@ -308,6 +308,7 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh)
SetWinSize (pSib); SetWinSize (pSib);
SetBorderSize (pSib); SetBorderSize (pSib);
#ifdef NXAGENT_SERVER
/* /*
* Don't force X to move children. It will position them * Don't force X to move children. It will position them
* according with gravity. * according with gravity.
...@@ -320,6 +321,9 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh) ...@@ -320,6 +321,9 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh)
*/ */
nxagentAddConfiguredWindow(pSib, CW_Update); nxagentAddConfiguredWindow(pSib, CW_Update);
#else
(*pScreen->PositionWindow)(pSib, pSib->drawable.x, pSib->drawable.y);
#endif
if ( (pChild = pSib->firstChild) ) if ( (pChild = pSib->firstChild) )
{ {
...@@ -460,6 +464,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP ...@@ -460,6 +464,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP
/* Figure out if the window should be moved. Doesn't /* Figure out if the window should be moved. Doesn't
make the changes to the window if event sent */ make the changes to the window if event sent */
#ifdef NXAGENT_SERVER
#ifdef TEST #ifdef TEST
if (nxagentWindowTopLevel(pWin)) if (nxagentWindowTopLevel(pWin))
{ {
...@@ -481,6 +486,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP ...@@ -481,6 +486,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP
return Success; return Success;
} }
#endif
if (mask & CWStackMode) if (mask & CWStackMode)
pSib = WhereDoIGoInTheStack(pWin, pSib, pParent->drawable.x + x, pSib = WhereDoIGoInTheStack(pWin, pSib, pParent->drawable.x + x,
...@@ -624,7 +630,9 @@ ActuallyDoSomething: ...@@ -624,7 +630,9 @@ ActuallyDoSomething:
if (action != RESTACK_WIN) if (action != RESTACK_WIN)
CheckCursorConfinement(pWin); CheckCursorConfinement(pWin);
#ifdef NXAGENT_SERVER
nxagentFlushConfigureWindow(); nxagentFlushConfigureWindow();
#endif
return(Success); return(Success);
#undef RESTACK_WIN #undef RESTACK_WIN
...@@ -687,10 +695,12 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent, ...@@ -687,10 +695,12 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
pWin->parent = pParent; pWin->parent = pParent;
pPrev = RealChildHead(pParent); pPrev = RealChildHead(pParent);
#ifdef NXAGENT_SERVER
if (pWin->parent == screenInfo.screens[0]->root) if (pWin->parent == screenInfo.screens[0]->root)
{ {
nxagentSetTopLevelEventMask(pWin); nxagentSetTopLevelEventMask(pWin);
} }
#endif
if (pPrev) if (pPrev)
{ {
...@@ -756,12 +766,14 @@ MapWindow(register WindowPtr pWin, ClientPtr client) ...@@ -756,12 +766,14 @@ MapWindow(register WindowPtr pWin, ClientPtr client)
#endif #endif
WindowPtr pLayerWin; WindowPtr pLayerWin;
#ifdef NXAGENT_SERVER
#ifdef TEST #ifdef TEST
if (nxagentWindowTopLevel(pWin)) if (nxagentWindowTopLevel(pWin))
{ {
fprintf(stderr, "MapWindow: pWin [%p] client [%p]\n", pWin, client); fprintf(stderr, "MapWindow: pWin [%p] client [%p]\n", pWin, client);
} }
#endif #endif
#endif
if (pWin->mapped) if (pWin->mapped)
return(Success); return(Success);
...@@ -852,7 +864,9 @@ MapWindow(register WindowPtr pWin, ClientPtr client) ...@@ -852,7 +864,9 @@ MapWindow(register WindowPtr pWin, ClientPtr client)
RegionUninit(&temp); RegionUninit(&temp);
} }
#ifdef NXAGENT_SERVER
nxagentFlushConfigureWindow(); nxagentFlushConfigureWindow();
#endif
return(Success); return(Success);
} }
...@@ -885,6 +899,7 @@ SaveScreens(int on, int mode) ...@@ -885,6 +899,7 @@ SaveScreens(int on, int mode)
(* screenInfo.screens[i]->SaveScreen) (screenInfo.screens[i], on); (* screenInfo.screens[i]->SaveScreen) (screenInfo.screens[i], on);
if (savedScreenInfo[i].ExternalScreenSaver) if (savedScreenInfo[i].ExternalScreenSaver)
{ {
#ifdef NXAGENT_SERVER
if (nxagentOption(Timeout) != 0) if (nxagentOption(Timeout) != 0)
{ {
#ifdef TEST #ifdef TEST
...@@ -893,6 +908,7 @@ SaveScreens(int on, int mode) ...@@ -893,6 +908,7 @@ SaveScreens(int on, int mode)
#endif #endif
} }
else else
#endif
{ {
if ((*savedScreenInfo[i].ExternalScreenSaver) if ((*savedScreenInfo[i].ExternalScreenSaver)
(screenInfo.screens[i], type, on == SCREEN_SAVER_FORCER)) (screenInfo.screens[i], type, on == SCREEN_SAVER_FORCER))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment