svnno****@sourc*****
svnno****@sourc*****
2016年 11月 1日 (火) 15:01:16 JST
Tera TermRevision: 6520
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6520
Author: doda
Date: 2016-11-01 15:01:15 +0900 (Tue, 01 Nov 2016)
Log Message:
-----------
必要も無く何度も setlocale() が呼ばれているので、Language 設定が変わった部分だけにまとめる
Modified Paths:
--------------
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtterm.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpcmn/language.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2016-11-01 06:01:12 UTC (rev 6519)
+++ trunk/teraterm/teraterm/vtdisp.c 2016-11-01 06:01:15 UTC (rev 6520)
@@ -2841,8 +2841,6 @@
Count = 6;
#endif
- setlocale(LC_ALL, ts.Locale);
-
ch = Buff[Count];
Buff[Count] = 0;
len = mbstowcs(NULL, Buff, 0);
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2016-11-01 06:01:12 UTC (rev 6519)
+++ trunk/teraterm/teraterm/vtterm.c 2016-11-01 06:01:15 UTC (rev 6520)
@@ -351,6 +351,8 @@
cv.JIS7KatakanaSend = ts.JIS7KatakanaSend;
cv.KanjiIn = ts.KanjiIn;
cv.KanjiOut = ts.KanjiOut;
+
+ setlocale(LC_ALL, ts.Locale);
}
void ResetKeypadMode(BOOL DisabledModeOnly)
@@ -5313,10 +5315,7 @@
unsigned int code;
char mbchar[32];
unsigned short cset;
- char *locptr;
- locptr = setlocale(LC_ALL, ts.Locale);
-
if ((b & 0x80) != 0x80 || ((b & 0xe0) == 0x80 && count == 0)) {
// 1\x83o\x83C\x83g\x96ڂ\xA8\x82\xE6\x82\xD12\x83o\x83C\x83g\x96ڂ\xAAASCII\x82̏ꍇ\x82́A\x82\xB7\x82ׂ\xC4ASCII\x8Fo\x97͂Ƃ\xB7\x82\xE9\x81B
// 1\x83o\x83C\x83g\x96ڂ\xAAC1\x90\xA7\x8C䕶\x8E\x9A(0x80-0x9f)\x82̏ꍇ\x82\xE0\x93\xAF\x97l\x81B
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2016-11-01 06:01:12 UTC (rev 6519)
+++ trunk/teraterm/teraterm/vtwin.cpp 2016-11-01 06:01:15 UTC (rev 6520)
@@ -2083,7 +2083,6 @@
if (attr != -1 && (attr & FILE_ATTRIBUTE_DIRECTORY)) {
ptr = SendVar->FullName;
// \x83p\x83X\x82̋\xE6\x90\xE8\x82\xF0 \ -> / \x82\xD6
- setlocale(LC_ALL, ts.Locale);
while (*ptr) {
if (isleadbyte(*ptr)) { // multi-byte
ptr += 2;
Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c 2016-11-01 06:01:12 UTC (rev 6519)
+++ trunk/teraterm/ttpcmn/language.c 2016-11-01 06:01:15 UTC (rev 6520)
@@ -50,7 +50,6 @@
*byte = 2;
// CP932\x82\xA9\x82\xE7UTF-16LE\x82֕ϊ\xB7\x82\xB7\x82\xE9
- setlocale(LC_ALL, locale);
buf[0] = KCode >> 8;
if (buf[0] > 0) {