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

minor cleanup of new fullscreen code

Browse Source
This commit is contained in:
F. Duncanh
2022-12-10 08:15:58 -05:00
parent 5215978a05
commit 09d1e5f194
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
renderers/video_renderer_gstreamer.c
View File

@@ -227,9 +227,11 @@ void video_renderer_render_buffer(raop_ntp_t *ntp, unsigned char* data, int data
if (renderer->gst_window->window) {
logger_log(logger, LOGGER_INFO, "\n*** X11 Windows: Use key F11 or (left Alt)+Enter to toggle full-screen mode\n");
using_x11 = true;
set_fullscreen(renderer->gst_window, &fullscreen);
if (fullscreen) {
set_fullscreen(renderer->gst_window, &fullscreen);
}
}
}
}
#endif
}
}
@@ -304,13 +306,13 @@ gboolean gstreamer_pipeline_bus_callback(GstBus *bus, GstMessage *message, gpoin
break;
#ifdef X_DISPLAY_FIX
case GST_MESSAGE_ELEMENT: {
GstNavigationMessageType mtype = gst_navigation_message_get_type (message);
if (using_x11 && mtype == GST_NAVIGATION_MESSAGE_EVENT) {
GstNavigationMessageType message_type = gst_navigation_message_get_type (message);
if (using_x11 && message_type == GST_NAVIGATION_MESSAGE_EVENT) {
GstEvent *event = NULL;
if (gst_navigation_message_parse_event (message, &event)) {
GstNavigationEventType e_type = gst_navigation_event_get_type (event);
GstNavigationEventType event_type = gst_navigation_event_get_type (event);
const gchar *key;
switch (e_type) {
switch (event_type) {
case GST_NAVIGATION_EVENT_KEY_PRESS:
if (gst_navigation_event_parse_key_event (event, &key)) {
if ((strcmp (key, "F11") == 0) || (alt_keypress && strcmp (key, "Return") == 0)) {
@@ -331,7 +333,9 @@ gboolean gstreamer_pipeline_bus_callback(GstBus *bus, GstMessage *message, gpoin
break;
}
}
gst_event_unref (event);
if (event) {
gst_event_unref (event);
}
}
break;
}

8
renderers/x_display_fix.h
View File

@@ -93,11 +93,9 @@ void set_fullscreen(X11_Window_t * X11, bool * fullscreen) {
1
}}
};
if (X11->window) {
XSendEvent(X11->display, XRootWindow(X11->display, XDefaultScreen(X11->display)),
False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent*) &msg);
XSync(X11->display, False);
}
XSendEvent(X11->display, XRootWindow(X11->display, XDefaultScreen(X11->display)),
False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent*) &msg);
XSync(X11->display, False);
}
#ifdef __cplusplus