Revision: 10785 https://osdn.net/projects/ttssh2/scm/svn/commits/10785 Author: zmatsuo Date: 2023-06-27 23:20:42 +0900 (Tue, 27 Jun 2023) Log Message: ----------- クリップボードの受信を受信文字コードにしたがって行うよう修正 - 接続先からTeraTermへ送られてくる、TeraTermがWindowsに設定する - 従来はUTF-8受信前提だった ticket #39745 Ticket Links: ------------ https://osdn.net/projects/ttssh2/tracker/detail/39745 Modified Paths: -------------- trunk/teraterm/teraterm/vtterm.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtterm.c =================================================================== --- trunk/teraterm/teraterm/vtterm.c 2023-06-27 14:20:28 UTC (rev 10784) +++ trunk/teraterm/teraterm/vtterm.c 2023-06-27 14:20:42 UTC (rev 10785) @@ -4993,6 +4993,11 @@ } cbbuff[len] = 0; + // cbbuff \x82\xF0 wchar_t \x82֕ϊ\xB7 + wchar_t *cbbuffW = ConvertUTF16(cbbuff, len); + free(cbbuff); + cbbuff = NULL; + if (ts.NotifyClipboardAccess) { wchar_t *buf; GetI18nStrWW("Tera Term", "MSG_CBACCESS_TITLE", @@ -4999,7 +5004,7 @@ L"Clipboard Access", ts.UILanguageFileW, ¬ify_title); GetI18nStrWW("Tera Term", "MSG_CBACCESS_WRITE", L"Remote host wirtes clipboard.", ts.UILanguageFileW, &buf); - aswprintf(¬ify_buff, L"%s\n--\n%hs", buf, cbbuff); + aswprintf(¬ify_buff, L"%s\n--\n%s", buf, cbbuffW); NotifyInfoMessageW(&cv, notify_buff, notify_title); free(buf); free(notify_title); @@ -5006,16 +5011,9 @@ free(notify_buff); } - // cbbuff \x82ɓ\xFC\x82\xC1\x82Ă\xA2\x82镶\x8E\x9A\x97\xF1\x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃZ\x83b\x83g\x82\xB7\x82\xE9 - { - // wchar_t \x82֕ϊ\xB7\x82\xB5\x82Đݒ\xE8 - // \x82Ƃ肠\x82\xA6\x82\xB8UTF-8 \x82\xAA\x93\xFC\x82\xC1\x82Ă\xA2\x82\xE9\x91O\x92\xF1 - // TODO \x8E\xF3\x90M\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82ɍ\x87\x82킹\x82ĕύX\x82\xB7\x82\xEA\x82\xCEok? - wchar_t *cbbuffW = ToWcharU8(cbbuff); - CBSetTextW(NULL, cbbuffW, 0); - free(cbbuffW); - } - free(cbbuff); + // cbbuffW \x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃZ\x83b\x83g\x82\xB7\x82\xE9 + CBSetTextW(NULL, cbbuffW, 0); + free(cbbuffW); } else if (ts.NotifyClipboardAccess) { GetI18nStrWW("Tera Term", "MSG_CBACCESS_REJECT_TITLE",