brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move workspace handling to MetaDisplay and MetaX11Display

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=759538
This commit is contained in:
Armin Krezović 2017-08-26 21:39:46 +02:00 committed by Jonas Ådahl
parent d79ffd3976
commit b7c3dada81
20 changed files with 1349 additions and 1393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/constraints.c
View File

@ -412,7 +412,7 @@ setup_constraint_info (ConstraintInfo *info,
&info->entire_monitor); &info->entire_monitor);
} }
cur_workspace = window->screen->active_workspace; cur_workspace = window->display->active_workspace;
info->usable_screen_region = info->usable_screen_region =
meta_workspace_get_onscreen_region (cur_workspace); meta_workspace_get_onscreen_region (cur_workspace);
info->usable_monitor_region = info->usable_monitor_region =
@ -499,7 +499,7 @@ place_window_if_needed(MetaWindow *window,
meta_window_get_work_area_for_logical_monitor (window, meta_window_get_work_area_for_logical_monitor (window,
logical_monitor, logical_monitor,
&info->work_area_monitor); &info->work_area_monitor);
cur_workspace = window->screen->active_workspace; cur_workspace = window->display->active_workspace;
info->usable_monitor_region = info->usable_monitor_region =
meta_workspace_get_onmonitor_region (cur_workspace, logical_monitor); meta_workspace_get_onmonitor_region (cur_workspace, logical_monitor);
@ -965,7 +965,7 @@ constrain_maximization (MetaWindow *window,
direction = META_DIRECTION_HORIZONTAL; direction = META_DIRECTION_HORIZONTAL;
else else
direction = META_DIRECTION_VERTICAL; direction = META_DIRECTION_VERTICAL;
active_workspace_struts = window->screen->active_workspace->all_struts; active_workspace_struts = window->display->active_workspace->all_struts;
target_size = info->current; target_size = info->current;
meta_rectangle_expand_to_avoiding_struts (&target_size, meta_rectangle_expand_to_avoiding_struts (&target_size,

16
src/core/core.c
View File

@ -87,22 +87,22 @@ lower_window_and_transients (MetaWindow *window,
* Do extra sanity checks to avoid possible race conditions. * Do extra sanity checks to avoid possible race conditions.
* (Borrowed from window.c.) * (Borrowed from window.c.)
*/ */
if (window->screen->active_workspace && if (window->display->active_workspace &&
meta_window_located_on_workspace (window, meta_window_located_on_workspace (window,
window->screen->active_workspace)) window->display->active_workspace))
{ {
GList* link; GList* link;
link = g_list_find (window->screen->active_workspace->mru_list, link = g_list_find (window->display->active_workspace->mru_list,
window); window);
g_assert (link); g_assert (link);
window->screen->active_workspace->mru_list = window->display->active_workspace->mru_list =
g_list_remove_link (window->screen->active_workspace->mru_list, g_list_remove_link (window->display->active_workspace->mru_list,
link); link);
g_list_free (link); g_list_free (link);
window->screen->active_workspace->mru_list = window->display->active_workspace->mru_list =
g_list_append (window->screen->active_workspace->mru_list, g_list_append (window->display->active_workspace->mru_list,
window); window);
} }
} }
@ -123,7 +123,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
* the focus window, assume that's always the case. (Typically, * the focus window, assume that's always the case. (Typically,
* this will be invoked via keyboard action or by a mouse action; * this will be invoked via keyboard action or by a mouse action;
* in either case the window or a modal child will have been focused.) */ * in either case the window or a modal child will have been focused.) */
meta_workspace_focus_default_window (window->screen->active_workspace, meta_workspace_focus_default_window (window->display->active_workspace,
NULL, NULL,
timestamp); timestamp);
} }

44
src/core/display-private.h
View File

@ -245,6 +245,16 @@ struct _MetaDisplay
guint work_area_later; guint work_area_later;
guint check_fullscreen_later; guint check_fullscreen_later;
MetaWorkspace *active_workspace;
GList *workspaces;
int rows_of_workspaces;
int columns_of_workspaces;
MetaDisplayCorner starting_corner;
guint vertical_workspaces : 1;
guint workspace_layout_overridden : 1;
}; };
struct _MetaDisplayClass struct _MetaDisplayClass
@ -434,4 +444,38 @@ void meta_display_queue_check_fullscreen (MetaDisplay *display);
MetaWindow *meta_display_get_pointer_window (MetaDisplay *display, MetaWindow *meta_display_get_pointer_window (MetaDisplay *display,
MetaWindow *not_this_one); MetaWindow *not_this_one);
void meta_display_init_workspaces (MetaDisplay *display);
void meta_display_update_workspace_layout (MetaDisplay *display);
typedef struct MetaWorkspaceLayout MetaWorkspaceLayout;
struct MetaWorkspaceLayout
{
int rows;
int cols;
int *grid;
int grid_area;
int current_row;
int current_col;
};
void meta_display_calc_workspace_layout (MetaDisplay *display,
int num_workspaces,
int current_space,
MetaWorkspaceLayout *layout);
void meta_display_free_workspace_layout (MetaWorkspaceLayout *layout);
void meta_display_minimize_all_on_active_workspace_except (MetaDisplay *display,
MetaWindow *keep);
/* Show/hide the desktop (temporarily hide all windows) */
void meta_display_show_desktop (MetaDisplay *display,
guint32 timestamp);
void meta_display_unshow_desktop (MetaDisplay *display);
void meta_display_workspace_switched (MetaDisplay *display,
int from,
int to,
MetaMotionDirection direction);
#endif #endif

993
src/core/display.c
View File

File diff suppressed because it is too large Load Diff

6
src/core/edge-resistance.c
View File

@ -1010,7 +1010,7 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
*/ */
stacked_windows = stacked_windows =
meta_stack_list_windows (display->stack, meta_stack_list_windows (display->stack,
display->screen->active_workspace); display->active_workspace);
/* /*
* 2nd: we need to separate that stacked list into a list of windows that * 2nd: we need to separate that stacked list into a list of windows that
@ -1168,8 +1168,8 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
*/ */
cache_edges (display, cache_edges (display,
edges, edges,
display->screen->active_workspace->monitor_edges, display->active_workspace->monitor_edges,
display->screen->active_workspace->screen_edges); display->active_workspace->screen_edges);
g_list_free (edges); g_list_free (edges);
/* /*

28
src/core/keybindings.c
View File

@ -2752,8 +2752,8 @@ handle_switch_to_last_workspace (MetaDisplay *display,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer dummy)
{ {
gint target = meta_screen_get_n_workspaces(screen) - 1; gint target = meta_display_get_n_workspaces(display) - 1;
MetaWorkspace *workspace = meta_screen_get_workspace_by_index (screen, target); MetaWorkspace *workspace = meta_display_get_workspace_by_index (display, target);
meta_workspace_activate (workspace, event->time); meta_workspace_activate (workspace, event->time);
} }
@ -2774,12 +2774,12 @@ handle_switch_to_workspace (MetaDisplay *display,
* current workspace. * current workspace.
*/ */
workspace = meta_workspace_get_neighbor (screen->active_workspace, workspace = meta_workspace_get_neighbor (display->active_workspace,
which); which);
} }
else else
{ {
workspace = meta_screen_get_workspace_by_index (screen, which); workspace = meta_display_get_workspace_by_index (display, which);
} }
if (workspace) if (workspace)
@ -3016,15 +3016,15 @@ handle_show_desktop (MetaDisplay *display,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer dummy)
{ {
if (screen->active_workspace->showing_desktop) if (display->active_workspace->showing_desktop)
{ {
meta_screen_unshow_desktop (screen); meta_display_unshow_desktop (display);
meta_workspace_focus_default_window (screen->active_workspace, meta_workspace_focus_default_window (display->active_workspace,
NULL, NULL,
event->time); event->time);
} }
else else
meta_screen_show_desktop (screen, event->time); meta_display_show_desktop (display, event->time);
} }
static void static void
@ -3122,7 +3122,7 @@ do_choose_window (MetaDisplay *display,
window = meta_display_get_tab_next (display, window = meta_display_get_tab_next (display,
type, type,
screen->active_workspace, display->active_workspace,
NULL, NULL,
backward); backward);
@ -3357,8 +3357,8 @@ handle_move_to_workspace_last (MetaDisplay *display,
if (window->always_sticky) if (window->always_sticky)
return; return;
which = meta_screen_get_n_workspaces (screen) - 1; which = meta_display_get_n_workspaces (display) - 1;
workspace = meta_screen_get_workspace_by_index (screen, which); workspace = meta_display_get_workspace_by_index (display, which);
meta_window_change_workspace (window, workspace); meta_window_change_workspace (window, workspace);
} }
@ -3389,12 +3389,12 @@ handle_move_to_workspace (MetaDisplay *display,
workspace = NULL; workspace = NULL;
if (flip) if (flip)
{ {
workspace = meta_workspace_get_neighbor (screen->active_workspace, workspace = meta_workspace_get_neighbor (display->active_workspace,
which); which);
} }
else else
{ {
workspace = meta_screen_get_workspace_by_index (screen, which); workspace = meta_display_get_workspace_by_index (display, which);
} }
if (workspace) if (workspace)
@ -3406,7 +3406,7 @@ handle_move_to_workspace (MetaDisplay *display,
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Resetting mouse_mode to FALSE due to " "Resetting mouse_mode to FALSE due to "
"handle_move_to_workspace() call with flip set.\n"); "handle_move_to_workspace() call with flip set.\n");
meta_display_clear_mouse_mode (workspace->screen->display); meta_display_clear_mouse_mode (workspace->display);
meta_workspace_activate_with_focus (workspace, meta_workspace_activate_with_focus (workspace,
window, window,
event->time); event->time);

