1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
From 2de455486403a710cb6896b0052b4cd7e46d83a2 Mon Sep 17 00:00:00 2001
From: Marius Vlad <marius.vlad@collabora.com>
Date: Thu, 10 Aug 2023 14:20:48 +0300
Subject: [PATCH] ext/wayland: Add title/appid support
Bug-AGL: SPEC-4870
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
---
ext/wayland/gstwaylandsink.c | 43 ++++++++++++++++++++++++++++++++++--
ext/wayland/gstwaylandsink.h | 2 ++
ext/wayland/wlwindow.c | 10 ++++++++-
ext/wayland/wlwindow.h | 2 +-
4 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
index 0761304..8913ee2 100644
--- a/ext/wayland/gstwaylandsink.c
+++ b/ext/wayland/gstwaylandsink.c
@@ -63,7 +63,9 @@ enum
{
PROP_0,
PROP_DISPLAY,
- PROP_FULLSCREEN
+ PROP_FULLSCREEN,
+ PROP_APP_ID,
+ PROP_TITLE
};
GST_DEBUG_CATEGORY (gstwayland_debug);
@@ -212,6 +214,16 @@ gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
"Whether the surface should be made fullscreen ", FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (gobject_class, PROP_APP_ID,
+ g_param_spec_string ("appid", "Top-level application id", "Wayland "
+ "appid, as xdg_shell::set_app_id",
+ NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_TITLE,
+ g_param_spec_string ("title", "Top-level title", "Wayland "
+ "title, xdg_shell::set_title",
+ NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
gst_type_mark_as_plugin_api (GST_TYPE_WAYLAND_VIDEO, 0);
}
@@ -246,6 +258,16 @@ gst_wayland_sink_get_property (GObject * object,
g_value_set_string (value, sink->display_name);
GST_OBJECT_UNLOCK (sink);
break;
+ case PROP_APP_ID:
+ GST_OBJECT_LOCK (sink);
+ g_value_set_string (value, sink->app_id);
+ GST_OBJECT_UNLOCK (sink);
+ break;
+ case PROP_TITLE:
+ GST_OBJECT_LOCK (sink);
+ g_value_set_string (value, sink->title);
+ GST_OBJECT_UNLOCK (sink);
+ break;
case PROP_FULLSCREEN:
GST_OBJECT_LOCK (sink);
g_value_set_boolean (value, sink->fullscreen);
@@ -269,6 +291,16 @@ gst_wayland_sink_set_property (GObject * object,
sink->display_name = g_value_dup_string (value);
GST_OBJECT_UNLOCK (sink);
break;
+ case PROP_APP_ID:
+ GST_OBJECT_LOCK (sink);
+ sink->app_id = g_value_dup_string (value);
+ GST_OBJECT_UNLOCK (sink);
+ break;
+ case PROP_TITLE:
+ GST_OBJECT_LOCK (sink);
+ sink->title = g_value_dup_string (value);
+ GST_OBJECT_UNLOCK (sink);
+ break;
case PROP_FULLSCREEN:
GST_OBJECT_LOCK (sink);
gst_wayland_sink_set_fullscreen (sink, g_value_get_boolean (value));
@@ -291,12 +323,18 @@ gst_wayland_sink_finalize (GObject * object)
gst_buffer_unref (sink->last_buffer);
if (sink->display)
g_object_unref (sink->display);
+ if (sink->title)
+ g_object_unref (sink->title);
+ if (sink->app_id)
+ g_object_unref (sink->app_id);
if (sink->window)
g_object_unref (sink->window);
if (sink->pool)
gst_object_unref (sink->pool);
g_free (sink->display_name);
+ g_free (sink->title);
+ g_free (sink->app_id);
g_mutex_clear (&sink->display_lock);
g_mutex_clear (&sink->render_lock);
@@ -718,7 +756,8 @@ gst_wayland_sink_show_frame (GstVideoSink * vsink, GstBuffer * buffer)
if (!sink->window) {
/* if we were not provided a window, create one ourselves */
sink->window = gst_wl_window_new_toplevel (sink->display,
- &sink->video_info, sink->fullscreen, &sink->render_lock);
+ &sink->video_info, sink->fullscreen, sink->app_id, sink->title,
+ &sink->render_lock);
g_signal_connect_object (sink->window, "closed",
G_CALLBACK (on_window_closed), sink, 0);
}
diff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h
index 7aabb6f..4db00e5 100644
--- a/ext/wayland/gstwaylandsink.h
+++ b/ext/wayland/gstwaylandsink.h
@@ -63,6 +63,8 @@ struct _GstWaylandSink
gboolean fullscreen;
gchar *display_name;
+ gchar *app_id;
+ gchar *title;
gboolean redraw_pending;
GMutex render_lock;
diff --git a/ext/wayland/wlwindow.c b/ext/wayland/wlwindow.c
index 66df0fc..ad2d3f3 100644
--- a/ext/wayland/wlwindow.c
+++ b/ext/wayland/wlwindow.c
@@ -254,7 +254,7 @@ gst_wl_window_ensure_fullscreen (GstWlWindow * window, gboolean fullscreen)
GstWlWindow *
gst_wl_window_new_toplevel (GstWlDisplay * display, const GstVideoInfo * info,
- gboolean fullscreen, GMutex * render_lock)
+ gboolean fullscreen, gchar *app_id, gchar *title, GMutex * render_lock)
{
GstWlWindow *window;
@@ -287,6 +287,14 @@ gst_wl_window_new_toplevel (GstWlDisplay * display, const GstVideoInfo * info,
/* Finally, commit the xdg_surface state as toplevel */
window->configured = FALSE;
+ if (app_id)
+ xdg_toplevel_set_app_id (window->xdg_toplevel, app_id);
+ else
+ xdg_toplevel_set_app_id (window->xdg_toplevel, "ext.wayland.waylandsink");
+ if (title)
+ xdg_toplevel_set_title (window->xdg_toplevel, title);
+ else
+ xdg_toplevel_set_title (window->xdg_toplevel, "ext.wayland.waylandsink");
wl_surface_commit (window->area_surface);
wl_display_flush (display->display);
diff --git a/ext/wayland/wlwindow.h b/ext/wayland/wlwindow.h
index 303c336..64399b3 100644
--- a/ext/wayland/wlwindow.h
+++ b/ext/wayland/wlwindow.h
@@ -83,7 +83,7 @@ GType gst_wl_window_get_type (void);
void gst_wl_window_ensure_fullscreen (GstWlWindow * window,
gboolean fullscreen);
GstWlWindow *gst_wl_window_new_toplevel (GstWlDisplay * display,
- const GstVideoInfo * info, gboolean fullscreen, GMutex * render_lock);
+ const GstVideoInfo * info, gboolean fullscreen, gchar * app_id, gchar *title, GMutex * render_lock);
GstWlWindow *gst_wl_window_new_in_surface (GstWlDisplay * display,
struct wl_surface * parent, GMutex * render_lock);
--
2.35.1
|
