diff options
author | markt <markt> | 2007-03-06 21:23:18 (GMT) |
---|---|---|
committer | markt <markt> | 2007-03-06 21:23:18 (GMT) |
commit | 82f02f44c590e6eb04b2b6211bc602cd75210524 (patch) | |
tree | a76b4d37f0e9cf23aa1182d133a001b3b868d88d | |
parent | e407bb80b62205cd647082bee4658327b962f24b (diff) | |
download | fluxbox_pavel-82f02f44c590e6eb04b2b6211bc602cd75210524.zip fluxbox_pavel-82f02f44c590e6eb04b2b6211bc602cd75210524.tar.bz2 |
I seem to have forgotten this in the last patch
-rw-r--r-- | src/FocusControl.cc | 18 | ||||
-rw-r--r-- | src/Window.cc | 6 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index e494d8f..e16cbec 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -399,9 +399,6 @@ void FocusControl::shutdown() { | |||
399 | * last_focused is set to something if we want to make use of the | 399 | * last_focused is set to something if we want to make use of the |
400 | * previously focused window (it must NOT be set focused now, it | 400 | * previously focused window (it must NOT be set focused now, it |
401 | * is probably dying). | 401 | * is probably dying). |
402 | * | ||
403 | * ignore_event means that it ignores the given event until | ||
404 | * it gets a focusIn | ||
405 | */ | 402 | */ |
406 | void FocusControl::revertFocus(BScreen &screen) { | 403 | void FocusControl::revertFocus(BScreen &screen) { |
407 | if (s_reverting) | 404 | if (s_reverting) |
@@ -455,21 +452,6 @@ void FocusControl::unfocusWindow(WinClient &client, | |||
455 | 452 | ||
456 | FluxboxWindow *fbwin = client.fbwindow(); | 453 | FluxboxWindow *fbwin = client.fbwindow(); |
457 | if (fbwin == 0) | 454 | if (fbwin == 0) |
458 | unfocus_frame = false; | ||
459 | |||
460 | WinClient *trans_parent = client.transientFor(); | ||
461 | while (trans_parent) { | ||
462 | if (trans_parent->fbwindow() && // can't focus if no fbwin | ||
463 | (!unfocus_frame || trans_parent->fbwindow() != fbwin) && // can't be this window | ||
464 | trans_parent->fbwindow()->isVisible() && | ||
465 | trans_parent->fbwindow()->setCurrentClient(*trans_parent, | ||
466 | s_focused_window == &client)) { | ||
467 | return; | ||
468 | } | ||
469 | trans_parent = trans_parent->transientFor(); | ||
470 | } | ||
471 | |||
472 | if (fbwin == 0) | ||
473 | return; // nothing more we can do | 455 | return; // nothing more we can do |
474 | 456 | ||
475 | BScreen &screen = fbwin->screen(); | 457 | BScreen &screen = fbwin->screen(); |
diff --git a/src/Window.cc b/src/Window.cc index 5b10058..e471d6e 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -204,9 +204,6 @@ void tempRaiseFluxboxWindow(FluxboxWindow &win) { | |||
204 | if (win.oplock) return; | 204 | if (win.oplock) return; |
205 | win.oplock = true; | 205 | win.oplock = true; |
206 | 206 | ||
207 | if (!win.winClient().transientList().empty()) | ||
208 | win.screen().layerManager().lock(); | ||
209 | |||
210 | if (!win.isIconic()) { | 207 | if (!win.isIconic()) { |
211 | // don't update netizen, as it is only temporary | 208 | // don't update netizen, as it is only temporary |
212 | win.layerItem().tempRaise(); | 209 | win.layerItem().tempRaise(); |
@@ -222,9 +219,6 @@ void tempRaiseFluxboxWindow(FluxboxWindow &win) { | |||
222 | } | 219 | } |
223 | win.oplock = false; | 220 | win.oplock = false; |
224 | 221 | ||
225 | if (!win.winClient().transientList().empty()) | ||
226 | win.screen().layerManager().unlock(); | ||
227 | |||
228 | } | 222 | } |
229 | 223 | ||
230 | class SetClientCmd:public FbTk::Command { | 224 | class SetClientCmd:public FbTk::Command { |