53
src/core/screen-private.h
View File

@ -46,16 +46,6 @@ struct _MetaScreen
MetaDisplay *display; MetaDisplay *display;
MetaWorkspace *active_workspace;
GList *workspaces;
int rows_of_workspaces;
int columns_of_workspaces;
MetaScreenCorner starting_corner;
guint vertical_workspaces : 1;
guint workspace_layout_overridden : 1;
int closing; int closing;
}; };
@ -68,48 +58,7 @@ MetaScreen* meta_screen_new (MetaDisplay *displ
guint32 timestamp); guint32 timestamp);
void meta_screen_free (MetaScreen *screen, void meta_screen_free (MetaScreen *screen,
guint32 timestamp); guint32 timestamp);
void meta_screen_init_workspaces (MetaScreen *screen);
void meta_screen_manage_all_windows (MetaScreen *screen); void meta_screen_manage_all_windows (MetaScreen *screen);
void meta_screen_update_workspace_layout (MetaScreen *screen);
void meta_screen_update_workspace_names (MetaScreen *screen);
typedef struct MetaWorkspaceLayout MetaWorkspaceLayout;
struct MetaWorkspaceLayout
{
int rows;
int cols;
int *grid;
int grid_area;
int current_row;
int current_col;
};
void meta_screen_calc_workspace_layout (MetaScreen *screen,
int num_workspaces,
int current_space,
MetaWorkspaceLayout *layout);
void meta_screen_free_workspace_layout (MetaWorkspaceLayout *layout);
void meta_screen_minimize_all_on_active_workspace_except (MetaScreen *screen,
MetaWindow *keep);
/* Show/hide the desktop (temporarily hide all windows) */
void meta_screen_show_desktop (MetaScreen *screen,
guint32 timestamp);
void meta_screen_unshow_desktop (MetaScreen *screen);
/* Update whether the destkop is being shown for the current active_workspace */
void meta_screen_update_showing_desktop_hint (MetaScreen *screen);
void meta_screen_workspace_switched (MetaScreen *screen,
int from,
int to,
MetaMotionDirection direction);
void meta_screen_set_active_workspace_hint (MetaScreen *screen);
void meta_screen_on_monitors_changed (MetaScreen *screen);
#endif #endif

1125
src/core/screen.c
View File

File diff suppressed because it is too large Load Diff

14
src/core/stack.c
View File

@ -117,7 +117,7 @@ meta_stack_add (MetaStack *stack,
window->desc, window->stack_position); window->desc, window->stack_position);
stack_sync_to_xserver (stack); stack_sync_to_xserver (stack);
meta_stack_update_window_tile_matches (stack, window->screen->active_workspace); meta_stack_update_window_tile_matches (stack, window->display->active_workspace);
} }
void void
@ -153,7 +153,7 @@ meta_stack_remove (MetaStack *stack,
} }
stack_sync_to_xserver (stack); stack_sync_to_xserver (stack);
meta_stack_update_window_tile_matches (stack, window->screen->active_workspace); meta_stack_update_window_tile_matches (stack, window->display->active_workspace);
} }
void void
@ -163,7 +163,7 @@ meta_stack_update_layer (MetaStack *stack,
stack->need_relayer = TRUE; stack->need_relayer = TRUE;
stack_sync_to_xserver (stack); stack_sync_to_xserver (stack);
meta_stack_update_window_tile_matches (stack, window->screen->active_workspace); meta_stack_update_window_tile_matches (stack, window->display->active_workspace);
} }
void void
@ -173,7 +173,7 @@ meta_stack_update_transient (MetaStack *stack,
stack->need_constrain = TRUE; stack->need_constrain = TRUE;
stack_sync_to_xserver (stack); stack_sync_to_xserver (stack);
meta_stack_update_window_tile_matches (stack, window->screen->active_workspace); meta_stack_update_window_tile_matches (stack, window->display->active_workspace);
} }
/* raise/lower within a layer */ /* raise/lower within a layer */
@ -202,7 +202,7 @@ meta_stack_raise (MetaStack *stack,
meta_window_set_stack_position_no_sync (window, max_stack_position); meta_window_set_stack_position_no_sync (window, max_stack_position);
stack_sync_to_xserver (stack); stack_sync_to_xserver (stack);
meta_stack_update_window_tile_matches (stack, window->screen->active_workspace); meta_stack_update_window_tile_matches (stack, window->display->active_workspace);
} }
void void
@ -230,7 +230,7 @@ meta_stack_lower (MetaStack *stack,
meta_window_set_stack_position_no_sync (window, min_stack_position); meta_window_set_stack_position_no_sync (window, min_stack_position);
stack_sync_to_xserver (stack); stack_sync_to_xserver (stack);
meta_stack_update_window_tile_matches (stack, window->screen->active_workspace); meta_stack_update_window_tile_matches (stack, window->display->active_workspace);
} }
void void
@ -1465,5 +1465,5 @@ meta_window_set_stack_position (MetaWindow *window,
meta_window_set_stack_position_no_sync (window, position); meta_window_set_stack_position_no_sync (window, position);
stack_sync_to_xserver (window->display->stack); stack_sync_to_xserver (window->display->stack);
meta_stack_update_window_tile_matches (window->display->stack, meta_stack_update_window_tile_matches (window->display->stack,
window->screen->active_workspace); window->display->active_workspace);
} }

86
src/core/window.c
View File

