mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 23:50:41 -05:00
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:
parent
f4f8699d84
commit
e46fc46701
16
ChangeLog
16
ChangeLog
@ -1,3 +1,19 @@
|
|||||||
|
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).
|
||||||
|
|
||||||
2004-12-22 Elijah Newren <newren@gmail.com>
|
2004-12-22 Elijah Newren <newren@gmail.com>
|
||||||
|
|
||||||
Partially resolve the conflicting requirements of windows on
|
Partially resolve the conflicting requirements of windows on
|
||||||
|
@ -258,7 +258,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
|
|||||||
* (Borrowed from window.c.)
|
* (Borrowed from window.c.)
|
||||||
*/
|
*/
|
||||||
if (window->screen->active_workspace &&
|
if (window->screen->active_workspace &&
|
||||||
meta_window_visible_on_workspace (window,
|
meta_window_located_on_workspace (window,
|
||||||
window->screen->active_workspace))
|
window->screen->active_workspace))
|
||||||
{
|
{
|
||||||
GList* link;
|
GList* link;
|
||||||
|
@ -4119,7 +4119,7 @@ meta_display_get_tab_current (MetaDisplay *display,
|
|||||||
window->screen == screen &&
|
window->screen == screen &&
|
||||||
IN_TAB_CHAIN (window, type) &&
|
IN_TAB_CHAIN (window, type) &&
|
||||||
(workspace == NULL ||
|
(workspace == NULL ||
|
||||||
meta_window_visible_on_workspace (window, workspace)))
|
meta_window_located_on_workspace (window, workspace)))
|
||||||
return window;
|
return window;
|
||||||
else
|
else
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -1344,7 +1344,7 @@ get_default_focus_window (MetaStack *stack,
|
|||||||
!window->minimized &&
|
!window->minimized &&
|
||||||
(window->input || window->take_focus) &&
|
(window->input || window->take_focus) &&
|
||||||
(workspace == NULL ||
|
(workspace == NULL ||
|
||||||
meta_window_visible_on_workspace (window, workspace)))
|
meta_window_located_on_workspace (window, workspace)))
|
||||||
{
|
{
|
||||||
if (topmost_dock == NULL &&
|
if (topmost_dock == NULL &&
|
||||||
window->type == META_WINDOW_DOCK)
|
window->type == META_WINDOW_DOCK)
|
||||||
@ -1431,7 +1431,7 @@ meta_stack_list_windows (MetaStack *stack,
|
|||||||
MetaWindow *window = link->data;
|
MetaWindow *window = link->data;
|
||||||
|
|
||||||
if (window &&
|
if (window &&
|
||||||
(workspace == NULL || meta_window_visible_on_workspace (window, workspace)))
|
(workspace == NULL || meta_window_located_on_workspace (window, workspace)))
|
||||||
{
|
{
|
||||||
workspace_windows = g_list_prepend (workspace_windows,
|
workspace_windows = g_list_prepend (workspace_windows,
|
||||||
window);
|
window);
|
||||||
|
11
src/window.c
11
src/window.c
@ -1170,9 +1170,8 @@ set_net_wm_state (MetaWindow *window)
|
|||||||
meta_error_trap_pop (window->display, FALSE);
|
meta_error_trap_pop (window->display, FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME rename this, it makes it sound like map state is relevant */
|
|
||||||
gboolean
|
gboolean
|
||||||
meta_window_visible_on_workspace (MetaWindow *window,
|
meta_window_located_on_workspace (MetaWindow *window,
|
||||||
MetaWorkspace *workspace)
|
MetaWorkspace *workspace)
|
||||||
{
|
{
|
||||||
return (window->on_all_workspaces && window->screen == workspace->screen) ||
|
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);
|
meta_verbose ("Should be showing for window %s\n", window->desc);
|
||||||
|
|
||||||
/* See if we're on the workspace */
|
/* 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);
|
window->screen->active_workspace);
|
||||||
|
|
||||||
if (!on_workspace)
|
if (!on_workspace)
|
||||||
@ -1304,7 +1303,7 @@ implement_showing (MetaWindow *window,
|
|||||||
{
|
{
|
||||||
gboolean on_workspace;
|
gboolean on_workspace;
|
||||||
|
|
||||||
on_workspace = meta_window_visible_on_workspace (window,
|
on_workspace = meta_window_located_on_workspace (window,
|
||||||
window->screen->active_workspace);
|
window->screen->active_workspace);
|
||||||
|
|
||||||
/* Really this effects code should probably
|
/* Really this effects code should probably
|
||||||
@ -2166,7 +2165,7 @@ meta_window_activate (MetaWindow *window,
|
|||||||
maybe_leave_show_desktop_mode (window);
|
maybe_leave_show_desktop_mode (window);
|
||||||
|
|
||||||
/* Get window on current workspace */
|
/* Get window on current workspace */
|
||||||
if (!meta_window_visible_on_workspace (window,
|
if (!meta_window_located_on_workspace (window,
|
||||||
window->screen->active_workspace))
|
window->screen->active_workspace))
|
||||||
meta_window_change_workspace (window,
|
meta_window_change_workspace (window,
|
||||||
window->screen->active_workspace);
|
window->screen->active_workspace);
|
||||||
@ -4240,7 +4239,7 @@ meta_window_notify_focus (MetaWindow *window,
|
|||||||
* workspace.
|
* workspace.
|
||||||
*/
|
*/
|
||||||
if (window->screen->active_workspace &&
|
if (window->screen->active_workspace &&
|
||||||
meta_window_visible_on_workspace (window,
|
meta_window_located_on_workspace (window,
|
||||||
window->screen->active_workspace))
|
window->screen->active_workspace))
|
||||||
{
|
{
|
||||||
GList* link;
|
GList* link;
|
||||||
|
@ -466,7 +466,7 @@ void meta_window_handle_mouse_grab_op_event (MetaWindow *window,
|
|||||||
|
|
||||||
GList* meta_window_get_workspaces (MetaWindow *window);
|
GList* meta_window_get_workspaces (MetaWindow *window);
|
||||||
|
|
||||||
gboolean meta_window_visible_on_workspace (MetaWindow *window,
|
gboolean meta_window_located_on_workspace (MetaWindow *window,
|
||||||
MetaWorkspace *workspace);
|
MetaWorkspace *workspace);
|
||||||
|
|
||||||
void meta_window_get_work_area_current_xinerama (MetaWindow *window,
|
void meta_window_get_work_area_current_xinerama (MetaWindow *window,
|
||||||
|
@ -384,7 +384,7 @@ meta_workspace_list_windows (MetaWorkspace *workspace)
|
|||||||
{
|
{
|
||||||
MetaWindow *window = tmp->data;
|
MetaWindow *window = tmp->data;
|
||||||
|
|
||||||
if (meta_window_visible_on_workspace (window, workspace))
|
if (meta_window_located_on_workspace (window, workspace))
|
||||||
workspace_windows = g_list_prepend (workspace_windows,
|
workspace_windows = g_list_prepend (workspace_windows,
|
||||||
window);
|
window);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user