[mutter/gnome-41] wayland: Add getter for XWayland manager object
- From: Jonas Ã…dahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gnome-41] wayland: Add getter for XWayland manager object
- Date: Thu, 2 Jun 2022 08:46:27 +0000 (UTC)
commit 834a2082eab97636424b41597e226c3a0298ce79
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Tue Apr 5 23:43:38 2022 +0200
wayland: Add getter for XWayland manager object
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2364>
src/wayland/meta-wayland-private.h | 4 ++--
src/wayland/meta-wayland-types.h | 2 ++
src/wayland/meta-wayland.c | 6 ++++++
src/wayland/meta-wayland.h | 3 +++
4 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h
index 5272b530f1..a3baa8cf7b 100644
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -52,7 +52,7 @@ typedef struct
char *name;
} MetaXWaylandConnection;
-typedef struct
+struct _MetaXWaylandManager
{
MetaXWaylandConnection private_connection;
MetaXWaylandConnection public_connection;
@@ -76,7 +76,7 @@ typedef struct
gboolean has_xrandr;
int rr_event_base;
int rr_error_base;
-} MetaXWaylandManager;
+};
struct _MetaWaylandCompositor
{
diff --git a/src/wayland/meta-wayland-types.h b/src/wayland/meta-wayland-types.h
index aeb6f61786..d3285455c6 100644
--- a/src/wayland/meta-wayland-types.h
+++ b/src/wayland/meta-wayland-types.h
@@ -63,4 +63,6 @@ typedef struct _MetaWaylandPointerClient MetaWaylandPointerClient;
typedef struct _MetaWaylandActivation MetaWaylandActivation;
+typedef struct _MetaXWaylandManager MetaXWaylandManager;
+
#endif
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index aeccbfe385..c8bda98998 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -764,3 +764,9 @@ meta_wayland_compositor_notify_surface_id (MetaWaylandCompositor *compositor,
meta_wayland_compositor_remove_surface_association (compositor, id);
}
}
+
+MetaXWaylandManager *
+meta_wayland_compositor_get_xwayland_manager (MetaWaylandCompositor *compositor)
+{
+ return &compositor->xwayland_manager;
+}
diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h
index 387e98b522..ec62aa6bec 100644
--- a/src/wayland/meta-wayland.h
+++ b/src/wayland/meta-wayland.h
@@ -91,5 +91,8 @@ void meta_wayland_compositor_notify_surface_id (MetaWaylandCo
int id,
MetaWaylandSurface *surface);
+META_EXPORT_TEST
+MetaXWaylandManager * meta_wayland_compositor_get_xwayland_manager (MetaWaylandCompositor *compositor);
+
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]