Skip to content

Commit

Permalink
[client,wayland] add alternate bitmap mime types
Browse files Browse the repository at this point in the history
add alternate bitmap mime types to clipboard
  • Loading branch information
akallabeth committed Feb 15, 2024
1 parent 140c433 commit 1ae1296
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions client/Wayland/wlf_cliprdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ static const char* mime_image[] = {
"image/gif", "image/tiff"
};

static const char mime_tiff[] = "image/tiff";
static const char mime_uri_list[] = "text/uri-list";
static const char mime_html[] = "text/html";
static const char mime_bmp[] = "image/bmp";
static const char* mime_bitmap[] = { "image/bmp", "image/x-bmp", "image/x-MS-bmp",
"image/x-win-bitmap" };

static const char mime_gnome_copied_files[] = "x-special/gnome-copied-files";
static const char mime_mate_copied_files[] = "x-special/mate-copied-files";
Expand Down Expand Up @@ -287,9 +289,15 @@ static BOOL wlf_cliprdr_add_client_format(wfClipboard* clipboard, const char* mi
}
else if (wlf_mime_is_image(mime))
{
UINT32 formatId = ClipboardGetFormatId(clipboard->system, mime_bmp);
wfl_cliprdr_add_client_format_id(clipboard, formatId);
for (size_t x = 0; x < ARRAYSIZE(mime_image); x++)
{
const char* mime_bmp = mime_image[x];
UINT32 formatId = ClipboardGetFormatId(clipboard->system, mime_bmp);
if (formatId != 0)
wfl_cliprdr_add_client_format_id(clipboard, formatId);
}
wfl_cliprdr_add_client_format_id(clipboard, CF_DIB);
wfl_cliprdr_add_client_format_id(clipboard, CF_TIFF);
}
else if (wlf_mime_is_file(mime))
{
Expand Down Expand Up @@ -539,7 +547,10 @@ static void wlf_cliprdr_transfer_data(UwacSeat* seat, void* context, const char*
else if (wlf_mime_is_image(mime))
{
request.responseMime = mime;
request.responseFormat = CF_DIB;
if (strcmp(mime, mime_tiff) == 0)
request.responseFormat = CF_TIFF;
else
request.responseFormat = CF_DIB;
}

if (request.responseMime != NULL)
Expand Down Expand Up @@ -749,7 +760,11 @@ wlf_cliprdr_server_format_data_request(CliprdrClientContext* context,

case CF_DIB:
case CF_DIBV5:
mime = mime_bmp;
mime = mime_bitmap[0];
break;

case CF_TIFF:
mime = mime_tiff;
break;

default:
Expand Down

0 comments on commit 1ae1296

Please sign in to comment.