mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Clean up clipboard reading

Browse Source 
(cherry picked from commit c132135332)
This commit is contained in:
Camilla Löwy 2022-03-24 19:04:15 +01:00
parent 857fae4920
commit 915e43885c
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/wl_window.c
View File

@ -1838,10 +1838,6 @@ void _glfwPlatformSetClipboardString(const char* string)
const char* _glfwPlatformGetClipboardString(void) const char* _glfwPlatformGetClipboardString(void)
{ {
int fds[2];
int ret;
size_t len = 0;
if (!_glfw.wl.selectionOffer) if (!_glfw.wl.selectionOffer)
{ {
_glfwInputError(GLFW_FORMAT_UNAVAILABLE, _glfwInputError(GLFW_FORMAT_UNAVAILABLE,
@ -1852,8 +1848,9 @@ const char* _glfwPlatformGetClipboardString(void)
if (_glfw.wl.selectionSource) if (_glfw.wl.selectionSource)
return _glfw.wl.clipboardString; return _glfw.wl.clipboardString;
ret = pipe2(fds, O_CLOEXEC); int fds[2];
if (ret < 0)
if (pipe2(fds, O_CLOEXEC) == -1)
{ {
// TODO: also report errno maybe? // TODO: also report errno maybe?
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -1866,11 +1863,14 @@ const char* _glfwPlatformGetClipboardString(void)
flushDisplay(); flushDisplay();
close(fds[1]); close(fds[1]);
size_t length = 0;
for (;;) for (;;)
{ {
// Grow the clipboard if we need to paste something bigger, there is no // Grow the clipboard if we need to paste something bigger, there is no
// shrink operation yet. // shrink operation yet.
const size_t requiredSize = len + 4096 + 1; const size_t readSize = 4096;
const size_t requiredSize = length + readSize + 1;
if (requiredSize > _glfw.wl.clipboardSize) if (requiredSize > _glfw.wl.clipboardSize)
{ {
char* string = realloc(_glfw.wl.clipboardString, requiredSize); char* string = realloc(_glfw.wl.clipboardString, requiredSize);
@ -1887,23 +1887,27 @@ const char* _glfwPlatformGetClipboardString(void)
} }
// Then read from the fd to the clipboard, handling all known errors. // Then read from the fd to the clipboard, handling all known errors.
ret = read(fds[0], _glfw.wl.clipboardString + len, 4096); const ssize_t result = read(fds[0], _glfw.wl.clipboardString + length, readSize);
if (ret == 0) if (result == 0)
break; break;
if (ret == -1 && errno == EINTR) else if (result == -1)
continue;
if (ret == -1)
{ {
if (errno == EINTR)
continue;
// TODO: also report errno maybe. // TODO: also report errno maybe.
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Failed to read from clipboard fd"); "Wayland: Failed to read from clipboard fd");
close(fds[0]); close(fds[0]);
return NULL; return NULL;
} }
len += ret;
length += result;
} }
close(fds[0]); close(fds[0]);
_glfw.wl.clipboardString[len] = '\0';
_glfw.wl.clipboardString[length] = '\0';
return _glfw.wl.clipboardString; return _glfw.wl.clipboardString;
} }