mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hand-apply patch (chansrv: handle ReparentNotify) from Authentic8: 68cdc07

Browse Source
This commit is contained in:
Jim Grandy 2013-07-06 08:17:20 -07:00
parent 8c176482ba
commit 9db0cb13d0
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sesman/chansrv/rail.c
View File

@ -1663,7 +1663,8 @@ rail_xevent(void *xevent)
break; break;
case CreateNotify: case CreateNotify:
LOG(10, (" got CreateNotify 0x%8.8x", lxevent->xcreatewindow.window)); LOG(10, (" got CreateNotify window 0x%8.8x parent 0x%8.8x",
lxevent->xcreatewindow.window, lxevent->xcreatewindow.parent));
break; break;
case DestroyNotify: case DestroyNotify:
@ -1678,14 +1679,15 @@ rail_xevent(void *xevent)
break; break;
case MapRequest: case MapRequest:
LOG(10, (" got MapRequest 0x%8.8x", lxevent->xmaprequest.window)); LOG(10, (" got MapRequest window 0x%8.8x", lxevent->xmaprequest.window));
XSelectInput(g_display, lxevent->xmaprequest.window, XSelectInput(g_display, lxevent->xmaprequest.window,
PropertyChangeMask | StructureNotifyMask); PropertyChangeMask | StructureNotifyMask);
XMapWindow(g_display, lxevent->xmaprequest.window); XMapWindow(g_display, lxevent->xmaprequest.window);
break; break;
case MapNotify: case MapNotify:
LOG(10, (" got MapNotify 0x%8.8x", lxevent->xmap.event)); LOG(10, (" got MapNotify window 0x%8.8x event 0x%8.8x",
lxevent->xmap.window, lxevent->xmap.event));
if (lxevent->xmap.window != lxevent->xmap.event) if (lxevent->xmap.window != lxevent->xmap.event)
{ {
XGetWindowAttributes(g_display, lxevent->xmap.window, &wnd_attributes); XGetWindowAttributes(g_display, lxevent->xmap.window, &wnd_attributes);
@ -1769,6 +1771,24 @@ rail_xevent(void *xevent)
LOG(10, (" got LeaveNotify")); LOG(10, (" got LeaveNotify"));
break; break;
case ReparentNotify:
LOG(10, (" got ReparentNotify window 0x%8.8x parent 0x%8.8x "
"event 0x%8.8x x %d y %d overrider redirect %d",
lxevent->xreparent.window, lxevent->xreparent.parent,
lxevent->xreparent.event, lxevent->xreparent.x,
lxevent->xreparent.y, lxevent->xreparent.override_redirect));
if (lxevent->xreparent.parent != g_root_window)
{
index = list_index_of(g_window_list, lxevent->xreparent.window);
if (index >= 0)
{
rail_destroy_window(lxevent->xreparent.window);
list_remove_item(g_window_list, index);
}
}
rv = 0;
break;
} }
return rv; return rv;