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

Stop using MetaScreen where it is unnecessary

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=759538
This commit is contained in:
Armin Krezović
2017-08-26 21:43:17 +02:00
committed by Jonas Ådahl
parent b7c3dada81
commit 1d5e37050d
38 changed files with 187 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/display.c
View File

@ -35,7 +35,6 @@
#include "events.h"
#include "util-private.h"
#include <meta/main.h>
#include "screen-private.h"
#include "window-private.h"
#include "boxes-private.h"
#include "frame.h"
@ -317,7 +316,7 @@ meta_display_class_init (MetaDisplayClass *klass)
0,
NULL, NULL, NULL,
G_TYPE_NONE, 3,
META_TYPE_SCREEN,
META_TYPE_DISPLAY,
META_TYPE_WINDOW,
META_TYPE_GRAB_OP);
@ -328,7 +327,7 @@ meta_display_class_init (MetaDisplayClass *klass)
0,
NULL, NULL, NULL,
G_TYPE_NONE, 3,
META_TYPE_SCREEN,
META_TYPE_DISPLAY,
META_TYPE_WINDOW,
META_TYPE_GRAB_OP);
@ -709,7 +708,6 @@ meta_display_open (void)
GError *error = NULL;
MetaDisplay *display;
MetaX11Display *x11_display;
MetaScreen *screen;
int i;
guint32 timestamp;
Window old_active_xwindow = None;
@ -726,7 +724,6 @@ meta_display_open (void)
display->autoraise_timeout_id = 0;
display->autoraise_window = NULL;
display->focus_window = NULL;
display->screen = NULL;
display->x11_display = NULL;
display->rect.x = display->rect.y = 0;
@ -815,23 +812,6 @@ meta_display_open (void)
display->last_user_time = timestamp;
display->compositor = NULL;
/* Mutter used to manage all X screens of the display in a single process, but
* now it always manages exactly one screen - the default screen retrieved
* from GDK.
*/
screen = meta_screen_new (display, timestamp);
if (!screen)
{
/* This would typically happen because all the screens already
* have window managers.
*/
meta_display_close (display, timestamp);
return FALSE;
}
display->screen = screen;
if (!meta_is_wayland_compositor ())
meta_prop_get_window (display->x11_display,
display->x11_display->xroot,
@ -1031,10 +1011,6 @@ meta_display_close (MetaDisplay *display,
/* Stop caring about events */
meta_display_free_events (display);
if (display->screen)
meta_screen_free (display->screen, timestamp);
display->screen = NULL;
/* Must be after all calls to meta_window_unmanage() since they
* unregister windows
*/
@ -1691,7 +1667,6 @@ get_event_route_from_grab_op (MetaGrabOp op)
gboolean
meta_display_begin_grab_op (MetaDisplay *display,
MetaScreen *screen,
MetaWindow *window,
MetaGrabOp op,
gboolean pointer_already_grabbed,
@ -1821,7 +1796,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
}
g_signal_emit (display, display_signals[GRAB_OP_BEGIN], 0,
screen, display->grab_window, display->grab_op);
display, display->grab_window, display->grab_op);
if (display->event_route == META_EVENT_ROUTE_WINDOW_OP)
meta_window_grab_op_began (display->grab_window, display->grab_op);
@ -1846,7 +1821,7 @@ meta_display_end_grab_op (MetaDisplay *display,
g_assert (grab_window != NULL);
g_signal_emit (display, display_signals[GRAB_OP_END], 0,
display->screen, grab_window, grab_op);
display, grab_window, grab_op);
/* We need to reset this early, since the
* meta_window_grab_op_ended callback relies on this being
@ -2457,17 +2432,6 @@ meta_resize_gravity_from_grab_op (MetaGrabOp op)
return gravity;
}
void
meta_display_unmanage_screen (MetaDisplay *display,
MetaScreen *screen,
guint32 timestamp)
{
meta_verbose ("Unmanaging screen %d on display %s\n",
meta_ui_get_screen_number (),
display->x11_display->name);
meta_display_close (display, timestamp);
}
void
meta_display_manage_all_windows (MetaDisplay *display)
{