1
0
Fork 0

wayland: Add getter for XWayland manager object

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2364>
This commit is contained in:
Jonas Ådahl 2022-04-05 23:43:38 +02:00 committed by Marge Bot
parent c575696acc
commit e1033951ef
4 changed files with 13 additions and 2 deletions

View file

@ -52,7 +52,7 @@ typedef struct
char *name; char *name;
} MetaXWaylandConnection; } MetaXWaylandConnection;
typedef struct struct _MetaXWaylandManager
{ {
MetaXWaylandConnection private_connection; MetaXWaylandConnection private_connection;
MetaXWaylandConnection public_connection; MetaXWaylandConnection public_connection;
@ -73,7 +73,7 @@ typedef struct
gboolean has_xrandr; gboolean has_xrandr;
int rr_event_base; int rr_event_base;
int rr_error_base; int rr_error_base;
} MetaXWaylandManager; };
struct _MetaWaylandCompositor struct _MetaWaylandCompositor
{ {

View file

@ -64,4 +64,6 @@ typedef struct _MetaWaylandActivation MetaWaylandActivation;
typedef struct _MetaWaylandDmaBufManager MetaWaylandDmaBufManager; typedef struct _MetaWaylandDmaBufManager MetaWaylandDmaBufManager;
typedef struct _MetaXWaylandManager MetaXWaylandManager;
#endif #endif

View file

@ -819,3 +819,9 @@ meta_wayland_compositor_is_egl_display_bound (MetaWaylandCompositor *compositor)
return priv->is_wayland_egl_display_bound; return priv->is_wayland_egl_display_bound;
} }
MetaXWaylandManager *
meta_wayland_compositor_get_xwayland_manager (MetaWaylandCompositor *compositor)
{
return &compositor->xwayland_manager;
}

View file

@ -94,5 +94,8 @@ void meta_wayland_compositor_notify_surface_id (MetaWaylandCo
int id, int id,
MetaWaylandSurface *surface); MetaWaylandSurface *surface);
META_EXPORT_TEST
MetaXWaylandManager * meta_wayland_compositor_get_xwayland_manager (MetaWaylandCompositor *compositor);
#endif #endif