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

fixed focus problems with qt-2.2.4 (see separate mail on kde-core-devel)

Browse source 
svn path=/trunk/kdebase/kwin/; revision=81151
This commit is contained in:
Matthias Ettrich 2001-02-03 12:30:46 +00:00
parent 1d95469d9f
commit f788868318
2 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
workspace.cpp
View file

@ -202,6 +202,7 @@ Workspace::Workspace( bool restore )
desktop_widget (0),
desktop_client (0),
active_client (0),
last_active_client (0),
should_get_focus (0),
most_recently_raised (0),
control_grab (false),
@ -331,6 +332,9 @@ void Workspace::init()
connect(kapp, SIGNAL(appearanceChanged()), this,
SLOT(slotResetAllClientsDelayed()));
connect(&focusEnsuranceTimer, SIGNAL(timeout()), this,
SLOT(focusEnsurance()));
XQueryTree(qt_xdisplay(), root, &root_return, &parent_return, &wins, &nwins);
for (i = 0; i < nwins; i++) {
XGetWindowAttributes(qt_xdisplay(), wins[i], &attr);
@ -417,6 +421,12 @@ bool Workspace::workspaceEvent( XEvent * e )
return TRUE;
}
if ( e->type == FocusIn )
focusEnsuranceTimer.stop();
else if ( e->type == FocusOut )
focusEnsuranceTimer.start(50);
Client * c = findClient( e->xany.window );
if ( c )
return c->windowEvent( e );
@ -630,6 +640,8 @@ bool Workspace::destroyClient( Client* c)
should_get_focus = 0;
if ( c == active_client )
active_client = 0;
if ( c == last_active_client )
last_active_client = 0;
storeFakeSessionInfo( c );
delete c;
propagateClients();
@ -696,12 +708,15 @@ bool Workspace::keyPress(XKeyEvent key)
freeKeyboard(FALSE);
return TRUE;
}
XGrabPointer( qt_xdisplay(), root, TRUE,
if ( XGrabPointer( qt_xdisplay(), root, TRUE,
(uint)(ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask |
LeaveWindowMask | PointerMotionMask),
GrabModeSync, GrabModeAsync,
None, None, kwin_time );
None, None, kwin_time ) != GrabSuccess ) {
freeKeyboard(FALSE);
return TRUE;
}
XGrabKeyboard(qt_xdisplay(),
root, FALSE,
GrabModeAsync, GrabModeAsync,
@ -724,12 +739,15 @@ bool Workspace::keyPress(XKeyEvent key)
|| km == (ControlMask)
)){
if (!control_grab){
XGrabPointer( qt_xdisplay(), root, TRUE,
if ( XGrabPointer( qt_xdisplay(), root, TRUE,
(uint)(ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask |
LeaveWindowMask | PointerMotionMask),
GrabModeSync, GrabModeAsync,
None, None, kwin_time );
None, None, kwin_time ) != GrabSuccess ) {
freeKeyboard(FALSE);
return TRUE;
}
XGrabKeyboard(qt_xdisplay(),
root, FALSE,
GrabModeAsync, GrabModeAsync,
@ -972,6 +990,7 @@ void Workspace::setActiveClient( Client* c )
if ( active_client )
active_client->setActive( FALSE );
active_client = c;
last_active_client = active_client;
if ( active_client ) {
focus_chain.remove( c );
if ( c->wantsTabFocus() )
@ -3110,5 +3129,23 @@ void Workspace::saveDesktopSettings()
}
/*!
Checks whether focus is in nirvana, and activates a client instead.
*/
void Workspace::focusEnsurance()
{
Window focus;
int revert;
XGetInputFocus( qt_xdisplay(), &focus, &revert );
if ( focus == None || focus == PointerRoot ) {
if ( !last_active_client )
last_active_client = topClientOnDesktop();
if ( last_active_client && last_active_client->isVisible() ) {
kwin_time = CurrentTime;
requestFocus( last_active_client );
}
}
}
#include "workspace.moc"

8
workspace.h
View file

@ -246,7 +246,8 @@ private slots:
void clientPopupAboutToShow();
void sendToDesktop( int );
void clientPopupActivated( int );
void focusEnsurance();
protected:
bool keyPress( XKeyEvent key );
bool keyRelease( XKeyEvent key );
@ -317,6 +318,7 @@ private:
Client* desktop_client;
Client* active_client;
Client* last_active_client;
Client* should_get_focus;
Client* most_recently_raised;
@ -352,9 +354,11 @@ private:
// colormap handling
Colormap default_colormap;
Colormap installed_colormap;
// Timer to collect requests for 'ResetAllClients'
QTimer resetTimer;
QTimer focusEnsuranceTimer;
};
inline WId Workspace::rootWin() const