@ -689,7 +689,7 @@ maybe_leave_show_desktop_mode (MetaWindow *window)
{ {
gboolean is_desktop_or_dock; gboolean is_desktop_or_dock;
if (!window->screen->active_workspace->showing_desktop) if (!window->display->active_workspace->showing_desktop)
return; return;
/* If the window is a transient for the dock or desktop, don't /* If the window is a transient for the dock or desktop, don't
@ -706,9 +706,9 @@ maybe_leave_show_desktop_mode (MetaWindow *window)
if (!is_desktop_or_dock) if (!is_desktop_or_dock)
{ {
meta_screen_minimize_all_on_active_workspace_except (window->screen, meta_display_minimize_all_on_active_workspace_except (window->display,
window); window);
meta_screen_unshow_desktop (window->screen); meta_display_unshow_desktop (window->display);
} }
} }
@ -1244,8 +1244,8 @@ _meta_window_shared_new (MetaDisplay *display,
"Window %s is initially on space %d\n", "Window %s is initially on space %d\n",
window->desc, window->initial_workspace); window->desc, window->initial_workspace);
workspace = meta_screen_get_workspace_by_index (window->screen, workspace = meta_display_get_workspace_by_index (window->display,
window->initial_workspace); window->initial_workspace);
} }
set_workspace_state (window, on_all_workspaces, workspace); set_workspace_state (window, on_all_workspaces, workspace);
@ -1284,7 +1284,7 @@ _meta_window_shared_new (MetaDisplay *display,
"Putting window %s on active workspace\n", "Putting window %s on active workspace\n",
window->desc); window->desc);
set_workspace_state (window, FALSE, window->screen->active_workspace); set_workspace_state (window, FALSE, window->display->active_workspace);
} }
meta_window_update_struts (window); meta_window_update_struts (window);
@ -1470,7 +1470,7 @@ meta_window_unmanage (MetaWindow *window,
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Focusing default window since we're unmanaging %s\n", "Focusing default window since we're unmanaging %s\n",
window->desc); window->desc);
meta_workspace_focus_default_window (window->screen->active_workspace, NULL, timestamp); meta_workspace_focus_default_window (window->display->active_workspace, NULL, timestamp);
} }
else else
{ {
@ -1516,7 +1516,7 @@ meta_window_unmanage (MetaWindow *window,
g_assert (window->workspace == NULL); g_assert (window->workspace == NULL);
#ifndef G_DISABLE_CHECKS #ifndef G_DISABLE_CHECKS
tmp = window->screen->workspaces; tmp = window->display->workspaces;
while (tmp != NULL) while (tmp != NULL)
{ {
MetaWorkspace *workspace = tmp->data; MetaWorkspace *workspace = tmp->data;
@ -1647,7 +1647,7 @@ meta_window_showing_on_its_workspace (MetaWindow *window)
&is_desktop_or_dock); &is_desktop_or_dock);
if (window->on_all_workspaces) if (window->on_all_workspaces)
workspace_of_window = window->screen->active_workspace; workspace_of_window = window->display->active_workspace;
else if (window->workspace) else if (window->workspace)
workspace_of_window = window->workspace; workspace_of_window = window->workspace;
else /* This only seems to be needed for startup */ else /* This only seems to be needed for startup */
@ -1687,7 +1687,7 @@ meta_window_should_be_showing (MetaWindow *window)
/* Windows should be showing if they're located on the /* Windows should be showing if they're located on the
* active workspace and they're showing on their own workspace. */ * active workspace and they're showing on their own workspace. */
return (meta_window_located_on_workspace (window, window->screen->active_workspace) && return (meta_window_located_on_workspace (window, window->display->active_workspace) &&
meta_window_showing_on_its_workspace (window)); meta_window_showing_on_its_workspace (window));
} }
@ -2630,11 +2630,11 @@ meta_window_hide (MetaWindow *window)
* We also pass in NULL if we are in the process of hiding all non-desktop * We also pass in NULL if we are in the process of hiding all non-desktop
* windows to avoid unexpected changes to the stacking order. * windows to avoid unexpected changes to the stacking order.
*/ */
if (my_workspace == window->screen->active_workspace && if (my_workspace == window->display->active_workspace &&
!my_workspace->showing_desktop) !my_workspace->showing_desktop)
not_this_one = window; not_this_one = window;
meta_workspace_focus_default_window (window->screen->active_workspace, meta_workspace_focus_default_window (window->display->active_workspace,
not_this_one, not_this_one,
timestamp); timestamp);
} }
@ -3641,7 +3641,7 @@ meta_window_activate_full (MetaWindow *window,
/* Get window on current or given workspace */ /* Get window on current or given workspace */
if (workspace == NULL) if (workspace == NULL)
workspace = window->screen->active_workspace; workspace = window->display->active_workspace;
/* For non-transient windows, we just set up a pulsing indicator, /* For non-transient windows, we just set up a pulsing indicator,
rather than move windows or workspaces. rather than move windows or workspaces.
@ -3869,8 +3869,8 @@ meta_window_update_monitor (MetaWindow *window,
*/ */
if (meta_prefs_get_workspaces_only_on_primary () && user_op && if (meta_prefs_get_workspaces_only_on_primary () && user_op &&
meta_window_is_on_primary_monitor (window) && meta_window_is_on_primary_monitor (window) &&
window->screen->active_workspace != window->workspace) window->display->active_workspace != window->workspace)
meta_window_change_workspace (window, window->screen->active_workspace); meta_window_change_workspace (window, window->display->active_workspace);
meta_window_main_monitor_changed (window, old); meta_window_main_monitor_changed (window, old);
@ -4036,7 +4036,7 @@ meta_window_move_resize_internal (MetaWindow *window,
meta_window_foreach_transient (window, maybe_move_attached_dialog, NULL); meta_window_foreach_transient (window, maybe_move_attached_dialog, NULL);
meta_stack_update_window_tile_matches (window->display->stack, meta_stack_update_window_tile_matches (window->display->stack,
window->screen->active_workspace); window->display->active_workspace);
} }
/** /**
@ -4642,8 +4642,8 @@ meta_window_focus (MetaWindow *window,
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"%s has %s as a modal transient, so focusing it instead.\n", "%s has %s as a modal transient, so focusing it instead.\n",
window->desc, modal_transient->desc); window->desc, modal_transient->desc);
if (!meta_window_located_on_workspace (modal_transient, window->screen->active_workspace)) if (!meta_window_located_on_workspace (modal_transient, window->display->active_workspace))
meta_window_change_workspace (modal_transient, window->screen->active_workspace); meta_window_change_workspace (modal_transient, window->display->active_workspace);
window = modal_transient; window = modal_transient;
} }
@ -4714,7 +4714,7 @@ set_workspace_state (MetaWindow *window,
else if (window->on_all_workspaces) else if (window->on_all_workspaces)
{ {
GList *l; GList *l;
for (l = window->screen->workspaces; l != NULL; l = l->next) for (l = window->display->workspaces; l != NULL; l = l->next)
{ {
MetaWorkspace *ws = l->data; MetaWorkspace *ws = l->data;
meta_workspace_remove_window (ws, window); meta_workspace_remove_window (ws, window);
@ -4729,7 +4729,7 @@ set_workspace_state (MetaWindow *window,
else if (window->on_all_workspaces) else if (window->on_all_workspaces)
{ {
GList *l; GList *l;
for (l = window->screen->workspaces; l != NULL; l = l->next) for (l = window->display->workspaces; l != NULL; l = l->next)
{ {
MetaWorkspace *ws = l->data; MetaWorkspace *ws = l->data;
meta_workspace_add_window (ws, window); meta_workspace_add_window (ws, window);
@ -4786,7 +4786,7 @@ meta_window_on_all_workspaces_changed (MetaWindow *window)
{ {
/* We're coming out of the sticky state. Put the window on /* We're coming out of the sticky state. Put the window on
* the currently active workspace. */ * the currently active workspace. */
workspace = window->screen->active_workspace; workspace = window->display->active_workspace;
} }
set_workspace_state (window, on_all_workspaces, workspace); set_workspace_state (window, on_all_workspaces, workspace);
@ -5010,7 +5010,7 @@ meta_window_change_workspace_by_index (MetaWindow *window,
gboolean append) gboolean append)
{ {
MetaWorkspace *workspace; MetaWorkspace *workspace;
MetaScreen *screen; MetaDisplay *display;
g_return_if_fail (!window->override_redirect); g_return_if_fail (!window->override_redirect);
@ -5020,13 +5020,13 @@ meta_window_change_workspace_by_index (MetaWindow *window,
return; return;
} }
screen = window->screen; display = window->display;
workspace = workspace =
meta_screen_get_workspace_by_index (screen, space_index); meta_display_get_workspace_by_index (display, space_index);
if (!workspace && append) if (!workspace && append)
workspace = meta_screen_append_new_workspace (screen, FALSE, CurrentTime); workspace = meta_display_append_new_workspace (display, FALSE, CurrentTime);
if (workspace) if (workspace)
meta_window_change_workspace (window, workspace); meta_window_change_workspace (window, workspace);
@ -5140,22 +5140,22 @@ meta_window_set_focused_internal (MetaWindow *window,
* list only if the window is actually on the active * list only if the window is actually on the active
* workspace. * workspace.
*/ */
if (window->screen->active_workspace && if (window->display->active_workspace &&
meta_window_located_on_workspace (window, meta_window_located_on_workspace (window,
window->screen->active_workspace)) window->display->active_workspace))
{ {
GList* link; GList* link;
link = g_list_find (window->screen->active_workspace->mru_list, link = g_list_find (window->display->active_workspace->mru_list,
window); window);
g_assert (link); g_assert (link);
window->screen->active_workspace->mru_list = window->display->active_workspace->mru_list =
g_list_remove_link (window->screen->active_workspace->mru_list, g_list_remove_link (window->display->active_workspace->mru_list,
link); link);
g_list_free (link); g_list_free (link);
window->screen->active_workspace->mru_list = window->display->active_workspace->mru_list =
g_list_prepend (window->screen->active_workspace->mru_list, g_list_prepend (window->display->active_workspace->mru_list,
window); window);
} }
@ -5399,7 +5399,7 @@ GList*
meta_window_get_workspaces (MetaWindow *window) meta_window_get_workspaces (MetaWindow *window)
{ {
if (window->on_all_workspaces) if (window->on_all_workspaces)
return window->screen->workspaces; return window->display->workspaces;
else if (window->workspace != NULL) else if (window->workspace != NULL)
return window->workspace->list_containing_self; return window->workspace->list_containing_self;
else if (window->constructing) else if (window->constructing)
@ -5764,7 +5764,7 @@ meta_window_shove_titlebar_onscreen (MetaWindow *window)
/* Get the basic info we need */ /* Get the basic info we need */
meta_window_get_frame_rect (window, &frame_rect); meta_window_get_frame_rect (window, &frame_rect);
onscreen_region = window->screen->active_workspace->screen_region; onscreen_region = window->display->active_workspace->screen_region;
/* Extend the region (just in case the window is too big to fit on the /* Extend the region (just in case the window is too big to fit on the
* screen), then shove the window on screen, then return the region to * screen), then shove the window on screen, then return the region to
@ -5816,7 +5816,7 @@ meta_window_titlebar_is_onscreen (MetaWindow *window)
* them overlaps with the titlebar sufficiently to consider it onscreen. * them overlaps with the titlebar sufficiently to consider it onscreen.
*/ */
is_onscreen = FALSE; is_onscreen = FALSE;
onscreen_region = window->screen->active_workspace->screen_region; onscreen_region = window->display->active_workspace->screen_region;
while (onscreen_region) while (onscreen_region)
{ {
MetaRectangle *spanning_rect = onscreen_region->data; MetaRectangle *spanning_rect = onscreen_region->data;
@ -6885,7 +6885,7 @@ ensure_mru_position_after (MetaWindow *window,
GList* window_position; GList* window_position;
GList* after_this_one_position; GList* after_this_one_position;
active_mru_list = window->screen->active_workspace->mru_list; active_mru_list = window->display->active_workspace->mru_list;
window_position = g_list_find (active_mru_list, window); window_position = g_list_find (active_mru_list, window);
after_this_one_position = g_list_find (active_mru_list, after_this_one); after_this_one_position = g_list_find (active_mru_list, after_this_one);
@ -6898,12 +6898,12 @@ ensure_mru_position_after (MetaWindow *window,
if (g_list_length (window_position) > g_list_length (after_this_one_position)) if (g_list_length (window_position) > g_list_length (after_this_one_position))
{ {
window->screen->active_workspace->mru_list = window->display->active_workspace->mru_list =
g_list_delete_link (window->screen->active_workspace->mru_list, g_list_delete_link (window->display->active_workspace->mru_list,
window_position); window_position);
window->screen->active_workspace->mru_list = window->display->active_workspace->mru_list =
g_list_insert_before (window->screen->active_workspace->mru_list, g_list_insert_before (window->display->active_workspace->mru_list,
after_this_one_position->next, after_this_one_position->next,
window); window);
} }
@ -7056,7 +7056,7 @@ meta_window_set_demands_attention (MetaWindow *window)
MetaWindow *other_window; MetaWindow *other_window;
gboolean obscured = FALSE; gboolean obscured = FALSE;
MetaWorkspace *workspace = window->screen->active_workspace; MetaWorkspace *workspace = window->display->active_workspace;
if (window->wm_state_demands_attention) if (window->wm_state_demands_attention)
return; return;
@ -7257,7 +7257,7 @@ MetaWorkspace *
meta_window_get_workspace (MetaWindow *window) meta_window_get_workspace (MetaWindow *window)
{ {
if (window->on_all_workspaces) if (window->on_all_workspaces)
return window->screen->active_workspace; return window->display->active_workspace;
else else
return window->workspace; return window->workspace;
} }

4
src/core/workspace-private.h
View File

@ -37,7 +37,7 @@
struct _MetaWorkspace struct _MetaWorkspace
{ {
GObject parent_instance; GObject parent_instance;
MetaScreen *screen; MetaDisplay *display;
GList *windows; GList *windows;
@ -72,7 +72,7 @@ struct _MetaWorkspaceClass
GObjectClass parent_class; GObjectClass parent_class;
}; };
MetaWorkspace* meta_workspace_new (MetaScreen *screen); MetaWorkspace* meta_workspace_new (MetaDisplay *display);
void meta_workspace_remove (MetaWorkspace *workspace); void meta_workspace_remove (MetaWorkspace *workspace);
void meta_workspace_add_window (MetaWorkspace *workspace, void meta_workspace_add_window (MetaWorkspace *workspace,
MetaWindow *window); MetaWindow *window);

136
src/core/workspace.c
View File

@ -34,7 +34,7 @@
#include <config.h> #include <config.h>
#include "backends/meta-backend-private.h" #include "backends/meta-backend-private.h"
#include "backends/meta-logical-monitor.h" #include "backends/meta-logical-monitor.h"
#include "screen-private.h" #include "x11/meta-x11-display-private.h"
#include <meta/workspace.h> #include <meta/workspace.h>
#include "workspace-private.h" #include "workspace-private.h"
#include "boxes-private.h" #include "boxes-private.h"
@ -223,16 +223,16 @@ meta_workspace_init (MetaWorkspace *workspace)
} }
MetaWorkspace* MetaWorkspace*
meta_workspace_new (MetaScreen *screen) meta_workspace_new (MetaDisplay *display)
{ {
MetaWorkspace *workspace; MetaWorkspace *workspace;
GSList *windows, *l; GSList *windows, *l;
workspace = g_object_new (META_TYPE_WORKSPACE, NULL); workspace = g_object_new (META_TYPE_WORKSPACE, NULL);
workspace->screen = screen; workspace->display = display;
workspace->screen->workspaces = workspace->display->workspaces =
g_list_append (workspace->screen->workspaces, workspace); g_list_append (workspace->display->workspaces, workspace);
workspace->windows = NULL; workspace->windows = NULL;
workspace->mru_list = NULL; workspace->mru_list = NULL;
@ -253,7 +253,7 @@ meta_workspace_new (MetaScreen *screen)
workspace->showing_desktop = FALSE; workspace->showing_desktop = FALSE;
/* make sure sticky windows are in our mru_list */ /* make sure sticky windows are in our mru_list */
windows = meta_display_list_windows (screen->display, META_LIST_SORTED); windows = meta_display_list_windows (display, META_LIST_SORTED);
for (l = windows; l; l = l->next) for (l = windows; l; l = l->next)
if (meta_window_located_on_workspace (l->data, workspace)) if (meta_window_located_on_workspace (l->data, workspace))
meta_workspace_add_window (workspace, l->data); meta_workspace_add_window (workspace, l->data);
@ -319,12 +319,12 @@ assert_workspace_empty (MetaWorkspace *workspace)
void void
meta_workspace_remove (MetaWorkspace *workspace) meta_workspace_remove (MetaWorkspace *workspace)
{ {
g_return_if_fail (workspace != workspace->screen->active_workspace); g_return_if_fail (workspace != workspace->display->active_workspace);
assert_workspace_empty (workspace); assert_workspace_empty (workspace);
workspace->screen->workspaces = workspace->display->workspaces =
g_list_remove (workspace->screen->workspaces, workspace); g_list_remove (workspace->display->workspaces, workspace);
meta_workspace_clear_logical_monitor_data (workspace); meta_workspace_clear_logical_monitor_data (workspace);
@ -439,14 +439,14 @@ workspace_switch_sound(MetaWorkspace *from,
int i, nw, x, y, fi, ti; int i, nw, x, y, fi, ti;
const char *e; const char *e;
nw = meta_screen_get_n_workspaces(from->screen); nw = meta_display_get_n_workspaces(from->display);
fi = meta_workspace_index(from); fi = meta_workspace_index(from);
ti = meta_workspace_index(to); ti = meta_workspace_index(to);
meta_screen_calc_workspace_layout(from->screen, meta_display_calc_workspace_layout(from->display,
nw, nw,
fi, fi,
&layout); &layout);
for (i = 0; i < nw; i++) for (i = 0; i < nw; i++)
if (layout.grid[i] == ti) if (layout.grid[i] == ti)
@ -489,7 +489,7 @@ workspace_switch_sound(MetaWorkspace *from,
NULL); NULL);
finish: finish:
meta_screen_free_workspace_layout (&layout); meta_display_free_workspace_layout (&layout);
#endif /* HAVE_LIBCANBERRA */ #endif /* HAVE_LIBCANBERRA */
} }
@ -519,7 +519,6 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
{ {
MetaWorkspace *old; MetaWorkspace *old;
MetaWindow *move_window; MetaWindow *move_window;
MetaScreen *screen;
MetaDisplay *display; MetaDisplay *display;
MetaCompositor *comp; MetaCompositor *comp;
MetaWorkspaceLayout layout1, layout2; MetaWorkspaceLayout layout1, layout2;
@ -529,36 +528,36 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
meta_verbose ("Activating workspace %d\n", meta_verbose ("Activating workspace %d\n",
meta_workspace_index (workspace)); meta_workspace_index (workspace));
if (workspace->screen->active_workspace == workspace) if (workspace->display->active_workspace == workspace)
return; return;
/* Free any cached pointers to the workspaces's edges from /* Free any cached pointers to the workspaces's edges from
* a current resize or move operation */ * a current resize or move operation */
meta_display_cleanup_edges (workspace->screen->display); meta_display_cleanup_edges (workspace->display);
if (workspace->screen->active_workspace) if (workspace->display->active_workspace)
workspace_switch_sound (workspace->screen->active_workspace, workspace); workspace_switch_sound (workspace->display->active_workspace, workspace);
/* Note that old can be NULL; e.g. when starting up */ /* Note that old can be NULL; e.g. when starting up */
old = workspace->screen->active_workspace; old = workspace->display->active_workspace;
workspace->screen->active_workspace = workspace; workspace->display->active_workspace = workspace;
meta_screen_set_active_workspace_hint (workspace->screen); meta_x11_display_set_active_workspace_hint (workspace->display->x11_display);
/* If the "show desktop" mode is active for either the old workspace /* If the "show desktop" mode is active for either the old workspace
* or the new one *but not both*, then update the * or the new one *but not both*, then update the
* _net_showing_desktop hint * _net_showing_desktop hint
*/ */
if (old && (old->showing_desktop != workspace->showing_desktop)) if (old && (old->showing_desktop != workspace->showing_desktop))
meta_screen_update_showing_desktop_hint (workspace->screen); meta_x11_display_update_showing_desktop_hint (workspace->display->x11_display);
if (old == NULL) if (old == NULL)
return; return;
move_window = NULL; move_window = NULL;
if (meta_grab_op_is_moving (workspace->screen->display->grab_op)) if (meta_grab_op_is_moving (workspace->display->grab_op))
move_window = workspace->screen->display->grab_window; move_window = workspace->display->grab_window;
if (move_window != NULL) if (move_window != NULL)
{ {
@ -579,19 +578,18 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
/* /*
* Notify the compositor that the active workspace is changing. * Notify the compositor that the active workspace is changing.
*/ */
screen = workspace->screen; display = workspace->display;
display = meta_screen_get_display (screen);
comp = meta_display_get_compositor (display); comp = meta_display_get_compositor (display);
direction = 0; direction = 0;
current_space = meta_workspace_index (old); current_space = meta_workspace_index (old);
new_space = meta_workspace_index (workspace); new_space = meta_workspace_index (workspace);
num_workspaces = meta_screen_get_n_workspaces (workspace->screen); num_workspaces = meta_display_get_n_workspaces (workspace->display);
meta_screen_calc_workspace_layout (workspace->screen, num_workspaces, meta_display_calc_workspace_layout (workspace->display, num_workspaces,
current_space, &layout1); current_space, &layout1);
meta_screen_calc_workspace_layout (workspace->screen, num_workspaces, meta_display_calc_workspace_layout (workspace->display, num_workspaces,
new_space, &layout2); new_space, &layout2);
if (meta_get_locale_direction () == META_LOCALE_DIRECTION_RTL) if (meta_get_locale_direction () == META_LOCALE_DIRECTION_RTL)
{ {
@ -628,8 +626,8 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
direction = META_MOTION_UP_LEFT; direction = META_MOTION_UP_LEFT;
} }
meta_screen_free_workspace_layout (&layout1); meta_display_free_workspace_layout (&layout1);
meta_screen_free_workspace_layout (&layout2); meta_display_free_workspace_layout (&layout2);
meta_compositor_switch_workspace (comp, old, workspace, direction); meta_compositor_switch_workspace (comp, old, workspace, direction);
@ -653,7 +651,7 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
} }
/* Emit switched signal from screen.c */ /* Emit switched signal from screen.c */
meta_screen_workspace_switched (screen, current_space, new_space, direction); meta_display_workspace_switched (display, current_space, new_space, direction);
} }
void void
@ -668,7 +666,7 @@ meta_workspace_index (MetaWorkspace *workspace)
{ {
int ret; int ret;
ret = g_list_index (workspace->screen->workspaces, workspace); ret = g_list_index (workspace->display->workspaces, workspace);
if (ret < 0) if (ret < 0)
meta_bug ("Workspace does not exist to index!\n"); meta_bug ("Workspace does not exist to index!\n");
@ -704,7 +702,7 @@ meta_workspace_list_windows (MetaWorkspace *workspace)
GSList *display_windows, *l; GSList *display_windows, *l;
GList *workspace_windows; GList *workspace_windows;
display_windows = meta_display_list_windows (workspace->screen->display, display_windows = meta_display_list_windows (workspace->display,
META_LIST_DEFAULT); META_LIST_DEFAULT);
workspace_windows = NULL; workspace_windows = NULL;
@ -741,8 +739,8 @@ meta_workspace_invalidate_work_area (MetaWorkspace *workspace)
/* If we are in the middle of a resize or move operation, we /* If we are in the middle of a resize or move operation, we
* might have cached pointers to the workspace's edges */ * might have cached pointers to the workspace's edges */
if (workspace == workspace->screen->active_workspace) if (workspace == workspace->display->active_workspace)
meta_display_cleanup_edges (workspace->screen->display); meta_display_cleanup_edges (workspace->display);
meta_workspace_clear_logical_monitor_data (workspace); meta_workspace_clear_logical_monitor_data (workspace);
@ -768,7 +766,7 @@ meta_workspace_invalidate_work_area (MetaWorkspace *workspace)
g_list_free (windows); g_list_free (windows);
meta_display_queue_workarea_recalc (workspace->screen->display); meta_display_queue_workarea_recalc (workspace->display);
} }
static MetaStrut * static MetaStrut *
@ -849,13 +847,13 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
workspace->screen_region = workspace->screen_region =
meta_rectangle_get_minimal_spanning_set_for_region ( meta_rectangle_get_minimal_spanning_set_for_region (
&workspace->screen->display->rect, &workspace->display->rect,
workspace->all_struts); workspace->all_struts);
/* STEP 3: Get the work areas (region-to-maximize-to) for the screen and /* STEP 3: Get the work areas (region-to-maximize-to) for the screen and
* monitors. * monitors.
*/ */
work_area = workspace->screen->display->rect; /* start with the screen */ work_area = workspace->display->rect; /* start with the screen */
if (workspace->screen_region == NULL) if (workspace->screen_region == NULL)
work_area = meta_rect (0, 0, -1, -1); work_area = meta_rect (0, 0, -1, -1);
else else
@ -872,7 +870,7 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
work_area.width, MIN_SANE_AREA); work_area.width, MIN_SANE_AREA);
if (work_area.width < 1) if (work_area.width < 1)
{ {
work_area.x = (workspace->screen->display->rect.width - MIN_SANE_AREA)/2; work_area.x = (workspace->display->rect.width - MIN_SANE_AREA)/2;
work_area.width = MIN_SANE_AREA; work_area.width = MIN_SANE_AREA;
} }
else else
@ -889,7 +887,7 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
work_area.height, MIN_SANE_AREA); work_area.height, MIN_SANE_AREA);
if (work_area.height < 1) if (work_area.height < 1)
{ {
work_area.y = (workspace->screen->display->rect.height - MIN_SANE_AREA)/2; work_area.y = (workspace->display->rect.height - MIN_SANE_AREA)/2;
work_area.height = MIN_SANE_AREA; work_area.height = MIN_SANE_AREA;
} }
else else
@ -956,7 +954,7 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
g_assert (workspace->screen_edges == NULL); g_assert (workspace->screen_edges == NULL);
g_assert (workspace->monitor_edges == NULL); g_assert (workspace->monitor_edges == NULL);
workspace->screen_edges = workspace->screen_edges =
meta_rectangle_find_onscreen_edges (&workspace->screen->display->rect, meta_rectangle_find_onscreen_edges (&workspace->display->rect,
workspace->all_struts); workspace->all_struts);
tmp = NULL; tmp = NULL;
for (l = logical_monitors; l; l = l->next) for (l = logical_monitors; l; l = l->next)
@ -1007,7 +1005,7 @@ meta_workspace_set_builtin_struts (MetaWorkspace *workspace,
MetaBackend *backend = meta_get_backend (); MetaBackend *backend = meta_get_backend ();
MetaMonitorManager *monitor_manager = MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend); meta_backend_get_monitor_manager (backend);
MetaScreen *screen = workspace->screen; MetaDisplay *display = workspace->display;
GSList *l; GSList *l;
for (l = struts; l; l = l->next) for (l = struts; l; l = l->next)
@ -1036,7 +1034,7 @@ meta_workspace_set_builtin_struts (MetaWorkspace *workspace,
META_DISPLAY_DOWN)) META_DISPLAY_DOWN))
continue; continue;
strut->rect.height = screen->display->rect.height - strut->rect.y; strut->rect.height = display->rect.height - strut->rect.y;
break; break;
case META_SIDE_LEFT: case META_SIDE_LEFT:
if (meta_monitor_manager_get_logical_monitor_neighbor (monitor_manager, if (meta_monitor_manager_get_logical_monitor_neighbor (monitor_manager,
@ -1053,7 +1051,7 @@ meta_workspace_set_builtin_struts (MetaWorkspace *workspace,
META_DISPLAY_RIGHT)) META_DISPLAY_RIGHT))
continue; continue;
strut->rect.width = screen->display->rect.width - strut->rect.x; strut->rect.width = display->rect.width - strut->rect.x;
break; break;
} }
} }
@ -1199,9 +1197,9 @@ meta_workspace_get_neighbor (MetaWorkspace *workspace,
gboolean ltr; gboolean ltr;
current_space = meta_workspace_index (workspace); current_space = meta_workspace_index (workspace);
num_workspaces = meta_screen_get_n_workspaces (workspace->screen); num_workspaces = meta_display_get_n_workspaces (workspace->display);
meta_screen_calc_workspace_layout (workspace->screen, num_workspaces, meta_display_calc_workspace_layout (workspace->display, num_workspaces,
current_space, &layout); current_space, &layout);
meta_verbose ("Getting neighbor of %d in direction %s\n", meta_verbose ("Getting neighbor of %d in direction %s\n",
current_space, meta_motion_direction_to_string (direction)); current_space, meta_motion_direction_to_string (direction));
@ -1246,9 +1244,9 @@ meta_workspace_get_neighbor (MetaWorkspace *workspace,
meta_verbose ("Neighbor workspace is %d at row %d col %d\n", meta_verbose ("Neighbor workspace is %d at row %d col %d\n",
i, layout.current_row, layout.current_col); i, layout.current_row, layout.current_col);
meta_screen_free_workspace_layout (&layout); meta_display_free_workspace_layout (&layout);
return meta_screen_get_workspace_by_index (workspace->screen, i); return meta_display_get_workspace_by_index (workspace->display, i);
} }
const char* const char*
@ -1262,19 +1260,17 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
MetaWindow *not_this_one, MetaWindow *not_this_one,
guint32 timestamp) guint32 timestamp)
{ {
MetaDisplay *display = workspace->screen->display;
if (timestamp == CurrentTime) if (timestamp == CurrentTime)
meta_warning ("CurrentTime used to choose focus window; " meta_warning ("CurrentTime used to choose focus window; "
"focus window may not be correct.\n"); "focus window may not be correct.\n");
if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK || if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
!workspace->screen->display->mouse_mode) !workspace->display->mouse_mode)
focus_ancestor_or_top_window (workspace, not_this_one, timestamp); focus_ancestor_or_top_window (workspace, not_this_one, timestamp);
else else
{ {
MetaWindow * window; MetaWindow * window;
window = meta_display_get_pointer_window (workspace->screen->display, not_this_one); window = meta_display_get_pointer_window (workspace->display, not_this_one);
if (window && if (window &&
window->type != META_WINDOW_DOCK && window->type != META_WINDOW_DOCK &&
window->type != META_WINDOW_DESKTOP) window->type != META_WINDOW_DESKTOP)
@ -1299,10 +1295,10 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
meta_window_focus (window, timestamp); meta_window_focus (window, timestamp);
} }
if (workspace->screen->display->autoraise_window != window && if (workspace->display->autoraise_window != window &&
meta_prefs_get_auto_raise ()) meta_prefs_get_auto_raise ())
{ {
meta_display_queue_autoraise_callback (display, window); meta_display_queue_autoraise_callback (workspace->display, window);
} }
} }
else if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_SLOPPY) else if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_SLOPPY)
@ -1312,7 +1308,7 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Setting focus to no_focus_window, since no valid " "Setting focus to no_focus_window, since no valid "
"window to focus found.\n"); "window to focus found.\n");
meta_x11_display_focus_the_no_focus_window (display->x11_display, meta_x11_display_focus_the_no_focus_window (workspace->display->x11_display,
timestamp); timestamp);
} }
} }
@ -1334,7 +1330,6 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
MetaWindow *not_this_one, MetaWindow *not_this_one,
guint32 timestamp) guint32 timestamp)
{ {
MetaDisplay *display = workspace->screen->display;
MetaWindow *window = NULL; MetaWindow *window = NULL;
if (not_this_one) if (not_this_one)
@ -1368,7 +1363,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
} }
} }
window = meta_stack_get_default_focus_window (display->stack, window = meta_stack_get_default_focus_window (workspace->display->stack,
workspace, workspace,
not_this_one); not_this_one);
@ -1386,22 +1381,21 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
else else
{ {
meta_topic (META_DEBUG_FOCUS, "No MRU window to focus found; focusing no_focus_window.\n"); meta_topic (META_DEBUG_FOCUS, "No MRU window to focus found; focusing no_focus_window.\n");
meta_x11_display_focus_the_no_focus_window (display->x11_display, meta_x11_display_focus_the_no_focus_window (workspace->display->x11_display,
timestamp); timestamp);
} }
} }
/** /**
* meta_workspace_get_screen: * meta_workspace_get_display:
* @workspace: a #MetaWorkspace * @workspace: a #MetaWorkspace
* *
* Gets the #MetaScreen that the workspace is part of. * Gets the #MetaDisplay that the workspace is part of.
* *
* Return value: (transfer none): the #MetaScreen for the workspace * Return value: (transfer none): the #MetaDisplay for the workspace
*/ */
MetaScreen * MetaDisplay *
meta_workspace_get_screen (MetaWorkspace *workspace) meta_workspace_get_display (MetaWorkspace *workspace)
{ {
return workspace->screen; return workspace->display;
} }

