This is now dead code. The only user was eliminated in commit 193ecc8b453b22b3e60248b9354c768dbd405598.
Signed-off-by: Ville Syrjälä <[email protected]> --- dix/window.c | 33 +++------------------------------ include/window.h | 5 ----- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/dix/window.c b/dix/window.c index 1953f02..ddde68a 100644 --- a/dix/window.c +++ b/dix/window.c @@ -2673,30 +2673,6 @@ RealizeTree(WindowPtr pWin) } } -static WindowPtr windowDisableMapUnmapEvents; - -void -DisableMapUnmapEvents(WindowPtr pWin) -{ - assert (windowDisableMapUnmapEvents == NULL); - - windowDisableMapUnmapEvents = pWin; -} - -void -EnableMapUnmapEvents(WindowPtr pWin) -{ - assert (windowDisableMapUnmapEvents != NULL); - - windowDisableMapUnmapEvents = NULL; -} - -static Bool -MapUnmapEventsEnabled(WindowPtr pWin) -{ - return pWin != windowDisableMapUnmapEvents; -} - /***** * MapWindow * If some other client has selected SubStructureReDirect on the parent @@ -2742,7 +2718,7 @@ MapWindow(WindowPtr pWin, ClientPtr client) } pWin->mapped = TRUE; - if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin)) + if (SubStrSend(pWin, pParent)) { memset(&event, 0, sizeof(xEvent)); event.u.u.type = MapNotify; @@ -2903,8 +2879,7 @@ UnrealizeTree( } #endif (* Unrealize)(pChild); - if (MapUnmapEventsEnabled(pWin)) - DeleteWindowFromAnyEvents(pChild, FALSE); + DeleteWindowFromAnyEvents(pChild, FALSE); if (pChild->viewable) { pChild->viewable = FALSE; @@ -2944,7 +2919,7 @@ UnmapWindow(WindowPtr pWin, Bool fromConfigure) if ((!pWin->mapped) || (!(pParent = pWin->parent))) return Success; - if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin)) + if (SubStrSend(pWin, pParent)) { memset(&event, 0, sizeof(xEvent)); event.u.u.type = UnmapNotify; @@ -3147,8 +3122,6 @@ SendVisibilityNotify(WindowPtr pWin) xEvent event; unsigned int visibility = pWin->visibility; - if (!MapUnmapEventsEnabled(pWin)) - return; #ifdef PANORAMIX /* This is not quite correct yet, but it's close */ if(!noPanoramiXExtension) { diff --git a/include/window.h b/include/window.h index e13598b..4f09d7c 100644 --- a/include/window.h +++ b/include/window.h @@ -261,11 +261,6 @@ extern _X_EXPORT RegionPtr CreateBoundingShape( extern _X_EXPORT RegionPtr CreateClipShape( WindowPtr /* pWin */ ); -extern _X_EXPORT void DisableMapUnmapEvents( - WindowPtr /* pWin */ ); -extern _X_EXPORT void EnableMapUnmapEvents( - WindowPtr /* pWin */ ); - extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, Bool enable); extern _X_EXPORT void PrintWindowTree(void); -- 1.7.3.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
