griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GHOST/Wayland: support pasting images from a copied file

Browse Source 
Support pasting images into Blender which have been copied from a
file manager (matching macOS).
This commit is contained in:
Campbell Barton
2024-10-28 13:40:26 +11:00
parent d367e6e2b5
commit 8682e4087b
1 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@@ -7967,6 +7967,28 @@ GHOST_TSuccess GHOST_SystemWayland::hasClipboardImage(void) const
if (data_offer->types.count(ghost_wl_mime_img_png)) {
return GHOST_kSuccess;
}
if (data_offer->types.count(ghost_wl_mime_text_uri)) {
const bool nil_terminate = true;
size_t data_buf_len = 0;
char *data = system_clipboard_get(
display_, nil_terminate, ghost_wl_mime_text_uri, &data_buf_len);
GHOST_TSuccess result = GHOST_kFailure;
if (data) {
std::vector<std::string_view> uris = gwl_clipboard_uri_ranges(data, data_buf_len);
if (!uris.empty()) {
const std::string_view &uri = uris.front();
char *filepath = GHOST_URL_decode_alloc(uri.data(), uri.size());
if (IMB_ispic(filepath)) {
result = GHOST_kSuccess;
}
free(filepath);
}
free(data);
}
return result;
}
}
return GHOST_kFailure;
@@ -8003,6 +8025,23 @@ uint *GHOST_SystemWayland::getClipboardImage(int *r_width, int *r_height) const
free(data);
}
}
else if (data_offer->types.count(ghost_wl_mime_text_uri)) {
const bool nil_terminate = true;
size_t data_len = 0;
char *data = system_clipboard_get(
display_, nil_terminate, ghost_wl_mime_text_uri, &data_len);
if (data) {
std::vector<std::string_view> uris = gwl_clipboard_uri_ranges(data, data_len);
if (!uris.empty()) {
const std::string_view &uri = uris.front();
char *filepath = GHOST_URL_decode_alloc(uri.data(), uri.size());
ibuf = IMB_loadiffname(filepath, IB_rect, nullptr);
free(filepath);
}
free(data);
}
}
if (ibuf) {
*r_width = ibuf->x;