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

addTransient() may temporary cause loops, so delay calling of findModal()

Browse source 
until they're broken

svn path=/trunk/kdebase/kwin/; revision=315405
This commit is contained in:
Luboš Luňák 2004-05-28 11:33:36 +00:00
parent 1fc08d271f
commit 80624445c9
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.cpp
View file

@ -125,6 +125,7 @@ Client::Client( Workspace *ws )
not_obscured = false;
urgency = false;
ignore_focus_stealing = false;
check_active_modal = false;
Pdeletewindow = 0;
Ptakefocus = 0;
@ -156,6 +157,7 @@ Client::~Client()
assert( frame == None && wrapper == None );
assert( decoration == NULL );
assert( block_geometry == 0 );
assert( !check_active_modal );
delete info;
delete bridge;
}

1
client.h
View file

@ -452,6 +452,7 @@ private slots:
uint not_obscured : 1;
uint urgency : 1; // XWMHints, UrgencyHint
uint ignore_focus_stealing : 1; // don't apply focus stealing prevention to this client
uint check_active_modal : 1; // see Client::addTransient()
void getWMHints();
void readIcons();
void getWindowProtocols();

17
group.cpp
View file

@ -417,7 +417,7 @@ void Client::setTransient( Window new_transient_for_id )
transient_for = workspace()->findClient( WindowMatchPredicate( transient_for_id ));
assert( transient_for != NULL ); // verifyTransient() had to check this
transient_for->addTransient( this );
}
} // checkGroup() will check 'check_active_modal'
checkGroup( NULL, true ); // force, because transiency has changed
workspace()->updateClientLayer( this );
}
@ -625,8 +625,8 @@ void Client::addTransient( Client* cl )
// assert( !cl->hasTransient( this, true )); will be fixed in checkGroupTransients()
assert( cl != this );
transients_list.append( cl );
if( workspace()->mostRecentlyActivatedClient() == this && cl->isModal())
workspace()->activateClient( findModal());
if( workspace()->mostRecentlyActivatedClient() == this && cl->isModal())
check_active_modal = true;
// kdDebug() << "ADDTRANS:" << this << ":" << cl << endl;
// kdDebug() << kdBacktrace() << endl;
// for( ClientList::ConstIterator it = transients_list.begin();
@ -859,6 +859,17 @@ void Client::checkGroup( Group* set_group, bool force )
}
}
checkGroupTransients();
// if the active window got new modal transient, activate it
// cannot be done in AddTransient(), because there may temporarily
// exist loops, breaking findModal
Client* check_modal = workspace()->mostRecentlyActivatedClient();
if( check_modal != NULL && check_modal->check_active_modal )
{
Client* new_modal = check_modal->findModal();
if( new_modal != NULL && new_modal != check_modal )
workspace()->activateClient( new_modal );
check_modal->check_active_modal = false;
}
workspace()->updateClientLayer( this );
}