svnno****@sourc*****
svnno****@sourc*****
2012年 8月 23日 (木) 23:08:38 JST
Tera TermRevision: 4991
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/4991
Author: doda
Date: 2012-08-23 23:08:38 +0900 (Thu, 23 Aug 2012)
Log Message:
-----------
EnableANSIColor が off の時は DECRQSS への応答に色属性を含めないようにした。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/vtterm.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2012-08-23 14:03:34 UTC (rev 4990)
+++ trunk/doc/en/html/about/history.html 2012-08-23 14:08:38 UTC (rev 4991)
@@ -38,6 +38,7 @@
<li>When the host number is discontinous value, Tera Term can read the [Hosts] section in the teraterm.ini file.</li>
<li>A button value is changed from 3 to 35 while the button is not pressed at the Any Event Tracking mode.</li>
<li>added the 0; character at the reply head by requesting the character attribute of the DECRQSS.</li>
+ <!-- li>DECRQSS \x82ɂ\xE6\x82镶\x8E\x9A\x91\xAE\x90\xAB\x82̖₢\x8D\x87\x82킹\x82ŁA<a href="../menu/setup-additional.html">Enable ANSI Color</a> \x90ݒ肪\x83I\x83t\x82̎\x9E\x82͉\x9E\x93\x9A\x82ɐF\x91\xAE\x90\xAB\x82\xF0\x8A܂߂Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li -->
<li>Macro
<ul>
<li>added the <a href="../macro/command/setpassword.html">setpassword</a> command.</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2012-08-23 14:03:34 UTC (rev 4990)
+++ trunk/doc/ja/html/about/history.html 2012-08-23 14:08:38 UTC (rev 4991)
@@ -38,6 +38,7 @@
<li>TERATERM.INI \x82\xCC [Hosts] \x83Z\x83N\x83V\x83\x87\x83\x93\x82ŁAHost\x82ɑ\xB1\x82\xAD\x90\x94\x8E\x9A\x82\xAA\x94\xF2\x82\xF1\x82ł\xA2\x82Ă\xE0\x91\xB1\x82\xAB\x82\xF0\x93ǂނ悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li>Any Event Tracking \x83\x82\x81[\x83h\x82ŁA\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x8F\xF3\x91Ԃł̃\x82\x81[\x83V\x83\x87\x83\x93\x83C\x83x\x83\x93\x83g\x82̃{\x83^\x83\x93\x92l\x82\xF0 3 \x82\xA9\x82\xE7 35 \x82֕ύX\x82\xB5\x82\xBD\x81B</li>
<li>DECRQSS \x82ɂ\xE6\x82镶\x8E\x9A\x91\xAE\x90\xAB\x82̖₢\x8D\x87\x82킹\x82ŁA\x89\x9E\x93\x9A\x82̐擪\x82\xC9 0; \x82\xF0\x95t\x89\xC1\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+ <li>DECRQSS \x82ɂ\xE6\x82镶\x8E\x9A\x91\xAE\x90\xAB\x82̖₢\x8D\x87\x82킹\x82ŁA<a href="../menu/setup-additional.html">Enable ANSI Color</a> \x90ݒ肪\x83I\x83t\x82̎\x9E\x82͉\x9E\x93\x9A\x82ɐF\x91\xAE\x90\xAB\x82\xF0\x8A܂߂Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li>\x83}\x83N\x83\x8D
<ul>
<li><a href="../macro/command/setpassword.html">setpassword</a>\x83R\x83}\x83\x93\x83h\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2012-08-23 14:03:34 UTC (rev 4990)
+++ trunk/teraterm/teraterm/vtterm.c 2012-08-23 14:08:38 UTC (rev 4991)
@@ -3085,7 +3085,7 @@
if (CharAttr.Attr & AttrReverse) {
len += _snprintf_s_l(&RepStr[len], sizeof(RepStr) - len, _TRUNCATE, ";7", CLocale);
}
- if (CharAttr.Attr2 & Attr2Fore) {
+ if (CharAttr.Attr2 & Attr2Fore && ts.ColorFlag & CF_ANSICOLOR) {
int color = CharAttr.Fore;
if (color <= 7 && (CharAttr.Attr & AttrBold) && (ts.ColorFlag & CF_PCBOLD16)) {
color += 8;
@@ -3109,7 +3109,7 @@
len += _snprintf_s_l(&RepStr[len], sizeof(RepStr) - len, _TRUNCATE, ";38;5;%d", CLocale, color);
}
}
- if (CharAttr.Attr2 & Attr2Back) {
+ if (CharAttr.Attr2 & Attr2Back && ts.ColorFlag & CF_ANSICOLOR) {
int color = CharAttr.Back;
if (color <= 7 && (CharAttr.Attr & AttrBlink) && (ts.ColorFlag & CF_PCBOLD16)) {
color += 8;