nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up the new focusing code for workspace switching

Browse source
This commit is contained in:
Dana Jansens 2002-08-25 08:41:18 +00:00
parent 3ee18e2f5f
commit 45863e605c
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Screen.cc
View file

@ -1264,21 +1264,28 @@ void BScreen::changeWorkspaceID(unsigned int id) {
XQueryPointer(blackbox->getXDisplay(), getRootWindow(), &r, &c,
&rx, &ry, &x, &y, &m) &&
c != None) {
if ( (win = blackbox->searchWindow(c)) ) {
if ( (win = blackbox->searchWindow(c)) )
f = win->setInputFocus();
blackbox->setFocusedWindow(win);
}
}
// If that fails, and we're doing focus_last, try to focus the last window.
if (! f && resource.focus_last &&
(win = current_workspace->getLastFocusedWindow())) {
(win = current_workspace->getLastFocusedWindow()))
f = win->setInputFocus();
blackbox->setFocusedWindow(win);
}
// If that fails, then set focus to nothing.
if (! f) blackbox->setFocusedWindow((BlackboxWindow *) 0);
/*
if we found a focus target, then we set the focused window explicitly
because it is possible to switch off this workspace before the x server
generates the FocusIn event for the window. if that happens, openbox would
lose track of what window was the 'LastFocused' window on the workspace.
if we did not find a focus target, then set the current focused window to
nothing.
*/
if (f)
blackbox->setFocusedWindow(win);
else
blackbox->setFocusedWindow((BlackboxWindow *) 0);
updateNetizenCurrentWorkspace();
}