Revision: 8847 https://osdn.net/projects/ttssh2/scm/svn/commits/8847 Author: zmatsuo Date: 2020-07-09 22:16:44 +0900 (Thu, 09 Jul 2020) Log Message: ----------- UNICODE_DISPLAY を削除 Modified Paths: -------------- trunk/teraterm/teraterm/unicode_test.h trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/unicode_test.h =================================================================== --- trunk/teraterm/teraterm/unicode_test.h 2020-07-06 14:36:18 UTC (rev 8846) +++ trunk/teraterm/teraterm/unicode_test.h 2020-07-09 13:16:44 UTC (rev 8847) @@ -8,7 +8,6 @@ #pragma once #define UNICODE_INTERNAL_BUFF 1 // 1 = \x93\xE0\x95\x94\x83o\x83b\x83t\x83 @ unicode\x89\xBB -#define UNICODE_DISPLAY 1 // 0/1 = DispStr()/DispStrW() // UNICODE_INTERNAL_BUFF\x82̉e\x8B\xBF\x82\xF0\x8EȂ\xA2 #define UNICODE_API 1 // UNICODE API\x82\xF0\x8B\x96\x89\xC2 Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2020-07-06 14:36:18 UTC (rev 8846) +++ trunk/teraterm/teraterm/vtdisp.c 2020-07-09 13:16:44 UTC (rev 8847) @@ -2730,6 +2730,7 @@ const BOOL draw_bg_enable = FALSE; #endif +#if 0 { char b[128]; memcpy(b, Buff, Count); @@ -2736,6 +2737,7 @@ b[Count] = 0; OutputDebugPrintf("(%d,%d)'%s'\n", *X, Y, b); } +#endif #if !UNICODE_INTERNAL_BUFF if ((ts.Language==IdRussian) && @@ -2794,9 +2796,11 @@ #endif } -// DispStr() \x82\xCC wchar_t\x94\xC5 -// TODO: \x8D\xA1\x82̂Ƃ\xB1\x82\xEB ExtTextOutW() \x82Ă\xD1 -#if defined(UNICODE_DISPLAY) +/** + * DispStr() \x82\xCC wchar_t\x94\xC5 + * Windows 95 \x82ɂ\xE0 ExtTextOutW() \x82͑\xB6\x8D݂\xB7\x82邪 + * \x93\xAE\x8D삪\x88قȂ\xE9\x82悤\x82\xBE + */ void DispStrW(const wchar_t *StrW, const char *WidthInfo, int Count, int Y, int* X) { #ifdef ALPHABLEND_TYPE2 @@ -2892,7 +2896,6 @@ *X += dx3 *FontWidth; } -#endif void DispEraseCurToEnd(int YEnd) {