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

nicer code and (hopefully) even more robust

Browse source 
svn path=/trunk/kdebase/kwin/; revision=33642
This commit is contained in:
Matthias Ettrich 1999-11-13 02:35:15 +00:00
parent 6862ff3dcb
commit b4cc618773
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
workspace.cpp
View file

@ -854,15 +854,32 @@ void Workspace::raiseClient( Client* c )
if ( c == desktop_client ) if ( c == desktop_client )
return; // deny return; // deny
Window* new_stack = new Window[ stacking_order.count()+1];
stacking_order.remove( c ); stacking_order.remove( c );
stacking_order.append( c ); stacking_order.append( c );
ClientList saveset; ClientList saveset;
if ( c->transientFor() ) {
saveset.append( c );
Client* t = findClient( c->transientFor() );
Client* tmp;
while ( t && !saveset.contains( t ) && t->transientFor() ) {
tmp = findClient( t->transientFor() );
if ( !tmp )
break;
saveset.append( t );
t = tmp;
}
if ( t && !saveset.contains( t ) && t != desktop_client ) {
raiseClient( t );
return;
}
}
saveset.clear();
saveset.append( c ); saveset.append( c );
raiseTransientsOf(saveset, c ); raiseTransientsOf(saveset, c );
Window* new_stack = new Window[ stacking_order.count()+1];
int i = 0; int i = 0;
for ( ClientList::ConstIterator it = stacking_order.fromLast(); it != stacking_order.end(); --it) { for ( ClientList::ConstIterator it = stacking_order.fromLast(); it != stacking_order.end(); --it) {
new_stack[i++] = (*it)->winId(); new_stack[i++] = (*it)->winId();
@ -871,21 +888,7 @@ void Workspace::raiseClient( Client* c )
XRestackWindows(qt_xdisplay(), new_stack, i); XRestackWindows(qt_xdisplay(), new_stack, i);
delete [] new_stack; delete [] new_stack;
if ( c->transientFor() ) {
Client* t = findClient( c->transientFor() );
Client* t2;
while (t && t->transientFor() ) {
t2 = findClient( t->transientFor() );
if ( t2 == c )
goto end;
if ( t2 == t )
break;
t = t2;
}
raiseClient( t );
}
end:
propagateClients( TRUE ); propagateClients( TRUE );
} }