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: Remove superfluous global struct member

Browse Source 
It seems unlikely that strlen will be a bottleneck when sending
clipboard contents.

(cherry picked from commit 738b1c73b5)
This commit is contained in:
Camilla Löwy 2022-03-22 19:04:29 +01:00
parent 53bd67ccfe
commit 2430d6b7f7
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wl_platform.h
View File

@ -258,7 +258,6 @@ typedef struct _GLFWlibraryWayland
char* clipboardString; char* clipboardString;
size_t clipboardSize; size_t clipboardSize;
char* clipboardSendString; char* clipboardSendString;
size_t clipboardSendSize;
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];

3
src/wl_window.c
View File

@ -1726,7 +1726,7 @@ static void dataSourceHandleSend(void* data,
int fd) int fd)
{ {
const char* string = _glfw.wl.clipboardSendString; const char* string = _glfw.wl.clipboardSendString;
size_t len = _glfw.wl.clipboardSendSize; size_t len = strlen(string);
int ret; int ret;
if (_glfw.wl.dataSource != dataSource) if (_glfw.wl.dataSource != dataSource)
@ -1809,7 +1809,6 @@ void _glfwPlatformSetClipboardString(const char* string)
free(_glfw.wl.clipboardSendString); free(_glfw.wl.clipboardSendString);
_glfw.wl.clipboardSendString = copy; _glfw.wl.clipboardSendString = copy;
_glfw.wl.clipboardSendSize = strlen(_glfw.wl.clipboardSendString);
_glfw.wl.dataSource = _glfw.wl.dataSource =
wl_data_device_manager_create_data_source(_glfw.wl.dataDeviceManager); wl_data_device_manager_create_data_source(_glfw.wl.dataDeviceManager);
if (!_glfw.wl.dataSource) if (!_glfw.wl.dataSource)