Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-13 01:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] wayland: fix copying rich text into guest

Browse Source 
Before this, copying rich text ends up with a lot of funky behaviour,
for example:
* copying text from Discord shows up as HTML unless pasted into a text
  editor first
* copying text from Firefox shows up as the single letter h

This commit fixes all the above issues.

Due to the change in logic, we now use the first text format offered
instead of the last, which is almost certainly the preferred form.
Doing this gets us proper Unicode support, or Unicode characters would
end up as escapes of the form \uXXXX (this is used in the fallback
forms for applications without UTF-8 support).
This commit is contained in:
Quantum 2021-01-29 23:53:04 -05:00 committed by Geoffrey McRae
parent 327d472d64
commit 25e74301be
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/displayservers/Wayland/wayland.c
View File

@ -644,11 +644,12 @@ static void dataOfferHandleOffer(void * data, struct wl_data_offer * offer,
const char * mimetype) const char * mimetype)
{ {
enum LG_ClipboardData type = mimetypeToCbType(mimetype); enum LG_ClipboardData type = mimetypeToCbType(mimetype);
// Oftentimes we'll get text/html alongside text/png, but would prefer to send // We almost never prefer text/html, as that's used to represent rich text.
// image/png. In general, prefer images over text content. // Since we can't copy or paste rich text, we should instead prefer actual
// images or plain text.
if (type != LG_CLIPBOARD_DATA_NONE && if (type != LG_CLIPBOARD_DATA_NONE &&
(wcb.stashedType == LG_CLIPBOARD_DATA_NONE || (wcb.stashedType == LG_CLIPBOARD_DATA_NONE ||
wcb.stashedType == LG_CLIPBOARD_DATA_TEXT)) strstr(wcb.stashedMimetype, "html")))
{ {
wcb.stashedType = type; wcb.stashedType = type;
if (wcb.stashedMimetype) if (wcb.stashedMimetype)