geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copied X11 error handler code from SDL_x11opengl.c 

Avoids needing to malloc to hold the error string.
main
Fredrick Brennan 2021-04-07 12:14:16 -04:00 committed by Ryan C. Gordon
parent b3b4677e32
commit c5dd9964c1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/x11/SDL_x11window.c
View File

@ -734,9 +734,14 @@ X11_SetWindowTitle(_THIS, SDL_Window * window)
status = X11_XChangeProperty(display, data->xwindow, _NET_WM_NAME, UTF8_STRING, 8, 0, (const unsigned char *) title, strlen(title)); status = X11_XChangeProperty(display, data->xwindow, _NET_WM_NAME, UTF8_STRING, 8, 0, (const unsigned char *) title, strlen(title));
if (status != Success) { if (status != Success) {
char* x11err = malloc(1024); char *x11_error = NULL;
X11_XGetErrorText(display, status, x11err, 1024); char x11_error_locale[256];
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Error when setting X11 window title to %s: %s\n", title, x11err); if (X11_XGetErrorText(display, status, x11_error_locale, sizeof(x11_error_locale)) == Success)
{
x11_error = SDL_iconv_string("UTF-8", "", x11_error_locale, SDL_strlen(x11_error_locale)+1);
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "Error when setting X11 window title to %s: %s\n", title, x11_error);
SDL_free(x11_error);
}
} }
X11_XFlush(display); X11_XFlush(display);