aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-19 01:43:18 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-19 01:43:18 (GMT)
commita8ec9d97b918325e78469bb63c01781a0feef0e7 (patch)
tree225d68197202ced33d6ae518ea60bcd437e23352
parentce74ed1c30d64760581599ec05030b609216feba (diff)
downloadfluxbox_pavel-a8ec9d97b918325e78469bb63c01781a0feef0e7.zip
fluxbox_pavel-a8ec9d97b918325e78469bb63c01781a0feef0e7.tar.bz2
don't let transient windows steal the focus from other programs
-rw-r--r--ChangeLog3
-rw-r--r--src/Window.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c6fee0..dc74024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/12/19:
4 * Don't let transient windows steal focus from other programs (Mark)
5 Window.cc
3*07/12/18: 6*07/12/18:
4 * NLS entries for Mouse Tab Focus and Click Tab Focus were switched - please 7 * NLS entries for Mouse Tab Focus and Click Tab Focus were switched - please
5 make sure they're right now in your language, bug #1786566 (Mark) 8 make sure they're right now in your language, bug #1786566 (Mark)
diff --git a/src/Window.cc b/src/Window.cc
index cccb9c4..6377da7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2246,7 +2246,7 @@ bool FluxboxWindow::allowsFocusFromClient() {
2246 2246
2247 FluxboxWindow *cur = FocusControl::focusedFbWindow(); 2247 FluxboxWindow *cur = FocusControl::focusedFbWindow();
2248 WinClient *client = FocusControl::focusedWindow(); 2248 WinClient *client = FocusControl::focusedWindow();
2249 if (cur && client && cur->isTyping() && 2249 if (cur && client && (m_client->isTransient() || cur->isTyping()) &&
2250 getRootTransientFor(m_client) != getRootTransientFor(client)) 2250 getRootTransientFor(m_client) != getRootTransientFor(client))
2251 return false; 2251 return false;
2252 2252