blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

GHOST/Wayland: skip redundant strlen() sending the clipboard

This commit is contained in:
Campbell Barton 2022-10-20 13:56:40 +11:00
parent d392e9afea
commit 1e1b9eef1b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@ -293,6 +293,7 @@ struct GWL_DataOffer {
struct GWL_DataSource {
struct wl_data_source *wl_data_source = nullptr;
char *buffer_out = nullptr;
size_t buffer_out_len = 0;
};
/**
@ -1273,7 +1274,7 @@ static void data_source_handle_send(void *data,
CLOG_INFO(LOG, 2, "send");
const char *const buffer = seat->data_source->buffer_out;
if (write(fd, buffer, strlen(buffer)) < 0) {
if (write(fd, buffer, seat->data_source->buffer_out_len) < 0) {
GHOST_PRINT("error writing to clipboard: " << std::strerror(errno) << std::endl);
}
close(fd);
@ -3584,9 +3585,9 @@ void GHOST_SystemWayland::putClipboard(const char *buffer, bool /*selection*/) c
/* Copy buffer. */
free(data_source->buffer_out);
const size_t buffer_size = strlen(buffer) + 1;
data_source->buffer_out = static_cast<char *>(malloc(buffer_size));
std::memcpy(data_source->buffer_out, buffer, buffer_size);
data_source->buffer_out_len = strlen(buffer);
data_source->buffer_out = static_cast<char *>(malloc(data_source->buffer_out_len));
std::memcpy(data_source->buffer_out, buffer, data_source->buffer_out_len);
data_source->wl_data_source = wl_data_device_manager_create_data_source(
display_->data_device_manager);