mirror of
https://github.com/glfw/glfw.git
synced 2024-11-22 04:54:35 +00:00
Wayland: Simplify clipboard string allocation
This commit is contained in:
parent
8d87be1268
commit
4651165272
@ -1413,15 +1413,6 @@ int _glfwInitWayland(void)
|
|||||||
wl_data_device_manager_get_data_device(_glfw.wl.dataDeviceManager,
|
wl_data_device_manager_get_data_device(_glfw.wl.dataDeviceManager,
|
||||||
_glfw.wl.seat);
|
_glfw.wl.seat);
|
||||||
wl_data_device_add_listener(_glfw.wl.dataDevice, &dataDeviceListener, NULL);
|
wl_data_device_add_listener(_glfw.wl.dataDevice, &dataDeviceListener, NULL);
|
||||||
|
|
||||||
_glfw.wl.clipboardSize = 4096;
|
|
||||||
_glfw.wl.clipboardString = _glfw_calloc(_glfw.wl.clipboardSize, 1);
|
|
||||||
if (!_glfw.wl.clipboardString)
|
|
||||||
{
|
|
||||||
_glfwInputError(GLFW_OUT_OF_MEMORY,
|
|
||||||
"Wayland: Failed to allocate clipboard memory");
|
|
||||||
return GLFW_FALSE;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return GLFW_TRUE;
|
return GLFW_TRUE;
|
||||||
@ -1513,6 +1504,5 @@ void _glfwTerminateWayland(void)
|
|||||||
close(_glfw.wl.cursorTimerfd);
|
close(_glfw.wl.cursorTimerfd);
|
||||||
|
|
||||||
_glfw_free(_glfw.wl.clipboardString);
|
_glfw_free(_glfw.wl.clipboardString);
|
||||||
_glfw_free(_glfw.wl.clipboardSendString);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -317,7 +317,6 @@ typedef struct _GLFWlibraryWayland
|
|||||||
int keyboardLastScancode;
|
int keyboardLastScancode;
|
||||||
char* clipboardString;
|
char* clipboardString;
|
||||||
size_t clipboardSize;
|
size_t clipboardSize;
|
||||||
char* clipboardSendString;
|
|
||||||
int timerfd;
|
int timerfd;
|
||||||
short int keycodes[256];
|
short int keycodes[256];
|
||||||
short int scancodes[GLFW_KEY_LAST + 1];
|
short int scancodes[GLFW_KEY_LAST + 1];
|
||||||
|
@ -1591,7 +1591,7 @@ static void dataSourceHandleSend(void* userData,
|
|||||||
const char* mimeType,
|
const char* mimeType,
|
||||||
int fd)
|
int fd)
|
||||||
{
|
{
|
||||||
char* string = _glfw.wl.clipboardSendString;
|
char* string = _glfw.wl.clipboardString;
|
||||||
size_t len = strlen(string);
|
size_t len = strlen(string);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@ -1667,16 +1667,23 @@ void _glfwSetClipboardStringWayland(const char* string)
|
|||||||
_glfw.wl.selectionSource = NULL;
|
_glfw.wl.selectionSource = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* copy = _glfw_strdup(string);
|
const size_t requiredSize = strlen(string) + 1;
|
||||||
if (!copy)
|
if (requiredSize > _glfw.wl.clipboardSize)
|
||||||
{
|
{
|
||||||
_glfwInputError(GLFW_OUT_OF_MEMORY,
|
_glfw_free(_glfw.wl.clipboardString);
|
||||||
"Wayland: Failed to allocate clipboard string");
|
_glfw.wl.clipboardString = _glfw_calloc(requiredSize, 1);
|
||||||
return;
|
if (!_glfw.wl.clipboardString)
|
||||||
|
{
|
||||||
|
_glfwInputError(GLFW_OUT_OF_MEMORY,
|
||||||
|
"Wayland: Failed to allocate clipboard string");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_glfw.wl.clipboardSize = requiredSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
_glfw_free(_glfw.wl.clipboardSendString);
|
// The argument may be a substring of the clipboard string
|
||||||
_glfw.wl.clipboardSendString = copy;
|
memmove(_glfw.wl.clipboardString, string, requiredSize);
|
||||||
|
|
||||||
_glfw.wl.selectionSource =
|
_glfw.wl.selectionSource =
|
||||||
wl_data_device_manager_create_data_source(_glfw.wl.dataDeviceManager);
|
wl_data_device_manager_create_data_source(_glfw.wl.dataDeviceManager);
|
||||||
@ -1684,8 +1691,6 @@ void _glfwSetClipboardStringWayland(const char* string)
|
|||||||
{
|
{
|
||||||
_glfwInputError(GLFW_PLATFORM_ERROR,
|
_glfwInputError(GLFW_PLATFORM_ERROR,
|
||||||
"Wayland: Failed to create clipboard data source");
|
"Wayland: Failed to create clipboard data source");
|
||||||
_glfw_free(_glfw.wl.clipboardSendString);
|
|
||||||
_glfw.wl.clipboardSendString = NULL;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
wl_data_source_add_listener(_glfw.wl.selectionSource,
|
wl_data_source_add_listener(_glfw.wl.selectionSource,
|
||||||
@ -1697,22 +1702,6 @@ void _glfwSetClipboardStringWayland(const char* string)
|
|||||||
_glfw.wl.serial);
|
_glfw.wl.serial);
|
||||||
}
|
}
|
||||||
|
|
||||||
static GLFWbool growClipboardString(void)
|
|
||||||
{
|
|
||||||
char* clipboard = _glfw.wl.clipboardString;
|
|
||||||
|
|
||||||
clipboard = _glfw_realloc(clipboard, _glfw.wl.clipboardSize * 2);
|
|
||||||
if (!clipboard)
|
|
||||||
{
|
|
||||||
_glfwInputError(GLFW_OUT_OF_MEMORY,
|
|
||||||
"Wayland: Failed to grow clipboard string");
|
|
||||||
return GLFW_FALSE;
|
|
||||||
}
|
|
||||||
_glfw.wl.clipboardString = clipboard;
|
|
||||||
_glfw.wl.clipboardSize = _glfw.wl.clipboardSize * 2;
|
|
||||||
return GLFW_TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* _glfwGetClipboardStringWayland(void)
|
const char* _glfwGetClipboardStringWayland(void)
|
||||||
{
|
{
|
||||||
int fds[2];
|
int fds[2];
|
||||||
@ -1727,7 +1716,7 @@ const char* _glfwGetClipboardStringWayland(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (_glfw.wl.selectionSource)
|
if (_glfw.wl.selectionSource)
|
||||||
return _glfw.wl.clipboardSendString;
|
return _glfw.wl.clipboardString;
|
||||||
|
|
||||||
ret = pipe2(fds, O_CLOEXEC);
|
ret = pipe2(fds, O_CLOEXEC);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
@ -1747,13 +1736,20 @@ const char* _glfwGetClipboardStringWayland(void)
|
|||||||
{
|
{
|
||||||
// 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.
|
||||||
if (len + 4096 > _glfw.wl.clipboardSize)
|
const size_t requiredSize = len + 4096 + 1;
|
||||||
|
if (requiredSize > _glfw.wl.clipboardSize)
|
||||||
{
|
{
|
||||||
if (!growClipboardString())
|
char* string = _glfw_realloc(_glfw.wl.clipboardString, requiredSize);
|
||||||
|
if (!string)
|
||||||
{
|
{
|
||||||
|
_glfwInputError(GLFW_OUT_OF_MEMORY,
|
||||||
|
"Wayland: Failed to grow clipboard string");
|
||||||
close(fds[0]);
|
close(fds[0]);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_glfw.wl.clipboardString = string;
|
||||||
|
_glfw.wl.clipboardSize = requiredSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Then read from the fd to the clipboard, handling all known errors.
|
// Then read from the fd to the clipboard, handling all known errors.
|
||||||
@ -1773,11 +1769,6 @@ const char* _glfwGetClipboardStringWayland(void)
|
|||||||
len += ret;
|
len += ret;
|
||||||
}
|
}
|
||||||
close(fds[0]);
|
close(fds[0]);
|
||||||
if (len + 1 > _glfw.wl.clipboardSize)
|
|
||||||
{
|
|
||||||
if (!growClipboardString())
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
_glfw.wl.clipboardString[len] = '\0';
|
_glfw.wl.clipboardString[len] = '\0';
|
||||||
return _glfw.wl.clipboardString;
|
return _glfw.wl.clipboardString;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user