morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Set _NET_WM_NAME (as server_name) so the window can be shared on screen-sharing software #31

Browse Source 
(added fix from  PR #3 from https://github.com/DavidVentura/UxPlay)

Gstreamer does not set the _NET_WM_NAME property on the window it
creates when using autovideosink (or ximagesink/xvimagesink for that
matter).

A lot of tools (like Zoom) filter based on this field being non-null, so
the window can't be shared.

This horrible hack finds the first open window that matches our application
name and proceeds to set _NET_WM_NAME on it.

It is very ugly, and I do not know what I am doing, but it works. Feel free to use this to write something that makes more sense.

---------------------------
changes from PR #31:
use the UxPlay server-name as the widow name.
This commit is contained in:
fduncanh
2021-08-01 16:48:06 -04:00
parent 019f2c9365
commit a8d562a5f7
1 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
renderers/video_renderer_gstreamer.c
View File

@@ -21,6 +21,12 @@
#include <assert.h>
#include <gst/gst.h>
#include <gst/app/gstappsrc.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <stdio.h>
Display* display;
Window root, my_window;
struct video_renderer_s {
logger_t *logger;
@@ -48,8 +54,38 @@ static gboolean check_plugins (void)
}
return ret;
}
Window enum_windows(Display* display, Window window, int depth) {
int i;
XTextProperty text;
XGetWMName(display, window, &text);
char* name;
XFetchName(display, window, &name);
if (name != 0 && strcmp((const char*) g_get_application_name(), name) == 0) {
return window;
}
Window _root, parent;
Window* children;
unsigned int n;
XQueryTree(display, window, &_root, &parent, &children, &n);
if (children != NULL) {
for (i = 0; i < n; i++) {
Window w = enum_windows(display, children[i], depth + 1);
if (w) return w;
}
XFree(children);
}
return (Window) NULL;
}
video_renderer_t *video_renderer_init(logger_t *logger, const char *server_name) {
display = XOpenDisplay(NULL);
root = XDefaultRootWindow(display);
video_renderer_t *renderer;
GError *error = NULL;
@@ -88,6 +124,17 @@ void video_renderer_render_buffer(video_renderer_t *renderer, raop_ntp_t *ntp, u
GST_BUFFER_DTS(buffer) = (GstClockTime)pts;
gst_buffer_fill(buffer, 0, data, data_len);
gst_app_src_push_buffer (GST_APP_SRC(renderer->appsrc), buffer);
if (!my_window) {
my_window = enum_windows(display, root, 0);
if (my_window) {
const char* str = g_get_application_name();
Atom _NET_WM_NAME = XInternAtom(display, "_NET_WM_NAME", 0);
Atom UTF8_STRING = XInternAtom(display, "UTF8_STRING",0);
XChangeProperty(display, my_window, _NET_WM_NAME, UTF8_STRING, 8, 0, (const unsigned char *) str, strlen(str));
XSync(display, False);
}
}
}
void video_renderer_flush(video_renderer_t *renderer) {
@@ -105,5 +152,4 @@ void video_renderer_destroy(video_renderer_t *renderer) {
/* not implemented for gstreamer */
void video_renderer_update_background(video_renderer_t *renderer, int type) {
}