github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11456 from akallabeth/mac_prefer_unicode

Browse Source 
[client,mac] prefer unicode from clipboard
This commit is contained in:
akallabeth 2025-04-02 13:09:41 +02:00 committed by GitHub
commit bf7f15c7ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
client/Mac/Clipboard.m
View File

@ -85,12 +85,15 @@ static int mac_cliprdr_send_client_format_list_response(CliprdrClientContext *cl
return 1;
}
static int mac_cliprdr_send_client_format_data_request(CliprdrClientContext *cliprdr,
UINT32 formatId)
static UINT mac_cliprdr_send_client_format_data_request(CliprdrClientContext *cliprdr,
UINT32 formatId)
{
CLIPRDR_FORMAT_DATA_REQUEST formatDataRequest = { 0 };
WINPR_ASSERT(cliprdr);
if (formatId == 0)
return CHANNEL_RC_OK;
mfContext *mfc = (mfContext *)cliprdr->custom;
WINPR_ASSERT(mfc);
@ -101,9 +104,7 @@ static int mac_cliprdr_send_client_format_data_request(CliprdrClientContext *cli
mfc->requestedFormatId = formatId;
(void)ResetEvent(mfc->clipboardRequestEvent);
cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest);
return 1;
return cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest);
}
static int mac_cliprdr_send_client_capabilities(CliprdrClientContext *cliprdr)
@ -179,8 +180,10 @@ static UINT mac_cliprdr_server_capabilities(CliprdrClientContext *cliprdr,
static UINT mac_cliprdr_server_format_list(CliprdrClientContext *cliprdr,
const CLIPRDR_FORMAT_LIST *formatList)
{
CLIPRDR_FORMAT *format;
WINPR_ASSERT(cliprdr);
mfContext *mfc = (mfContext *)cliprdr->custom;
WINPR_ASSERT(mfc);
if (mfc->serverFormats)
{
@ -214,28 +217,26 @@ static UINT mac_cliprdr_server_format_list(CliprdrClientContext *cliprdr,
mac_cliprdr_send_client_format_list_response(cliprdr, TRUE);
uint32_t formatId = 0;
for (UINT32 index = 0; index < mfc->numServerFormats; index++)
{
format = &(mfc->serverFormats[index]);
const CLIPRDR_FORMAT *format = &(mfc->serverFormats[index]);
if (format->formatId == CF_UNICODETEXT)
{
mac_cliprdr_send_client_format_data_request(cliprdr, CF_UNICODETEXT);
break;
}
formatId = format->formatId;
else if (format->formatId == CF_OEMTEXT)
{
mac_cliprdr_send_client_format_data_request(cliprdr, CF_OEMTEXT);
break;
if (formatId == 0)
formatId == CF_OEMTEXT;
}
else if (format->formatId == CF_TEXT)
{
mac_cliprdr_send_client_format_data_request(cliprdr, CF_TEXT);
break;
if (formatId == 0)
formatId == CF_TEXT;
}
}
return CHANNEL_RC_OK;
return mac_cliprdr_send_client_format_data_request(cliprdr, formatId);
}
/**