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

context: Move X11 display policy under the context

Browse Source 
The context implementations already effectively dictate the policy, so
let them do it more directly instead of going indirectly via global
variables.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>
This commit is contained in:
Jonas Ådahl
2021-04-16 20:34:29 +02:00
parent e62f7e2910
commit 50ed027b6f
10 changed files with 84 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/display.c
View File

@@ -60,7 +60,6 @@
#include "core/events.h"
#include "core/frame.h"
#include "core/keybindings-private.h"
#include "core/main-private.h"
#include "core/meta-clipboard-manager.h"
#include "core/meta-workspace-manager-private.h"
#include "core/util-private.h"
@@ -890,7 +889,10 @@ meta_display_new (MetaContext *context,
#ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor ())
{
if (meta_get_x11_display_policy () == META_X11_DISPLAY_POLICY_MANDATORY)
MetaX11DisplayPolicy x11_display_policy;
x11_display_policy = meta_context_get_x11_display_policy (context);
if (x11_display_policy == META_X11_DISPLAY_POLICY_MANDATORY)
{
meta_display_init_x11 (display, NULL,
(GAsyncReadyCallback) on_x11_initialized,