diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/display.c | 2 | ||||
| -rw-r--r-- | src/core/keybindings.c | 4 | ||||
| -rw-r--r-- | src/core/screen-private.h | 3 | ||||
| -rw-r--r-- | src/core/screen.c | 31 | ||||
| -rw-r--r-- | src/core/stack-tracker.c | 1 | ||||
| -rw-r--r-- | src/core/workspace.c | 2 |
6 files changed, 8 insertions, 35 deletions
diff --git a/src/core/display.c b/src/core/display.c index 551c3b27b..f3d413e24 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -407,7 +407,7 @@ enable_compositor (MetaDisplay *display) if (!display->compositor) return; - meta_compositor_manage_screen (display->compositor, display->screen); + meta_compositor_manage (display->compositor); } static void diff --git a/src/core/keybindings.c b/src/core/keybindings.c index 74b3b2221..31aaf18d5 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -1654,7 +1654,7 @@ process_event (MetaDisplay *display, event->modifier_state); if (!binding || (!window && binding->flags & META_KEY_BINDING_PER_WINDOW) || - meta_compositor_filter_keybinding (display->compositor, screen, binding)) + meta_compositor_filter_keybinding (display->compositor, binding)) goto not_found; if (binding->handler == NULL) @@ -1739,7 +1739,7 @@ process_overlay_key (MetaDisplay *display, display->overlay_key_combo.keycode, display->grab_mask); if (binding && - meta_compositor_filter_keybinding (display->compositor, screen, binding)) + meta_compositor_filter_keybinding (display->compositor, binding)) return TRUE; meta_display_overlay_key_activate (display); } diff --git a/src/core/screen-private.h b/src/core/screen-private.h index 427bda28f..b4ec59dd7 100644 --- a/src/core/screen-private.h +++ b/src/core/screen-private.h @@ -118,9 +118,6 @@ struct _MetaScreen guint all_keys_grabbed : 1; int closing; - - /* Managed by compositor.c */ - gpointer compositor_data; /* Instead of unmapping withdrawn windows we can leave them mapped * and restack them below a guard window. When using a compositor diff --git a/src/core/screen.c b/src/core/screen.c index 897c5ac1b..9771af544 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -708,7 +708,6 @@ meta_screen_new (MetaDisplay *display, screen->columns_of_workspaces = -1; screen->vertical_workspaces = FALSE; screen->starting_corner = META_SCREEN_TOPLEFT; - screen->compositor_data = NULL; screen->guard_window = None; reload_monitor_infos (screen); @@ -809,8 +808,7 @@ meta_screen_free (MetaScreen *screen, meta_display_grab (display); - meta_compositor_unmanage_screen (screen->display->compositor, - screen); + meta_compositor_unmanage (screen->display->compositor); meta_display_unmanage_windows_for_screen (display, screen, timestamp); @@ -1440,11 +1438,10 @@ meta_screen_update_tile_preview_timeout (gpointer data) monitor = meta_window_get_current_tile_monitor_number (window); meta_window_get_current_tile_area (window, &tile_rect); meta_compositor_show_tile_preview (screen->display->compositor, - screen, window, &tile_rect, monitor); + window, &tile_rect, monitor); } else - meta_compositor_hide_tile_preview (screen->display->compositor, - screen); + meta_compositor_hide_tile_preview (screen->display->compositor); return FALSE; } @@ -1480,8 +1477,7 @@ meta_screen_hide_tile_preview (MetaScreen *screen) if (screen->tile_preview_timeout_id > 0) g_source_remove (screen->tile_preview_timeout_id); - meta_compositor_hide_tile_preview (screen->display->compositor, - screen); + meta_compositor_hide_tile_preview (screen->display->compositor); } MetaWindow* @@ -2499,7 +2495,6 @@ on_monitors_changed (MetaMonitorManager *manager, } meta_compositor_sync_screen_size (screen->display->compositor, - screen, screen->rect.width, screen->rect.height); /* Queue a resize on all the windows */ @@ -3040,24 +3035,6 @@ meta_screen_get_size (MetaScreen *screen, *height = screen->rect.height; } -/** - * meta_screen_get_compositor_data: (skip) - * @screen: A #MetaScreen - * - */ -gpointer -meta_screen_get_compositor_data (MetaScreen *screen) -{ - return screen->compositor_data; -} - -void -meta_screen_set_compositor_data (MetaScreen *screen, - gpointer compositor) -{ - screen->compositor_data = compositor; -} - void meta_screen_set_cm_selection (MetaScreen *screen) { diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c index e87c13f1c..77266a088 100644 --- a/src/core/stack-tracker.c +++ b/src/core/stack-tracker.c @@ -1246,7 +1246,6 @@ meta_stack_tracker_sync_stack (MetaStackTracker *tracker) } meta_compositor_sync_stack (tracker->screen->display->compositor, - tracker->screen, meta_windows); g_list_free (meta_windows); diff --git a/src/core/workspace.c b/src/core/workspace.c index f1e2527a1..ca87c0bf7 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -665,7 +665,7 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace, meta_screen_free_workspace_layout (&layout1); meta_screen_free_workspace_layout (&layout2); - meta_compositor_switch_workspace (comp, screen, old, workspace, direction); + meta_compositor_switch_workspace (comp, old, workspace, direction); /* This needs to be done after telling the compositor we are switching * workspaces since focusing a window will cause it to be immediately |