42
src/meta/display.h
View File

@ -208,4 +208,46 @@ int meta_display_get_monitor_neighbor_index (MetaDisplay *display,
int which_monitor, int which_monitor,
MetaDisplayDirection dir); MetaDisplayDirection dir);
GList *meta_display_get_workspaces (MetaDisplay *display);
int meta_display_get_n_workspaces (MetaDisplay *display);
MetaWorkspace* meta_display_get_workspace_by_index (MetaDisplay *display,
int index);
void meta_display_remove_workspace (MetaDisplay *display,
MetaWorkspace *workspace,
guint32 timestamp);
MetaWorkspace *meta_display_append_new_workspace (MetaDisplay *display,
gboolean activate,
guint32 timestamp);
int meta_display_get_active_workspace_index (MetaDisplay *display);
MetaWorkspace *meta_display_get_active_workspace (MetaDisplay *display);
void meta_display_focus_default_window (MetaDisplay *display,
guint32 timestamp);
/**
* MetaDisplayCorner:
* @META_DISPLAY_TOPLEFT: top-left corner
* @META_DISPLAY_TOPRIGHT: top-right corner
* @META_DISPLAY_BOTTOMLEFT: bottom-left corner
* @META_DISPLAY_BOTTOMRIGHT: bottom-right corner
*/
typedef enum
{
META_DISPLAY_TOPLEFT,
META_DISPLAY_TOPRIGHT,
META_DISPLAY_BOTTOMLEFT,
META_DISPLAY_BOTTOMRIGHT
} MetaDisplayCorner;
void meta_display_override_workspace_layout (MetaDisplay *display,
MetaDisplayCorner starting_corner,
gboolean vertical_layout,
int n_rows,
int n_columns);
#endif #endif

