svnno****@sourc*****
svnno****@sourc*****
2016年 4月 4日 (月) 20:13:38 JST
Tera TermRevision: 6360
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6360
Author: doda
Date: 2016-04-04 20:13:38 +0900 (Mon, 04 Apr 2016)
Log Message:
-----------
DECFI/DECBI で BCE が適用されなかったのを修正
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/buffer.c
Added Paths:
-----------
trunk/tests/decfi-bce.sh
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2016-04-02 13:10:16 UTC (rev 6359)
+++ trunk/doc/en/html/about/history.html 2016-04-04 11:13:38 UTC (rev 6360)
@@ -46,8 +46,9 @@
<li>Bug fixes
<ul>
+ <li>When <a href="../setup/teraterm-com.html#AutoComPortReconnect">AutoComPortReconnect</a>=on is enabled, Tera Term can not recognize a part of device regarding USB serial port connection and disconnection.</li>
+ <!-- li>DECFI, DECBI \x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X\x82ŁA\x94w\x8Ci\x90F\x8F\xC1\x8B\x8E(BCE)\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li -->
<li>MACRO: When <a href="../macro/command/ifthenelseif.html">if</a> has macro command without parameter, syntax error occurs.</li>
- <li>When <a href="../setup/teraterm-com.html#AutoComPortReconnect">AutoComPortReconnect</a>=on is enabled, Tera Term can not recognize a part of device regarding USB serial port connection and disconnection.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2016-04-02 13:10:16 UTC (rev 6359)
+++ trunk/doc/ja/html/about/history.html 2016-04-04 11:13:38 UTC (rev 6360)
@@ -46,8 +46,9 @@
<li>\x83o\x83O\x8FC\x90\xB3
<ul>
+ <li><a href="../setup/teraterm-com.html#AutoComPortReconnect">AutoComPortReconnect</a>=on\x82̏ꍇ\x82ɂ\xA8\x82\xA2\x82āA\x88ꕔ\x82̋@\x8A\xED\x82\xC5USB\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̐ڑ\xB1\x81E\x90ؒf\x82\xAA\x8C\x9F\x8Fo\x82ł\xAB\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ <li>DECFI, DECBI \x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X\x82ŁA\x94w\x8Ci\x90F\x8F\xC1\x8B\x8E(BCE)\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xCC 1 \x8Ds\x8C`\x8E\xAE\x82\xCC <a href="../macro/command/ifthenelseif.html">if</a> \x95\xB6\x82ŁA\x83p\x83\x89\x83\x81\x81[\x83^\x82̖\xB3\x82\xA2\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xAA\x83G\x83\x89\x81[\x82ƂȂ\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
- <li><a href="../setup/teraterm-com.html#AutoComPortReconnect">AutoComPortReconnect</a>=on\x82̏ꍇ\x82ɂ\xA8\x82\xA2\x82āA\x88ꕔ\x82̋@\x8A\xED\x82\xC5USB\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̐ڑ\xB1\x81E\x90ؒf\x82\xAA\x8C\x9F\x8Fo\x82ł\xAB\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c 2016-04-02 13:10:16 UTC (rev 6359)
+++ trunk/teraterm/teraterm/buffer.c 2016-04-04 11:13:38 UTC (rev 6360)
@@ -3827,11 +3827,11 @@
memmove(&(AttrBuffFG[Ptr]), &(AttrBuffFG[Ptr+count]), MoveLen);
memmove(&(AttrBuffBG[Ptr]), &(AttrBuffBG[Ptr+count]), MoveLen);
- memset(&(CodeBuff[Ptr+MoveLen]), 0x20, count);
- memset(&(AttrBuff[Ptr+MoveLen]), AttrDefault, count);
- memset(&(AttrBuff2[Ptr+MoveLen]), AttrDefault, count);
- memset(&(AttrBuffFG[Ptr+MoveLen]), AttrDefaultFG, count);
- memset(&(AttrBuffBG[Ptr+MoveLen]), AttrDefaultBG, count);
+ memset(&(CodeBuff[Ptr+MoveLen]), 0x20, count);
+ memset(&(AttrBuff[Ptr+MoveLen]), AttrDefault, count);
+ memset(&(AttrBuff2[Ptr+MoveLen]), CurCharAttr.Attr2 & Attr2ColorMask, count);
+ memset(&(AttrBuffFG[Ptr+MoveLen]), CurCharAttr.Fore, count);
+ memset(&(AttrBuffBG[Ptr+MoveLen]), CurCharAttr.Back, count);
LPtr = NextLinePtr(LPtr);
}
@@ -3867,11 +3867,11 @@
memmove(&(AttrBuffFG[Ptr+count]), &(AttrBuffFG[Ptr]), MoveLen);
memmove(&(AttrBuffBG[Ptr+count]), &(AttrBuffBG[Ptr]), MoveLen);
- memset(&(CodeBuff[Ptr]), 0x20, count);
- memset(&(AttrBuff[Ptr]), AttrDefault, count);
- memset(&(AttrBuff2[Ptr]), AttrDefault, count);
- memset(&(AttrBuffFG[Ptr]), AttrDefaultFG, count);
- memset(&(AttrBuffBG[Ptr]), AttrDefaultBG, count);
+ memset(&(CodeBuff[Ptr]), 0x20, count);
+ memset(&(AttrBuff[Ptr]), AttrDefault, count);
+ memset(&(AttrBuff2[Ptr]), CurCharAttr.Attr2 & Attr2ColorMask, count);
+ memset(&(AttrBuffFG[Ptr]), CurCharAttr.Fore, count);
+ memset(&(AttrBuffBG[Ptr]), CurCharAttr.Back, count);
if (AttrBuff[LPtr+CursorRightM] & AttrKanji) {
CodeBuff[LPtr+CursorRightM] = 0x20;
Added: trunk/tests/decfi-bce.sh
===================================================================
--- trunk/tests/decfi-bce.sh (rev 0)
+++ trunk/tests/decfi-bce.sh 2016-04-04 11:13:38 UTC (rev 6360)
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+trap "OSC 111; CSI m; exit" 0 2
+
+ESC() {
+ while [ $# -gt 0 ]; do
+ printf "\033$1"
+ shift
+ done
+}
+
+CSI() {
+ while [ $# -gt 0 ]; do
+ ESC "[$1"
+ shift
+ done
+}
+
+OSC() {
+ while [ $# -gt 0 ]; do
+ ESC "]$1" '\'
+ shift
+ done
+}
+
+OSC "11;#440000"
+CSI "4;37;44m" H 2J
+
+echo "1234567890"; sleep 1
+
+printf "shift to the right 5 columns"; sleep 1
+CSI G
+ESC 6 6 6 6 6
+echo ""
+
+sleep 2
+
+CSI 6G
+printf "shift to the left 3 columns"; sleep 1
+CSI 999G
+ESC 9 9 9
+echo
+
+sleep 2
Property changes on: trunk/tests/decfi-bce.sh
___________________________________________________________________
Added: svn:executable
+ *