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

Change Client::checkGroupTransients() to really do what it's supposed to do,

Browse source 
including indirect transiency.
Should finally fix #67914 and all its dupes.

svn path=/trunk/kdebase/kwin/; revision=268157
This commit is contained in:
Luboš Luňák 2003-11-19 12:10:48 +00:00
parent 0fb3d41e26
commit b2b60d647f
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
group.cpp
View file

@ -115,7 +115,6 @@ Group* Workspace::findGroup( Window leader )
return NULL; return NULL;
} }
void Workspace::updateMinimizedOfTransients( Client* c ) void Workspace::updateMinimizedOfTransients( Client* c )
{ {
// if mainwindow is minimized or shaded, minimize transients too // if mainwindow is minimized or shaded, minimize transients too
@ -151,7 +150,6 @@ void Workspace::updateMinimizedOfTransients( Client* c )
} }
/*! /*!
Sets the client \a c's transient windows' on_all_desktops property to \a on_all_desktops. Sets the client \a c's transient windows' on_all_desktops property to \a on_all_desktops.
*/ */
@ -349,8 +347,6 @@ void Client::setTransient( Window new_transient_for_id )
{ {
transient_for = workspace()->findClient( WindowMatchPredicate( transient_for_id )); transient_for = workspace()->findClient( WindowMatchPredicate( transient_for_id ));
assert( transient_for != NULL ); // verifyTransient() had to check this assert( transient_for != NULL ); // verifyTransient() had to check this
if( transient_for->groupTransient())
removeTransient( transient_for );
transient_for->addTransient( this ); transient_for->addTransient( this );
} }
checkGroup(); checkGroup();
@ -444,28 +440,32 @@ void Client::cleanGrouping()
// Make sure that no group transient is considered transient // Make sure that no group transient is considered transient
// for a window that is (directly or indirectly) transient for it. // for a window that is (directly or indirectly) transient for it.
// Group transients not being transient for each other is already // Group transients not being transient for each other is already
// handled before calling addTransient(). // handled before calling addTransient(). Non-group transients
// not causing loops are checked in verifyTransientFor().
void Client::checkGroupTransients() void Client::checkGroupTransients()
{ {
for( ClientList::ConstIterator it1 = group()->members().begin(); for( ClientList::ConstIterator it1 = group()->members().begin();
it1 != group()->members().end(); it1 != group()->members().end();
++it1 ) ++it1 )
{ {
if( !(*it1)->groupTransient()) if( !(*it1)->groupTransient()) // check all group transients in the group
continue; // TODO optimize to check only the changed ones?
for( ClientList::ConstIterator it2 = group()->members().begin();
it2 != group()->members().end();
++it2 ) // group transients can be transient only for others in the group,
{ // so don't make them transient for the ones that are transient for it
if( *it1 == *it2 )
continue; continue;
for( ClientList::Iterator it2 = (*it1)->transients_list.begin(); for( Client* cl = (*it2)->transientFor();
it2 != (*it1)->transients_list.end(); cl != NULL;
) cl = cl->transientFor())
{ {
Client* cl = (*it2)->transientFor();
if( cl != NULL )
cl = cl->transientFor();
if( cl == *it1 ) if( cl == *it1 )
{ {
it2 = (*it1)->transients_list.remove( it2 ); (*it2)->transients_list.remove( *it1 );
continue; continue;
} }
++it2; }
} }
} }
} }
@ -549,7 +549,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined )
void Client::addTransient( Client* cl ) void Client::addTransient( Client* cl )
{ {
assert( !transients_list.contains( cl )); assert( !transients_list.contains( cl ));
assert( !cl->transients_list.contains( this )); // assert( !cl->hasTransient( this, true )); will be fixed in checkGroupTransients()
assert( cl != this ); assert( cl != this );
transients_list.append( cl ); transients_list.append( cl );
// kdDebug() << "ADDTRANS:" << this << ":" << cl << endl; // kdDebug() << "ADDTRANS:" << this << ":" << cl << endl;