Tera TermRevision: 10604
https://osdn.net/projects/ttssh2/scm/svn/commits/10604
Author: zmatsuo
Date: 2023-02-21 23:43:02 +0900 (Tue, 21 Feb 2023)
Log Message:
-----------
SGR 7(反転属性)で文字色の反転しなくなる場合がある
- 「反転属性色を有効にする」のチェックを外す
-「設定」-「その他の設定」-「表示」
- 「反転属性の文字に対して、反転ではなく別の色で表示する」という設定
- 反転しなくなる設定ではない
MFT: r10603
ticket #47472
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/10603
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/47472
Modified Paths:
--------------
branches/4-stable/teraterm/teraterm/vtdisp.c
-------------- next part --------------
Modified: branches/4-stable/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/4-stable/teraterm/teraterm/vtdisp.c 2023-02-21 14:39:49 UTC (rev 10603)
+++ branches/4-stable/teraterm/teraterm/vtdisp.c 2023-02-21 14:43:02 UTC (rev 10604)
@@ -2635,7 +2635,7 @@
AttrFlag |= ((ts.ColorFlag & CF_URLCOLOR) && (Attr.Attr & AttrUnder)) ? AttrUnder : 0;
AttrFlag |= ((ts.ColorFlag & CF_BOLDCOLOR) && (Attr.Attr & AttrBold)) ? AttrBold : 0;
AttrFlag |= ((ts.ColorFlag & CF_BLINKCOLOR) && (Attr.Attr & AttrBlink)) ? AttrBlink : 0;
- AttrFlag |= ((ts.ColorFlag & CF_REVERSECOLOR) && (Attr.Attr & AttrReverse)) ? AttrReverse : 0;
+ AttrFlag |= (Attr.Attr & AttrReverse) ? AttrReverse : 0;
Attr2Flag = 0;
Attr2Flag |= ((ts.ColorFlag & CF_ANSICOLOR) && (Attr.Attr2 & Attr2Fore)) ? Attr2Fore : 0;
Attr2Flag |= ((ts.ColorFlag & CF_ANSICOLOR) && (Attr.Attr2 & Attr2Back)) ? Attr2Back : 0;
@@ -2680,8 +2680,15 @@
BackColor = BGVTColor[1];
}
else {
- TextColor = BGVTReverseColor[0];
- BackColor = BGVTReverseColor[1];
+ if ((ts.ColorFlag & CF_REVERSECOLOR) == 0) {
+ TextColor = BGVTColor[1];
+ BackColor = BGVTColor[0];
+ }
+ else {
+ // \x94\xBD\x93]\x91\xAE\x90\xAB\x90F\x82\xAA\x97L\x8C\xF8
+ TextColor = BGVTReverseColor[0];
+ BackColor = BGVTReverseColor[1];
+ }
}
} else if (AttrFlag & AttrBlink) {
if (!reverse) {