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

adjust activateNextClient() policy

Browse source 
(on a client close, don't activate any random client in the 
group but only the leader -and raise it- or the last active client)
http://svn.reviewboard.kde.org/r/5830/
BUG: 183911

svn path=/trunk/KDE/kdebase/workspace/; revision=1208125
This commit is contained in:
Thomas Lübking 2010-12-20 18:21:46 +00:00
parent 94605a5ef5
commit f55d275c61
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
activation.cpp
View file

@ -419,6 +419,13 @@ void Workspace::clientHidden( Client* c )
activateNextClient( c );
}
static inline bool isUsableFocusCandidate( Client *c, Client *prev, bool respectScreen )
{
return c != prev &&
c->isShown( false ) && c->isOnCurrentDesktop() && c->isOnCurrentActivity() &&
( !respectScreen || c->isOnScreen( prev ? prev->screen() : Workspace::self()->activeScreen() ) );
}
// deactivates 'c' and activates next client
bool Workspace::activateNextClient( Client* c )
{
@ -437,34 +444,31 @@ bool Workspace::activateNextClient( Client* c )
{
if ( options->focusPolicyIsReasonable())
{ // search the focus_chain for a client to transfer focus to,
// first try to transfer focus to the first suitable window in the group
Client* get_focus = NULL;
const ClientList windows = ( c != NULL ? c->group()->members() : ClientList());
for ( int i = focus_chain[ currentDesktop() ].size() - 1;
i >= 0;
--i )
// first try to pass the focus to the (former) active clients leader
if ( c && ( get_focus = c->transientFor() ) &&
isUsableFocusCandidate( get_focus, c, options->separateScreenFocus ))
{
Client* ci = focus_chain[ currentDesktop() ].at( i );
if( c == ci || !ci->isShown( false )
|| !ci->isOnCurrentDesktop() || !ci->isOnCurrentActivity())
continue;
if( options->separateScreenFocus )
{
if( c != NULL && !ci->isOnScreen( c->screen()))
continue;
if( c == NULL && !ci->isOnScreen( activeScreen()))
continue;
}
if( windows.contains( ci ))
{
get_focus = ci;
break;
}
if( get_focus == NULL )
get_focus = ci;
raiseClient( get_focus ); // also raise - we don't know where it came from
}
if( get_focus == NULL )
else // nope, ask the focus chain for the next candidate
{
get_focus = NULL; // reset
for ( int i = focus_chain[ currentDesktop() ].size() - 1; i >= 0; --i )
{
Client* ci = focus_chain[ currentDesktop() ].at( i );
if ( isUsableFocusCandidate( ci, c, options->separateScreenFocus ))
{
get_focus = ci;
break; // we're done
}
}
}
if( get_focus == NULL ) // last chance: focus the desktop
get_focus = findDesktop( true, currentDesktop());
if( get_focus != NULL )
requestFocus( get_focus );
else