aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-01-05 17:57:07 (GMT)
committermarkt <markt>2007-01-05 17:57:07 (GMT)
commit416cca0eddb164d6c328588829f6c48d6e4e976d (patch)
tree4f28341d0eb83273e2f08e9bb94948d7f9c3cee1
parent8930a711ee101c1a02f579a2ee8ebbe39065c085 (diff)
downloadfluxbox_pavel-416cca0eddb164d6c328588829f6c48d6e4e976d.zip
fluxbox_pavel-416cca0eddb164d6c328588829f6c48d6e4e976d.tar.bz2
don't change focus to a window that doesn't accept focus, see bug #1626114
-rw-r--r--ChangeLog2
-rw-r--r--src/FocusControl.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d24279..299a5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/01/05: 3*07/01/05:
4 * Don't change focus to a window that doesn't accept focus (Mark)
5 FocusControl.cc
4 * Only grab keybindings on screens managed by fluxbox (Mark) 6 * Only grab keybindings on screens managed by fluxbox (Mark)
5 fluxbox.hh Keys.cc/hh FbTk/KeyUtil.cc/hh 7 fluxbox.hh Keys.cc/hh FbTk/KeyUtil.cc/hh
6 * Fix locale being applied to the clock. (Simon) 8 * Fix locale being applied to the clock. (Simon)
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index f363f30..e0bb886 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -216,7 +216,8 @@ WinClient *FocusControl::lastFocusedWindow(int workspace) {
216 for (; it != it_end; ++it) { 216 for (; it != it_end; ++it) {
217 if ((*it)->fbwindow() && 217 if ((*it)->fbwindow() &&
218 ((((int)(*it)->fbwindow()->workspaceNumber()) == workspace || 218 ((((int)(*it)->fbwindow()->workspaceNumber()) == workspace ||
219 (*it)->fbwindow()->isStuck()) && !(*it)->fbwindow()->isIconic())) 219 (*it)->fbwindow()->isStuck()) && (*it)->acceptsFocus() &&
220 !(*it)->fbwindow()->isIconic()))
220 return *it; 221 return *it;
221 } 222 }
222 return 0; 223 return 0;