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

expose possiblility of user selection of X11 display

Browse Source
This commit is contained in:
F. Duncanh
2025-03-23 15:56:30 -04:00
parent 904ed267cb
commit 72bbcc0fd7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
renderers/video_renderer.c
View File

@@ -322,7 +322,7 @@ void video_renderer_init(logger_t *render_logger, const char *server_name, vide
logger_log(logger, LOGGER_ERR, "This error usually means that a uxplay option was mistyped\n"
" or some requested part of GStreamer is not installed\n");
}
g_clear_error (&error);
g_clear_error (&error);
}
g_assert (renderer_type[i]->pipeline);
@@ -344,11 +344,14 @@ void video_renderer_init(logger_t *render_logger, const char *server_name, vide
renderer_type[i]->gst_window = NULL;
renderer_type[i]->use_x11 = false;
X11_search_attempts = 0;
/* setting char *x11_display_name to NULL means the value is taken from $DISPLAY in the environment
* (a uxplay option to specify a different value is possible) */
char *x11_display_name = NULL;
if (use_x11) {
if (i == 0) {
renderer_type[0]->gst_window = (X11_Window_t *) calloc(1, sizeof(X11_Window_t));
g_assert(renderer_type[0]->gst_window);
get_X11_Display(renderer_type[0]->gst_window);
get_X11_Display(renderer_type[0]->gst_window, x11_display_name);
if (renderer_type[0]->gst_window->display) {
renderer_type[i]->use_x11 = true;
} else {

4
renderers/x_display_fix.h
View File

@@ -43,8 +43,8 @@ struct X11_Window_s {
Window window;
} typedef X11_Window_t;
static void get_X11_Display(X11_Window_t * X11) {
X11->display = XOpenDisplay(NULL);
static void get_X11_Display(X11_Window_t * X11, char *display_name) {
X11->display = XOpenDisplay(display_name);
X11->window = (Window) NULL;
}