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

I seem to have forgotten this in the last patch

Browse source
This commit is contained in:
markt 2007-03-06 21:23:18 +00:00
parent e407bb80b6
commit 82f02f44c5
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/FocusControl.cc
View file

@ -399,9 +399,6 @@ void FocusControl::shutdown() {
* last_focused is set to something if we want to make use of the * last_focused is set to something if we want to make use of the
* previously focused window (it must NOT be set focused now, it * previously focused window (it must NOT be set focused now, it
* is probably dying). * is probably dying).
*
* ignore_event means that it ignores the given event until
* it gets a focusIn
*/ */
void FocusControl::revertFocus(BScreen &screen) { void FocusControl::revertFocus(BScreen &screen) {
if (s_reverting) if (s_reverting)
@ -454,21 +451,6 @@ void FocusControl::unfocusWindow(WinClient &client,
// go up the transient tree looking for a focusable window // go up the transient tree looking for a focusable window
FluxboxWindow *fbwin = client.fbwindow(); FluxboxWindow *fbwin = client.fbwindow();
if (fbwin == 0)
unfocus_frame = false;
WinClient *trans_parent = client.transientFor();
while (trans_parent) {
if (trans_parent->fbwindow() && // can't focus if no fbwin
(!unfocus_frame || trans_parent->fbwindow() != fbwin) && // can't be this window
trans_parent->fbwindow()->isVisible() &&
trans_parent->fbwindow()->setCurrentClient(*trans_parent,
s_focused_window == &client)) {
return;
}
trans_parent = trans_parent->transientFor();
}
if (fbwin == 0) if (fbwin == 0)
return; // nothing more we can do return; // nothing more we can do

6
src/Window.cc
View file

@ -204,9 +204,6 @@ void tempRaiseFluxboxWindow(FluxboxWindow &win) {
if (win.oplock) return; if (win.oplock) return;
win.oplock = true; win.oplock = true;
if (!win.winClient().transientList().empty())
win.screen().layerManager().lock();
if (!win.isIconic()) { if (!win.isIconic()) {
// don't update netizen, as it is only temporary // don't update netizen, as it is only temporary
win.layerItem().tempRaise(); win.layerItem().tempRaise();
@ -222,9 +219,6 @@ void tempRaiseFluxboxWindow(FluxboxWindow &win) {
} }
win.oplock = false; win.oplock = false;
if (!win.winClient().transientList().empty())
win.screen().layerManager().unlock();
} }
class SetClientCmd:public FbTk::Command { class SetClientCmd:public FbTk::Command {