diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:40:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:40:04 +0100 |
| commit | eb8c16ef9d24add2e0912269775d586d7d4061e4 (patch) | |
| tree | 75a0ce4167c351512b1226cefc5630297f1b4384 /nx-X11/programs/Xserver/dix | |
| parent | 5f806ddfdb46c9a727b00ac96a6b939c447ca488 (diff) | |
| parent | 7675af8e1323925badd313adf3ec8333984d7ee1 (diff) | |
| download | nx-libs-eb8c16ef9d24add2e0912269775d586d7d4061e4.tar.gz nx-libs-eb8c16ef9d24add2e0912269775d586d7d4061e4.tar.bz2 nx-libs-eb8c16ef9d24add2e0912269775d586d7d4061e4.zip | |
Merge branch 'uli42-pr/simplify_nxwindow' into 3.6.x
Attributes GH PR #866: https://github.com/ArcticaProject/nx-libs/pull/866
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/window.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index ee146d783..d294e139d 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -497,9 +497,12 @@ CreateRootWindow(ScreenPtr pScreen) return TRUE; } -#ifndef NXAGENT_SERVER void +#ifdef NXAGENT_SERVER +xorg_InitRootWindow(WindowPtr pWin) +#else InitRootWindow(WindowPtr pWin) +#endif { ScreenPtr pScreen = pWin->drawable.pScreen; int backFlag = CWBorderPixel | CWCursor | CWBackingStore; @@ -531,7 +534,6 @@ InitRootWindow(WindowPtr pWin) MapWindow(pWin, serverClient); } -#endif /* NXAGENT_SERVER */ /* Set the region to the intersection of the rectangle and the * window's winSize. The window is typically the parent of the @@ -913,7 +915,6 @@ CrushTree(WindowPtr pWin) * If wid is None, don't send any events *****/ -#ifndef NXAGENT_SERVER int DeleteWindow(void * value, XID wid) { @@ -949,7 +950,6 @@ DeleteWindow(void * value, XID wid) free(pWin); return Success; } -#endif /* NXAGENT_SERVER */ void DestroySubwindows(register WindowPtr pWin, ClientPtr client) @@ -2988,7 +2988,6 @@ UnrealizeTree( * generated. Cannot unmap a root window. *****/ -#ifndef NXAGENT_SERVER int UnmapWindow(register WindowPtr pWin, Bool fromConfigure) { @@ -3042,7 +3041,6 @@ UnmapWindow(register WindowPtr pWin, Bool fromConfigure) WindowsRestructured (); return(Success); } -#endif /* NXAGENT_SERVER */ /***** * UnmapSubwindows |