Tera TermRevision: 10321
https://osdn.net/projects/ttssh2/scm/svn/commits/10321
Author: zmatsuo
Date: 2022-10-16 23:28:29 +0900 (Sun, 16 Oct 2022)
Log Message:
-----------
使用していないデバグ用のdefineを削除
- UNICODE_INTERNAL_BUFF を削除
Modified Paths:
--------------
trunk/teraterm/teraterm/buffer.h
trunk/teraterm/teraterm/unicode_test.h
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtterm.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.h
===================================================================
--- trunk/teraterm/teraterm/buffer.h 2022-10-16 05:37:07 UTC (rev 10320)
+++ trunk/teraterm/teraterm/buffer.h 2022-10-16 14:28:29 UTC (rev 10321)
@@ -64,9 +64,7 @@
typedef struct {
BYTE Attr;
BYTE Attr2;
-#if 1 //UNICODE_INTERNAL_BUFF
WORD AttrEx; // \x83A\x83g\x83\x8A\x83r\x83\x85\x81[\x83g\x82𑝂₷\x83e\x83X\x83g
-#endif
BYTE Fore;
BYTE Back;
} TCharAttr;
@@ -101,7 +99,6 @@
void BuffPrint(BOOL ScrollRegion);
void BuffDumpCurrentLine(PrintFile *handle, BYTE TERM);
void BuffPutChar(BYTE b, TCharAttr Attr, BOOL Insert);
-void BuffPutKanji(WORD w, TCharAttr Attr, BOOL Insert);
int BuffPutUnicode(unsigned int uc, TCharAttr Attr, BOOL Insert);
void BuffUpdateRect(int XStart, int YStart, int XEnd, int YEnd);
void UpdateStr(void);
Modified: trunk/teraterm/teraterm/unicode_test.h
===================================================================
--- trunk/teraterm/teraterm/unicode_test.h 2022-10-16 05:37:07 UTC (rev 10320)
+++ trunk/teraterm/teraterm/unicode_test.h 2022-10-16 14:28:29 UTC (rev 10321)
@@ -7,10 +7,6 @@
*/
#pragma once
-// TODO \x8D폜
-// \x91\xBD\x95\xAA0\x82ɂł\xAB\x82Ȃ\xA2
-#define UNICODE_INTERNAL_BUFF 1 // 1 = \x93\xE0\x95\x94\x83o\x83b\x83t\x83 ＠ unicode\x89\xBB
-
// \x83f\x83o\x83O\x97p\x8B@\x94\enable
// CTRL x2\x82Ń}\x83E\x83X\x83|\x83C\x83\x93\x83^\x89\xBA\x82̕\xB6\x8E\x9A\x95\\x96@\x82\xF0\x95\\x8E\xA6
#define UNICODE_DEBUG 1
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2022-10-16 05:37:07 UTC (rev 10320)
+++ trunk/teraterm/teraterm/vtdisp.c 2022-10-16 14:28:29 UTC (rev 10321)
@@ -139,9 +139,7 @@
TCharAttr DefCharAttr = {
AttrDefault,
AttrDefault,
-#if UNICODE_INTERNAL_BUFF
AttrDefault,
-#endif
AttrDefaultFG,
AttrDefaultBG
};
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2022-10-16 05:37:07 UTC (rev 10320)
+++ trunk/teraterm/teraterm/vtterm.c 2022-10-16 14:28:29 UTC (rev 10321)
@@ -799,20 +799,14 @@
}
if (Wrap) {
-#if UNICODE_INTERNAL_BUFF
TCharAttr t = BuffGetCursorCharAttr(CursorX, CursorY);
t.Attr |= AttrLineContinued;
t.AttrEx = t.Attr;
BuffSetCursorCharAttr(CursorX, CursorY, t);
-#endif
CarriageReturn(FALSE);
LineFeed(LF,FALSE);
-#if !UNICODE_INTERNAL_BUFF
- CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
-#else
CharAttrTmp.Attr |= AttrLineContinued;
t.AttrEx = t.Attr;
-#endif
}
if (NeedsOutputBufs()) {
@@ -862,7 +856,6 @@
}
#endif
-#if UNICODE_INTERNAL_BUFF
CharAttrTmp.AttrEx = CharAttrTmp.Attr;
if (ts.Language == IdJapanese) {
unsigned long u32;
@@ -887,9 +880,6 @@
} else {
BuffPutUnicode(b, CharAttrTmp, InsertMode);
}
-#else
- BuffPutChar(b, CharAttrTmp, InsertMode);
-#endif
if (CursorX == CursorRightM || CursorX >= NumOfColumns-1) {
UpdateStr();
@@ -934,9 +924,7 @@
}
CharAttrTmp.Attr |= AttrSpecial;
-#if UNICODE_INTERNAL_BUFF
CharAttrTmp.AttrEx = CharAttrTmp.Attr;
-#endif
BuffPutChar(b, CharAttrTmp, InsertMode);
if (CursorX == CursorRightM || CursorX >= NumOfColumns-1) {
@@ -982,23 +970,16 @@
if (Wrap) {
CarriageReturn(FALSE);
LineFeed(LF,FALSE);
-#if !UNICODE_INTERNAL_BUFF
- if (ts.EnableContinuedLineCopy)
- CharAttrTmp.Attr |= AttrLineContinued;
-#else
if (ts.EnableContinuedLineCopy) {
CharAttrTmp.Attr |= AttrLineContinued;
CharAttrTmp.AttrEx = CharAttrTmp.Attr;
}
-#endif
}
else if (CursorX > LineEnd - 1) {
if (AutoWrapMode) {
if (ts.EnableContinuedLineCopy) {
CharAttrTmp.Attr |= AttrLineContinued;
-#if UNICODE_INTERNAL_BUFF
CharAttrTmp.AttrEx = CharAttrTmp.Attr;
-#endif
if (CursorX == LineEnd)
BuffPutChar(0x20, CharAttr, FALSE);
}
@@ -1022,7 +1003,6 @@
Special = FALSE;
}
-#if UNICODE_INTERNAL_BUFF
{
// codepage\x88ꗗ
// https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43
@@ -1061,9 +1041,6 @@
CharAttrTmp.AttrEx = CharAttrTmp.Attr;
BuffPutUnicode(u32, CharAttrTmp, InsertMode);
}
-#else
- BuffPutKanji(Kanji, CharAttrTmp, InsertMode);
-#endif
if (CursorX < LineEnd - 1) {
MoveRight();
@@ -2354,9 +2331,7 @@
case 0: /* Clear all */
attr->Attr = DefCharAttr.Attr;
attr->Attr2 = DefCharAttr.Attr2 | (attr->Attr2&Attr2Protect);
-#if UNICODE_INTERNAL_BUFF
attr->AttrEx = attr->Attr;
-#endif
attr->Fore = DefCharAttr.Fore;
attr->Back = DefCharAttr.Back;
mask->Attr = AttrSgrMask;
@@ -3831,9 +3806,7 @@
attr.Attr &= AttrSgrMask;
mask.Attr &= AttrSgrMask;
attr.Attr2 &= Attr2ColorMask;
-#if UNICODE_INTERNAL_BUFF
attr.AttrEx = attr.Attr;
-#endif
mask.Attr2 &= Attr2ColorMask;
if (RectangleMode) {
BuffChangeAttrBox(Param[2]-1, Param[1]-1, Param[4]-1, Param[3]-1, &attr, &mask);
@@ -5826,7 +5799,6 @@
if ((Gn[Glr[0]] == IdKatakana) || EUCkanaIn) {
b = b | 0x80;
EUCkanaIn = FALSE;
-#if UNICODE_INTERNAL_BUFF
{
// b\x82\xCDsjis\x82̔\xBC\x8Ap\x83J\x83^\x83J\x83i
unsigned long u32 = CP932ToUTF32(b);
@@ -5833,7 +5805,6 @@
PutU32(u32);
}
return TRUE;
-#endif
}
PutChar(b);
}
@@ -5891,13 +5862,9 @@
(ts.KanjiCode==IdJIS) &&
(ts.JIS7Katakana==0) &&
((ts.TermFlag & TF_FIXEDJIS)!=0)) {
-#if UNICODE_INTERNAL_BUFF
// b\x82\xCDsjis\x82̔\xBC\x8Ap\x83J\x83^\x83J\x83i
unsigned long u32 = CP932ToUTF32(b);
PutU32(u32);
-#else
- PutChar(b); // katakana
-#endif
} else {
if (Gn[Glr[1]] == IdASCII) {
b = b & 0x7f;
@@ -6041,13 +6008,6 @@
static void ParseASCII(BYTE b)
{
-#if !UNICODE_INTERNAL_BUFF
- if (ts.Language == IdJapanese) {
- ParseFirstJP(b);
- return;
- }
-#endif
-
if (SSflag) {
PutChar(b);
SSflag = FALSE;