Rename meta_window_visible_on_workspace to

2004-12-22  Elijah Newren  <newren@gmail.com>

	* src/core.c (meta_core_user_lower_and_unfocus):
	* src/display.c (meta_display_get_current_tab):
	* src/stack.c (get_default_focus_window, meta_stack_list_windows):
	* src/window.c (set_net_wm_state, meta_window_should_be_showing,
	implement_showing, meta_window_activate,
	meta_window_notify_focus):
	* src/window.h:
	* src/workspace.c (meta_workspace_list_windows):

	Rename meta_window_visible_on_workspace to
	meta_window_located_on_workspace (whether or not the window was
	showing wasn't taken into account, which made "visible"
	confusing).  Fixes #136314.
This commit is contained in:
Elijah Newren
2004-12-23 00:20:33 +00:00
committed by Elijah Newren
parent f4f8699d84
commit e46fc46701
7 changed files with 27 additions and 12 deletions

View File

@ -1170,9 +1170,8 @@ set_net_wm_state (MetaWindow *window)
meta_error_trap_pop (window->display, FALSE);
}
/* FIXME rename this, it makes it sound like map state is relevant */
gboolean
meta_window_visible_on_workspace (MetaWindow *window,
meta_window_located_on_workspace (MetaWindow *window,
MetaWorkspace *workspace)
{
return (window->on_all_workspaces && window->screen == workspace->screen) ||
@ -1274,7 +1273,7 @@ meta_window_should_be_showing (MetaWindow *window)
meta_verbose ("Should be showing for window %s\n", window->desc);
/* See if we're on the workspace */
on_workspace = meta_window_visible_on_workspace (window,
on_workspace = meta_window_located_on_workspace (window,
window->screen->active_workspace);
if (!on_workspace)
@ -1304,7 +1303,7 @@ implement_showing (MetaWindow *window,
{
gboolean on_workspace;
on_workspace = meta_window_visible_on_workspace (window,
on_workspace = meta_window_located_on_workspace (window,
window->screen->active_workspace);
/* Really this effects code should probably
@ -2166,7 +2165,7 @@ meta_window_activate (MetaWindow *window,
maybe_leave_show_desktop_mode (window);
/* Get window on current workspace */
if (!meta_window_visible_on_workspace (window,
if (!meta_window_located_on_workspace (window,
window->screen->active_workspace))
meta_window_change_workspace (window,
window->screen->active_workspace);
@ -4240,7 +4239,7 @@ meta_window_notify_focus (MetaWindow *window,
* workspace.
*/
if (window->screen->active_workspace &&
meta_window_visible_on_workspace (window,
meta_window_located_on_workspace (window,
window->screen->active_workspace))
{
GList* link;