aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-01 11:59:12 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-11-02 11:39:29 +0100
commit40a4fae660b21de943c8f23a77a9ab7bef78180d (patch)
treedf77ae702502afdab877e05944fe7074acfd0aaa /nx-X11/programs/Xserver
parent5f806ddfdb46c9a727b00ac96a6b939c447ca488 (diff)
downloadnx-libs-40a4fae660b21de943c8f23a77a9ab7bef78180d.tar.gz
nx-libs-40a4fae660b21de943c8f23a77a9ab7bef78180d.tar.bz2
nx-libs-40a4fae660b21de943c8f23a77a9ab7bef78180d.zip
NXwindow.c: call upstream version UnmapWindow()
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/dix/window.c6
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXwindow.c57
2 files changed, 5 insertions, 58 deletions
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index ee146d783..80f572a10 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -2988,9 +2988,12 @@ UnrealizeTree(
* generated. Cannot unmap a root window.
*****/
-#ifndef NXAGENT_SERVER
int
+#ifdef NXAGENT_SERVER
+xorg_UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
+#else
UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
+#endif
{
register WindowPtr pParent;
xEvent event;
@@ -3042,7 +3045,6 @@ UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
WindowsRestructured ();
return(Success);
}
-#endif /* NXAGENT_SERVER */
/*****
* UnmapSubwindows
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index 88e68e463..c682efb10 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -857,23 +857,9 @@ MapWindow(register WindowPtr pWin, ClientPtr client)
return(Success);
}
-/*****
- * UnmapWindow
- * If the window is already unmapped, this request has no effect.
- * Otherwise, the window is unmapped and an UnMapNotify event is
- * generated. Cannot unmap a root window.
- *****/
-
int
UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
{
- register WindowPtr pParent;
- xEvent event;
- Bool wasRealized = (Bool)pWin->realized;
- Bool wasViewable = (Bool)pWin->viewable;
- ScreenPtr pScreen = pWin->drawable.pScreen;
- WindowPtr pLayerWin = pWin;
-
#ifdef TEST
if (nxagentWindowTopLevel(pWin))
{
@@ -882,48 +868,7 @@ UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
}
#endif
- if ((!pWin->mapped) || (!(pParent = pWin->parent)))
- return(Success);
- if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin))
- {
- memset(&event, 0, sizeof(xEvent));
- event.u.u.type = UnmapNotify;
- event.u.unmapNotify.window = pWin->drawable.id;
- event.u.unmapNotify.fromConfigure = fromConfigure;
- DeliverEvents(pWin, &event, 1, NullWindow);
- }
- if (wasViewable && !fromConfigure)
- {
- pWin->valdata = UnmapValData;
- (*pScreen->MarkOverlappedWindows)(pWin, pWin->nextSib, &pLayerWin);
- (*pScreen->MarkWindow)(pLayerWin->parent);
- }
- pWin->mapped = FALSE;
- if (wasRealized)
- UnrealizeTree(pWin, fromConfigure);
- if (wasViewable)
- {
- if (!fromConfigure)
- {
- (*pScreen->ValidateTree)(pLayerWin->parent, pWin, VTUnmap);
- (*pScreen->HandleExposures)(pLayerWin->parent);
- }
-#ifdef DO_SAVE_UNDERS
- if (DO_SAVE_UNDERS(pWin))
- {
- if ( (*pScreen->ChangeSaveUnder)(pLayerWin, pWin->nextSib) )
- {
- (*pScreen->PostChangeSaveUnder)(pLayerWin, pWin->nextSib);
- }
- }
- pWin->DIXsaveUnder = FALSE;
-#endif /* DO_SAVE_UNDERS */
- if (!fromConfigure && pScreen->PostValidateTree)
- (*pScreen->PostValidateTree)(pLayerWin->parent, pWin, VTUnmap);
- }
- if (wasRealized && !fromConfigure)
- WindowsRestructured ();
- return(Success);
+ return xorg_UnmapWindow(pWin, fromConfigure);
}
void