diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-10-28 14:30:07 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:39:30 +0100 |
| commit | 5327a85b777f87bdf8e57fdd6df5dc0350a1df2f (patch) | |
| tree | 09404d6e00194852222ac22faf8fe6de966dbf96 /nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | |
| parent | aab723eab22914e65e5fd16a2a252e597b10028a (diff) | |
| download | nx-libs-5327a85b777f87bdf8e57fdd6df5dc0350a1df2f.tar.gz nx-libs-5327a85b777f87bdf8e57fdd6df5dc0350a1df2f.tar.bz2 nx-libs-5327a85b777f87bdf8e57fdd6df5dc0350a1df2f.zip | |
NXwindow.c: mark NX changes
many functions are almost identical to dix. Mark the minimal changes.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXwindow.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index a34ca862a..77ee97f8a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -308,6 +308,7 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh) SetWinSize (pSib); SetBorderSize (pSib); +#ifdef NXAGENT_SERVER /* * Don't force X to move children. It will position them * according with gravity. @@ -320,6 +321,9 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh) */ nxagentAddConfiguredWindow(pSib, CW_Update); +#else + (*pScreen->PositionWindow)(pSib, pSib->drawable.x, pSib->drawable.y); +#endif if ( (pChild = pSib->firstChild) ) { @@ -460,6 +464,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP /* Figure out if the window should be moved. Doesn't make the changes to the window if event sent */ +#ifdef NXAGENT_SERVER #ifdef TEST if (nxagentWindowTopLevel(pWin)) { @@ -481,6 +486,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP return Success; } +#endif if (mask & CWStackMode) pSib = WhereDoIGoInTheStack(pWin, pSib, pParent->drawable.x + x, @@ -624,7 +630,9 @@ ActuallyDoSomething: if (action != RESTACK_WIN) CheckCursorConfinement(pWin); +#ifdef NXAGENT_SERVER nxagentFlushConfigureWindow(); +#endif return(Success); #undef RESTACK_WIN @@ -687,10 +695,12 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent, pWin->parent = pParent; pPrev = RealChildHead(pParent); +#ifdef NXAGENT_SERVER if (pWin->parent == screenInfo.screens[0]->root) { nxagentSetTopLevelEventMask(pWin); } +#endif if (pPrev) { @@ -756,12 +766,14 @@ MapWindow(register WindowPtr pWin, ClientPtr client) #endif WindowPtr pLayerWin; +#ifdef NXAGENT_SERVER #ifdef TEST if (nxagentWindowTopLevel(pWin)) { fprintf(stderr, "MapWindow: pWin [%p] client [%p]\n", pWin, client); } #endif +#endif if (pWin->mapped) return(Success); @@ -852,7 +864,9 @@ MapWindow(register WindowPtr pWin, ClientPtr client) RegionUninit(&temp); } +#ifdef NXAGENT_SERVER nxagentFlushConfigureWindow(); +#endif return(Success); } @@ -885,6 +899,7 @@ SaveScreens(int on, int mode) (* screenInfo.screens[i]->SaveScreen) (screenInfo.screens[i], on); if (savedScreenInfo[i].ExternalScreenSaver) { +#ifdef NXAGENT_SERVER if (nxagentOption(Timeout) != 0) { #ifdef TEST @@ -893,6 +908,7 @@ SaveScreens(int on, int mode) #endif } else +#endif { if ((*savedScreenInfo[i].ExternalScreenSaver) (screenInfo.screens[i], type, on == SCREEN_SAVER_FORCER)) |