diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-25 15:41:14 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-25 15:41:14 +0000 |
| commit | ad8e8d4988b515ff690564588983eeedf3f238f4 (patch) | |
| tree | 55da02d07770845f4afe3c84eb9dece3d0951371 /openbox/screen.c | |
| parent | cca8a9030154a13c05d63ab700bc94c578707891 (diff) | |
less negatives means less confusing.. but yeah. get rid of omnipresent check in focus_fallback
Diffstat (limited to 'openbox/screen.c')
| -rw-r--r-- | openbox/screen.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openbox/screen.c b/openbox/screen.c index 2e8965e2..381753ae 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -530,16 +530,17 @@ void screen_set_desktop(guint num, gboolean dofocus) } } + if (focus_client && (focus_client->desktop == DESKTOP_ALL || + focus_client->desktop == screen_desktop)) + dofocus = FALSE; + /* have to try focus here because when you leave an empty desktop there is no focus out to watch for do this before hiding the windows so if helper windows are coming with us, they don't get hidden */ - if (dofocus - && (!focus_client || (focus_client->desktop != DESKTOP_ALL - && focus_client->desktop != num)) - && (c = focus_fallback(TRUE))) + if (dofocus && (c = focus_fallback(TRUE))) { /* only do the flicker reducing stuff ahead of time if we are going to call xsetinputfocus on the window ourselves. otherwise there is |