Revision: 7468 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7468 Author: zmatsuo Date: 2019-03-10 23:32:02 +0900 (Sun, 10 Mar 2019) Log Message: ----------- Merge branch 'trunk' into cmake # Conflicts: # installer/release/lang/Japanese.lng # teraterm/teraterm/addsetting.cpp # teraterm/teraterm/vtwin.cpp # teraterm/teraterm/vtwin.h # teraterm/ttpdlg/ttdlg.c # teraterm/ttpdlg/ttpdlg.rc # ttssh2/ttxssh/ttxssh.c Modified Paths: -------------- branches/cmake/doc/en/html/about/copyright.html branches/cmake/doc/en/html/about/history.html branches/cmake/doc/en/html/index.html branches/cmake/doc/en/html/macro/syntax/index.html branches/cmake/doc/en/html/menu/setup-additional.html branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html branches/cmake/doc/en/html/menu/setup-terminal_ja.html branches/cmake/doc/en/html/menu/setup-terminal_ko.html branches/cmake/doc/en/html/menu/setup-terminal_utf8.html branches/cmake/doc/en/html/reference/develop.txt branches/cmake/doc/en/html/setup/teraterm-ini.html branches/cmake/doc/en/html/usage/mouse.html branches/cmake/doc/en/teraterm.hhc branches/cmake/doc/en/teraterm.hhp branches/cmake/doc/ja/html/about/copyright.html branches/cmake/doc/ja/html/about/history.html branches/cmake/doc/ja/html/index.html branches/cmake/doc/ja/html/macro/syntax/index.html branches/cmake/doc/ja/html/menu/setup-additional.html branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html branches/cmake/doc/ja/html/menu/setup-terminal.html branches/cmake/doc/ja/html/menu/setup-terminal_ko.html branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html branches/cmake/doc/ja/html/reference/develop.txt branches/cmake/doc/ja/html/setup/teraterm-ini.html branches/cmake/doc/ja/html/usage/mouse.html branches/cmake/doc/ja/html/usage/unicode.html branches/cmake/doc/ja/teraterm.hhc branches/cmake/doc/ja/teraterm.hhp branches/cmake/installer/release/TERATERM.INI branches/cmake/installer/release/lang/English.lng branches/cmake/installer/release/lang/French.lng branches/cmake/installer/release/lang/German.lng branches/cmake/installer/release/lang/Japanese.lng branches/cmake/installer/release/lang/Korean.lng branches/cmake/installer/release/lang/Russian.lng branches/cmake/installer/release/lang/Simplified Chinese.lng branches/cmake/installer/release/lang/Traditional Chinese.lng branches/cmake/installer/release/license.txt branches/cmake/installer/teraterm.iss branches/cmake/teraterm/common/helpid.h branches/cmake/teraterm/common/tt-version.h branches/cmake/teraterm/common/ttlib.h branches/cmake/teraterm/keycode/keycode-version.rc branches/cmake/teraterm/teraterm/tt-version.rc branches/cmake/teraterm/teraterm/ttermpro.rc branches/cmake/teraterm/teraterm/ttime.c branches/cmake/teraterm/teraterm/vtdisp.c branches/cmake/teraterm/teraterm/vtdisp.h branches/cmake/teraterm/teraterm/vtterm.c branches/cmake/teraterm/teraterm/vtwin.cpp branches/cmake/teraterm/teraterm/vtwin.h branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc branches/cmake/teraterm/ttpdlg/dlg_res.h branches/cmake/teraterm/ttpdlg/ttdlg.c branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc branches/cmake/teraterm/ttpdlg/ttpdlg.rc branches/cmake/teraterm/ttpfile/ttpfile-version.rc branches/cmake/teraterm/ttpmacro/ttm-version.rc branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj branches/cmake/teraterm/ttpset/ttpset-version.rc branches/cmake/teraterm/ttpset/ttset.c branches/cmake/teraterm/ttptek/ttptek-version.rc branches/cmake/ttssh2/ttxssh/ssh.c branches/cmake/ttssh2/ttxssh/ttxssh-version.h branches/cmake/ttssh2/ttxssh/ttxssh-version.rc branches/cmake/ttssh2/ttxssh/ttxssh.c branches/cmake/ttssh2/ttxssh/ttxssh.h branches/cmake/ttssh2/ttxssh/ttxssh.rc Added Paths: ----------- branches/cmake/doc/en/html/macro/syntax/file.html branches/cmake/doc/ja/html/macro/syntax/file.html -------------- next part -------------- Modified: branches/cmake/doc/en/html/about/copyright.html =================================================================== --- branches/cmake/doc/en/html/about/copyright.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/about/copyright.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -41,7 +41,7 @@ <h3 id="license_teraterm">License</h3> <pre> Copyright (C) 1994-1998 T. Teranishi -(C) 2004-2018 TeraTerm Project +(C) 2004-2019 TeraTerm Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -128,7 +128,7 @@ <h3 id="license_ttssh">License</h3> <pre> (C)1998-2001 Robert O'Callahan -(C) 2004-2018 TeraTerm Project +(C) 2004-2019 TeraTerm Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, Modified: branches/cmake/doc/en/html/about/history.html =================================================================== --- branches/cmake/doc/en/html/about/history.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/about/history.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -31,23 +31,40 @@ <h2 id="teraterm">Tera Term</h2> -<h3 id="teraterm_4.102">2019.xx.xx (Ver 4.102)</h3> +<h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3> <ul class="history"> - <!-- li>Changes + <li>Misc <ul> - <li></li> + <li>upgraded TTSSH to <a href="#ttssh_2.89">2.89</a>.</li> </ul> - </li --> + </li> +</ul> - <!-- li>Bug fixes +<h3 id="teraterm_4.102">2019.02.28 (Ver 4.102)</h3> +<ul class="history"> + <li>Changes <ul> - <li></li> + <li>The AlphaBlend VT window can be configured as a different value for each active and inative.</li> + <li>The value of transparency can be temporarily changed by moving the mouse wheel on the title bar of the VT window.</li> + <li>The internal implemention of the VT window was speeded up.</li> + <li>UTF-8: Four bytes character can not be shown yet but can be decoded, the impact range of character corruption was be minimized.</li> + <li>The language code(CodePage) of the "<a href="../menu/setup-terminal.html">Terminal ([Setup] menu)</a>" dialog(<a href="../usage/unicode.html">Unicode usage</a>).</li> + <li>MACRO: The macro file can support UTF-8 and UTF-16(with BOM) encoding.</li> + <li>MACRO: The <a href="../macro/command/getfileattr.html">getfileattr</a> command can be based on the current directory same as other command.</li> + <li>MARCO: The <a href="../macro/command/fileopen.html">fileopen</a> command can cause an error when a file is not found with read only mode.</li> </ul> - </li --> + </li> + <li>Bug fixes + <ul> + <li>When the AlphaBlend window is enabled, an application fault occurs on Windows 10.</li> + </ul> + </li> + <li>Misc <ul> <li>upgraded TTSSH to <a href="#ttssh_2.88">2.88</a>.</li> + <li>upgraded Oniguruma to 6.9.1.</li> </ul> </li> </ul> @@ -3084,13 +3101,35 @@ <h2 id="ttssh">TTSSH</h2> -<h3 id="ttssh_2.88">2019.xx.xx (Ver 2.88)</h3> +<h3 id="ttssh_2.89">2019.xx.xx (Ver 2.89)</h3> <ul class="history"> + <li>Bug fixes + <ul> + <li>garbage data is added to the CipherOrder and MacOrder settings when saving settings.</li> + </ul> + </li> +</ul> + +<h3 id="ttssh_2.88">2019.02.28 (Ver 2.88)</h3> +<ul class="history"> <li>Changes <ul> <li>added <a href="../commandline/ttssh.html#ssh-N">/ssh-N commandline option</a> to disable a shell session when starting a connection.</li> + <li>Default state of <a href="../menu/setup-sshkeygenerator.html#kdf">bcrypt KDF checkbox</a> on <a href="../menu/setup-sshkeygenerator.html">SSH Key generator dialog</a> is changed to on.</li> </ul> </li> + + <li>Bug fixes + <ul> + <li>Can't change password on SSH Change Password dialog when old password is empty string.</li> + </ul> + </li> + + <li>Misc + <ul> + <li>upgraded OpenSSL to 1.0.2r.</li> + </ul> + </li> </ul> <h3 id="ttssh_2.87">2018.11.30 (Ver 2.87)</h3> Modified: branches/cmake/doc/en/html/index.html =================================================================== --- branches/cmake/doc/en/html/index.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/index.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -13,7 +13,7 @@ <p class="center"> Copyright (C) 1994-1998 T. Teranishi<BR> -(C) 2004-2018 TeraTerm Project<BR> +(C) 2004-2019 TeraTerm Project<BR> All Rights Reserved.<BR> </p> Added: branches/cmake/doc/en/html/macro/syntax/file.html =================================================================== --- branches/cmake/doc/en/html/macro/syntax/file.html (rev 0) +++ branches/cmake/doc/en/html/macro/syntax/file.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -0,0 +1,82 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<HTML> +<HEAD> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +<TITLE>TTL file</TITLE> +<META http-equiv="Content-Style-Type" content="text/css"> +<link rel="stylesheet" href="../../style.css" type="text/css"> +</HEAD> +<BODY> + +<h1>Encoding</h1> + +<p> +The Unicode (UTF-8, UTF-16BE, UTF-16LE) can be supported from Tera Term 4.102. +</p> + +<p> +The TTL file was processed as ANSI CodePage in previous version. +</p> + +<h2>Supporting encoding</h2> + +<table> + <tr> + <th>encoding</th> + <th>support</th> + </tr> + <tr> + <td>Usually (ANSI CodePage)</td> + <td>Support</td> + </tr> + <tr> + <td>UTF-8 (with BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-8 (without BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-16BE (without BOM)</td> + <td>Not support<td> + </tr> + <tr> + <td>UTF-16LE (without BOM)</td> + <td>Not support<td> + </tr> + <tr> + <td>UTF-16 (with BE BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-16 (with LE BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-16 (without BOM = UTF-16BE)</td> + <td>Not support<td> + </tr> +</table> + +<h2>Encoding determination</h2> + +<p> +Tera Term determines the encoding as follows. +</p> + +<dl> + <dt>When BOM exists</dt> + <dd>Tera Term determines one of UTF-8, UTF-16BE and UTF-16LE from BOM type, next reading the file.</dd> + + <dt>When BOM does not exist</dt> + <dd> + <ul> + <li>Reading the file as UTF-8.</li> + <li>Reading the file as CP_ACP (same as before 4.102) when the file can not be decoded as UTF-8.</li> + </ul> + </dd> +</dl> +</body> +</html> Modified: branches/cmake/doc/en/html/macro/syntax/index.html =================================================================== --- branches/cmake/doc/en/html/macro/syntax/index.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/macro/syntax/index.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -16,6 +16,7 @@ </p> <UL> + <LI><A HREF="file.html">TTL file</A></LI> <LI><A HREF="types.html">Types</A></LI> <LI><A HREF="formats.html">Formats of constants</A></LI> <LI><A HREF="identifiers.html">Identifiers and reserved words</A></LI> Modified: branches/cmake/doc/en/html/menu/setup-additional.html =================================================================== --- branches/cmake/doc/en/html/menu/setup-additional.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/menu/setup-additional.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -258,10 +258,11 @@ <h2 id="TabVisual">"Visual" tab</h2> <dl> - <dt id="AlphaBlend">AlphaBlend</dt> + <dt id="AlphaBlendActive">Window Transparency / Active</dt> + <dt id="AlphaBlend">Window Transparency / Inactive</dt> <dd> - You can setup the value of transparency. The range of transparency - is from 0 to 255. The more transparency reduces the value, the more + You can set up the value of transparency when the window is active (on focus) and not active (non-focus). + The range of transparency is from 0 to 255. The more transparency reduces the value, the more window transparency is blinding. </dd> Modified: branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html =================================================================== --- branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/menu/setup-sshkeygenerator.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -18,55 +18,55 @@ </p> <dl> - <dt>Key type</dt> + <dt id="type">Key type</dt> <dd>Specify the type of key to generate. <dl> - <dt>RSA1</dt> + <dt id="rsa1">RSA1</dt> <dd>Generate SSH1 RSA key.</dd> - <dt>RSA</dt> + <dt id="rsa">RSA</dt> <dd>Generate SSH2 RSA key.</dd> - <dt>DSA</dt> + <dt id="dsa">DSA</dt> <dd>Generate SSH2 DSA key.<br /> The DSA key does not have 1024 bits is invalid, so the key can not be generated because the key will not be used for some servers.<br /> If the key bits is over 1024, the security level can not be stronger. Please use the RSA and ECDSA key algorithm if your security level is higher.</dd> - <dt>ECDSA-256</dt> + <dt id="ecdsa256">ECDSA-256</dt> <dd>Generate SSH2 ECDSA(256bit) key.</dd> - <dt>ECDSA-384</dt> + <dt id="ecdsa384">ECDSA-384</dt> <dd>Generate SSH2 ECDSA(384bit) key.</dd> - <dt>ECDSA-521</dt> + <dt id="ecdsa521">ECDSA-521</dt> <dd>Generate SSH2 ECDSA(521bit) key.</dd> - <dt>ED25519</dt> + <dt id="ed25519">ED25519</dt> <dd>Generate SSH2 ED25519 key.</dd> </dl> </dd> - <dt>Key Bits</dt> + <dt id="bits">Key Bits</dt> <dd>Specify the key length to generate. </dd> - <dt>bcrypt KDF</dt> + <dt id="kdf">bcrypt KDF</dt> <dd>Specify the bcrypt KDF format of the private key.</dd> - <dt>Generate</dt> + <dt id="generate">Generate</dt> <dd>Generate the key.</dd> - <dt>Key passphrase</dt> + <dt id="passphrase">Key passphrase</dt> <dd>Specify passphrase of private key.</dd> - <dt>Confirm passphrase</dt> + <dt id="confirm_pass">Confirm passphrase</dt> <dd>Confirm passphrase of private key. Please input the same passphrase as Key passphrase. </dd> - <dt>Save public key</dt> + <dt id="save_public">Save public key</dt> <dd>Save public key.<dd> - <dt>Save private key</dt> + <dt id="save_private">Save private key</dt> <dd>Save private key<br /> The private key is encrypted by the AES-128 algorithm. The key is encrypted by the 3DES into the Tera Term 4.76(TTSSH 2.63) before.</dd> Modified: branches/cmake/doc/en/html/menu/setup-terminal_ja.html =================================================================== --- branches/cmake/doc/en/html/menu/setup-terminal_ja.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/menu/setup-terminal_ja.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -159,11 +159,6 @@ Refer to <a href="../usage/unicode.html">Unicode</a> for details. </dd> - <dt id="CodePage">CodePage</dt> - <dd> - Codepage setting. - Refer to <a href="../usage/unicode.html">Unicode</a> for details. - </dd> </dl> </body> </html> Modified: branches/cmake/doc/en/html/menu/setup-terminal_ko.html =================================================================== --- branches/cmake/doc/en/html/menu/setup-terminal_ko.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/menu/setup-terminal_ko.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -125,11 +125,6 @@ Refer to <a href="../usage/unicode.html">Unicode</a> for details. </dd> - <dt id="CodePage">CodePage</dt> - <dd> - Codepage setting. - Refer to <a href="../usage/unicode.html">Unicode</a> for details. - </dd> </dl> </body> </html> Modified: branches/cmake/doc/en/html/menu/setup-terminal_utf8.html =================================================================== --- branches/cmake/doc/en/html/menu/setup-terminal_utf8.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/menu/setup-terminal_utf8.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -125,11 +125,6 @@ Refer to <a href="../usage/unicode.html">Unicode</a> for details. </dd> - <dt id="CodePage">CodePage</dt> - <dd> - Codepage setting. - Refer to <a href="../usage/unicode.html">Unicode</a> for details. - </dd> </dl> </body> </html> Modified: branches/cmake/doc/en/html/reference/develop.txt =================================================================== --- branches/cmake/doc/en/html/reference/develop.txt 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/reference/develop.txt 2019-03-10 14:32:02 UTC (rev 7468) @@ -44,8 +44,8 @@ * Libraries -- Oniguruma 6.9.0 (https://github.com/kkos/oniguruma) -- OpenSSL 1.0.2q (http://www.openssl.org/) +- Oniguruma 6.9.1 (https://github.com/kkos/oniguruma) +- OpenSSL 1.0.2r (http://www.openssl.org/) - zlib 1.2.11 (http://www.zlib.net/) - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/) - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html) Modified: branches/cmake/doc/en/html/setup/teraterm-ini.html =================================================================== --- branches/cmake/doc/en/html/setup/teraterm-ini.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/setup/teraterm-ini.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -112,8 +112,8 @@ <tr> <td id="AlphaBlend"><a href="../menu/setup-additional.html#AlphaBlend">AlphaBlend</a></td> <td style="width:250px;">255</td> - <td style="width:250px;"><-</td> - <td></td> + <td style="width:250px;">*</td> + <td>* the value of <a href="#AlphaBlend">AlphaBlend</a> setting is used.</td> </tr> <tr> <td id="AlternateScreenBuffer"><a href="teraterm-term.html#AltScr">AlternateScreenBuffer</a></td> @@ -284,12 +284,6 @@ <td></td> </tr> <tr> - <td id="CodePage">CodePage</td> - <td style="width:250px;">*</td> - <td style="width:250px;">932</td> - <td>* by the installer</td> - </tr> - <tr> <td id="ComPort"><a href="../menu/setup-serialport.html#ComPort">ComPort</a></td> <td style="width:250px;">1</td> <td style="width:250px;"><-</td> Modified: branches/cmake/doc/en/html/usage/mouse.html =================================================================== --- branches/cmake/doc/en/html/usage/mouse.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/html/usage/mouse.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -16,9 +16,13 @@ </h2> <dl> -<dt>Wheel mouse</dt> -<dd>This package supports wheel mouse button. Also, a user can send cursor key sequences as the mouse wheel rotating when the application cursor mode is enabled by starting vi or less command.</dd> +<dt>Mouse wheel</dt> +<dd>This package supports mouse wheel button. Also, a user can send cursor key sequences as the mouse wheel rotating when the application cursor mode is enabled by starting vi or less command.</dd> +<dt>Mouse wheel on title bar</dt> +<dd>The value of transparency can be temporarily changed by moving the mouse wheel on the title bar (NOTE: This value can not be recorded).<br /> + When active status of the window is changed, <a href="../menu/setup-additional.html#AlphaBlendActive">the value of transparency</a> switches to set value.</dd> + <dt>Dragging with the left button</dt> <dd>Selects text, and copies it to the clipboard.</dd> Modified: branches/cmake/doc/en/teraterm.hhc =================================================================== --- branches/cmake/doc/en/teraterm.hhc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/teraterm.hhc 2019-03-10 14:32:02 UTC (rev 7468) @@ -620,6 +620,11 @@ </OBJECT> <UL> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="TTL file"> + <param name="Local" value="html\macro\syntax\file.html"> + <param name="ImageNumber" value="11"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Types"> <param name="Local" value="html\macro\syntax\types.html"> <param name="ImageNumber" value="11"> Modified: branches/cmake/doc/en/teraterm.hhp =================================================================== --- branches/cmake/doc/en/teraterm.hhp 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/en/teraterm.hhp 2019-03-10 14:32:02 UTC (rev 7468) @@ -182,6 +182,7 @@ HlpMacroCommandline=html\macro\commandline.html HlpMacroAssoc=html\macro\howtoassoc.html HlpMacroSyntax=html\macro\syntax\index.html +HlpMacroSyntaxFile=html\macro\syntax\file.html HlpMacroSyntaxType=html\macro\syntax\types.html HlpMacroSyntaxFormat=html\macro\syntax\formats.html HlpMacroSyntaxIdent=html\macro\syntax\identifiers.html Modified: branches/cmake/doc/ja/html/about/copyright.html =================================================================== --- branches/cmake/doc/ja/html/about/copyright.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/about/copyright.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -41,7 +41,7 @@ <h3 id="license_teraterm">\x83\x89\x83C\x83Z\x83\x93\x83X</h3> <pre> Copyright (C) 1994-1998 T. Teranishi -(C) 2004-2018 TeraTerm Project +(C) 2004-2019 TeraTerm Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -121,7 +121,7 @@ <h3 id="license_ttssh">\x83\x89\x83C\x83Z\x83\x93\x83X</h3> <pre> (C)1998-2001 Robert O'Callahan -(C) 2004-2018 TeraTerm Project +(C) 2004-2019 TeraTerm Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, Modified: branches/cmake/doc/ja/html/about/history.html =================================================================== --- branches/cmake/doc/ja/html/about/history.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/about/history.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -31,23 +31,40 @@ <h2 id="teraterm">Tera Term</h2> -<h3 id="teraterm_4.102">2019.xx.xx (Ver 4.102)</h3> +<h3 id="teraterm_4.103">2019.xx.xx (Ver 4.103)</h3> <ul class="history"> - <!-- li>\x95ύX + <li>\x82\xBB\x82̑\xBC <ul> - <li></li> + <li><a href="#ttssh_2.89">TTSSH(2.89)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li> </ul> - </li --> + </li> +</ul> - <!-- li>\x83o\x83O\x8FC\x90\xB3 +<h3 id="teraterm_4.102">2019.02.28 (Ver 4.102)</h3> +<ul class="history"> + <li>\x95ύX <ul> - <li></li> + <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߐݒ\xE8\x82\xF0\x81A\x83A\x83N\x83e\x83B\x83u/\x94\xF1\x83A\x83N\x83e\x83B\x83u\x8E\x9E\x82̊e\x81X\x82ŕʂ̒l\x82\xF0\x90ݒ\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> + <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82̃^\x83C\x83g\x83\x8B\x83o\x81[\x8F\xE3\x82Ń}\x83E\x83X\x83z\x83C\x81[\x83\x8B\x82𑀍삷\x82邱\x82ƂŁA\x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߒl\x82\xF0\x88ꎞ\x93I\x82ɕύX\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> + <li>VT \x83E\x83B\x83\x93\x83h\x83E\x82̓\xE0\x95\x94\x8F\x88\x97\x9D\x82\xF0\x8D\x82\x91\xAC\x89\xBB\x82\xB5\x82\xBD\x81B</li> + <li>UTF-8 \x82\xC5 4 \x83o\x83C\x83g\x82ɂȂ镶\x8E\x9A\x82\xF0\x81i\x95\\x8E\xA6\x82ł\xAB\x82Ȃ\xA2\x82\xAA\x81j\x90\xB3\x82\xB5\x82\xAD\x83f\x83R\x81[\x83h\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x81A\x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82\xB7\x82\xE9\x94͈͂\xAA\x8Dŏ\xAC\x8C\xC0\x82ɂȂ\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> + <li>"<a href="../menu/setup-terminal.html">Terminal setup[\x92[\x96\x96\x82̐ݒ\xE8]</a>" \x83_\x83C\x83A\x83\x8D\x83O\x82̌\xBE\x8C\xEA\x83R\x81[\x83h(CodePage)\x90ݒ\xE8\x82\xF0\x8D폜\x82\xB5\x82\xBD\x81B(<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>)</li> + <li>\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82̃G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x82Ƃ\xB5\x82\xC4 UTF-8, UTF-16(with BOM)\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81B</li> + <li><a href="../macro/command/getfileattr.html">getfileattr</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x91\xBC\x82̃R\x83}\x83\x93\x83h\x82Ɠ\xAF\x97l\x82ɃJ\x83\x8C\x83\x93\x83g\x83t\x83H\x83\x8B\x83_\x82\xF0\x8A\x82Ƃ\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> + <li><a href="../macro/command/fileopen.html">fileopen</a> \x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ŁA\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97p\x83\x82\x81[\x83h\x8E\x9E\x82Ƀt\x83@\x83C\x83\x8B\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82̓G\x83\x89\x81[\x82ƂȂ\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li> </ul> - </li --> + </li> + <li>\x83o\x83O\x8FC\x90\xB3 + <ul> + <li>\x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߐݒ肪\x97L\x8C\xF8\x82\xBE\x82\xC6 Windows 10 \x82ŗ\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81B</li> + </ul> + </li> + <li>\x82\xBB\x82̑\xBC <ul> <li><a href="#ttssh_2.88">TTSSH(2.88)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li> + <li>Oniguruma 6.9.1\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li> </ul> </li> </ul> @@ -3090,13 +3107,35 @@ <h2 id="ttssh">TTSSH</h2> -<h3 id="ttssh_2.88">2019.xx.xx (Ver 2.88)</h3> +<h3 id="ttssh_2.89">2019.xx.xx (Ver 2.89)</h3> <ul class="history"> + <li>\x83o\x83O\x8FC\x90\xB3 + <ul> + <li>\x90ݒ\xE8\x82̕ۑ\xB6\x8E\x9E\x81ACipherOrder, MacOrder \x90ݒ\xE8\x82ɃS\x83~\x82\xAA\x95t\x89\xC1\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> + </ul> + </li> +</ul> + +<h3 id="ttssh_2.88">2019.02.28 (Ver 2.88)</h3> +<ul class="history"> <li>\x95ύX <ul> <li>\x90ڑ\xB1\x8AJ\x8En\x8E\x9E\x82ɃV\x83F\x83\x8B\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8AJ\x8En\x82\xB5\x82Ȃ\xA2\x88ׂ\xCC <a href="../commandline/ttssh.html#ssh-N">/ssh-N</a> \x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li> + <li><a href="../menu/setup-sshkeygenerator.html">SSH\x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC <a href="../menu/setup-sshkeygenerator.html#kdf">bcrypt KDF \x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X</a>\x82̃f\x83t\x83H\x83\x8B\x83g\x82\xF0 on \x82ɕύX\x82\xB5\x82\xBD\x81B</li> </ul> </li> + + <li>\x83o\x83O\x8FC\x90\xB3 + <ul> + <li>\x8B\x8C\x83p\x83X\x83\x8F\x81[\x83h\x82\xAA\x8B\x9A\x97\xF1\x82̎\x9E\x81ASSH \x83p\x83X\x83\x8F\x81[\x83h\x95ύX\x83_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82\xAA\x95ύX\x8Fo\x97\x88\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> + </ul> + </li> + + <li>\x82\xBB\x82̑\xBC + <ul> + <li>OpenSSL 1.0.2r\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li> + </ul> + </li> </ul> <h3 id="ttssh_2.87">2018.11.30 (Ver 2.87)</h3> Modified: branches/cmake/doc/ja/html/index.html =================================================================== --- branches/cmake/doc/ja/html/index.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/index.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -13,7 +13,7 @@ <p class="center"> Copyright (C) 1994-1998 T. Teranishi<BR> -(C) 2004-2018 TeraTerm Project<BR> +(C) 2004-2019 TeraTerm Project<BR> All Rights Reserved.<BR> </p> Added: branches/cmake/doc/ja/html/macro/syntax/file.html =================================================================== --- branches/cmake/doc/ja/html/macro/syntax/file.html (rev 0) +++ branches/cmake/doc/ja/html/macro/syntax/file.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -0,0 +1,82 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<HTML> +<HEAD> +<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS"> +<TITLE>TTL\x83t\x83@\x83C\x83\x8B</TITLE> +<META http-equiv="Content-Style-Type" content="text/css"> +<link rel="stylesheet" href="../../style.css" type="text/css"> +</HEAD> +<BODY> + +<h1>\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O</h1> + +<p> +Tera Term 4.102\x82\xE6\x82\xE8\x81AUnicode (UTF-8, UTF-16BE, UTF-16LE) \x82ɑΉ\x9E\x82\xB5\x82܂\xB5\x82\xBD\x81B +</p> + +<p> +\x8F]\x97\x88\x82\xCDANSI CodePage\x82Ƃ\xB5\x82ď\x88\x97\x9D\x82\xB5\x82Ă\xA2\x82܂\xB5\x82\xBD\x81B +</p> + +<h2>\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O</h2> + +<table> + <tr> + <th>encoding</th> + <th>support</th> + </tr> + <tr> + <td>\x8F]\x97\x88\x82ǂ\xA8\x82\xE8 (ANSI CodePage)</td> + <td>Support</td> + </tr> + <tr> + <td>UTF-8 (with BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-8 (without BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-16BE (without BOM)</td> + <td>Not support<td> + </tr> + <tr> + <td>UTF-16LE (without BOM)</td> + <td>Not support<td> + </tr> + <tr> + <td>UTF-16 (with BE BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-16 (with LE BOM)</td> + <td>Support<td> + </tr> + <tr> + <td>UTF-16 (without BOM = UTF-16BE)</td> + <td>Not support<td> + </tr> +</table> + +<h2>\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O\x82̔\xBB\x92\xE8</h2> + +<p> +Tera Term\x82͎\x9F\x82̂悤\x82ɔ\xBB\x92肵\x82܂\xB7\x81B +</p> + +<dl> + <dt>BOM\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ</dt> + <dd>BOM\x82̎\xED\x95ʂ\xA9\x82\xE7UTF-8, UTF-16BE, UTF-16LE\x82肵\x82ēǂݍ\x9E\x82\xDE</dd> + + <dt>BOM\x82\xAA\x82Ȃ\xA2\x8Fꍇ</dt> + <dd> + <ul> + <li>UTF-8\x82Ƃ\xB5\x82ēǂݍ\x9E\x82\xDE</li> + <li>UTF-8\x82Ƃ\xB5\x82ăf\x83R\x81[\x83h\x82ł\xAB\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ\x82\xCDCP_ACP(4.102\x88ȑO\x82Ɠ\xAF\x82\xB6)\x82Ƃ\xB5\x82ēǂݍ\x9E\x82\xDE</li> + </ul> + </dd> +</dl> +</body> +</html> Modified: branches/cmake/doc/ja/html/macro/syntax/index.html =================================================================== --- branches/cmake/doc/ja/html/macro/syntax/index.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/macro/syntax/index.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -16,6 +16,7 @@ </p> <UL> + <LI><A HREF="file.html">TTL\x83t\x83@\x83C\x83\x8B</A></LI> <LI><A HREF="types.html">\x83f\x81[\x83^\x8C^</A></LI> <LI><A HREF="formats.html">\x92萔\x82̌`\x8E\xAE</A></LI> <LI><A HREF="identifiers.html">\x96\xBC\x91O\x82̌`\x8E\xAE</A></LI> Modified: branches/cmake/doc/ja/html/menu/setup-additional.html =================================================================== --- branches/cmake/doc/ja/html/menu/setup-additional.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/menu/setup-additional.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -255,10 +255,11 @@ <h2 id="TabVisual">"Visual" \x83^\x83u</h2> <dl> - <dt id="AlphaBlend">AlphaBlend</dt> + <dt id="AlphaBlendActive">Window Transparency / Active</dt> + <dt id="AlphaBlend">Window Transparency / Inactive</dt> <dd> - \x93\xA7\x96\xBE\x93x\x82\xCD0\x81`255\x82͈̔͂Ŏw\x92肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x81A - \x92l\x82\xF0\x8F\xAC\x82\xB3\x82\xAD\x82\xB7\x82\xE9\x82قǓ\xA7\x96\xBE\x93x\x82͋\xAD\x82\xAD\x82Ȃ\xE8\x82܂\xB7\x81B + VT \x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x83A\x83N\x83e\x83B\x83u(\x83t\x83H\x81[\x83J\x83X\x82\xAA\x82\xA0\x82\xE9)\x8E\x9E\x81A\x82\xA8\x82\xE6\x82є\xF1\x83A\x83N\x83e\x83B\x83u(\x83t\x83H\x81[\x83J\x83X\x82\xAA\x82Ȃ\xA2)\x8E\x9E\x82̓\xA7\x96\xBE\x93x\x82\xF0\x90ݒ\xE8\x82ł\xAB\x82܂\xB7\x81B + \x92l\x82\xCD0\x81`255\x82͈̔͂Ŏw\x92肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x81A\x92l\x82\xF0\x8F\xAC\x82\xB3\x82\xAD\x82\xB7\x82\xE9\x82قǓ\xA7\x96\xBE\x93x\x82͋\xAD\x82\xAD\x82Ȃ\xE8\x82܂\xB7\x81B </dd> <dt>Eterm lookfeel</dt> Modified: branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html =================================================================== --- branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/menu/setup-sshkeygenerator.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -18,56 +18,56 @@ </p> <dl> - <dt>Key type</dt> + <dt id="type">Key type</dt> <dd>\x90\xB6\x90\xAC\x82\xB7\x82錮\x82̎\xED\x97ނ\xF0\x8Ew\x92肵\x82܂\xB7\x81B <dl> - <dt>RSA1</dt> + <dt id="rsa1">RSA1</dt> <dd>SSH1\x97p RSA\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B</dd> - <dt>RSA</dt> + <dt id="rsa">RSA</dt> <dd>SSH2\x97p RSA\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B</dd> - <dt>DSA</dt> + <dt id="dsa">DSA</dt> <dd>SSH2\x97p DSA\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B<br /> \x8C\xAE\x92\xB7\x82\xAA1024\x83r\x83b\x83g\x88ȊO\x82\xCCDSA\x8C\xAE\x82́ASSH\x83v\x83\x8D\x83g\x83R\x83\x8B\x82Ƃ\xB5\x82ĔK\x82̌\xAE\x82ł\xA0\x82\xE8\x81A\x83T\x81[\x83o\x82ɂ\xE6\x82\xC1\x82Ă͎g\x82\xA6\x82Ȃ\xA2\x89\\x90\xAB\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x82̂ō쐬\x82ł\xAB\x82܂\xB9\x82\xF1\x81B<br /> DSA\x8C\xAE\x82̌\xAE\x92\xB7\x82\xF01024\x83r\x83b\x83g\x82\xE6\x82\xE8\x91傫\x82\xAD\x82\xB5\x82Ă\xE0\x81A\x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x82\xF0\x8D\x82\x82߂鎖\x82ɂ͂Ȃ\xE8\x82܂\xB9\x82\xF1\x81B \x82\xE6\x82苭\x93x\x82̍\x82\x82\xA2\x8C\xAE\x82\xF0\x8Eg\x82\xA2\x82\xBD\x82\xA2\x8Fꍇ\x82́ARSA\x8C\xAE\x82\xE2ECDSA\x8C\xAE\x82\xF0\x8Eg\x97p\x82\xB5\x82ĉ\xBA\x82\xB3\x82\xA2\x81B</dd> - <dt>ECDSA-256</dt> + <dt id="ecdsa256">ECDSA-256</dt> <dd>SSH2\x97p ECDSA(256bit)\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B</dd> - <dt>ECDSA-384</dt> + <dt id="ecdsa384">ECDSA-384</dt> <dd>SSH2\x97p ECDSA(384bit)\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B</dd> - <dt>ECDSA-521</dt> + <dt id="ecdsa521">ECDSA-521</dt> <dd>SSH2\x97p ECDSA(521bit)\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B</dd> - <dt>ED25519</dt> + <dt id="ed25519">ED25519</dt> <dd>SSH2\x97p ED25519\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B</dd> </dl> </dd> - <dt>Key Bits</dt> + <dt id="bits">Key Bits</dt> <dd>\x90\xB6\x90\xAC\x82\xB7\x82錮\x82̌\xAE\x92\xB7\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B</dd> - <dt>bcrypt KDF</dt> + <dt id="kdf">bcrypt KDF</dt> <dd>\x94閧\x8C\xAE\x83t\x83H\x81[\x83}\x83b\x83g\x82Ƃ\xB5\x82\xC4 bcrypt KDF \x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B</dd> - <dt>Generate</dt> + <dt id="generate">Generate</dt> <dd>\x8C\xAE\x82\xAC\x82\xB5\x82܂\xB7\x81B</dd> - <dt>Key passphrase</dt> + <dt id="passphrase">Key passphrase</dt> <dd>\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x94閧\x8C\xAE\x82ɕt\x82\xAF\x82\xE9\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B</dd> - <dt>Confirm passphrase</dt> + <dt id="confirm_pass">Confirm passphrase</dt> <dd> \x94閧\x8C\xAE\x82ɕt\x82\xAF\x82\xE9\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82̊m\x94F\x82\xF0\x82\xB5\x82܂\xB7\x81B Key passphrase\x82Ɠ\xAF\x82\xB6\x82\xE0\x82̂\xF0\x93\xFC\x97͂\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B </dd> - <dt>Save public key</dt> + <dt id="save_pulic">Save public key</dt> <dd>\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x8C\xF6\x8AJ\x8C\xAE\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7\x81B</dd> - <dt>Save private key</dt> + <dt id="save_private">Save private key</dt> <dd>\x90\xB6\x90\xAC\x82\xB5\x82\xBD\x94閧\x8C\xAE\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7\x81B<br /> \x94閧\x8C\xAE\x82\xCD AES-128 \x82ňÍ\x86\x89\xBB\x82\xB3\x82\xEA\x82܂\xB7\x81B(Tera Term 4.76(TTSSH 2.63) \x82܂ł\xCD 3DES \x82ňÍ\x86\x89\xBB\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD)</dd> <dl> Modified: branches/cmake/doc/ja/html/menu/setup-terminal.html =================================================================== --- branches/cmake/doc/ja/html/menu/setup-terminal.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/menu/setup-terminal.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -160,11 +160,6 @@ \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB </dd> - <dt id="CodePage">CodePage</dt> - <dd> - \x83R\x81[\x83h\x83y\x81[\x83W\x81B - \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB - </dd> </dl> </body> </html> Modified: branches/cmake/doc/ja/html/menu/setup-terminal_ko.html =================================================================== --- branches/cmake/doc/ja/html/menu/setup-terminal_ko.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/menu/setup-terminal_ko.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -126,11 +126,6 @@ \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB </dd> - <dt id="CodePage">CodePage</dt> - <dd> - \x83R\x81[\x83h\x83y\x81[\x83W\x81B - \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB - </dd> </dl> </body> </html> Modified: branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html =================================================================== --- branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/menu/setup-terminal_utf8.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -126,11 +126,6 @@ \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB </dd> - <dt id="CodePage">CodePage</dt> - <dd> - \x83R\x81[\x83h\x83y\x81[\x83W\x81B - \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB - </dd> </dl> </body> </html> Modified: branches/cmake/doc/ja/html/reference/develop.txt =================================================================== --- branches/cmake/doc/ja/html/reference/develop.txt 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/reference/develop.txt 2019-03-10 14:32:02 UTC (rev 7468) @@ -48,8 +48,8 @@ \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A -- Oniguruma 6.9.0 (https://github.com/kkos/oniguruma) -- OpenSSL 1.0.2q (http://www.openssl.org/) +- Oniguruma 6.9.1 (https://github.com/kkos/oniguruma) +- OpenSSL 1.0.2r (http://www.openssl.org/) - zlib 1.2.11 (http://www.zlib.net/) - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/) - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html) Modified: branches/cmake/doc/ja/html/setup/teraterm-ini.html =================================================================== --- branches/cmake/doc/ja/html/setup/teraterm-ini.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/setup/teraterm-ini.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -110,6 +110,12 @@ <td></td> </tr> <tr> + <td id="AlphaBlendActive"><a href="../menu/setup-additional.html#AlphaBlendActive">AlphaBlendActive</a></td> + <td style="width:250px;">255</td> + <td style="width:250px;">\x81\xA6</td> + <td>\x81\xA6<a href="#AlphaBlend">AlphaBlend</a>\x82̐ݒ\xE8\x92l\x82\xAA\x8Eg\x82\xED\x82\xEA\x82\xE9</td> + </tr> + <tr> <td id="AlphaBlend"><a href="../menu/setup-additional.html#AlphaBlend">AlphaBlend</a></td> <td style="width:250px;">255</td> <td style="width:250px;"><-</td> @@ -284,12 +290,6 @@ <td></td> </tr> <tr> - <td id="CodePage">CodePage</td> - <td style="width:250px;">\x81\xA6</td> - <td style="width:250px;">932</td> - <td>\x81\xA6\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82ɂ\xE6\x82\xE9</td> - </tr> - <tr> <td id="ComPort"><a href="../menu/setup-serialport.html#ComPort">ComPort</a></td> <td style="width:250px;">1</td> <td style="width:250px;"><-</td> Modified: branches/cmake/doc/ja/html/usage/mouse.html =================================================================== --- branches/cmake/doc/ja/html/usage/mouse.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/usage/mouse.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -16,9 +16,13 @@ </h2> <dl> -<dt>\x83z\x83C\x81[\x83\x8B\x83}\x83E\x83X</dt> -<dd>\x83I\x83\x8A\x83W\x83i\x83\x8B\x82\xCCTera Term\x82ł̓z\x83C\x81[\x83\x8B\x83}\x83E\x83X\x82\xAA\x8C\xF8\x82\xAB\x82܂\xB9\x82A\x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82ł̓z\x83C\x81[\x83\x8B\x83{\x83^\x83\x93\x82\xF0\x8Eg\x82\xC1\x82ăX\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xF0\x8F㉺\x82\xB3\x82\xB9\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B\x82܂\xBD\x81A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83J\x81[\x83\\x83\x8B\x83\x82\x81[\x83h\x8E\x9E(vi\x82\xE2less\x93\x99\x82\xF0\x8Eg\x97p\x8E\x9E)\x82ɂ́A\x83z\x83C\x81[\x83\x8B\x82̉\xF1\x93]\x82\xF0\x8F㉺\x82̃J\x81[\x83\\x83\x8B\x83L\x81[\x82Ƃ\xB5\x82đ\x97\x90M\x82\xB7\x82鎖\x82\xAA\x82ł\xAB\x82܂\xB7\x81B</dd> +<dt>\x83}\x83E\x83X\x83z\x83C\x81[\x83\x8B</dt> +<dd>\x83z\x83C\x81[\x83\x8B\x82̉\xF1\x93]\x82ŃX\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xF0\x8F㉺\x82\xB3\x82\xB9\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B\x82܂\xBD\x81A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83J\x81[\x83\\x83\x8B\x83\x82\x81[\x83h\x8E\x9E(vi\x82\xE2less\x93\x99\x82\xF0\x8Eg\x97p\x8E\x9E)\x82ɂ́A\x83z\x83C\x81[\x83\x8B\x82̉\xF1\x93]\x82\xF0\x8F㉺\x82̃J\x81[\x83\\x83\x8B\x83L\x81[\x82Ƃ\xB5\x82đ\x97\x90M\x82\xB7\x82鎖\x82\xAA\x82ł\xAB\x82܂\xB7\x81B</dd> +<dt>\x83^\x83C\x83g\x83\x8B\x83o\x81[\x8F\xE3\x82Ń}\x83E\x83X\x83z\x83C\x81[\x83\x8B</dt> +<dd>\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x83C\x83g\x83\x8B\x83o\x81[\x8F\xE3\x82Ńz\x83C\x81[\x83\x8B\x82\xF0\x89\xF1\x93]\x82\xB3\x82\xB9\x82\xE9\x82ƁA\x83E\x83B\x83\x93\x83h\x83E\x82̓\xA7\x89ߒl\x82\xF0\x88ꎞ\x93I\x82ɕύX\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81i\x82\xB1\x82̒l\x82͕ۑ\xB6\x82ł\xAB\x82܂\xB9\x82\xF1\x81j\x81B<br /> + \x83E\x83B\x83\x93\x83h\x83E\x82̃A\x83N\x83e\x83B\x83u\x8F\xF3\x91Ԃ\xAA\x95ύX\x82\xB3\x82\xEA\x82\xE9\x82ƁA<a href="../menu/setup-additional.html#AlphaBlendActive">\x90ݒ\xE8</a>\x82\xB3\x82ꂽ\x93\xA7\x89ߒl\x82ɖ߂\xE8\x82܂\xB7\x81B</dd> + <dt>\x8D\xB6\x83{\x83^\x83\x93\x82Ńh\x83\x89\x83b\x83O</dt> <dd>\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x91I\x91\xF0\x82\xB5\x81A\x82\xBB\x82\xEA\x82\xF0\x83N\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82ɃR\x83s\x81[\x82\xB7\x82\xE9\x81B</dd> Modified: branches/cmake/doc/ja/html/usage/unicode.html =================================================================== --- branches/cmake/doc/ja/html/usage/unicode.html 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/html/usage/unicode.html 2019-03-10 14:32:02 UTC (rev 7468) @@ -97,7 +97,7 @@ \x83\x8D\x83P\x81[\x83\x8B\x82\xA8\x82\xE6\x82уt\x83H\x83\x93\x83g\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x90ݒ肳\x82\xEA\x82Ă\xA2\x82\xEA\x82A\x89p\x8C\xEA\x94\xC5Windows\x82œ\xFA\x96{\x8C\xEA\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x82\xE8\x81A \x93\xFA\x96{\x8C\xEA\x94\xC5Windows\x82Ŋ؍\x91\x8C\xEA\x82\xF0\x95\\x8E\xA6\x82\xB5\x82\xBD\x82肷\x82鎖\x82\xE0\x89\\x82ł\xB7\x81B<br> -\x82\xBD\x82\xBE\x82\xB5\x91\xBD\x8D\x91\x8C\xEA\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x88\xEA\x82\xCCTera Term\x83E\x83B\x83\x93\x83h\x83E\x82œ\xFA\x96{\x8C\xEA\x82Ɗ؍\x91\x8C\xEA\x82\x9E\x82\xC9 +\x82\xBD\x82\xBE\x82\xB5\x91\xBD\x8C\xBE\x8C\xEA\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x88\xEA\x82\xCCTera Term\x83E\x83B\x83\x93\x83h\x83E\x82œ\xFA\x96{\x8C\xEA\x82Ɗ؍\x91\x8C\xEA\x82\x9E\x82\xC9 \x95\\x8E\xA6\x82\xB5\x82\xBD\x82肷\x82鎖\x82͏o\x97\x88\x82܂\xB9\x82\xF1\x81B </p> Modified: branches/cmake/doc/ja/teraterm.hhc =================================================================== --- branches/cmake/doc/ja/teraterm.hhc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/teraterm.hhc 2019-03-10 14:32:02 UTC (rev 7468) @@ -629,6 +629,11 @@ </OBJECT> <UL> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="TTL\x83t\x83@\x83C\x83\x8B"> + <param name="Local" value="html\macro\syntax\file.html"> + <param name="ImageNumber" value="11"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="\x83f\x81[\x83^\x8C^"> <param name="Local" value="html\macro\syntax\types.html"> <param name="ImageNumber" value="11"> Modified: branches/cmake/doc/ja/teraterm.hhp =================================================================== --- branches/cmake/doc/ja/teraterm.hhp 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/doc/ja/teraterm.hhp 2019-03-10 14:32:02 UTC (rev 7468) @@ -192,6 +192,7 @@ HlpMacroCommandline=html\macro\commandline.html HlpMacroAssoc=html\macro\howtoassoc.html HlpMacroSyntax=html\macro\syntax\index.html +HlpMacroSyntaxFile=html\macro\syntax\file.html HlpMacroSyntaxType=html\macro\syntax\types.html HlpMacroSyntaxFormat=html\macro\syntax\formats.html HlpMacroSyntaxIdent=html\macro\syntax\identifiers.html Modified: branches/cmake/installer/release/TERATERM.INI =================================================================== --- branches/cmake/installer/release/TERATERM.INI 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/TERATERM.INI 2019-03-10 14:32:02 UTC (rev 7468) @@ -109,6 +109,7 @@ ; Translucent window (0 - 255: transparency value) AlphaBlend=255 +AlphaBlendActive=255 ; Cygwin install path CygwinDirectory= Modified: branches/cmake/installer/release/lang/English.lng =================================================================== --- branches/cmake/installer/release/lang/English.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/English.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-27) +; Updated by TeraTerm Project (2019-02-28) [Tera Term] ;DLG_SYSTEM_FONT=System,14,0 @@ -224,7 +224,9 @@ DLG_TAB_COPYPASTE_PASTEDELAY=P&aste delay per line DLG_TAB_COPYPASTE_PASTEDELAY2=ms -DLG_TAB_VISUAL_ALPHA=&Alpha blend +DLG_TAB_VISUAL_ALPHA=Window Transparency +DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active +DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive DLG_TAB_VISUAL_ETERM=&Eterm lookfeel(*) DLG_TAB_VISUAL_BGIMG=Background &Image DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness @@ -394,7 +396,6 @@ DLG_TERM_KIN=Kanji-i&n: DLG_TERM_KOUT=Kanji-&out: DLG_TERM_LOCALE=lo&cale: -DLG_TERM_CODEPAGE=Code&Page: DLG_TERM_RUSSCHARSET=Character set DLG_TERM_RUSSHOST=H&ost: DLG_TERM_RUSSCLIENT=&Client: Modified: branches/cmake/installer/release/lang/French.lng =================================================================== --- branches/cmake/installer/release/lang/French.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/French.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-27) +; Updated by TeraTerm Project (2019-02-28) ; Last translated (French language) by Francois MOCQ (2010-07-21) [Tera Term] @@ -226,6 +226,8 @@ DLG_TAB_COPYPASTE_PASTEDELAY2=ms DLG_TAB_VISUAL_ALPHA=M\xE9lange alpha +DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active +DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive DLG_TAB_VISUAL_ETERM=Apparence Eterm(*) DLG_TAB_VISUAL_BGIMG=Background &Image DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness @@ -395,7 +397,6 @@ DLG_TERM_KIN=Kanji-i&n: DLG_TERM_KOUT=Kanji-&out: DLG_TERM_LOCALE=lo&cal: -DLG_TERM_CODEPAGE=Page de Code: DLG_TERM_RUSSCHARSET=Jeu de caract\xE8res DLG_TERM_RUSSHOST=H\xF4te: DLG_TERM_RUSSCLIENT=&Client: Modified: branches/cmake/installer/release/lang/German.lng =================================================================== --- branches/cmake/installer/release/lang/German.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/German.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-27) +; Updated by TeraTerm Project (2019-02-28) ; Last translated (German language) by Frederik Schwarzer (2010-05-17) [Tera Term] @@ -226,6 +226,8 @@ DLG_TAB_COPYPASTE_PASTEDELAY2=ms DLG_TAB_VISUAL_ALPHA=&Transparenz +DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active +DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive DLG_TAB_VISUAL_ETERM=&Eterm-Aussehen(*) DLG_TAB_VISUAL_BGIMG=Background &Image DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness @@ -395,7 +397,6 @@ DLG_TERM_KIN=Kanji-i&n: DLG_TERM_KOUT=Kanji-&out: DLG_TERM_LOCALE=locale: -DLG_TERM_CODEPAGE=CodePage: DLG_TERM_RUSSCHARSET=Zeichensatz DLG_TERM_RUSSHOST=H&ost: DLG_TERM_RUSSCLIENT=&Client: Modified: branches/cmake/installer/release/lang/Japanese.lng =================================================================== --- branches/cmake/installer/release/lang/Japanese.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/Japanese.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-28) +; Updated by TeraTerm Project (2019-02-28) [Tera Term] ;DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128 @@ -224,9 +224,9 @@ DLG_TAB_COPYPASTE_PASTEDELAY=\x93\\x82\xE8\x95t\x82\xAF\x82̍s\x8AԒx\x89\x84(&A) DLG_TAB_COPYPASTE_PASTEDELAY2=\x83~\x83\x8A\x95b -DLG_TAB_VISUAL_ALPHA=\x93\xA7\x89߃E\x83B\x83\x93\x83h\x83E -DLG_TAB_VISUAL_ALPHA_ACTIVE_LABEL=\x83A\x83N\x83e\x83B\x83u(&A) -DLG_TAB_VISUAL_ALPHA_INACTIVE_LABEL=\x94\xF1\x83A\x83N\x83e\x83B\x83u(&C) +DLG_TAB_VISUAL_ALPHA=\x94\xBC\x93\xA7\x96\xBE\x93x +DLG_TAB_VISUAL_ALPHA_ACTIVE=\x83A\x83N\x83e\x83C\x83u\x8E\x9E(&A) +DLG_TAB_VISUAL_ALPHA_INACTIVE=\x94\xF1\x83A\x83N\x83e\x83B\x83u\x8E\x9E(&C) DLG_TAB_VISUAL_ETERM=&Eterm\x95\x97\x82ɂ\xB7\x82\xE9(*) DLG_TAB_VISUAL_BGIMG=\x94w\x8Ci\x89摜(&I) DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=\x89摜\x82̖\xBE\x82邳(&T) @@ -396,7 +396,6 @@ DLG_TERM_KIN=\x8A\xBF\x8E\x9A\x83C\x83\x93(&N): DLG_TERM_KOUT=\x8A\xBF\x8E\x9A\x83A\x83E\x83g(&O): DLG_TERM_LOCALE=\x83\x8D\x83P\x81[\x83\x8B(&C): -DLG_TERM_CODEPAGE=\x8C\xBE\x8C\xEA\x83R\x81[\x83h(&P): DLG_TERM_RUSSCHARSET=\x95\xB6\x8E\x9A\x83Z\x83b\x83g DLG_TERM_RUSSHOST=\x83z\x83X\x83g(&O): DLG_TERM_RUSSCLIENT=\x83N\x83\x89\x83C\x83A\x83\x93\x83g(&C): Modified: branches/cmake/installer/release/lang/Korean.lng =================================================================== --- branches/cmake/installer/release/lang/Korean.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/Korean.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-27) +; Updated by TeraTerm Project (2019-02-28) ; Last translated (Korean language) by Daehong Kim (2013-07-25) [Tera Term] @@ -225,7 +225,9 @@ DLG_TAB_COPYPASTE_PASTEDELAY=\xC1ٴ\xE7 \xBAٿ\xA9\xB3ֱ\xE2 \xC1\xF6\xBF\xAC(&A) DLG_TAB_COPYPASTE_PASTEDELAY2=ms -DLG_TAB_VISUAL_ALPHA=\xC5\xF5\xB8\x{DD75}(&A) +DLG_TAB_VISUAL_ALPHA=\xC5\xF5\xB8\x{DD75} +DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active +DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive DLG_TAB_VISUAL_ETERM=Eterm \xB4\xC0\xB3\xA6(*)(&E) DLG_TAB_VISUAL_BGIMG=\xB9\xE8\xB0\xE6\xB1\xB2(&I) DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness @@ -395,7 +397,6 @@ DLG_TERM_KIN=Kanji-i&n: DLG_TERM_KOUT=Kanji-&out: DLG_TERM_LOCALE=lo&cale: -DLG_TERM_CODEPAGE=\xC4ڵ\xE5 \xC6\xE4\xC0\xCC\xC1\xF6(&P): DLG_TERM_RUSSCHARSET=\xB9\xAE\xC0ڼ\xBCƮ DLG_TERM_RUSSHOST=ȣ\xBD\xBAƮ(&O): DLG_TERM_RUSSCLIENT=Ŭ\xB6\xF3\xC0̾\xF0Ʈ(&C): Modified: branches/cmake/installer/release/lang/Russian.lng =================================================================== --- branches/cmake/installer/release/lang/Russian.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/Russian.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-27) +; Updated by TeraTerm Project (2019-02-28) ; Last translated (Russian language) by Ryumik Sergey (2017-07-19) [Tera Term] @@ -226,6 +226,8 @@ DLG_TAB_COPYPASTE_PASTEDELAY2=\xEC\xF1 DLG_TAB_VISUAL_ALPHA=&\xCF\xF0\xEE\xE7\xF0\xE0\xF7\xED\xFB\xE9 +DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active +DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive DLG_TAB_VISUAL_ETERM=&\xD1\xF2\xE8\xEB\xFC Eterm (*) DLG_TAB_VISUAL_BGIMG=&\xD4\xEE\xED\xEE\xE2\xFB\xE9 \xF0\xE8\xF1\xF3\xED\xEE\xEA DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=&\xDF\xF0\xEA\xEE\xF1\xF2\xFC \xE8\xE7\xEE\xE1\xF0\xE0\xE6\xE5\xED\xE8\xFF @@ -395,7 +397,6 @@ DLG_TERM_KIN=Kanji-i&n: DLG_TERM_KOUT=Kanji-&out: DLG_TERM_LOCALE=&\xD0\xE0\xF1\xEF\xEE\xEB\xEE\xE6\xE5\xED\xE8\xE5: -DLG_TERM_CODEPAGE=&\xCA\xEE\xE4\xEE\xE2\xE0\xFF \xF1\xF2\xF0.: DLG_TERM_RUSSCHARSET=\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 DLG_TERM_RUSSHOST=&\xD5\xEE\xF1\xF2: DLG_TERM_RUSSCLIENT=&\xCA\xEB\xE8\xE5\xED\xF2: Modified: branches/cmake/installer/release/lang/Simplified Chinese.lng =================================================================== --- branches/cmake/installer/release/lang/Simplified Chinese.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/Simplified Chinese.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-27) +; Updated by TeraTerm Project (2019-02-28) ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11) [Tera Term] @@ -225,7 +225,9 @@ DLG_TAB_COPYPASTE_PASTEDELAY=ճ\xCC\xF9\xD0м\xE4\xD1\xD3ʱ(&A) DLG_TAB_COPYPASTE_PASTEDELAY2=\xBA\xC1\xC3\xEB -DLG_TAB_VISUAL_ALPHA=\xC3\xF7\xB6\xC8(&A) +DLG_TAB_VISUAL_ALPHA=\xC3\xF7\xB6\xC8 +DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active +DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive DLG_TAB_VISUAL_ETERM=&Eterm \xB7\xE7\xB8\xF1 (*) DLG_TAB_VISUAL_BGIMG=\xB1\xB3\xBE\xB0ͼ\xCF\xF1(&I) DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=ͼ\xCF\xF1\xC1\xC1\xB6\xC8(&T) @@ -395,7 +397,6 @@ DLG_TERM_KIN=\xBA\xBA\xD7\xD6\xCA\xE4\xC8\xEB(&N)\xA3\xBA DLG_TERM_KOUT=\xBA\xBA\xD7\xD6\xCA\xE4\xB3\xF6(&O)\xA3\xBA DLG_TERM_LOCALE=\xB5\xD8\xC7\xF8(&C)\xA3\xBA -DLG_TERM_CODEPAGE=\xB1\xE0\xC2\xEB(&P)\xA3\xBA DLG_TERM_RUSSCHARSET=\xD7ַ\xFB\xBC\xAF DLG_TERM_RUSSHOST=\xD6\xF7\xBB\xFA\xB6\xCB(&O)\xA3\xBA DLG_TERM_RUSSCLIENT=\xBFͻ\xA7\xB6\xCB(&C)\xA3\xBA Modified: branches/cmake/installer/release/lang/Traditional Chinese.lng =================================================================== --- branches/cmake/installer/release/lang/Traditional Chinese.lng 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/lang/Traditional Chinese.lng 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,4 @@ -; Updated by TeraTerm Project (2018-08-27) +; Updated by TeraTerm Project (2019-02-28) ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20) [Tera Term] @@ -225,7 +225,9 @@ DLG_TAB_COPYPASTE_PASTEDELAY=\xB6K\xA4W\xAEɹj\xA6橵\xAE\xC9(&A) DLG_TAB_COPYPASTE_PASTEDELAY2=\xB2@\xAC\xED -DLG_TAB_VISUAL_ALPHA=\xB3z\xA9\xFA\xAB\xD7(&A) +DLG_TAB_VISUAL_ALPHA=\xB3z\xA9\xFA\xAB\xD7 +DLG_TAB_VISUAL_ALPHA_ACTIVE=&Active +DLG_TAB_VISUAL_ALPHA_INACTIVE=Ina&ctive DLG_TAB_VISUAL_ETERM=&Eterm \xAD\xB7\xAE\xE6 (*) DLG_TAB_VISUAL_BGIMG=\xADI\xB4\xBA\xB9Ϲ\xB3(&I) DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness @@ -395,7 +397,6 @@ DLG_TERM_KIN=\xA4\xA4\xA4\xE5\xBF\xE9\xA4J(&N)\xA1G DLG_TERM_KOUT=\xA4\xA4\xA4\xE5\xBF\xE9\xA5X(&O)\xA1G DLG_TERM_LOCALE=\xA6a\xB0\xCF(&C)\xA1G -DLG_TERM_CODEPAGE=\xBDs\xBDX(&P)\xA1G DLG_TERM_RUSSCHARSET=\xA6r\xB2Ŷ\xB0 DLG_TERM_RUSSHOST=\xA5D\xBE\xF7\xBA\xDD(&O)\xA1G DLG_TERM_RUSSCLIENT=\xABȤ\xE1\xBA\xDD(&C)\xA1G Modified: branches/cmake/installer/release/license.txt =================================================================== --- branches/cmake/installer/release/license.txt 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/release/license.txt 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,7 +1,7 @@ License of Tera Term Copyright (C) 1994-1998 T. Teranishi -(C) 2004-2018 TeraTerm Project +(C) 2004-2019 TeraTerm Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -30,7 +30,7 @@ License of TTSSH (C)1998-2001 Robert O'Callahan -(C) 2004-2018 TeraTerm Project +(C) 2004-2019 TeraTerm Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, Modified: branches/cmake/installer/teraterm.iss =================================================================== --- branches/cmake/installer/teraterm.iss 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/installer/teraterm.iss 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,5 +1,5 @@ #define AppName "Tera Term" -#define AppVer "4.101" +#define AppVer "4.102" #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); [InnoIDE_PreCompile] @@ -27,7 +27,7 @@ ;Name: makearchive.bat; Parameters: release [Setup] -AppCopyright=(C) 2004-2018 TeraTerm Project +AppCopyright=(C) 2004-2019 TeraTerm Project AppPublisher=TeraTerm Project AppPublisherURL=https://ttssh2.osdn.jp/ AppSupportURL=https://ttssh2.osdn.jp/ Modified: branches/cmake/teraterm/common/helpid.h =================================================================== --- branches/cmake/teraterm/common/helpid.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/common/helpid.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -217,6 +217,7 @@ #define HlpMacroAssoc 90003 #define HlpMacroSyntax 91000 #define HlpMacroSyntaxType 91001 +#define HlpMacroSyntaxFile 91007 #define HlpMacroSyntaxFormat 91002 #define HlpMacroSyntaxIdent 91003 #define HlpMacroSyntaxVar 91004 Modified: branches/cmake/teraterm/common/tt-version.h =================================================================== --- branches/cmake/teraterm/common/tt-version.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/common/tt-version.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -29,7 +29,7 @@ #pragma once #define TT_VERSION_MAJOR 4 -#define TT_VERSION_MINOR 101 +#define TT_VERSION_MINOR 102 #define TT_TOSTR(x) TT_TOSTR2(x) #define TT_TOSTR2(x) #x #define TT_VERSION_STR(sep) TT_TOSTR(TT_VERSION_MAJOR) sep TT_TOSTR(TT_VERSION_MINOR) Modified: branches/cmake/teraterm/common/ttlib.h =================================================================== --- branches/cmake/teraterm/common/ttlib.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/common/ttlib.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1994-1999 T. Teranishi + * Copyright (C) 1994-1998 T. Teranishi * (C) 2006-2019 TeraTerm Project * All rights reserved. * Modified: branches/cmake/teraterm/keycode/keycode-version.rc =================================================================== --- branches/cmake/teraterm/keycode/keycode-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/keycode/keycode-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -26,7 +26,7 @@ VALUE "FileDescription", "Keycode Checker" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "KEYCODE" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "KEYCODE.EXE" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/teraterm/teraterm/tt-version.rc =================================================================== --- branches/cmake/teraterm/teraterm/tt-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/tt-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -26,7 +26,7 @@ VALUE "FileDescription", "Tera Term" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "TTERMPRO" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "TTERMPRO.EXE" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/teraterm/teraterm/ttermpro.rc =================================================================== --- branches/cmake/teraterm/teraterm/ttermpro.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/ttermpro.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -146,11 +146,11 @@ STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU FONT 8, "Tahoma", 0, 0, 0x0 BEGIN - LTEXT "Transparent Window",IDC_ALPHABLEND,5,5,78,8 - LTEXT "&Active",IDC_ALPHA_BLEND_ACTIVE_LABEL,14,19,50,8 - EDITTEXT IDC_ALPHA_BLEND_ACTIVE,69,18,19,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Ina&ctive",IDC_ALPHA_BLEND_INACTIVE_LABEL,14,33,49,8 - EDITTEXT IDC_ALPHA_BLEND_INACTIVE,69,32,19,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Window Transparency",IDC_ALPHABLEND,5,5,78,8 + LTEXT "&Active",IDC_ALPHA_BLEND_ACTIVE_LABEL,14,17,54,8 + EDITTEXT IDC_ALPHA_BLEND_ACTIVE,69,16,19,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Ina&ctive",IDC_ALPHA_BLEND_INACTIVE_LABEL,14,31,54,8 + EDITTEXT IDC_ALPHA_BLEND_INACTIVE,69,30,19,12,ES_AUTOHSCROLL | ES_NUMBER GROUPBOX "",IDC_STATIC,97,2,155,54 CONTROL "&Eterm lookfeel(*)",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,8,66,12 LTEXT "Image Brightness",IDC_BGIMG_BRIGHTNESS,166,19,56,8 Modified: branches/cmake/teraterm/teraterm/ttime.c =================================================================== --- branches/cmake/teraterm/teraterm/ttime.c 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/ttime.c 2019-03-10 14:32:02 UTC (rev 7468) @@ -251,6 +251,7 @@ HIMC hIMC; BOOL stat; + if (HIMEDLL==NULL) return FALSE; hIMC = (*PImmGetContext)(HVTWin); stat = (*PImmGetOpenStatus)(hIMC); (*PImmReleaseContext)(HVTWin, hIMC); @@ -262,6 +263,7 @@ void SetIMEOpenStatus(BOOL stat) { HIMC hIMC; + if (HIMEDLL==NULL) return; hIMC = (*PImmGetContext)(HVTWin); (*PImmSetOpenStatus)(hIMC, stat); (*PImmReleaseContext)(HVTWin, hIMC); Modified: branches/cmake/teraterm/teraterm/vtdisp.c =================================================================== --- branches/cmake/teraterm/teraterm/vtdisp.c 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/vtdisp.c 2019-03-10 14:32:02 UTC (rev 7468) @@ -113,6 +113,7 @@ // caret variables static int CaretStatus; static BOOL CaretEnabled = TRUE; +BOOL IMEstat; /* IME Status TRUE=IME ON */ // ---- device context and status flags static HDC VTDC = NULL; /* Device context for VT window */ @@ -2170,40 +2171,31 @@ void CaretOn() // Turn on the cursor { - int CaretX, CaretY, H; - HIMC hImc; - HBITMAP color; - int ime_on; - if (ts.KillFocusCursor == 0 && !Active) return; - /* IME\x82\xCCon/off\x8F\xF3\x91Ԃ\xF0\x8C\xA9\x82āA\x83J\x81[\x83\\x83\x8B\x82̐F\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B - * WM_INPUTLANGCHANGE, WM_IME_NOTIFY \x82ł̓J\x81[\x83\\x83\x8B\x82̍ĕ`\x89\xE6\x82̂ݍs\x82\xA4\x81B - * (2010.5.20 yutaka) - */ - hImc = ImmGetContext(HVTWin); - ime_on = ImmGetOpenStatus(hImc); - ImmReleaseContext(HVTWin, hImc); - if ((ts.WindowFlag & WF_IMECURSORCHANGE) != 0 && ime_on) { - color = (HBITMAP)1; - } else { - color = NULL; - } + if (! CaretEnabled) return; - CaretX = (CursorX-WinOrgX)*FontWidth; - CaretY = (CursorY-WinOrgY)*FontHeight; + if (Active) { + int CaretX, CaretY, H; + HBITMAP color; - if ((ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) && - CanUseIME() && (ts.IMEInline>0)) - { - /* set IME conversion window pos. & font */ - SetConversionWindow(HVTWin,CaretX,CaretY); - } + /* IME\x82\xCCon/off\x8F\xF3\x91Ԃ\xF0\x8C\xA9\x82āA\x83J\x81[\x83\\x83\x8B\x82̐F\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B + * WM_INPUTLANGCHANGE, WM_IME_NOTIFY \x82ł̓J\x81[\x83\\x83\x8B\x82̍ĕ`\x89\xE6\x82̂ݍs\x82\xA4\x81B + * (2010.5.20 yutaka) + */ + if ((ts.WindowFlag & WF_IMECURSORCHANGE) == 0) { + color = 0; + } else { + if (IMEstat) { + color = (HBITMAP)1; + } else { + color = 0; + } + } - if (! CaretEnabled) return; - - if (Active) { + CaretX = (CursorX-WinOrgX)*FontWidth; + CaretY = (CursorY-WinOrgY)*FontHeight; if (ts.CursorShape!=IdVCur) { if (ts.CursorShape==IdHCur) { CaretY = CaretY+FontHeight-CurWidth; Modified: branches/cmake/teraterm/teraterm/vtdisp.h =================================================================== --- branches/cmake/teraterm/teraterm/vtdisp.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/vtdisp.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -128,6 +128,8 @@ extern int PageStart, BuffEnd; extern TCharAttr DefCharAttr; +extern BOOL IMEstat; + #define SCROLL_BOTTOM 1 #define SCROLL_LINEDOWN 2 #define SCROLL_LINEUP 3 Modified: branches/cmake/teraterm/teraterm/vtterm.c =================================================================== --- branches/cmake/teraterm/teraterm/vtterm.c 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/vtterm.c 2019-03-10 14:32:02 UTC (rev 7468) @@ -198,16 +198,13 @@ static int NewKeyId, NewKeyLen; /* Mouse Report */ -int MouseReportMode; -int MouseReportExtMode; -unsigned int DecLocatorFlag; -int LastX, LastY; -int ButtonStat; -int FilterTop, FilterBottom, FilterLeft, FilterRight; +static int MouseReportMode; +static int MouseReportExtMode; +static unsigned int DecLocatorFlag; +static int LastX, LastY; +static int ButtonStat; +static int FilterTop, FilterBottom, FilterLeft, FilterRight; -/* IME Status */ -BOOL IMEstat; - /* Beep over-used */ static DWORD BeepStartTime = 0; static DWORD BeepSuppressTime = 0; @@ -5525,11 +5522,11 @@ } // UTF-8\x82Ŏ\xF3\x90M\x83f\x81[\x83^\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9 -BOOL ParseFirstUTF8(BYTE b, int proc_combining) // returns TRUE if b is processed // (actually allways returns TRUE) +static BOOL ParseFirstUTF8(BYTE b, int proc_combining) { - static BYTE buf[3]; + static BYTE buf[4]; static int count = 0; static int can_combining = 0; static unsigned int first_code; @@ -5592,7 +5589,7 @@ return TRUE; } - if ((buf[0] & 0xe0) == 0xe0 && + if ((buf[0] & 0xf0) == 0xe0 && (buf[1] & 0xc0) == 0x80 && (buf[2] & 0xc0) == 0x80) { // 3\x83o\x83C\x83g\x83R\x81[\x83h\x82̏ꍇ @@ -5649,12 +5646,31 @@ skip: count = 0; + } + + if (count < 4) { + return TRUE; + } + + if ((buf[0] & 0xf1) == 0xf0 && + (buf[1] & 0xc0) == 0x80 && + (buf[2] & 0xc0) == 0x80 && + (buf[2] & 0xc0) == 0x80) + { // 4\x83o\x83C\x83g\x83R\x81[\x83h\x82̏ꍇ + code = ((buf[0] & 0x07) << 18); + code |= ((buf[1] & 0x3f) << 12); + code |= ((buf[2] & 0x3f) << 6); + code |= (buf[3] & 0x3f); + + UnicodeToCP932(code); + count = 0; + return TRUE; } else { ParseASCII(buf[0]); ParseASCII(buf[1]); ParseASCII(buf[2]); + ParseASCII(buf[3]); count = 0; - } return TRUE; Modified: branches/cmake/teraterm/teraterm/vtwin.cpp =================================================================== --- branches/cmake/teraterm/teraterm/vtwin.cpp 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/vtwin.cpp 2019-03-10 14:32:02 UTC (rev 7468) @@ -179,6 +179,7 @@ ON_WM_TIMER() ON_WM_VSCROLL() ON_WM_DEVICECHANGE() + ON_MESSAGE(WM_IME_STARTCOMPOSITION,OnIMEStartComposition) ON_MESSAGE(WM_IME_COMPOSITION,OnIMEComposition) ON_MESSAGE(WM_INPUTLANGCHANGE,OnIMEInputChange) ON_MESSAGE(WM_IME_NOTIFY,OnIMENotify) @@ -3096,6 +3097,17 @@ } //--> + +LRESULT CVTWindow::OnIMEStartComposition(WPARAM wParam, LPARAM lParam) +{ + // \x88ʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9 + int CaretX = (CursorX-WinOrgX)*FontWidth; + int CaretY = (CursorY-WinOrgY)*FontHeight; + SetConversionWindow(HVTWin,CaretX,CaretY); + + return CFrameWnd::DefWindowProc(WM_IME_STARTCOMPOSITION,wParam,lParam); +} + LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam) { HGLOBAL hstr; @@ -3164,6 +3176,15 @@ LRESULT CVTWindow::OnIMENotify(WPARAM wParam, LPARAM lParam) { if (wParam == IMN_SETOPENSTATUS) { + // IME\x82\xCCOn/Off\x82\xF0\x8E擾\x82\xB7\x82\xE9 + IMEstat = GetIMEOpenStatus(); + + // \x8F\xF3\x91Ԃ\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9IME\x82̂\xBD\x82߂Ɉʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9 + int CaretX = (CursorX-WinOrgX)*FontWidth; + int CaretY = (CursorY-WinOrgY)*FontHeight; + SetConversionWindow(HVTWin,CaretX,CaretY); + + // \x95`\x89\xE6 ChangeCaret(); } Modified: branches/cmake/teraterm/teraterm/vtwin.h =================================================================== --- branches/cmake/teraterm/teraterm/vtwin.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/teraterm/vtwin.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -135,6 +135,7 @@ afx_msg LRESULT OnEnterSizeMove(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam); //--> + afx_msg LRESULT OnIMEStartComposition(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnIMEComposition(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnIMEInputChange(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnIMENotify(WPARAM wParam, LPARAM lParam); Modified: branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc =================================================================== --- branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpcmn/ttpcmn-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -28,7 +28,7 @@ VALUE "FileDescription", "Tera Term Common Routines" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "TTPCMN" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "ttpcmn.dll" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/teraterm/ttpdlg/dlg_res.h =================================================================== --- branches/cmake/teraterm/ttpdlg/dlg_res.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpdlg/dlg_res.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -120,11 +120,7 @@ #define IDC_HOSTTCPPROTOCOLLABEL 1019 #define IDC_HOSTTCPPROTOCOL 1020 #define IDC_LOCALE_BOX 1022 -#define IDC_EDIT1 1024 #define IDC_LOCALE_EDIT 1024 -#define IDC_CODEPAGE_LABEL 1025 -#define IDC_EDIT2 1026 -#define IDC_CODEPAGE_EDIT 1026 #define IDC_TT_VERSION 1027 #define IDC_AUTHOR_URL 1028 #define IDC_FORUM_LABEL 1029 Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c =================================================================== --- branches/cmake/teraterm/ttpdlg/ttdlg.c 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpdlg/ttdlg.c 2019-03-10 14:32:02 UTC (rev 7468) @@ -160,7 +160,6 @@ { IDC_TERMKINTEXT, "DLG_TERM_KIN" }, { IDC_TERMKOUTTEXT, "DLG_TERM_KOUT" }, { IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" }, - { IDC_CODEPAGE_LABEL, "DLG_TERM_CODEPAGE" }, }; SetDlgTexts(Dialog, TextInfosJp, _countof(TextInfosJp), UILanguageFile); } @@ -178,7 +177,6 @@ { IDC_TERMKANJILABEL, "DLG_TERMK_KANJI" }, { IDC_TERMKANJISENDLABEL, "DLG_TERMK_KANJISEND" }, { IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" }, - { IDC_CODEPAGE_LABEL, "DLG_TERM_CODEPAGE" }, }; SetDlgTexts(Dialog, TextInfosKo, _countof(TextInfosKo), UILanguageFile); } @@ -248,8 +246,6 @@ // \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X SetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale); SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0); - - SetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, ts->CodePage, FALSE); } else if (ts->Language==IdRussian) { SetDropDownList(Dialog,IDC_TERMRUSSHOST,RussList,ts->RussHost); @@ -263,8 +259,6 @@ // \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X SetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale); SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0); - - SetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, ts->CodePage, FALSE); } else if (ts->Language==IdUtf8) { SetDropDownList(Dialog, IDC_TERMKANJI, Utf8List, KanjiCode2List(ts->Language,ts->KanjiCode)); @@ -273,8 +267,6 @@ // \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X SetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale); SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0); - - SetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, ts->CodePage, FALSE); } return TRUE; @@ -336,8 +328,6 @@ GetRB(Dialog,&ts->AutoWinSwitch,IDC_TERMAUTOSWITCH,IDC_TERMAUTOSWITCH); if (ts->Language==IdJapanese) { - BOOL ret; - if ((w = (WORD)GetCurSel(Dialog, IDC_TERMKANJI)) > 0) { ts->KanjiCode = w; } @@ -354,7 +344,6 @@ } GetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale, sizeof(ts->Locale)); - ts->CodePage = GetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, &ret, FALSE); } else if (ts->Language==IdRussian) { if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSHOST)) > 0) { @@ -369,8 +358,6 @@ } else if (ts->Language==IdKorean || // HKS ts->Language==IdUtf8) { - BOOL ret; - if ((w = (WORD)GetCurSel(Dialog, IDC_TERMKANJI)) > 0) { ts->KanjiCode = List2KanjiCode(ts->Language, w); } @@ -384,7 +371,6 @@ ts->KanjiOut = 0; GetDlgItemTextA(Dialog, IDC_LOCALE_EDIT, ts->Locale, sizeof(ts->Locale)); - ts->CodePage = GetDlgItemInt(Dialog, IDC_CODEPAGE_EDIT, &ret, FALSE); } } Modified: branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc =================================================================== --- branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -26,7 +26,7 @@ VALUE "FileDescription", "Tera Term Dialog Routines" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "TTPDLG" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "TTPDLG.dll" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/teraterm/ttpdlg/ttpdlg.rc =================================================================== --- branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -84,8 +84,6 @@ PUSHBUTTON "&Help",IDC_TERMHELP,198,54,40,14 RTEXT "lo&cale:",IDC_LOCALE_LABEL,12,129,44,8 EDITTEXT IDC_LOCALE_EDIT,59,127,63,13,ES_AUTOHSCROLL - RTEXT "Code&Page:",IDC_CODEPAGE_LABEL,128,129,50,8 - EDITTEXT IDC_CODEPAGE_EDIT,180,127,40,14,ES_AUTOHSCROLL | ES_NUMBER END IDD_TERMDLGJ DIALOGEX 20, 20, 245, 158 @@ -125,8 +123,6 @@ PUSHBUTTON "&Help",IDC_TERMHELP,198,54,40,14 RTEXT "lo&cale:",IDC_LOCALE_LABEL,12,142,44,8 EDITTEXT IDC_LOCALE_EDIT,59,140,63,13,ES_AUTOHSCROLL - RTEXT "Code&Page:",IDC_CODEPAGE_LABEL,128,142,50,8 - EDITTEXT IDC_CODEPAGE_EDIT,180,140,40,14,ES_AUTOHSCROLL | ES_NUMBER END IDD_SERIALDLG DIALOGEX 20, 20, 190, 143 @@ -235,7 +231,7 @@ "Static",SS_LEFTNOWORDWRAP | WS_GROUP,39,59,134,8 DEFPUSHBUTTON "OK",IDOK,169,6,32,16,WS_GROUP CONTROL "All Rights Reserved.",IDC_RIGHTS_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,39,75,76,8 - CONTROL "(C) 2004-2018 TeraTerm Project",IDC_PROJECT_LABEL, + CONTROL "(C) 2004-2019 TeraTerm Project",IDC_PROJECT_LABEL, "Static",SS_LEFTNOWORDWRAP | WS_GROUP,39,67,122,9 LTEXT "Includes:",IDC_INLUCDE_LABEL,39,26,31,8 LTEXT "Version",IDC_TT_VERSION,39,12,127,8 Modified: branches/cmake/teraterm/ttpfile/ttpfile-version.rc =================================================================== --- branches/cmake/teraterm/ttpfile/ttpfile-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpfile/ttpfile-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -26,7 +26,7 @@ VALUE "FileDescription", "Tera Term File Transfer Routines" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "TTPFILE" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "TTPFILE.dll" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/teraterm/ttpmacro/ttm-version.rc =================================================================== --- branches/cmake/teraterm/ttpmacro/ttm-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpmacro/ttm-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -26,7 +26,7 @@ VALUE "FileDescription", "Tera Term Macro Interpreter" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "TTPMACRO" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "TTPMACRO.EXE" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj =================================================================== --- branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2019-03-10 14:32:02 UTC (rev 7468) @@ -78,7 +78,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs> @@ -85,6 +85,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> + <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -114,7 +115,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs> @@ -121,6 +122,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> + <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj =================================================================== --- branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2019-03-10 14:32:02 UTC (rev 7468) @@ -79,7 +79,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs> @@ -86,6 +86,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> + <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -114,7 +115,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs> @@ -121,6 +122,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> + <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj =================================================================== --- branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj 2019-03-10 14:32:02 UTC (rev 7468) @@ -73,10 +73,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="onig_s.lib SFMT.lib iphlpapi.lib" + AdditionalDependencies="nafxcw.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)" + IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib" DelayLoadDLLs="iphlpapi.dll;user32.dll" GenerateDebugInformation="true" SubSystem="2" @@ -161,10 +162,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="onig_sd.lib SFMTd.lib iphlpapi.lib" + AdditionalDependencies="nafxcwd.lib LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)" + IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib" DelayLoadDLLs="iphlpapi.dll;user32.dll" GenerateDebugInformation="true" SubSystem="2" Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj =================================================================== --- branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj 2019-03-10 14:32:02 UTC (rev 7468) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="shift_jis"?> + <VisualStudioProject ProjectType="Visual C++" Version="8.00" @@ -72,10 +73,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="onig_s.lib SFMT.lib iphlpapi.lib" + AdditionalDependencies="nafxcw.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)" + IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib" DelayLoadDLLs="iphlpapi.dll;user32.dll" GenerateDebugInformation="true" SubSystem="2" @@ -161,10 +163,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="onig_sd.lib SFMTd.lib iphlpapi.lib" + AdditionalDependencies="nafxcwd.lib LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)" + IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib" DelayLoadDLLs="iphlpapi.dll;user32.dll" GenerateDebugInformation="true" SubSystem="2" Modified: branches/cmake/teraterm/ttpset/ttpset-version.rc =================================================================== --- branches/cmake/teraterm/ttpset/ttpset-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpset/ttpset-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -26,7 +26,7 @@ VALUE "FileDescription", "Tera Term Setting Routines" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "TTPSEt" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "ttpset.dll" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/teraterm/ttpset/ttset.c =================================================================== --- branches/cmake/teraterm/ttpset/ttset.c 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttpset/ttset.c 2019-03-10 14:32:02 UTC (rev 7468) @@ -1569,7 +1569,7 @@ ts->AlphaBlendInactive = max(0, ts->AlphaBlendInactive); ts->AlphaBlendInactive = min(255, ts->AlphaBlendInactive); ts->AlphaBlendActive = - GetPrivateProfileInt(Section, "AlphaBlendActive", 255, FName); + GetPrivateProfileInt(Section, "AlphaBlendActive", ts->AlphaBlendInactive, FName); ts->AlphaBlendActive = max(0, ts->AlphaBlendActive); ts->AlphaBlendActive = min(255, ts->AlphaBlendActive); Modified: branches/cmake/teraterm/ttptek/ttptek-version.rc =================================================================== --- branches/cmake/teraterm/ttptek/ttptek-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/teraterm/ttptek/ttptek-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -28,7 +28,7 @@ VALUE "FileDescription", "Tera Term Tek Emulation Routines" VALUE "FileVersion", TT_RES_VERSION_STR VALUE "InternalName", "TTPTEK" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "ttptek.dll" VALUE "ProductName", "Tera Term" VALUE "ProductVersion", TT_RES_VERSION_STR Modified: branches/cmake/ttssh2/ttxssh/ssh.c =================================================================== --- branches/cmake/ttssh2/ttxssh/ssh.c 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/ttssh2/ttxssh/ssh.c 2019-03-10 14:32:02 UTC (rev 7468) @@ -7549,9 +7549,10 @@ return FALSE; } - if (old_passwd[0] == 0 || new_passwd[0] == 0) { + if (new_passwd[0] == 0) { // \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8AJ\x82\xA2\x82Ă\xB7\x82\xAE\x82\xC9 Return \x82\xF0\x89\x9F\x82\xB5\x82Ă\xB5\x82܂\xC1\x82\xBD\x8E\x9E\x82̑\xF4\x82ׁ̈A - // \x82Ƃ肠\x82\xA6\x82\xB8\x8B\xF3\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x82͂\xB6\x82\xA2\x82Ă\xA8\x82\xAD\x81B + // \x82Ƃ肠\x82\xA6\x82\xB8\x90V\x83p\x83X\x83\x8F\x81[\x83h\x82\xAA\x8B\xF3\x82̏ꍇ\x82\xF0\x82͂\xB6\x82\xA2\x82Ă\xA8\x82\xAD\x81B + // c.f. Ticket: #38970 return FALSE; } Modified: branches/cmake/ttssh2/ttxssh/ttxssh-version.h =================================================================== --- branches/cmake/ttssh2/ttxssh/ttxssh-version.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/ttssh2/ttxssh/ttxssh-version.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -31,6 +31,6 @@ #include "tt-version.h" #define TTSSH_VERSION_MAJOR 2 -#define TTSSH_VERSION_MINOR 87 +#define TTSSH_VERSION_MINOR 88 #define TTSSH_VERSION_STR(sep) TT_TOSTR(TTSSH_VERSION_MAJOR) sep TT_TOSTR(TTSSH_VERSION_MINOR) #define TTSSH_RES_VERSION_STR TTSSH_VERSION_STR(", ") ", 0, 0" Modified: branches/cmake/ttssh2/ttxssh/ttxssh-version.rc =================================================================== --- branches/cmake/ttssh2/ttxssh/ttxssh-version.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/ttssh2/ttxssh/ttxssh-version.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -26,7 +26,7 @@ VALUE "FileDescription", "Tera Term Secure Shell Extension" VALUE "FileVersion", TTSSH_RES_VERSION_STR VALUE "InternalName", "TTXSSH" - VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2018 TeraTerm Project" + VALUE "LegalCopyright", "(C)1998-2001 Robert O'Callahan, (C) 2000-2003 Jun-ya KATO, (C) 2004-2019 TeraTerm Project" VALUE "OriginalFilename", "TTXSSH.dll" VALUE "ProductName", "TTSSH" VALUE "ProductVersion", TTSSH_RES_VERSION_STR Modified: branches/cmake/ttssh2/ttxssh/ttxssh.c =================================================================== --- branches/cmake/ttssh2/ttxssh/ttxssh.c 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/ttssh2/ttxssh/ttxssh.c 2019-03-10 14:32:02 UTC (rev 7468) @@ -299,6 +299,7 @@ if (!listed[num]) { buf[i] = num + '0'; + listed[num] = 1; i++; } } @@ -4584,6 +4585,13 @@ SetDlgItemInt(dlg, IDC_BCRYPT_KDF_ROUNDS, DEFAULT_ROUNDS, FALSE); SendDlgItemMessage(dlg, IDC_BCRYPT_KDF_ROUNDS, EM_LIMITTEXT, 4, 0); + // default bcrypt KDF + EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), TRUE); + SendMessage(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_ROUNDS), TRUE); + SetDlgItemInt(dlg, IDC_BCRYPT_KDF_ROUNDS, DEFAULT_ROUNDS, FALSE); + SendDlgItemMessage(dlg, IDC_BCRYPT_KDF_ROUNDS, EM_LIMITTEXT, 4, 0); + } return TRUE; Modified: branches/cmake/ttssh2/ttxssh/ttxssh.h =================================================================== --- branches/cmake/ttssh2/ttxssh/ttxssh.h 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/ttssh2/ttxssh/ttxssh.h 2019-03-10 14:32:02 UTC (rev 7468) @@ -142,7 +142,7 @@ cipher. The first digit is the most preferred cipher, and so on. The digit SSH_CIPHER_NONE signifies that any ciphers after it are disabled. */ - char CipherOrder[SSH_CIPHER_MAX+1]; + char CipherOrder[SSH_CIPHER_MAX+2]; char KnownHostsFiles[2048]; int DefaultAuthMethod; Modified: branches/cmake/ttssh2/ttxssh/ttxssh.rc =================================================================== --- branches/cmake/ttssh2/ttxssh/ttxssh.rc 2019-03-09 17:33:37 UTC (rev 7467) +++ branches/cmake/ttssh2/ttxssh/ttxssh.rc 2019-03-10 14:32:02 UTC (rev 7468) @@ -38,7 +38,7 @@ LTEXT "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15 ICON "",IDC_TTSSH_ICON,248,7,20,20 LTEXT "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11 - LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****\r\nSSH2 support, (C) 2004-2018 TeraTerm Project",IDC_INCLUDES,6,36,262,34 + LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****\r\nSSH2 support, (C) 2004-2019 TeraTerm Project",IDC_INCLUDES,6,36,262,34 LTEXT "OpenSSL:",IDC_OPENSSL_VERSION,6,69,175,8 LTEXT "zlib:",IDC_ZLIB_VERSION,6,78,175,8 LTEXT "PuTTY:",IDC_PUTTY_VERSION,6,87,175,8