diff options
| author | Elijah Newren <newren@math.utah.edu> | 2004-09-15 16:53:20 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2004-09-15 16:53:20 +0000 |
| commit | cffe7e95667b92af5539c69147556169dd224781 (patch) | |
| tree | 7d1a952501e8d536e5eabdac717b99b501520c36 /src/workspace.c | |
| parent | b8b647e34683a0da10550c83e06edaedf01345f6 (diff) | |
| download | metacity-cffe7e95667b92af5539c69147556169dd224781.tar.gz | |
Focus the no_focus_window if no suitable window is in the mru list (should
2004-09-15 Elijah Newren <newren@math.utah.edu>
Focus the no_focus_window if no suitable window is in the mru list
(should fix the almost contrived extra issue found in #147475)
* doc/how-to-get-focus-right.txt: We no longer need to lie about
only focusing panels upon explicit request.
* src/workspace.c: (meta_workspace_focus_top_window): removed this
function--it was more code than needed and was unreliable anyway,
(meta_workspace_focus_mru_window): if a suitable window isn't in
the mru list, focus the no_focus_window instead of calling
focus_top_window.
Diffstat (limited to 'src/workspace.c')
| -rw-r--r-- | src/workspace.c | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/src/workspace.c b/src/workspace.c index 912a41bd..728c333f 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -31,8 +31,6 @@ void meta_workspace_queue_calc_showing (MetaWorkspace *workspace); static void set_active_space_hint (MetaScreen *screen); static void meta_workspace_focus_mru_window (MetaWorkspace *workspace, MetaWindow *not_this_one); -static void meta_workspace_focus_top_window (MetaWorkspace *workspace, - MetaWindow *not_this_one); static void maybe_add_to_list (MetaScreen *screen, MetaWindow *window, gpointer data) @@ -867,41 +865,10 @@ meta_workspace_focus_mru_window (MetaWorkspace *workspace, } else { - meta_topic (META_DEBUG_FOCUS, "No MRU window to focus found\n"); - meta_workspace_focus_top_window (workspace, not_this_one); - } -} - -/* Focus top window on workspace */ -void -meta_workspace_focus_top_window (MetaWorkspace *workspace, - MetaWindow *not_this_one) -{ - MetaWindow *window; - - if (not_this_one) - meta_topic (META_DEBUG_FOCUS, - "Focusing top window excluding %s\n", not_this_one->desc); - - window = meta_stack_get_default_focus_window (workspace->screen->stack, - workspace, - not_this_one); - - /* FIXME I'm a loser on the CurrentTime front */ - if (window) - { - meta_topic (META_DEBUG_FOCUS, - "Focusing top window %s\n", window->desc); - - meta_window_focus (window, - meta_display_get_current_time (workspace->screen->display)); - - /* Also raise the window if in click-to-focus */ - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK) - meta_window_raise (window); - } - else - { - meta_topic (META_DEBUG_FOCUS, "No top window to focus found\n"); + meta_topic (META_DEBUG_FOCUS, "No MRU window to focus found; focusing no_focus_window.\n"); + XSetInputFocus (workspace->screen->display->xdisplay, + workspace->screen->display->no_focus_window, + RevertToPointerRoot, + meta_display_get_current_time (workspace->screen->display)); } } |