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

fixed transient_for handling for embedded main windows

Browse source 
Patch reviewed by Lars.

svn path=/trunk/kdebase/kwin/; revision=67756
This commit is contained in:
Matthias Ettrich 2000-10-15 14:19:15 +00:00
parent 1e18909d45
commit 1266db9901
3 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
client.cpp
View file

@ -443,6 +443,7 @@ Client::Client( Workspace *ws, WId w, QWidget *parent, const char *name, WFlags
else {
transient_for = (WId) ww;
transient_for_defined = TRUE;
verifyTransientFor();
}
if ( mainClient()->isSticky() )
@ -1036,6 +1037,7 @@ bool Client::propertyNotify( XPropertyEvent& e )
} else {
transient_for = (WId) ww;
transient_for_defined = TRUE;
verifyTransientFor();
}
break;
case XA_WM_HINTS:
@ -2682,6 +2684,10 @@ void Client::autoRaise()
autoRaiseTimer = 0;
}
/*!
Clones settings from other client. Used in
Workspace::slotResetAllClients()
*/
void Client::cloneMode(Client *client)
{
shaded = client->shaded;
@ -2697,6 +2703,32 @@ NETWinInfo * Client::netWinInfo()
return static_cast<NETWinInfo *>(info);
}
/*!
The transient_for window may be embedded in another application,
so kwin cannot see it. Try to find the managed client for the
window and fix the transient_for property if possible.
*/
void Client::verifyTransientFor()
{
unsigned int nwins;
Window root_return, parent_return, *wins;
if ( transient_for == 0 || transient_for == win )
return;
WId old_transient_for = transient_for;
while ( transient_for &&
transient_for != workspace()->rootWin() &&
!workspace()->findClient( transient_for ) ) {
wins = 0;
int r = XQueryTree(qt_xdisplay(), transient_for, &root_return, &parent_return, &wins, &nwins);
if ( wins )
XFree((void *) wins);
if ( r == 0)
break;
transient_for = parent_return;
}
if ( old_transient_for != transient_for && workspace()->findClient( transient_for ) )
XSetTransientForHint( qt_xdisplay(), win, transient_for );
}
NoBorderClient::NoBorderClient( Workspace *ws, WId w, QWidget *parent, const char *name )
: Client( ws, w, parent, name )

5
client.h
View file

@ -172,9 +172,6 @@ public:
Colormap colormap() const;
/**
* Clone settings from other client.
*/
void cloneMode(Client *);
public slots:
@ -289,7 +286,7 @@ private:
WinInfo* info;
QTimer* autoRaiseTimer;
Colormap cmap;
void verifyTransientFor();
};
inline WId Client::window() const

9
workspace.cpp
View file

@ -312,7 +312,7 @@ void Workspace::init()
setCurrentDesktop( 1 );
unsigned int i, nwins;
Window dw1, dw2, *wins;
Window root_return, parent_return, *wins;
XWindowAttributes attr;
connect(&mgr, SIGNAL(resetAllClients()), this,
@ -320,8 +320,7 @@ void Workspace::init()
connect(kapp, SIGNAL(appearanceChanged()), this,
SLOT(slotResetAllClients()));
// XGrabServer( qt_xdisplay() );
XQueryTree(qt_xdisplay(), root, &dw1, &dw2, &wins, &nwins);
XQueryTree(qt_xdisplay(), root, &root_return, &parent_return, &wins, &nwins);
for (i = 0; i < nwins; i++) {
XGetWindowAttributes(qt_xdisplay(), wins[i], &attr);
if (attr.override_redirect )
@ -346,8 +345,8 @@ void Workspace::init()
}
}
}
XFree((void *) wins);
// XUngrabServer( qt_xdisplay() );
if ( wins )
XFree((void *) wins);
propagateClients();
//CT initialize the cascading info