42
src/meta/screen.h
View File

@ -38,46 +38,4 @@ GType meta_screen_get_type (void);
MetaDisplay *meta_screen_get_display (MetaScreen *screen); MetaDisplay *meta_screen_get_display (MetaScreen *screen);
GList *meta_screen_get_workspaces (MetaScreen *screen);
int meta_screen_get_n_workspaces (MetaScreen *screen);
MetaWorkspace* meta_screen_get_workspace_by_index (MetaScreen *screen,
int index);
void meta_screen_remove_workspace (MetaScreen *screen,
MetaWorkspace *workspace,
guint32 timestamp);
MetaWorkspace *meta_screen_append_new_workspace (MetaScreen *screen,
gboolean activate,
guint32 timestamp);
int meta_screen_get_active_workspace_index (MetaScreen *screen);
MetaWorkspace * meta_screen_get_active_workspace (MetaScreen *screen);
void meta_screen_focus_default_window (MetaScreen *screen,
guint32 timestamp);
/**
* MetaScreenCorner:
* @META_SCREEN_TOPLEFT: top-left corner
* @META_SCREEN_TOPRIGHT: top-right corner
* @META_SCREEN_BOTTOMLEFT: bottom-left corner
* @META_SCREEN_BOTTOMRIGHT: bottom-right corner
*/
typedef enum
{
META_SCREEN_TOPLEFT,
META_SCREEN_TOPRIGHT,
META_SCREEN_BOTTOMLEFT,
META_SCREEN_BOTTOMRIGHT
} MetaScreenCorner;
void meta_screen_override_workspace_layout (MetaScreen *screen,
MetaScreenCorner starting_corner,
gboolean vertical_layout,
int n_rows,
int n_columns);
#endif #endif

