Thu Jan 12 17:09:18 2006 Søren Sandmann <sandmann@redhat.com>

Add new functions to enable and disable events on Map and Unmap.
Use them here to make sure Composite redirect doesn't cause Map/UnmapNotify
    events that would confuse window managers.
This commit is contained in:
Søren Sandmann Pedersen
2006-01-12 22:14:56 +00:00
parent 847d83ec3c
commit c2dedf4d17
4 changed files with 53 additions and 2 deletions

View File

@@ -101,7 +101,11 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
return BadAlloc;
}
if (wasMapped)
{
DisableMapUnmapEvents (pWin);
UnmapWindow (pWin, FALSE);
EnableMapUnmapEvents (pWin);
}
REGION_NULL (pScreen, &cw->borderClip);
cw->update = CompositeRedirectAutomatic;
@@ -135,7 +139,9 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
{
Bool overrideRedirect = pWin->overrideRedirect;
pWin->overrideRedirect = TRUE;
DisableMapUnmapEvents (pWin);
MapWindow (pWin, pClient);
EnableMapUnmapEvents (pWin);
pWin->overrideRedirect = overrideRedirect;
}
@@ -169,7 +175,11 @@ compFreeClientWindow (WindowPtr pWin, XID id)
if (!cw->clients)
{
if (wasMapped)
{
DisableMapUnmapEvents (pWin);
UnmapWindow (pWin, FALSE);
EnableMapUnmapEvents (pWin);
}
if (pWin->redirectDraw)
compFreePixmap (pWin);
@@ -193,7 +203,9 @@ compFreeClientWindow (WindowPtr pWin, XID id)
{
Bool overrideRedirect = pWin->overrideRedirect;
pWin->overrideRedirect = TRUE;
DisableMapUnmapEvents (pWin);
MapWindow (pWin, clients[CLIENT_ID(id)]);
EnableMapUnmapEvents (pWin);
pWin->overrideRedirect = overrideRedirect;
}
}