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

Try harder to restore focus if something sets it to null.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=365079
This commit is contained in:
Luboš Luňák 2004-11-22 11:34:09 +00:00
parent a9e6a2f113
commit 5baf4a79c4
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
activation.cpp
View file

@ -384,21 +384,24 @@ void Workspace::clientHidden( Client* c )
activateNextClient( c );
}
// deactivates 'c' and activates next client
void Workspace::activateNextClient( Client* c )
// deactivates 'c' and activates next client
bool Workspace::activateNextClient( Client* c )
{
// if 'c' is not the active or the to-become active one, do nothing
if( !( c == active_client
|| ( should_get_focus.count() > 0 && c == should_get_focus.last())))
return;
return false;
if( popup )
popup->close();
if( c == active_client )
setActiveClient( NULL, Allowed );
should_get_focus.remove( c );
if( c != NULL )
{
if( c == active_client )
setActiveClient( NULL, Allowed );
should_get_focus.remove( c );
}
if( focusChangeEnabled())
{
if ( c->wantsTabFocus() && focus_chain.contains( c ) )
if ( c != NULL && c->wantsTabFocus() && focus_chain.contains( c ) )
{
focus_chain.remove( c );
focus_chain.prepend( c );
@ -407,7 +410,7 @@ void Workspace::activateNextClient( Client* c )
{ // search the focus_chain for a client to transfer focus to
// if 'c' is transient, transfer focus to the first suitable mainwindow
Client* get_focus = NULL;
const ClientList mainwindows = c->mainClients();
const ClientList mainwindows = ( c != NULL ? c->mainClients() : ClientList());
for( ClientList::ConstIterator it = focus_chain.fromLast();
it != focus_chain.end();
--it )
@ -429,11 +432,14 @@ void Workspace::activateNextClient( Client* c )
else
focusToNull();
}
else
return false;
}
else
// if blocking focus, move focus to the desktop later if needed
// in order to avoid flickering
focusToNull();
return true;
}

7
events.cpp
View file

@ -429,8 +429,11 @@ bool Workspace::workspaceEvent( XEvent * e )
if( focus == None || focus == PointerRoot )
{
//kdWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" << endl;
if( mostRecentlyActivatedClient() != NULL )
requestFocus( mostRecentlyActivatedClient(), true );
Client *c = mostRecentlyActivatedClient();
if( c != NULL )
requestFocus( c, true );
else if( activateNextClient( NULL ))
; // ok, activated
else
focusToNull();
}

2
workspace.h
View file

@ -118,7 +118,7 @@ class Workspace : public QObject, public KWinInterface, public KDecorationDefine
void setShouldGetFocus( Client* );
bool fakeRequestedActivity( Client* c );
void unfakeActivity( Client* c );
void activateNextClient( Client* c );
bool activateNextClient( Client* c );
bool focusChangeEnabled() { return block_focus == 0; }
void updateColormap();