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

window: Keep track of fullscreen monitors directly

Browse Source 
Instead of keeping around array indexes, keep track of them by storing
a pointer instead. This also changes from using an array (imitating the
X11 behaviour) to more explicit storing.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl
2016-11-29 17:50:17 +08:00
parent 0a4fb008f3
commit ecf796f82b
6 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/core/window.c
View File

@@ -927,7 +927,6 @@ _meta_window_shared_new (MetaDisplay *display,
window->maximize_vertically_after_placement = FALSE;
window->minimize_after_placement = FALSE;
window->fullscreen = FALSE;
window->fullscreen_monitors[0] = -1;
window->require_fully_onscreen = TRUE;
window->require_on_single_monitor = TRUE;
window->require_titlebar_visible = TRUE;
@@ -3279,32 +3278,32 @@ meta_window_unmake_fullscreen (MetaWindow *window)
}
}
void
meta_window_update_fullscreen_monitors (MetaWindow *window,
unsigned long top,
unsigned long bottom,
unsigned long left,
unsigned long right)
static void
meta_window_clear_fullscreen_monitors (MetaWindow *window)
{
MetaBackend *backend = meta_get_backend ();
MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend);
int n_logical_monitors =
meta_monitor_manager_get_num_logical_monitors (monitor_manager);
window->fullscreen_monitors.top = NULL;
window->fullscreen_monitors.bottom = NULL;
window->fullscreen_monitors.left = NULL;
window->fullscreen_monitors.right = NULL;
}
if ((int) top < n_logical_monitors &&
(int) bottom < n_logical_monitors &&
(int) left < n_logical_monitors &&
(int) right < n_logical_monitors)
void
meta_window_update_fullscreen_monitors (MetaWindow *window,
MetaLogicalMonitor *top,
MetaLogicalMonitor *bottom,
MetaLogicalMonitor *left,
MetaLogicalMonitor *right)
{
if (top && bottom && left && right)
{
window->fullscreen_monitors[0] = top;
window->fullscreen_monitors[1] = bottom;
window->fullscreen_monitors[2] = left;
window->fullscreen_monitors[3] = right;
window->fullscreen_monitors.top = top;
window->fullscreen_monitors.bottom = bottom;
window->fullscreen_monitors.left = left;
window->fullscreen_monitors.right = right;
}
else
{
window->fullscreen_monitors[0] = -1;
meta_window_clear_fullscreen_monitors (window);
}
if (window->fullscreen)
@@ -3313,6 +3312,12 @@ meta_window_update_fullscreen_monitors (MetaWindow *window,
}
}
gboolean
meta_window_has_fullscreen_monitors (MetaWindow *window)
{
return window->fullscreen_monitors.top != NULL;
}
void
meta_window_shade (MetaWindow *window,
guint32 timestamp)
@@ -3567,8 +3572,8 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
meta_backend_get_monitor_manager (backend);
const MetaLogicalMonitor *old, *new;
if (window->fullscreen_monitors[0] != -1)
window->fullscreen_monitors[0] = -1;
if (meta_window_has_fullscreen_monitors (window))
meta_window_clear_fullscreen_monitors (window);
if (window->override_redirect || window->type == META_WINDOW_DESKTOP)
{