diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-03-23 17:03:32 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2021-10-26 16:55:12 +0200 |
| commit | 39f80885c1365b6f1e0e459a8d9557fccef5f5e1 (patch) | |
| tree | 91b7be41fbfd9c75ad9c8b7cc522f5ca7ad8b2a2 /src/wayland/meta-xwayland.c | |
| parent | fb78ac401647e46ee437324811e1e99575d057cd (diff) | |
| download | mutter-39f80885c1365b6f1e0e459a8d9557fccef5f5e1.tar.gz | |
xwayland: Setup RANDR integration with MetaX11Display
This doesn't gain us anything right away, but will allow us to trap
errors, which will soon be necessary.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1796>
Diffstat (limited to 'src/wayland/meta-xwayland.c')
| -rw-r--r-- | src/wayland/meta-xwayland.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index c0dbe7b09..10bfab90b 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -66,7 +66,7 @@ static int display_number_override = -1; static void meta_xwayland_stop_xserver (MetaXWaylandManager *manager); static void -meta_xwayland_set_primary_output (Display *xdisplay); +meta_xwayland_set_primary_output (MetaX11Display *x11_display); void meta_xwayland_associate_window_with_surface (MetaWindow *window, @@ -1211,7 +1211,7 @@ monitors_changed_cb (MetaMonitorManager *monitor_manager) { MetaX11Display *x11_display = meta_get_display ()->x11_display; - meta_xwayland_set_primary_output (x11_display->xdisplay); + meta_xwayland_set_primary_output (x11_display); } static void @@ -1234,9 +1234,10 @@ on_x11_display_closing (MetaDisplay *display, static void meta_xwayland_init_xrandr (MetaXWaylandManager *manager, - Display *xdisplay) + MetaX11Display *x11_display) { MetaMonitorManager *monitor_manager = meta_monitor_manager_get (); + Display *xdisplay = meta_x11_display_get_xdisplay (x11_display); manager->has_xrandr = XRRQueryExtension (xdisplay, &manager->rr_event_base, @@ -1251,20 +1252,19 @@ meta_xwayland_init_xrandr (MetaXWaylandManager *manager, g_signal_connect (monitor_manager, "monitors-changed", G_CALLBACK (monitors_changed_cb), NULL); - meta_xwayland_set_primary_output (xdisplay); + meta_xwayland_set_primary_output (x11_display); } static void on_x11_display_setup (MetaDisplay *display, MetaXWaylandManager *manager) { - MetaX11Display *x11_display = meta_display_get_x11_display (display); MetaContext *context = meta_display_get_context (display); - Display *xdisplay = meta_x11_display_get_xdisplay (x11_display); + MetaX11Display *x11_display = meta_display_get_x11_display (display); MetaX11DisplayPolicy x11_display_policy; meta_xwayland_init_dnd (x11_display); - meta_xwayland_init_xrandr (manager, xdisplay); + meta_xwayland_init_xrandr (manager, x11_display); meta_xwayland_stop_xserver_timeout (manager); x11_display_policy = meta_context_get_x11_display_policy (context); @@ -1354,8 +1354,9 @@ meta_xwayland_shutdown (MetaXWaylandManager *manager) } static void -meta_xwayland_set_primary_output (Display *xdisplay) +meta_xwayland_set_primary_output (MetaX11Display *x11_display) { + Display *xdisplay = meta_x11_display_get_xdisplay (x11_display); XRRScreenResources *resources; MetaMonitorManager *monitor_manager; MetaLogicalMonitor *primary_monitor; @@ -1422,7 +1423,8 @@ meta_xwayland_handle_xevent (XEvent *event) if (manager->has_xrandr && event->type == manager->rr_event_base + RRNotify) { MetaX11Display *x11_display = meta_get_display ()->x11_display; - meta_xwayland_set_primary_output (x11_display->xdisplay); + + meta_xwayland_set_primary_output (x11_display); return TRUE; } |