Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-15 20:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

tested + fixed x11 implementation

Browse Source
This commit is contained in:
bayemite 2021-06-03 18:10:38 +10:00 committed by Bayemite
parent 610635f511
commit ec2c2f64e4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/x11_window.c
View File

@ -31,7 +31,8 @@
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xutil.h>
#include <X11/Xlib.h>
#include <sys/select.h> #include <sys/select.h>
#include <string.h> #include <string.h>
@ -2084,7 +2085,7 @@ char* _glfwPlatformGetWindowTitle(_GLFWwindow* window)
_glfwGrabErrorHandlerX11(); _glfwGrabErrorHandlerX11();
if (XGetWMName(_glfw.x11.display, window->x11.handle, &textProperty) != 0) if (XGetWMName(_glfw.x11.display, window->x11.handle, &textProperty) == 0)
{ {
_glfwInputErrorX11(GLFW_PLATFORM_ERROR, "X11: Could not get window title"); _glfwInputErrorX11(GLFW_PLATFORM_ERROR, "X11: Could not get window title");
_glfwReleaseErrorHandlerX11(); _glfwReleaseErrorHandlerX11();
@ -2095,7 +2096,6 @@ char* _glfwPlatformGetWindowTitle(_GLFWwindow* window)
if (ret != Success) if (ret != Success)
{ {
_glfwReleaseErrorHandlerX11(); _glfwReleaseErrorHandlerX11();
if (ret == XNoMemory) if (ret == XNoMemory)
_glfwInputErrorX11(GLFW_PLATFORM_ERROR, "X11: No memory to convert window title to UTF-8"); _glfwInputErrorX11(GLFW_PLATFORM_ERROR, "X11: No memory to convert window title to UTF-8");
else if (ret == XLocaleNotSupported || ret == XConverterNotFound) else if (ret == XLocaleNotSupported || ret == XConverterNotFound)
@ -2106,18 +2106,17 @@ char* _glfwPlatformGetWindowTitle(_GLFWwindow* window)
return NULL; return NULL;
} }
if (len < 1)
if (len < 1) // empty title
{ {
_glfwReleaseErrorHandlerX11(); _glfwReleaseErrorHandlerX11();
_glfwInputError(GLFW_PLATFORM_ERROR, "X11: Could not convert window title to UTF-8");
if (textProperty.value != NULL) if (textProperty.value != NULL)
XFree(textProperty.value); XFree(textProperty.value);
if (charList != NULL) if (charList != NULL)
XFreeStringList(charList); XFreeStringList(charList);
return NULL; return calloc(1, sizeof(char));
} }
title = _glfw_strdup(charList[0]); title = _glfw_strdup(charList[0]);