yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If there's a MapRequest in the wrapper window, this means something

Browse source 
has reparented an unknown window inside the wrapper, and wants to show it.
This is either somebody doing something stupid, or it's a save-set saved
window from some crashing application. And save-set is a bit flawed,
as it in fact should reparent to root, not to the closest existing ancestor.
Therefore, act like if it was reparented to root, and manage the window.
Takes care of #68241.

svn path=/trunk/kdebase/kwin/; revision=273671
This commit is contained in:
Luboš Luňák 2003-12-18 12:25:22 +00:00
parent 05b1897258
commit 5a171eac2b
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
events.cpp
View file

@ -324,6 +324,8 @@ bool Workspace::workspaceEvent( XEvent * e )
// a chance to reparent it back to root // a chance to reparent it back to root
// since KWin can get MapRequest only for root window children and // since KWin can get MapRequest only for root window children and
// children of WindowWrapper (=clients), the check is AFAIK useless anyway // children of WindowWrapper (=clients), the check is AFAIK useless anyway
// Note: Now the save-set support in Client::mapRequestEvent() actually requires that
// this code doesn't check the parent to be root.
// if ( e->xmaprequest.parent == root ) { //###TODO store previously destroyed client ids // if ( e->xmaprequest.parent == root ) { //###TODO store previously destroyed client ids
if ( addSystemTrayWin( e->xmaprequest.window ) ) if ( addSystemTrayWin( e->xmaprequest.window ) )
return TRUE; return TRUE;
@ -598,6 +600,20 @@ bool Client::mapRequestEvent( XMapRequestEvent* e )
{ {
if( e->window != window()) if( e->window != window())
{ {
// Special support for the save-set feature, which is a bit broken.
// If there's a window from one client embedded in another one,
// e.g. using XEMBED, and the embedder suddenly looses its X connection,
// save-set will reparent the embedded window to its closest ancestor
// that will remains. Unfortunately, with reparenting window managers,
// this is not the root window, but the frame (or in KWin's case,
// it's the wrapper for the client window). In this case,
// the wrapper will get ReparentNotify for a window it won't know,
// which will be ignored, and then it gets MapRequest, as save-set
// always maps. Returning true here means that Workspace::workspaceEvent()
// will handle this MapRequest and manage this window (i.e. act as if
// it was reparented to root window).
if( e->parent == wrapperId())
return false;
return true; // no messing with frame etc. return true; // no messing with frame etc.
} }
if( isTopMenu() && workspace()->managingTopMenus()) if( isTopMenu() && workspace()->managingTopMenus())