Damn, I managed to commit one file to HEAD and one to 3_1_BRANCH with
the last commit. svn path=/trunk/kdebase/kwin/; revision=220410
This commit is contained in:
parent
b1658f3efe
commit
19ce45b1c4
1 changed files with 0 additions and 36 deletions
|
@ -485,9 +485,6 @@ void Workspace::init()
|
|||
connect(kapp, SIGNAL(settingsChanged(int)), this,
|
||||
SLOT(slotSettingsChanged(int)));
|
||||
|
||||
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);
|
||||
|
@ -577,11 +574,6 @@ bool Workspace::workspaceEvent( XEvent * e )
|
|||
}
|
||||
|
||||
|
||||
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 );
|
||||
|
@ -4282,34 +4274,6 @@ 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 ) {
|
||||
|
||||
Window root_return;
|
||||
Window child = root;
|
||||
int root_x, root_y, lx, ly;
|
||||
uint state;
|
||||
if ( ! XQueryPointer( qt_xdisplay(), root, &root_return, &child,
|
||||
&root_x, &root_y, &lx, &ly, &state ) )
|
||||
return; // cursor is on another screen, so do not play with focus
|
||||
|
||||
if ( !last_active_client )
|
||||
last_active_client = topClientOnDesktop();
|
||||
if ( last_active_client && last_active_client->isVisible() ) {
|
||||
qt_x_time = CurrentTime;
|
||||
requestFocus( last_active_client );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Workspace::configureWM()
|
||||
{
|
||||
QStringList args;
|
||||
|
|
Loading…
Reference in a new issue