mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Windows/Linux) Fix windows title regressions

Browse Source
This commit is contained in:
LibretroAdmin 2022-08-02 16:35:50 +02:00
parent 33c9f56df0
commit 3c7fa43f29
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/common/win32_common.c
View File

@ -635,15 +635,14 @@ static bool win32_browser(
char new_title[PATH_MAX];
char new_file[32768];
new_title[0] = '\0';
new_file[0] = '\0';
if (!string_is_empty(title))
strlcpy(new_title, title, sizeof(new_title));
else
new_title[0] = '\0';
if (filename && *filename)
strlcpy(new_file, filename, sizeof(new_file));
else
new_file[0] = '\0';
/* OPENFILENAME.lpstrFilters is actually const,
* so this cast should be safe */
@ -2346,6 +2345,7 @@ void win32_update_title(void)
if (window)
{
char title[128];
title[0] = '\0';
video_driver_get_window_title(title, sizeof(title));
update_title_wait = g_win32_refresh_rate;
if (title[0])

16
gfx/common/x11_common.c
View File

@ -203,27 +203,24 @@ static void xdg_screensaver_inhibit(Window wnd)
{
int ret;
char cmd[64];
char title[128];
cmd[0] = '\0';
cmd[0] = '\0';
title[0] = '\0';
RARCH_LOG("[X11]: Suspending screensaver (X11, xdg-screensaver).\n");
if (g_x11_dpy && g_x11_win)
{
char title[128];
size_t title_len;
/* Make sure the window has a title, even if it's a bogus one, otherwise
* xdg-screensaver will fail and report to stderr, framing RA for its bug.
* A single space character is used so that the title bar stays visibly
* the same, as if there's no title at all. */
video_driver_get_window_title(title, sizeof(title));
if ((title_len = strlen(title)) == 0)
{
title[0] = ' ';
title[1] = '\0';
}
if (strlen(title) == 0)
snprintf(title, sizeof(title), " ");
XChangeProperty(g_x11_dpy, g_x11_win, XA_WM_NAME, XA_STRING,
8, PropModeReplace, (const unsigned char*) title, title_len);
8, PropModeReplace, (const unsigned char*) title, strlen(title));
}
snprintf(cmd, sizeof(cmd), "xdg-screensaver suspend 0x%x", (int)wnd);
@ -767,6 +764,7 @@ bool x11_connect(void)
void x11_update_title(void *data)
{
char title[128];
title[0] = '\0';
video_driver_get_window_title(title, sizeof(title));
if (title[0])
XChangeProperty(g_x11_dpy, g_x11_win, XA_WM_NAME, XA_STRING,