isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-27 03:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

window: Make window_is_terminal private

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-03-18 10:08:28 -04:00
parent 8b4c5459c0
commit 1f15c85c00
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/window-private.h
View File

@ -567,9 +567,6 @@ void meta_window_change_workspace (MetaWindow *window,
/* Return whether the window should be currently mapped */ /* Return whether the window should be currently mapped */
gboolean meta_window_should_be_showing (MetaWindow *window); gboolean meta_window_should_be_showing (MetaWindow *window);
/* See warning in window.c about this function */
gboolean __window_is_terminal (MetaWindow *window);
void meta_window_update_struts (MetaWindow *window); void meta_window_update_struts (MetaWindow *window);
/* this gets root coords */ /* this gets root coords */

11
src/core/window.c
View File

@ -2399,8 +2399,8 @@ intervening_user_event_occurred (MetaWindow *window)
* behavior is worthwhile. The basic idea is to get more feedback about how * behavior is worthwhile. The basic idea is to get more feedback about how
* usage scenarios of "strict" focus users and what they expect. See #326159. * usage scenarios of "strict" focus users and what they expect. See #326159.
*/ */
gboolean static gboolean
__window_is_terminal (MetaWindow *window) window_is_terminal (MetaWindow *window)
{ {
if (window == NULL || window->res_class == NULL) if (window == NULL || window->res_class == NULL)
return FALSE; return FALSE;
@ -2476,7 +2476,7 @@ window_state_on_map (MetaWindow *window,
if (*takes_focus && if (*takes_focus &&
meta_prefs_get_focus_new_windows () == G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT && meta_prefs_get_focus_new_windows () == G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT &&
!window->display->allow_terminal_deactivation && !window->display->allow_terminal_deactivation &&
__window_is_terminal (window->display->focus_window) && window_is_terminal (window->display->focus_window) &&
!meta_window_is_ancestor_of_transient (window->display->focus_window, !meta_window_is_ancestor_of_transient (window->display->focus_window,
window)) window))
{ {
@ -9252,9 +9252,8 @@ meta_window_set_user_time (MetaWindow *window,
/* If this is a terminal, user interaction with it means the user likely /* If this is a terminal, user interaction with it means the user likely
* doesn't want to have focus transferred for now due to new windows. * doesn't want to have focus transferred for now due to new windows.
*/ */
if (meta_prefs_get_focus_new_windows () == if (meta_prefs_get_focus_new_windows () == G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT &&
G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT && window_is_terminal (window))
__window_is_terminal (window))
window->display->allow_terminal_deactivation = FALSE; window->display->allow_terminal_deactivation = FALSE;
} }