Tera TermRevision: 7294
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7294
Author: zmatsuo
Date: 2018-12-01 01:49:32 +0900 (Sat, 01 Dec 2018)
Log Message:
-----------
Merge remote-tracking branch 'remotes/origin/trunk' into cmake
Modified Paths:
--------------
branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
branches/cmake/doc/en/html/about/ctrlseq.html
branches/cmake/doc/en/html/about/history.html
branches/cmake/doc/en/html/reference/develop.txt
branches/cmake/doc/en/html/reference/keycode.txt
branches/cmake/doc/en/html/usage/mouse.html
branches/cmake/doc/ja/html/about/ctrlseq.html
branches/cmake/doc/ja/html/about/history.html
branches/cmake/doc/ja/html/reference/develop.txt
branches/cmake/doc/ja/html/reference/keycode.txt
branches/cmake/doc/ja/html/usage/mouse.html
branches/cmake/installer/teraterm.iss
branches/cmake/teraterm/common/tt-version.h
branches/cmake/teraterm/teraterm/vtdisp.c
branches/cmake/teraterm/teraterm/vtdisp.h
branches/cmake/teraterm/teraterm/vtterm.c
branches/cmake/teraterm/ttpdlg/ttpdlg.rc
branches/cmake/ttssh2/ttxssh/ttxssh-version.h
-------------- next part --------------
Modified: branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
===================================================================
--- branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2018-11-30 16:49:32 UTC (rev 7294)
@@ -13,6 +13,10 @@
#define ID_MENUID_BASE 55101
#define MAX_MENU_ITEMS 20
+#define ID_MENUID_INC_WIDTH (ID_MENUID_BASE + 50)
+#define ID_MENUID_DEC_WIDTH (ID_MENUID_BASE + 51)
+#define ID_MENUID_INC_HEIGHT (ID_MENUID_BASE + 52)
+#define ID_MENUID_DEC_HEIGHT (ID_MENUID_BASE + 53)
static HANDLE hInst; /* Instance handle of TTX*.DLL */
@@ -277,7 +281,35 @@
SendMessage(HWin, WM_COMMAND, MAKELONG(ID_SETUP_TERMINAL, 0), 0);
return 1;
}
- return 0;
+ switch (cmd) {
+ case ID_MENUID_INC_WIDTH:
+ pvar->ts->TerminalWidth += 1;
+ pvar->ReplaceTermDlg = TRUE;
+ break;
+ case ID_MENUID_DEC_WIDTH:
+ if (pvar->ts->TerminalWidth > 1) {
+ pvar->ts->TerminalWidth -= 1;
+ pvar->ReplaceTermDlg = TRUE;
+ }
+ break;
+ case ID_MENUID_INC_HEIGHT:
+ pvar->ts->TerminalHeight += 1;
+ pvar->ReplaceTermDlg = TRUE;
+ break;
+ case ID_MENUID_DEC_HEIGHT:
+ if (pvar->ts->TerminalHeight > 1) {
+ pvar->ts->TerminalHeight -= 1;
+ pvar->ReplaceTermDlg = TRUE;
+ }
+ break;
+ default:
+ return 0;
+ }
+
+ if (pvar->ReplaceTermDlg) {
+ SendMessage(HWin, WM_COMMAND, MAKELONG(ID_SETUP_TERMINAL, 0), 0);
+ }
+ return 1;
}
static TTXExports Exports = {
Modified: branches/cmake/doc/en/html/about/ctrlseq.html
===================================================================
--- branches/cmake/doc/en/html/about/ctrlseq.html 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/en/html/about/ctrlseq.html 2018-11-30 16:49:32 UTC (rev 7294)
@@ -250,6 +250,11 @@
<i>Ps2</i> = 0 Restore maximized window.
= 1 Maximize window.
+ = 10 Change full-screen state of window. Currently use the window maximizing instead.
+ <i>Ps2</i> = 0 Undo full-screen mode.
+ = 1 Change to full-screen.
+ = 2 Toggle full-screen.
+
= 11 Reports window state.
Response: CSI <i>s</i> t
<i>s</i> = 1 Normal. (non-iconified)
@@ -256,15 +261,31 @@
= 2 Iconified.
= 13 Reports window position.
+ <i>Ps2</i> = Omitted, 0, 1
+ Reports whole window position.
+ = 2 Reprots text area position.
Response: CSI 3 ; <i>x</i> ; <i>y</i> t
<i>x</i> X position of window.
<i>y</i> Y position of window.
= 14 Reports window size in pixels.
+ <i>Ps2</i> = Omitted, 0, 1
+ Reports text area size.
+ = 2 Reprots whole window size.
Response: CSI 4 ; <i>y</i> ; <i>x</i> t
<i>y</i> Window height in pixels.
<i>x</i> Window width in pixels.
+ = 15 Reports root window size in pixels.
+ Response: CSI 5 ; <i>y</i> ; <i>x</i> t
+ <i>y</i> Root window height in pixels.
+ <i>x</i> Root window width in pixels.
+
+ = 16 Reports character size in pixels.
+ Response: CSI 6 ; <i>y</i> ; <i>x</i> t
+ <i>y</i> character height in pixels.
+ <i>x</i> character width in pixels.
+
= 18 Reports terminal size in characters.
Response: CSI 8 ; <i>y</i> ; <i>x</i> t
<i>y</i> Terminal height in characters. (Lines)
Modified: branches/cmake/doc/en/html/about/history.html
===================================================================
--- branches/cmake/doc/en/html/about/history.html 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/en/html/about/history.html 2018-11-30 16:49:32 UTC (rev 7294)
@@ -31,6 +31,42 @@
<h2 id="teraterm">Tera Term</h2>
+<h3 id="teraterm_4.101">2018.11.30 (Ver 4.101)</h3>
+<ul class="history">
+ <li>Changes
+ <ul>
+ <li>added support for following dtterm window manipulation sequences.
+ <ul>
+ <li>10: Full-screen mode</li>
+ <li>13;2: Report window position. (text area)</li>
+ <li>14;2: Report window size. (whole window)</li>
+ <li>15: Report root window size in pixels.</li>
+ <li>16: Report character size in pixels.</li>
+ </ul></li>
+ <li>The behavior of following dtterm window manipulation sequence was changed.
+ <ul>
+ <li>14: Report window size sequence: report text area size instead of whole window size.</li>
+ </ul></li>
+ <li>The left and right margin mode does not be reset when window size is changed.</li>
+ <li>The `/' character can be treated as path separator by using the command line option receiving a file name.</li>
+ </ul>
+ </li>
+
+ <li>Bug fixes
+ <ul>
+ <li>The plugin compiled before 4.100 can not called because the DLL's calling convention is changed in Tera Term 4.100. </li>
+ </ul>
+ </li>
+
+ <li>Misc
+ <ul>
+ <li>upgraded TTSSH to <a href="#ttssh_2.87">2.87</a>.</li>
+ <li>upgraded TTXResizeMenu Plug-in to <a href="#resizemenu_1.05">1.05</a></li>
+ <li>upgraded Oniguruma to 6.9.0.</li>
+ </ul>
+ </li>
+</ul>
+
<h3 id="teraterm_4.100">2018.08.31 (Ver 4.100)</h3>
<ul class="history">
<li>Changes
@@ -3027,6 +3063,15 @@
<h2 id="ttssh">TTSSH</h2>
+<h3 id="ttssh_2.87">2018.11.30 (Ver 2.87)</h3>
+<ul class="history">
+ <li>Misc
+ <ul>
+ <li>upgraded OpenSSL to 1.0.2q.</li>
+ </ul>
+ </li>
+</ul>
+
<h3 id="ttssh_2.86">2018.08.31 (Ver 2.86)</h3>
<ul class="history">
<li>Bug fixes
@@ -4828,6 +4873,11 @@
</ul>
<h2 id="resizemenu">TTXResizeMenu</h2>
+<h3 id="resizemenu_1.05">2018.11.30 (Ver 1.05)</h3>
+<ul class="history">
+ <li>added menu id to increase/decrease window size. (for shortcut keys)</li>
+</ul>
+
<h3 id="resizemenu_1.04">2018.08.31 (Ver 1.04)</h3>
<ul class="history">
<li>Fixed an issue where TTXResizeMenu can not be loaded on Windows 95/NT4.0.</li>
Modified: branches/cmake/doc/en/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/en/html/reference/develop.txt 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/en/html/reference/develop.txt 2018-11-30 16:49:32 UTC (rev 7294)
@@ -44,8 +44,8 @@
* Libraries
-- Oniguruma 6.8.2 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.0.2p (http://www.openssl.org/)
+- Oniguruma 6.9.0 (https://github.com/kkos/oniguruma)
+- OpenSSL 1.0.2q (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/reference/keycode.txt
===================================================================
--- branches/cmake/doc/en/html/reference/keycode.txt 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/en/html/reference/keycode.txt 2018-11-30 16:49:32 UTC (rev 7294)
@@ -478,6 +478,10 @@
TTXResizeMenu Menu command ID
-----------------------------------------
[Resize] Menu(1) - Menu(20) 55101 - 55120
+-- Increase window width 55151 (not in menu)
+-- Decrease window width 55152 (not in menu)
+-- Increase window height 55153 (not in menu)
+-- Decrease window height 55154 (not in menu)
TTXViewMode Menu command ID
-----------------------------------------
Modified: branches/cmake/doc/en/html/usage/mouse.html
===================================================================
--- branches/cmake/doc/en/html/usage/mouse.html 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/en/html/usage/mouse.html 2018-11-30 16:49:32 UTC (rev 7294)
@@ -69,8 +69,8 @@
However, when "Do not display this dialog, next drop" is checked on the dialog, the dialog is not shown. Next, the dialog can be shown by using CTRL key pressing. </dd>
<dt>When ConfirmFileDragAndDrop is off</dt>
<dd>
- When one file is dropped, the action is done without dialog dislaying. The default action is Send File (Past content of file).<br>
- When one or multiple folders are dropped, the action is done without dialog dislaying. The default action is Past Filename.<br>
+ When one file is dropped, the action is done without dialog displaying. The default action is Send File (Paste content of file).<br>
+ When one or multiple folders are dropped, the action is done without dialog displaying. The default action is Paste Filename.<br>
The dialog is shown other than these(multiple files/a file and folder). In this case, the dialog can be shown by using CTRL key pressing.
</dd>
</dl>
@@ -86,7 +86,7 @@
<dl>
<dt>dest</dt>
<dd>
- Specity the destination path. <br>
+ Specify the destination path. <br>
The path is treated as home directory when dest is empty. <br>
NOTICE: The "~" may not be used in some cases of remote OS and shell.
</dd>
Modified: branches/cmake/doc/ja/html/about/ctrlseq.html
===================================================================
--- branches/cmake/doc/ja/html/about/ctrlseq.html 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/ja/html/about/ctrlseq.html 2018-11-30 16:49:32 UTC (rev 7294)
@@ -238,6 +238,10 @@
= 9 \x92[\x96\x96\x82̍ő剻\x8F\xF3\x91Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B
<i>Ps2</i> = 0 \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x92ʏ\xED\x83T\x83C\x83Y\x82ɕύX\x82\xB7\x82\xE9\x81B
= 1 \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Dő剻\x82\xB7\x82\xE9\x81B
+ = 10 \x92[\x96\x96\x82̃t\x83\x8B\x83X\x83N\x83\x8A\x81[\x83\x93\x83\x82\x81[\x83h\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x8C\xBB\x8D݂͒[\x96\x96\x82̍ő剻\x82ő\xE3\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x81B
+ <i>Ps2</i> = 0 \x83t\x83\x8B\x83X\x83N\x83\x8A\x81[\x83\x93\x8F\xF3\x91Ԃ\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9
+ = 1 \x83t\x83\x8B\x83X\x83N\x83\x8A\x81[\x83\x93\x8F\xF3\x91Ԃɂ\xB7\x82\xE9
+ = 2 \x83t\x83\x8B\x83X\x83N\x83\x8A\x81[\x83\x93\x8F\xF3\x91Ԃ\xF0\x95ύX\x82\xB7\x82\xE9(\x83g\x83O\x83\x8B)
= 11 \x83E\x83B\x83\x93\x83h\x83E\x82̍ŏ\xAC\x89\xBB\x8F\xF3\x91Ԃ\xF0\x95\xB7\x82\xE9\x81B
\x89\x9E\x93\x9A: CSI <i>s</i> t
@@ -245,15 +249,31 @@
= 2 \x8Dŏ\xAC\x89\xBB\x8F\xF3\x91\xD4
= 13 \x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu\x82\xF0\x95\xB7\x82\xE9\x81B
+ <i>Ps2</i> = \x8Fȗ\xAA, 0, 1
+ \x83E\x83B\x83\x93\x83h\x83E\x91S\x91̂̈ʒu\x82\xF0\x95\xB7\x82\xE9
+ = 2 \x83e\x83L\x83X\x83g\x97̈\xE6\x82̈ʒu\x82\xF0\x95\xB7\x82\xE9
\x89\x9E\x93\x9A: CSI 3 ; <i>x</i> ; <i>y</i> t
<i>x</i> \x83E\x83B\x83\x93\x83h\x83E\x8D\xB6\x8F\xE3\x8Ap\x82\xCC X \x8D\xC0\x95W
<i>y</i> \x83E\x83B\x83\x93\x83h\x83E\x8D\xB6\x8F\xE3\x8Ap\x82\xCC Y \x8D\xC0\x95W
= 14 \x83E\x83B\x83\x93\x83h\x83E\x82̃T\x83C\x83Y\x82\xF0\x95\xB7\x82\xE9\x81B
+ <i>Ps2</i> = \x8Fȗ\xAA, 0, 1
+ \x83e\x83L\x83X\x83g\x97̈\xE6\x82̃T\x83C\x83Y\x82\xF0\x95\xB7\x82\xE9
+ = 2 \x83E\x83B\x83\x93\x83h\x83E\x91S\x91̂̃T\x83C\x83Y\x82\xF0\x95\xB7\x82\xE9
\x89\x9E\x93\x9A: CSI 4 ; <i>y</i> ; <i>x</i> t
<i>y</i> \x83E\x83B\x83\x93\x83h\x83E\x82̍\x82\x82\xB3
<i>x</i> \x83E\x83B\x83\x93\x83h\x83E\x82̕\x9D
+ = 15 \x83\x8B\x81[\x83g\x83E\x83B\x83\x93\x83h\x83E\x82̃T\x83C\x83Y\x82\xF0\x83s\x83N\x83Z\x83\x8B\x90\x94\x82ŕ\xB7\x82\xE9\x81B
+ \x89\x9E\x93\x9A: CSI 5 ; <i>y</i> ; <i>x</i> t
+ <i>y</i> \x83\x8B\x81[\x83g\x83E\x83B\x83\x93\x83h\x83E\x82̍\x82\x82\xB3(\x83s\x83N\x83Z\x83\x8B)
+ <i>x</i> \x83\x8B\x81[\x83g\x83E\x83B\x83\x93\x83h\x83E\x82̕\x9D(\x83s\x83N\x83Z\x83\x8B)
+
+ = 16 \x95\xB6\x8E\x9A\x83T\x83C\x83Y\x82\xF0\x95\xB7\x82\xE9\x81B
+ \x89\x9E\x93\x9A: CSI 6 ; <i>y</i> ; <i>x</i> t
+ <i>y</i> \x95\xB6\x8E\x9A\x82̍\x82\x82\xB3(\x83s\x83N\x83Z\x83\x8B)
+ <i>x</i> \x95\xB6\x8E\x9A\x82̕\x9D(\x83s\x83N\x83Z\x83\x8B)
+
= 18 \x92[\x96\x96\x83T\x83C\x83Y\x82\xF0\x95\xB7\x82\xE9\x81B
\x89\x9E\x93\x9A: CSI 8 ; <i>y</i> ; <i>x</i> t
<i>y</i> \x92[\x96\x96\x83T\x83C\x83Y\x82̍\x82\x82\xB3(\x8Ds\x90\x94)
Modified: branches/cmake/doc/ja/html/about/history.html
===================================================================
--- branches/cmake/doc/ja/html/about/history.html 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/ja/html/about/history.html 2018-11-30 16:49:32 UTC (rev 7294)
@@ -31,6 +31,42 @@
<h2 id="teraterm">Tera Term</h2>
+<h3 id="teraterm_4.101">2018.11.30 (Ver 4.101)</h3>
+<ul class="history">
+ <li>\x95ύX
+ <ul>
+ <li>\x88ȉ\xBA\x82\xCC dtterm \x82̃E\x83B\x83\x93\x83h\x83E\x91\x80\x8D\xEC\x83V\x81[\x83P\x83\x93\x83X\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81B
+ <ul>
+ <li>10: \x83t\x83\x8B\x83X\x83N\x83\x8A\x81[\x83\x93\x83\x82\x81[\x83h</li>
+ <li>13;2: \x83E\x83B\x83\x93\x83h\x83E\x88ʒu\x95\xFB\x8C\xFC(\x83e\x83L\x83X\x83g\x97̈\xE6)</li>
+ <li>14;2: \x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95\xF1\x8D\x90(\x83E\x83B\x83\x93\x83h\x83E\x91S\x91\xCC)</li>
+ <li>15: \x83\x8B\x81[\x83g\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95\xF1\x8D\x90(\x83s\x83N\x83Z\x83\x8B)</li>
+ <li>16: \x95\xB6\x8E\x9A\x83T\x83C\x83Y\x95\xF1\x8D\x90(\x83s\x83N\x83Z\x83\x8B)</li>
+ </ul></li>
+ <li>\x88ȉ\xBA\x82\xCC dtterm \x82̃E\x83B\x83\x93\x83h\x83E\x91\x80\x8D\xEC\x83V\x81[\x83P\x83\x93\x83X\x82̓\xAE\x8D\xEC\x82\xF0\x95ύX\x82\xB5\x82\xBD\x81B
+ <ul>
+ <li>14: \x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95\xF1\x8D\x90: \x95\xB7\x82\xE9\x97̈\xE6\x82\xF0\x83E\x83B\x83\x93\x83h\x83E\x91S\x91̂\xA9\x82\xE7\x83e\x83L\x83X\x83g\x97̈\xE6\x82ɕύX\x82\xB5\x82\xBD\x81B</li>
+ </ul></li>
+ <li>\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95ύX\x8E\x9E\x82ɍ\xB6\x89E\x83}\x81[\x83W\x83\x93\x83\x82\x81[\x83h\x82\xF0\x83\x8A\x83Z\x83b\x83g\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+ <li>\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8E\xE6\x82\xE9\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93\x82ŁA`/' \x82\xE0\x83p\x83X\x8B\xE6\x90\xE8\x8BL\x8D\x86\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+ </ul>
+ </li>
+
+ <li>\x83o\x83O\x8FC\x90\xB3
+ <ul>
+ <li>Ver 4.100 \x82\xC5 DLL \x82̌Ăяo\x82\xB5\x8BK\x96\xF1\x82\xF0\x95ς\xA6\x82\xBD\x82\xB1\x82ƂŁA\x82\xBB\x82\xEA\x88ȑO\x82ɃR\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x83v\x83\x89\x83O\x83C\x83\x93\x82\xAA\x8CĂяo\x82\xB9\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ </ul>
+ </li>
+
+ <li>\x82\xBB\x82̑\xBC
+ <ul>
+ <li><a href="#ttssh_2.87">TTSSH(2.87)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+ <li><a href="#resizemenu_1.05">TTXResizeMenu Plugin(1.05)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+ <li>Oniguruma 6.9.0\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+ </ul>
+ </li>
+</ul>
+
<h3 id="teraterm_4.100">2018.08.31 (Ver 4.100)</h3>
<ul class="history">
<li>\x95ύX
@@ -3033,6 +3069,15 @@
<h2 id="ttssh">TTSSH</h2>
+<h3 id="ttssh_2.87">2018.11.30 (Ver 2.87)</h3>
+<ul class="history">
+ <li>\x82\xBB\x82̑\xBC
+ <ul>
+ <li>OpenSSL 1.0.2q\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+ </ul>
+ </li>
+</ul>
+
<h3 id="ttssh_2.86">2018.08.31 (Ver 2.86)</h3>
<ul class="history">
<li>\x83o\x83O\x8FC\x90\xB3
@@ -4835,6 +4880,11 @@
</ul>
<h2 id="resizemenu">TTXResizeMenu</h2>
+<h3 id="resizemenu_1.05">2018.11.30 (Ver 1.05)</h3>
+<ul class="history">
+ <li>\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xB8\x82\xB3\x82\xB9\x82\xE9\x88ׂ̃\x81\x83j\x83\x85\x81[ID\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B(\x83V\x83\x87\x81[\x83g\x83J\x83b\x83g\x83L\x81[\x92\xE8\x8B`\x97p)</li>
+</ul>
+
<h3 id="resizemenu_1.04">2018.08.31 (Ver 1.04)</h3>
<ul class="history">
<li>Windows 95/NT4.0 \x82\xC5 TTXResizeMenu \x82\xAA\x93ǂݍ\x9E\x82܂\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
Modified: branches/cmake/doc/ja/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/ja/html/reference/develop.txt 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/ja/html/reference/develop.txt 2018-11-30 16:49:32 UTC (rev 7294)
@@ -48,8 +48,8 @@
\x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
-- Oniguruma 6.8.2 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.0.2p (http://www.openssl.org/)
+- Oniguruma 6.9.0 (https://github.com/kkos/oniguruma)
+- OpenSSL 1.0.2q (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/reference/keycode.txt
===================================================================
--- branches/cmake/doc/ja/html/reference/keycode.txt 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/ja/html/reference/keycode.txt 2018-11-30 16:49:32 UTC (rev 7294)
@@ -488,6 +488,10 @@
TTXResizeMenu \x83\x81\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h ID
-----------------------------------------
[Resize] Menu(1) - Menu(20) 55101 - 55120
+-- Increase window width 55151 (\x83\x81\x83j\x83\x85\x81[\x8A\x84\x82蓖\x82ĂȂ\xB5)
+-- Decrease window width 55152 (\x83\x81\x83j\x83\x85\x81[\x8A\x84\x82蓖\x82ĂȂ\xB5)
+-- Increase window height 55153 (\x83\x81\x83j\x83\x85\x81[\x8A\x84\x82蓖\x82ĂȂ\xB5)
+-- Decrease window height 55154 (\x83\x81\x83j\x83\x85\x81[\x8A\x84\x82蓖\x82ĂȂ\xB5)
TTXViewMode \x83\x81\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h ID
-----------------------------------------
Modified: branches/cmake/doc/ja/html/usage/mouse.html
===================================================================
--- branches/cmake/doc/ja/html/usage/mouse.html 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/doc/ja/html/usage/mouse.html 2018-11-30 16:49:32 UTC (rev 7294)
@@ -71,8 +71,8 @@
\x82\xBD\x82\xBE\x82\xB5\x81A\x83_\x83C\x83A\x83\x8D\x83O\x82\xC5 "\x8E\x9F\x82̃h\x83\x8D\x83b\x83v\x8E\x9E\x81A\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2" \x82\xF0\x83`\x83F\x83b\x83N\x82\xB5\x82\xC4 OK \x82\xF0\x89\x9F\x82\xB7\x82ƕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xAD\x82Ȃ\xE8\x82܂\xB7\x81B\x82\xBB\x82̌\xE3\x82\xCD CTRL \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ȃ\xAA\x82\xE7\x83h\x83\x8D\x83b\x83v\x82\xB7\x82\xEA\x82_\x83C\x83A\x83\x8D\x83O\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82܂\xB7\x81B</dd>
<dt>ConfirmFileDragAndDrop \x82\xAA off \x82̂Ƃ\xAB</dt>
<dd>
- 1\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x83h\x83\x8D\x83b\x83v\x82\xB7\x82\xE9\x82ƁA\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB9\x82\xB8\x82ɏ\x88\x97\x9D\x82\xB5\x82܂\xB7\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82̏\x88\x97\x9D\x82\xCDSend File (Past content of file)\x82ł\xB7\x81B<br>
- 1\x82܂\xBD\x82͕\xA1\x90\x94\x82̃t\x83H\x83\x8B\x83_\x82\xF0\x83h\x83\x8D\x83b\x83v\x82\xB7\x82\xE9\x82ƁA\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB9\x82\xB8\x82ɏ\x88\x97\x9D\x82\xB5\x82܂\xB7\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82̏\x88\x97\x9D\x82\xCDPast Filename\x82ł\xB7\x81B<br>
+ 1\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x83h\x83\x8D\x83b\x83v\x82\xB7\x82\xE9\x82ƁA\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB9\x82\xB8\x82ɏ\x88\x97\x9D\x82\xB5\x82܂\xB7\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82̏\x88\x97\x9D\x82\xCDSend File (Paste content of file)\x82ł\xB7\x81B<br>
+ 1\x82܂\xBD\x82͕\xA1\x90\x94\x82̃t\x83H\x83\x8B\x83_\x82\xF0\x83h\x83\x8D\x83b\x83v\x82\xB7\x82\xE9\x82ƁA\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x95\\x8E\xA6\x82\xB9\x82\xB8\x82ɏ\x88\x97\x9D\x82\xB5\x82܂\xB7\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82̏\x88\x97\x9D\x82\xCDPaste Filename\x82ł\xB7\x81B<br>
\x82\xB1\x82\xEA\x82\xE7\x88ȊO(\x95\xA1\x90\x94\x82̃t\x83@\x83C\x83\x8B/\x83t\x83@\x83C\x83\x8B\x82ƃt\x83H\x83\x8B\x83_)\x82̏ꍇ\x82̓_\x83C\x83A\x83\x8D\x83O\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82܂\xB7\x81B\x82܂\xBD\x81A\x8F\xE3\x8BL\x82̏ꍇ\x82ł\xE0\x81ACTRL \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ȃ\xAA\x82\xE7\x83h\x83\x8D\x83b\x83v\x82\xB7\x82\xE9\x82ƃ_\x83C\x83A\x83\x8D\x83O\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82܂\xB7\x81B
</dd>
</dl>
Modified: branches/cmake/installer/teraterm.iss
===================================================================
--- branches/cmake/installer/teraterm.iss 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/installer/teraterm.iss 2018-11-30 16:49:32 UTC (rev 7294)
@@ -1,5 +1,5 @@
#define AppName "Tera Term"
-#define AppVer "4.100"
+#define AppVer "4.101"
#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
[InnoIDE_PreCompile]
Modified: branches/cmake/teraterm/common/tt-version.h
===================================================================
--- branches/cmake/teraterm/common/tt-version.h 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/teraterm/common/tt-version.h 2018-11-30 16:49:32 UTC (rev 7294)
@@ -29,7 +29,7 @@
#pragma once
#define TT_VERSION_MAJOR 4
-#define TT_VERSION_MINOR 100
+#define TT_VERSION_MINOR 101
#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/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/teraterm/teraterm/vtdisp.c 2018-11-30 16:49:32 UTC (rev 7294)
@@ -3721,6 +3721,14 @@
case WINDOW_REFRESH:
InvalidateRect(HVTWin, NULL, FALSE);
break;
+ case WINDOW_TOGGLE_MAXIMIZE:
+ if (IsZoomed(HVTWin)) {
+ ShowWindow(HVTWin, SW_RESTORE);
+ }
+ else {
+ ShowWindow(HVTWin, SW_MAXIMIZE);
+ }
+ break;
}
}
@@ -3744,29 +3752,43 @@
return IsIconic(HVTWin);
}
-void DispGetWindowPos(int *x, int *y) {
+void DispGetWindowPos(int *x, int *y, BOOL client) {
WINDOWPLACEMENT wndpl;
+ POINT point;
- wndpl.length = sizeof(WINDOWPLACEMENT);
- GetWindowPlacement(HVTWin, &wndpl);
+ if (client) {
+ point.x = point.y = 0;
+ ClientToScreen(HVTWin, &point);
+ *x = point.x;
+ *y = point.y;
+ }
+ else {
+ wndpl.length = sizeof(WINDOWPLACEMENT);
+ GetWindowPlacement(HVTWin, &wndpl);
- switch (wndpl.showCmd) {
- case SW_SHOWMAXIMIZED:
- *x = wndpl.ptMaxPosition.x;
- *y = wndpl.ptMaxPosition.y;
- break;
- default:
- *x = wndpl.rcNormalPosition.left;
- *y = wndpl.rcNormalPosition.top;
+ switch (wndpl.showCmd) {
+ case SW_SHOWMAXIMIZED:
+ *x = wndpl.ptMaxPosition.x;
+ *y = wndpl.ptMaxPosition.y;
+ break;
+ default:
+ *x = wndpl.rcNormalPosition.left;
+ *y = wndpl.rcNormalPosition.top;
+ }
}
return;
}
-void DispGetWindowSize(int *width, int *height) {
+void DispGetWindowSize(int *width, int *height, BOOL client) {
RECT r;
- GetWindowRect(HVTWin, &r);
+ if (client) {
+ GetClientRect(HVTWin, &r);
+ }
+ else {
+ GetWindowRect(HVTWin, &r);
+ }
*width = r.right - r.left;
*height = r.bottom - r.top;
@@ -3773,7 +3795,7 @@
return;
}
-void DispGetRootWinSize(int *x, int *y)
+void DispGetRootWinSize(int *x, int *y, BOOL inPixels)
{
HMODULE mod;
HMONITOR monitor;
@@ -3796,8 +3818,14 @@
SystemParametersInfo(SPI_GETWORKAREA, 0, &desktop, 0);
}
- *x = (desktop.right - desktop.left - (win.right - win.left - client.right)) / FontWidth;
- *y = (desktop.bottom - desktop.top - (win.bottom - win.top - client.bottom)) / FontHeight;
+ if (inPixels) {
+ *x = desktop.right - desktop.left;
+ *y = desktop.bottom - desktop.top;
+ }
+ else {
+ *x = (desktop.right - desktop.left - (win.right - win.left - client.right)) / FontWidth;
+ *y = (desktop.bottom - desktop.top - (win.bottom - win.top - client.bottom)) / FontHeight;
+ }
return;
}
Modified: branches/cmake/teraterm/teraterm/vtdisp.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.h 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/teraterm/teraterm/vtdisp.h 2018-11-30 16:49:32 UTC (rev 7294)
@@ -111,9 +111,9 @@
void DispShowWindow(int mode);
void DispResizeWin(int w, int h);
BOOL DispWindowIconified();
-void DispGetWindowPos(int *x, int *y);
-void DispGetWindowSize(int *width, int *height);
-void DispGetRootWinSize(int *x, int *y);
+void DispGetWindowPos(int *x, int *y, BOOL client);
+void DispGetWindowSize(int *width, int *height, BOOL client);
+void DispGetRootWinSize(int *x, int *y, BOOL inPixels);
int DispFindClosestColor(int red, int green, int blue);
void UpdateBGBrush(void);
void DpiChanged(void);
@@ -142,6 +142,7 @@
#define WINDOW_RAISE 4
#define WINDOW_LOWER 5
#define WINDOW_REFRESH 6
+#define WINDOW_TOGGLE_MAXIMIZE 7
#ifdef __cplusplus
}
Modified: branches/cmake/teraterm/teraterm/vtterm.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtterm.c 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/teraterm/teraterm/vtterm.c 2018-11-30 16:49:32 UTC (rev 7294)
@@ -447,7 +447,6 @@
MainY = 0;
MainTop = 0;
MainBottom = NumOfLines-StatusLine-1;
- LRMarginMode = FALSE;
}
void SendCSIstr(char *str, int len) {
@@ -2418,6 +2417,27 @@
}
break;
+ case 10: // Full-screen
+ /*
+ * \x96{\x97\x88\x82Ȃ\xE7\x82\xCE PuTTY \x82̂悤\x82ȃt\x83\x8B\x83X\x83N\x83\x8A\x81[\x83\x93\x83\x82\x81[\x83h\x82\xF0\x8E\xC0\x91\x95\x82\xB7\x82\xE9\x82ׂ\xAB\x82\xBE\x82\xAA\x81A
+ * \x82Ƃ肠\x82\xA6\x82\xB8\x82͎蔲\x82\xAB\x82ōő剻\x82𗘗p\x82\xB7\x82\xE9
+ */
+ if (ts.WindowFlag & WF_WINDOWCHANGE) {
+ RequiredParams(2);
+ switch (Param[2]) {
+ case 0:
+ DispShowWindow(WINDOW_RESTORE);
+ break;
+ case 1:
+ DispShowWindow(WINDOW_MAXIMIZE);
+ break;
+ case 2:
+ DispShowWindow(WINDOW_TOGGLE_MAXIMIZE);
+ break;
+ }
+ }
+ break;
+
case 11: // Report window state
if (ts.WindowFlag & WF_WINDOWREPORT) {
len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "%dt", CLocale, DispWindowIconified()?2:1);
@@ -2427,7 +2447,18 @@
case 13: // Report window position
if (ts.WindowFlag & WF_WINDOWREPORT) {
- DispGetWindowPos(&x, &y);
+ RequiredParams(2);
+ switch (Param[2]) {
+ case 0:
+ case 1:
+ DispGetWindowPos(&x, &y, FALSE);
+ break;
+ case 2:
+ DispGetWindowPos(&x, &y, TRUE);
+ break;
+ default:
+ return;
+ }
len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "3;%u;%ut", CLocale, (unsigned int)x, (unsigned int)y);
SendCSIstr(Report, len);
}
@@ -2435,12 +2466,39 @@
case 14: /* get window size */
if (ts.WindowFlag & WF_WINDOWREPORT) {
- DispGetWindowSize(&x, &y);
+ RequiredParams(2);
+ switch (Param[2]) {
+ case 0:
+ case 1:
+ DispGetWindowSize(&x, &y, TRUE);
+ break;
+ case 2:
+ DispGetWindowSize(&x, &y, FALSE);
+ break;
+ default:
+ return;
+ }
+
len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "4;%d;%dt", CLocale, y, x);
SendCSIstr(Report, len);
}
break;
+ case 15: // Report display size (pixel)
+ if (ts.WindowFlag & WF_WINDOWREPORT) {
+ DispGetRootWinSize(&x, &y, TRUE);
+ len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "5;%d;%dt", CLocale, y, x);
+ SendCSIstr(Report, len);
+ }
+ break;
+
+ case 16: // Report character cell size (pixel)
+ if (ts.WindowFlag & WF_WINDOWREPORT) {
+ len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "6;%d;%dt", CLocale, FontHeight, FontWidth);
+ SendCSIstr(Report, len);
+ }
+ break;
+
case 18: /* get terminal size */
if (ts.WindowFlag & WF_WINDOWREPORT) {
len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "8;%u;%ut", CLocale,
@@ -2451,7 +2509,7 @@
case 19: // Report display size (character)
if (ts.WindowFlag & WF_WINDOWREPORT) {
- DispGetRootWinSize(&x, &y);
+ DispGetRootWinSize(&x, &y, FALSE);
len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "9;%d;%dt", CLocale, y, x);
SendCSIstr(Report, len);
}
@@ -2720,6 +2778,12 @@
void CSQChangeColumnMode(int width) // DECCOLM
{
ChangeTerminalSize(width, NumOfLines-StatusLine);
+ LRMarginMode = FALSE;
+
+ // DECCOLM \x82ł͉\xE6\x96ʂ\xAA\x83N\x83\x8A\x83A\x82\xB3\x82\xEA\x82\xE9\x82̂\xAA\x8Ed\x97l
+ // ClearOnResize \x82\xAA off \x82̎\x9E\x82͂\xB1\x82\xB1\x82ŃN\x83\x8A\x83A\x82\xB7\x82\xE9\x81B
+ // ClearOnResize \x82\xAA on \x82̎\x9E\x82\xCD ChangeTerminalSize() \x82\xF0\x8CĂԂƃN\x83\x8A\x83A\x82\xB3\x82\xEA\x82\xE9\x82̂ŁA
+ // \x97]\x8Cv\x82ȃX\x83N\x83\x8D\x81[\x83\x8B\x82\xF0\x94\xF0\x82\xAF\x82\xE9\x88ׂɂ\xB1\x82\xB1\x82ł̓N\x83\x8A\x83A\x82\xB5\x82Ȃ\xA2\x81B
if ((ts.TermFlag & TF_CLEARONRESIZE) == 0) {
MoveCursor(0, 0);
BuffClearScreen();
Modified: branches/cmake/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2018-11-30 16:49:32 UTC (rev 7294)
@@ -221,7 +221,7 @@
PUSHBUTTON "&Help",IDC_DIRHELP,115,34,36,14
END
-IDD_ABOUTDLG DIALOGEX 20, 20, 211, 128
+IDD_ABOUTDLG DIALOGEX 20, 20, 211, 118
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "About Tera Term"
FONT 14, "System", 0, 0, 0x0
@@ -241,8 +241,8 @@
LTEXT "Version",IDC_TT_VERSION,39,12,127,8
RTEXT "Author:",IDC_AUTHOR_LABEL,5,106,28,8
LTEXT "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,106,128,8,SS_NOTIFY | WS_TABSTOP
- RTEXT "Forum:",IDC_FORUM_LABEL,5,115,25,8
- LTEXT "http://logmett.com/support-forums",IDC_FORUM_URL,36,115,136,8,SS_NOTIFY | WS_TABSTOP
+// RTEXT "Forum:",IDC_FORUM_LABEL,8,115,25,8
+// LTEXT "http://logmett.com/support-forums",IDC_FORUM_URL,36,115,136,8,SS_NOTIFY | WS_TABSTOP
LTEXT "Oniguruma: ",IDC_ONIGURUMA_LABEL,39,35,114,8
LTEXT "Built using Microsoft Visual C++",IDC_BUILDTOOL,5,87,205,10
LTEXT "Build time: ",IDC_BUILDTIME,5,97,205,8
Modified: branches/cmake/ttssh2/ttxssh/ttxssh-version.h
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh-version.h 2018-11-30 16:29:01 UTC (rev 7293)
+++ branches/cmake/ttssh2/ttxssh/ttxssh-version.h 2018-11-30 16:49:32 UTC (rev 7294)
@@ -31,6 +31,6 @@
#include "tt-version.h"
#define TTSSH_VERSION_MAJOR 2
-#define TTSSH_VERSION_MINOR 86
+#define TTSSH_VERSION_MINOR 87
#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"