diff options
Diffstat (limited to 'src/core/window.c')
| -rw-r--r-- | src/core/window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/window.c b/src/core/window.c index 7e3d33e6..2f2f8000 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -1667,7 +1667,7 @@ idle_calc_showing (gpointer data) tmp = tmp->next; } - if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK) + if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK) { /* When display->mouse_mode is false, we want to ignore * EnterNotify events unless they come from mouse motion. To do @@ -2004,7 +2004,7 @@ window_state_on_map (MetaWindow *window, * approximation to enforce so we do that. */ if (*takes_focus && - meta_prefs_get_focus_new_windows () == META_FOCUS_NEW_WINDOWS_STRICT && + meta_prefs_get_focus_new_windows () == G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT && !window->display->allow_terminal_deactivation && __window_is_terminal (window->display->focus_window) && !meta_window_is_ancestor_of_transient (window->display->focus_window, @@ -2221,7 +2221,7 @@ meta_window_show (MetaWindow *window) * that new window below a lot of other windows. */ if (overlap || - (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK && + (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK && meta_prefs_get_raise_on_click ())) meta_window_stack_just_below (window, focus_window); @@ -5447,7 +5447,7 @@ meta_window_notify_focus (MetaWindow *window, * * There is dicussion in bugs 102209, 115072, and 461577 */ - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK || + if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK || !meta_prefs_get_raise_on_click()) meta_display_ungrab_focus_window_button (window->display, window); } @@ -5491,7 +5491,7 @@ meta_window_notify_focus (MetaWindow *window, meta_window_update_layer (window); /* Re-grab for click to focus and raise-on-click, if necessary */ - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK || + if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK || !meta_prefs_get_raise_on_click ()) meta_display_grab_focus_window_button (window->display, window); } @@ -8138,7 +8138,7 @@ meta_window_set_user_time (MetaWindow *window, * doesn't want to have focus transferred for now due to new windows. */ if (meta_prefs_get_focus_new_windows () == - META_FOCUS_NEW_WINDOWS_STRICT && + G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT && __window_is_terminal (window)) window->display->allow_terminal_deactivation = FALSE; } |