summaryrefslogtreecommitdiff
path: root/openbox/screen.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-27 22:50:40 +0000
committerDana Jansens <danakj@orodu.net>2007-05-27 22:50:40 +0000
commitb8fded742abad3c43c708ee935f5b58237170a01 (patch)
tree460eda8e5419796c4667bcb5b02db918ba28e5ee /openbox/screen.c
parent568ca95bc222b1c694fbd77ce417fd04630846ae (diff)
make focuslast only apply to switching desktops, like 3.3.1
Diffstat (limited to 'openbox/screen.c')
-rw-r--r--openbox/screen.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/openbox/screen.c b/openbox/screen.c
index deaf55ee..11d527ee 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -539,12 +539,14 @@ void screen_set_desktop(guint num, gboolean dofocus)
dofocus = FALSE;
/* have to try focus here because when you leave an empty desktop
- there is no focus out to watch for
+ there is no focus out to watch for. also, we have different rules
+ here. we always allow it to look under the mouse pointer if
+ config_focus_last is FALSE
do this before hiding the windows so if helper windows are coming
with us, they don't get hidden
*/
- if (dofocus && (c = focus_fallback(TRUE)))
+ if (dofocus && (c = focus_fallback(TRUE, !config_focus_last)))
{
/* only do the flicker reducing stuff ahead of time if we are going
to call xsetinputfocus on the window ourselves. otherwise there is
@@ -1007,7 +1009,7 @@ void screen_show_desktop(gboolean show, ObClient *show_only)
else if (!show_only) {
ObClient *c;
- if ((c = focus_fallback(TRUE))) {
+ if ((c = focus_fallback(TRUE, FALSE))) {
/* only do the flicker reducing stuff ahead of time if we are going
to call xsetinputfocus on the window ourselves. otherwise there
is no guarantee the window will actually take focus.. */