2
src/meta/workspace.h
View File

@ -37,7 +37,7 @@ typedef struct _MetaWorkspaceClass MetaWorkspaceClass;
GType meta_workspace_get_type (void); GType meta_workspace_get_type (void);
int meta_workspace_index (MetaWorkspace *workspace); int meta_workspace_index (MetaWorkspace *workspace);
MetaScreen *meta_workspace_get_screen (MetaWorkspace *workspace); MetaDisplay *meta_workspace_get_display (MetaWorkspace *workspace);
GList* meta_workspace_list_windows (MetaWorkspace *workspace); GList* meta_workspace_list_windows (MetaWorkspace *workspace);
void meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace, void meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace,
int which_monitor, int which_monitor,

21
src/x11/events.c
View File

@ -843,7 +843,6 @@ handle_input_xevent (MetaX11Display *x11_display,
Window modified; Window modified;
MetaWindow *window; MetaWindow *window;
MetaDisplay *display = x11_display->display; MetaDisplay *display = x11_display->display;
MetaScreen *screen = display->screen;
if (input_event == NULL) if (input_event == NULL)
return FALSE; return FALSE;
@ -912,7 +911,7 @@ handle_input_xevent (MetaX11Display *x11_display,
"Focus got set to None, probably due to " "Focus got set to None, probably due to "
"brain-damage in the X protocol (see bug " "brain-damage in the X protocol (see bug "
"125492). Setting the default focus window.\n"); "125492). Setting the default focus window.\n");
meta_workspace_focus_default_window (screen->active_workspace, meta_workspace_focus_default_window (display->active_workspace,
NULL, NULL,
meta_x11_display_get_current_time_roundtrip (x11_display)); meta_x11_display_get_current_time_roundtrip (x11_display));
} }
@ -924,7 +923,7 @@ handle_input_xevent (MetaX11Display *x11_display,
"Focus got set to root window, probably due to " "Focus got set to root window, probably due to "
"gnome-session logout dialog usage (see bug " "gnome-session logout dialog usage (see bug "
"153220). Setting the default focus window.\n"); "153220). Setting the default focus window.\n");
meta_workspace_focus_default_window (screen->active_workspace, meta_workspace_focus_default_window (display->active_workspace,
NULL, NULL,
meta_x11_display_get_current_time_roundtrip (x11_display)); meta_x11_display_get_current_time_roundtrip (x11_display));
} }
@ -1398,12 +1397,12 @@ handle_other_xevent (MetaX11Display *x11_display,
if (window->minimized) if (window->minimized)
{ {
meta_window_unminimize (window); meta_window_unminimize (window);
if (window->workspace != window->screen->active_workspace) if (window->workspace != window->display->active_workspace)
{ {
meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n", meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
window->mapped, window->minimized); window->mapped, window->minimized);
meta_window_change_workspace (window, meta_window_change_workspace (window,
window->screen->active_workspace); window->display->active_workspace);
} }
} }
break; break;
@ -1488,10 +1487,10 @@ handle_other_xevent (MetaX11Display *x11_display,
{ {
if (event->xproperty.atom == if (event->xproperty.atom ==
x11_display->atom__NET_DESKTOP_LAYOUT) x11_display->atom__NET_DESKTOP_LAYOUT)
meta_screen_update_workspace_layout (display->screen); meta_display_update_workspace_layout (display);
else if (event->xproperty.atom == else if (event->xproperty.atom ==
x11_display->atom__NET_DESKTOP_NAMES) x11_display->atom__NET_DESKTOP_NAMES)
meta_screen_update_workspace_names (display->screen); meta_x11_display_update_workspace_names (x11_display);
/* we just use this property as a sentinel to avoid /* we just use this property as a sentinel to avoid
* certain race conditions. See the comment for the * certain race conditions. See the comment for the
@ -1552,7 +1551,7 @@ handle_other_xevent (MetaX11Display *x11_display,
"specified timestamp of %u\n", "specified timestamp of %u\n",
space, time); space, time);
workspace = meta_screen_get_workspace_by_index (display->screen, space); workspace = meta_display_get_workspace_by_index (display, space);
/* Handle clients using the older version of the spec... */ /* Handle clients using the older version of the spec... */
if (time == 0 && workspace) if (time == 0 && workspace)
@ -1593,11 +1592,11 @@ handle_other_xevent (MetaX11Display *x11_display,
showing_desktop ? "show" : "hide"); showing_desktop ? "show" : "hide");
if (showing_desktop) if (showing_desktop)
meta_screen_show_desktop (display->screen, timestamp); meta_display_show_desktop (display, timestamp);
else else
{ {
meta_screen_unshow_desktop (display->screen); meta_display_unshow_desktop (display);
meta_workspace_focus_default_window (display->screen->active_workspace, NULL, timestamp); meta_workspace_focus_default_window (display->active_workspace, NULL, timestamp);
} }
} }
else if (event->xclient.message_type == else if (event->xclient.message_type ==

8
src/x11/meta-x11-display-private.h
View File

@ -202,4 +202,12 @@ int meta_x11_display_logical_monitor_to_xinerama_index (MetaX11Display *x11_
MetaLogicalMonitor *meta_x11_display_xinerama_index_to_logical_monitor (MetaX11Display *x11_display, MetaLogicalMonitor *meta_x11_display_xinerama_index_to_logical_monitor (MetaX11Display *x11_display,
int xinerama_index); int xinerama_index);
/* Update whether the destkop is being shown for the current active_workspace */
void meta_x11_display_update_showing_desktop_hint (MetaX11Display *x11_display);
void meta_x11_display_update_workspace_names (MetaX11Display *x11_display);
void meta_x11_display_set_active_workspace_hint (MetaX11Display *x11_display);
void meta_x11_display_set_number_of_spaces_hint (MetaX11Display *x11_display,
int n_spaces);
#endif /* META_X11_DISPLAY_PRIVATE_H */ #endif /* META_X11_DISPLAY_PRIVATE_H */

106
src/x11/meta-x11-display.c
View File

@ -53,6 +53,7 @@
#include "backends/x11/meta-backend-x11.h" #include "backends/x11/meta-backend-x11.h"
#include "core/frame.h" #include "core/frame.h"
#include "core/util-private.h" #include "core/util-private.h"
#include "core/workspace-private.h"
#include "meta/errors.h" #include "meta/errors.h"
#include "meta/main.h" #include "meta/main.h"
@ -1562,3 +1563,108 @@ meta_x11_display_xinerama_index_to_logical_monitor (MetaX11Display *x11_display,
return NULL; return NULL;
} }
void
meta_x11_display_update_showing_desktop_hint (MetaX11Display *x11_display)
{
MetaDisplay *display = x11_display->display;
unsigned long data[1];
data[0] = display->active_workspace->showing_desktop ? 1 : 0;
meta_error_trap_push (x11_display);
XChangeProperty (x11_display->xdisplay,
x11_display->xroot,
x11_display->atom__NET_SHOWING_DESKTOP,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
meta_error_trap_pop (x11_display);
}
void
meta_x11_display_update_workspace_names (MetaX11Display *x11_display)
{
char **names;
int n_names;
int i;
/* this updates names in prefs when the root window property changes,
* iff the new property contents don't match what's already in prefs
*/
names = NULL;
n_names = 0;
if (!meta_prop_get_utf8_list (x11_display,
x11_display->xroot,
x11_display->atom__NET_DESKTOP_NAMES,
&names, &n_names))
{
meta_verbose ("Failed to get workspace names from root window\n");
return;
}
i = 0;
while (i < n_names)
{
meta_topic (META_DEBUG_PREFS,
"Setting workspace %d name to \"%s\" due to _NET_DESKTOP_NAMES change\n",
i, names[i] ? names[i] : "null");
meta_prefs_change_workspace_name (i, names[i]);
++i;
}
g_strfreev (names);
}
void
meta_x11_display_set_active_workspace_hint (MetaX11Display *x11_display)
{
MetaDisplay *display = x11_display->display;
unsigned long data[1];
/* this is because we destroy the spaces in order,
* so we always end up setting a current desktop of
* 0 when closing a screen, so lose the current desktop
* on restart. By doing this we keep the current
* desktop on restart.
*/
if (display->closing > 0)
return;
data[0] = meta_workspace_index (display->active_workspace);
meta_verbose ("Setting _NET_CURRENT_DESKTOP to %lu\n", data[0]);
meta_error_trap_push (x11_display);
XChangeProperty (x11_display->xdisplay,
x11_display->xroot,
x11_display->atom__NET_CURRENT_DESKTOP,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
meta_error_trap_pop (x11_display);
}
void
meta_x11_display_set_number_of_spaces_hint (MetaX11Display *x11_display,
int n_spaces)
{
unsigned long data[1];
if (x11_display->display->closing > 0)
return;
data[0] = n_spaces;
meta_verbose ("Setting _NET_NUMBER_OF_DESKTOPS to %lu\n", data[0]);
meta_error_trap_push (x11_display);
XChangeProperty (x11_display->xdisplay,
x11_display->xroot,
x11_display->atom__NET_NUMBER_OF_DESKTOPS,
XA_CARDINAL,
32, PropModeReplace, (guchar*) data, 1);
meta_error_trap_pop (x11_display);
}

2
src/x11/window-props.c
View File

@ -1049,7 +1049,7 @@ reload_net_startup_id (MetaWindow *window,
if (window->initial_timestamp_set) if (window->initial_timestamp_set)
timestamp = window->initial_timestamp; timestamp = window->initial_timestamp;
if (window->initial_workspace_set) if (window->initial_workspace_set)
workspace = meta_screen_get_workspace_by_index (window->screen, window->initial_workspace); workspace = meta_display_get_workspace_by_index (window->display, window->initial_workspace);
meta_window_activate_with_workspace (window, timestamp, workspace); meta_window_activate_with_workspace (window, timestamp, workspace);
} }

8
src/x11/window-x11.c
View File

@ -445,8 +445,8 @@ meta_window_apply_session_info (MetaWindow *window,
MetaWorkspace *space; MetaWorkspace *space;
space = space =
meta_screen_get_workspace_by_index (window->screen, meta_display_get_workspace_by_index (window->display,
GPOINTER_TO_INT (tmp->data)); GPOINTER_TO_INT (tmp->data));
if (space) if (space)
spaces = g_slist_prepend (spaces, space); spaces = g_slist_prepend (spaces, space);
@ -2409,8 +2409,8 @@ meta_window_x11_client_message (MetaWindow *window,
window->desc, space); window->desc, space);
workspace = workspace =
meta_screen_get_workspace_by_index (window->screen, meta_display_get_workspace_by_index (window->display,
space); space);
if (workspace) if (workspace)
meta_window_change_workspace (window, workspace); meta_window_change_workspace (window, workspace);