isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

screen: Remove a bunch of screen checks

Browse Source 
Now that we only manage one screen, this isn't necessary anymore.
This commit is contained in:
Jasper St. Pierre 2014-08-15 19:43:08 -04:00
parent 320f38de47
commit 06d55bf019
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/screen.c
View File

@ -1022,9 +1022,7 @@ meta_screen_foreach_window (MetaScreen *screen,
{ {
MetaWindow *window = tmp->data; MetaWindow *window = tmp->data;
if (META_IS_WINDOW (window) && if (META_IS_WINDOW (window) && !window->override_redirect)
window->screen == screen &&
!window->override_redirect)
(* func) (screen, window, data); (* func) (screen, window, data);
} }
@ -2098,16 +2096,13 @@ set_work_area_hint (MetaScreen *screen)
{ {
MetaWorkspace *workspace = tmp_list->data; MetaWorkspace *workspace = tmp_list->data;
if (workspace->screen == screen) meta_workspace_get_work_area_all_monitors (workspace, &area);
{ tmp[0] = area.x;
meta_workspace_get_work_area_all_monitors (workspace, &area); tmp[1] = area.y;
tmp[0] = area.x; tmp[2] = area.width;
tmp[1] = area.y; tmp[3] = area.height;
tmp[2] = area.width;
tmp[3] = area.height;
tmp += 4; tmp += 4;
}
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
} }
@ -2501,8 +2496,7 @@ on_monitors_changed (MetaMonitorManager *manager,
{ {
MetaWindow *window = tmp->data; MetaWindow *window = tmp->data;
if (window->screen == screen) meta_window_update_for_monitors_changed (window);
meta_window_update_for_monitors_changed (window);
} }
g_slist_free (windows); g_slist_free (windows);
@ -2544,8 +2538,7 @@ queue_windows_showing (MetaScreen *screen)
{ {
MetaWindow *w = tmp->data; MetaWindow *w = tmp->data;
if (w->screen == screen) meta_window_queue (w, META_QUEUE_CALC_SHOWING);
meta_window_queue (w, META_QUEUE_CALC_SHOWING);
tmp = tmp->next; tmp = tmp->next;
} }
@ -2567,9 +2560,7 @@ meta_screen_minimize_all_on_active_workspace_except (MetaScreen *screen,
{ {
MetaWindow *w = tmp->data; MetaWindow *w = tmp->data;
if (w->screen == screen && if (w->has_minimize_func && w != keep)
w->has_minimize_func &&
w != keep)
meta_window_minimize (w); meta_window_minimize (w);
tmp = tmp->next; tmp = tmp->next;
@ -2597,8 +2588,7 @@ meta_screen_show_desktop (MetaScreen *screen,
{ {
MetaWindow *w = windows->data; MetaWindow *w = windows->data;
if (w->screen == screen && if (w->type == META_WINDOW_DESKTOP)
w->type == META_WINDOW_DESKTOP)
{ {
meta_window_focus (w, timestamp); meta_window_focus (w, timestamp);
break; break;

3
src/core/stack.c
View File

@ -639,8 +639,7 @@ create_constraints (Constraint **constraints,
parent = w->transient_for; parent = w->transient_for;
if (parent && WINDOW_IN_STACK (parent) && if (parent && WINDOW_IN_STACK (parent))
parent->screen == w->screen)
{ {
meta_topic (META_DEBUG_STACK, "Constraining %s above %s due to transiency\n", meta_topic (META_DEBUG_STACK, "Constraining %s above %s due to transiency\n",
w->desc, parent->desc); w->desc, parent->desc);

3
src/core/window.c
View File

@ -1488,8 +1488,7 @@ gboolean
meta_window_located_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->workspace == workspace);
(window->workspace == workspace);
} }
static gboolean static gboolean