SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dix: Factor out DeliverMapNotify

Browse Source 
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson
2012-09-20 11:16:24 -04:00
committed by Keith Packard
parent 63843cb700
commit d20cc0fca4
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dix/window.c
View File

@@ -2543,6 +2543,17 @@ MaybeDeliverMapRequest(WindowPtr pWin, WindowPtr pParent, ClientPtr client)
client) == 1;
}
static void
DeliverMapNotify(WindowPtr pWin)
{
xEvent event = {
.u.mapNotify.window = pWin->drawable.id,
.u.mapNotify.override = pWin->overrideRedirect,
};
event.u.u.type = MapNotify;
DeliverEvents(pWin, &event, 1, NullWindow);
}
/*****
* MapWindow
* If some other client has selected SubStructureReDirect on the parent
@@ -2576,14 +2587,8 @@ MapWindow(WindowPtr pWin, ClientPtr client)
return Success;
pWin->mapped = TRUE;
if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin)) {
xEvent event = {
.u.mapNotify.window = pWin->drawable.id,
.u.mapNotify.override = pWin->overrideRedirect,
};
event.u.u.type = MapNotify;
DeliverEvents(pWin, &event, 1, NullWindow);
}
if (SubStrSend(pWin, pParent) && MapUnmapEventsEnabled(pWin))
DeliverMapNotify(pWin);
if (!pParent->realized)
return Success;
@@ -2650,14 +2655,8 @@ MapSubwindows(WindowPtr pParent, ClientPtr client)
continue;
pWin->mapped = TRUE;
if (parentNotify || StrSend(pWin)) {
xEvent event = {
.u.mapNotify.window = pWin->drawable.id,
.u.mapNotify.override = pWin->overrideRedirect
};
event.u.u.type = MapNotify;
DeliverEvents(pWin, &event, 1, NullWindow);
}
if (parentNotify || StrSend(pWin))
DeliverMapNotify(pWin);
if (!pFirstMapped)
pFirstMapped = pWin;