From svnnotify @ sourceforge.jp Wed May 1 20:07:21 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Wed, 01 May 2013 20:07:21 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B5219=5D__Tera_Term_Menu=E3=81=AE?=
=?utf-8?b?44Os44K444K544OI44Oq44KSaW5p44OV44Kh44Kk44Or5YyW44GZ44KL44OE?=
=?utf-8?b?44O844Or?=
Message-ID: <1367406441.115306.27485.nullmailer@users.sourceforge.jp>
Revision: 5219
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5219
Author: yutakapon
Date: 2013-05-01 20:07:19 +0900 (Wed, 01 May 2013)
Log Message:
-----------
Tera Term Menuのレジストリをiniファイル化するツール
- ActivePerlスクリプト
Added Paths:
-----------
trunk/installer/ttpmenu/ttpmenu.pl
-------------- next part --------------
Added: trunk/installer/ttpmenu/ttpmenu.pl
===================================================================
--- trunk/installer/ttpmenu/ttpmenu.pl (rev 0)
+++ trunk/installer/ttpmenu/ttpmenu.pl 2013-05-01 11:07:19 UTC (rev 5219)
@@ -0,0 +1,71 @@
+
+#
+# Export Tera Term Menu registry to ini file.
+# with ActivePerl
+#
+# Usage:
+# c:\>perl ttpmenu.pl > ttpmenu.ini
+#
+
+use Win32::Registry;
+use strict;
+
+my $TTMREG = "Software\\ShinpeiTools\\TTermMenu";
+my $tips;
+my $key;
+my @subkeys;
+
+PrintSectionName("TTermMenu");
+ExportIniFile($TTMREG);
+
+$HKEY_CURRENT_USER->Open($TTMREG, $tips) or die "Can not open registry";
+$tips->GetKeys(\@subkeys);
+$tips->Close();
+foreach $key (@subkeys) {
+# print "$key\n";
+ PrintSectionName("$key");
+ ExportIniFile($TTMREG . "\\" . $key);
+}
+
+
+exit(0);
+
+
+sub PrintSectionName {
+ my($name) = @_;
+
+ print "[$name]\n";
+}
+
+
+sub ExportIniFile {
+ my($path) = @_;
+ my($tips);
+ my(%vals);
+ my($key, $RegType, $RegValue, $RegKey, @bytes);
+
+ $HKEY_CURRENT_USER->Open($path, $tips) or die "Can not open registry";
+
+ $tips->GetValues(\%vals);
+ foreach $key (keys(%vals)) {
+ $RegType = $vals{$key}->[1];
+ $RegValue = $vals{$key}->[2];
+ $RegKey = $vals{$key}->[0];
+ print "$RegKey=";
+ if ($RegType == REG_DWORD) {
+ printf "%08x\n", $RegValue;
+
+ } elsif ($RegType == REG_BINARY) {
+ @bytes = unpack('C*', $RegValue);
+ printf "%02x ", $_ foreach @bytes;
+ print "\n";
+
+ } else {
+ print "$RegValue\n";
+ }
+ }
+ print "\n";
+
+ $tips->Close();
+}
+
From svnnotify @ sourceforge.jp Wed May 1 20:20:01 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Wed, 01 May 2013 20:20:01 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjBdIHpsaWIgMS4yLiA4IOOBq+OCog==?=
=?utf-8?b?44OD44OX44OH44O844OI44GX44Gf44CC?=
Message-ID: <1367407201.921348.5830.nullmailer@users.sourceforge.jp>
Revision: 5220
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5220
Author: yutakapon
Date: 2013-05-01 20:20:01 +0900 (Wed, 01 May 2013)
Log Message:
-----------
zlib 1.2.8 にアップデートした。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/reference/develop.txt
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/reference/develop.txt
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2013-05-01 11:07:19 UTC (rev 5219)
+++ trunk/doc/en/html/about/history.html 2013-05-01 11:20:01 UTC (rev 5220)
@@ -81,6 +81,7 @@
added the Korean.lng language file. Special thanks to Daehong Kim.
upgraded TTSSH to 2.65
upgraded Oniguruma to 5.9.4
+ upgraded zlib to 1.2.8
Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt 2013-05-01 11:07:19 UTC (rev 5219)
+++ trunk/doc/en/html/reference/develop.txt 2013-05-01 11:20:01 UTC (rev 5220)
@@ -24,7 +24,7 @@
* Libraries
- Oniguruma 5.9.4 (http://www.geocities.jp/kosako3/oniguruma/)
- OpenSSL 1.0.1e (http://www.openssl.org/)
-- zlib 1.2.7 (http://www.zlib.net/)
+- zlib 1.2.8 (http://www.zlib.net/)
- PuTTY 0.62 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2013-05-01 11:07:19 UTC (rev 5219)
+++ trunk/doc/ja/html/about/history.html 2013-05-01 11:20:01 UTC (rev 5220)
@@ -80,6 +80,7 @@
\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82??\x91\x8C\xEA(Korean.lng)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81BDaehong Kim\x8E\x81\x82?\xB4\x8E?\xB5\x82?\xB7\x81B
TTSSH(2.65)\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B
Oniguruma 5.9.4\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD
+ zlib 1.2.8\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD
Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt 2013-05-01 11:07:19 UTC (rev 5219)
+++ trunk/doc/ja/html/reference/develop.txt 2013-05-01 11:20:01 UTC (rev 5220)
@@ -24,7 +24,7 @@
\x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
- Oniguruma 5.9.4 (http://www.geocities.jp/kosako3/oniguruma/)
- OpenSSL 1.0.1e (http://www.openssl.org/)
-- zlib 1.2.7 (http://www.zlib.net/)
+- zlib 1.2.8 (http://www.zlib.net/)
- PuTTY 0.62 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
From svnnotify @ sourceforge.jp Wed May 1 20:22:58 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Wed, 01 May 2013 20:22:58 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjFdICDov73liqDnrofmiYDjgpLplpM=?=
=?utf-8?b?6YGV44Gj44Gm44GE44Gf44Gu44KS5L+u5q2j44GX44Gf44CC?=
Message-ID: <1367407378.682441.15829.nullmailer@users.sourceforge.jp>
Revision: 5221
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5221
Author: yutakapon
Date: 2013-05-01 20:22:58 +0900 (Wed, 01 May 2013)
Log Message:
-----------
追加箇所を間違っていたのを修正した。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2013-05-01 11:20:01 UTC (rev 5220)
+++ trunk/doc/en/html/about/history.html 2013-05-01 11:22:58 UTC (rev 5221)
@@ -81,7 +81,6 @@
added the Korean.lng language file. Special thanks to Daehong Kim.
upgraded TTSSH to 2.65
upgraded Oniguruma to 5.9.4
- upgraded zlib to 1.2.8
@@ -2054,6 +2053,7 @@
Misc
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2013-05-01 11:20:01 UTC (rev 5220)
+++ trunk/doc/ja/html/about/history.html 2013-05-01 11:22:58 UTC (rev 5221)
@@ -80,7 +80,6 @@
\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82??\x91\x8C\xEA(Korean.lng)\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81BDaehong Kim\x8E\x81\x82?\xB4\x8E?\xB5\x82?\xB7\x81B
TTSSH(2.65)\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B
Oniguruma 5.9.4\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD
- zlib 1.2.8\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD
@@ -2054,6 +2053,7 @@
\x82\xBB\x82?\xBC
+ - zlib 1.2.8\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD
From svnnotify @ sourceforge.jp Thu May 2 00:55:26 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 02 May 2013 00:55:26 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjJdICBUZXJhIFRlcm3jga7jgqbjgqM=?=
=?utf-8?b?44Oz44OJ44Km576k44KS44CM5Lim44G544Gm6KGo56S644CN44GZ44KL6Zai?=
=?utf-8?b?5pWw44KS6L+95Yqg44GX44Gf44CC?=
Message-ID: <1367423726.319755.10033.nullmailer@users.sourceforge.jp>
Revision: 5222
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5222
Author: yutakapon
Date: 2013-05-02 00:55:25 +0900 (Thu, 02 May 2013)
Log Message:
-----------
Tera Termのウィンドウ群を「並べて表示」する関数を追加した。
関数自体はまだどこからも呼んでいないので、実際にはまだ動かない。
Modified Paths:
--------------
trunk/teraterm/common/ttcommon.h
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpcmn/ttpcmn.def
-------------- next part --------------
Modified: trunk/teraterm/common/ttcommon.h
===================================================================
--- trunk/teraterm/common/ttcommon.h 2013-05-01 11:22:58 UTC (rev 5221)
+++ trunk/teraterm/common/ttcommon.h 2013-05-01 15:55:25 UTC (rev 5222)
@@ -35,6 +35,9 @@
void FAR PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
HWND FAR PASCAL GetNthWin(int n);
void FAR PASCAL ShowAllWin(int stat);
+void FAR PASCAL ShowAllWinSidebySide(HWND);
+void FAR PASCAL ShowAllWinStacked(HWND);
+void FAR PASCAL ShowAllWinCascade(HWND);
int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
int FAR PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2013-05-01 11:22:58 UTC (rev 5221)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2013-05-01 15:55:25 UTC (rev 5222)
@@ -1028,6 +1028,109 @@
}
}
+// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x81[\x82\xF0\x8Dl\x97\xB6\x82\xB5\x82āA\x83^\x83X\x83N\x83o\x81[\x82\xF0\x8F\x9C\x82\xA2\x82\xBD\x83f\x83B\x83X\x83v\x83\x8C\x83C\x83T\x83C\x83Y\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
+static void get_desktop_size_by_multi_monitor(HWND hwnd, RECT *rect)
+{
+ HMONITOR hMon;
+ MONITORINFO mi;
+
+ // FIXME: Windows95\x82ł?\xA2\x92\xE8\x8B`\x82??l\x81B
+ hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+
+ ZeroMemory( &mi, sizeof( mi ));
+ mi.cbSize = sizeof( mi );
+ GetMonitorInfo(hMon, &mi);
+ *rect = mi.rcWork; // \x83^\x83X\x83N\x83o\x81[\x82\xF0\x8F\x9C\x82\xA2\x82\xBD\x83f\x83B\x83X\x83v\x83\x8C\x83C\x83T\x83C\x83Y
+}
+
+// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Side by Side)
+void FAR PASCAL ShowAllWinSidebySide(HWND myhwnd)
+{
+ int i, n, width;
+ HWND hwnd[MAXNWIN];
+ RECT rc;
+
+ get_desktop_size_by_multi_monitor(myhwnd, &rc);
+
+ n = 0;
+ for (i = 0 ; i < pm->NWin ; i++) {
+ if (IsIconic(pm->WinList[i]) || !IsWindowVisible(pm->WinList[i]))
+ continue;
+
+ if (pm->WinList[i] == myhwnd) {
+ hwnd[n] = hwnd[0];
+ hwnd[0] = myhwnd;
+ } else {
+ hwnd[n] = pm->WinList[i];
+ }
+ n++;
+ }
+ if (n <= 1) // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82??\xE3\x82??\x82?\xC0\x82\xE9
+ goto error;
+
+ width = (rc.right - rc.left) / n;
+ for (i = 0 ; i < n ; i++) {
+ ShowWindow(hwnd[i], SW_RESTORE);
+ SetWindowPos(hwnd[i], 0,
+ width*i + rc.left,
+ rc.top,
+ width,
+ rc.bottom - rc.top,
+ SWP_NOOWNERZORDER | SWP_NOZORDER);
+ }
+ SetFocus(hwnd[0]);
+
+error:
+ return;
+}
+
+// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F?\x82?\xC0\x82??\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Stacked)
+void FAR PASCAL ShowAllWinStacked(HWND myhwnd)
+{
+ int i, n, height;
+ HWND hwnd[MAXNWIN];
+ RECT rc;
+
+ get_desktop_size_by_multi_monitor(myhwnd, &rc);
+
+ n = 0;
+ for (i = 0 ; i < pm->NWin ; i++) {
+ if (IsIconic(pm->WinList[i]) || !IsWindowVisible(pm->WinList[i]))
+ continue;
+
+ if (pm->WinList[i] == myhwnd) {
+ hwnd[n] = hwnd[0];
+ hwnd[0] = myhwnd;
+ } else {
+ hwnd[n] = pm->WinList[i];
+ }
+ n++;
+ }
+ if (n <= 1) // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82??\xE3\x82??\x82?\xC0\x82\xE9
+ goto error;
+
+ height = (rc.bottom - rc.top) / n;
+ for (i = 0 ; i < n ; i++) {
+ ShowWindow(hwnd[i], SW_RESTORE);
+ SetWindowPos(hwnd[i], 0,
+ rc.left,
+ rc.top + height*i,
+ rc.right - rc.left,
+ height,
+ SWP_NOOWNERZORDER | SWP_NOZORDER);
+ }
+ SetFocus(hwnd[0]);
+
+error:
+ return;
+}
+
+// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82??\\x8E\xA6\x82\xB7\x82\xE9(Cascade)
+void FAR PASCAL ShowAllWinCascade(HWND myhwnd)
+{
+ // TODO:
+}
+
int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
{
if ( ! cv->Ready ) {
Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def 2013-05-01 11:22:58 UTC (rev 5221)
+++ trunk/teraterm/ttpcmn/ttpcmn.def 2013-05-01 15:55:25 UTC (rev 5222)
@@ -47,3 +47,6 @@
mctimelocal @53
RestartTeraTerm @55
+ ShowAllWinSidebySide @56
+ ShowAllWinStacked @57
+ ShowAllWinCascade @58
From svnnotify @ sourceforge.jp Thu May 2 14:37:15 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 02 May 2013 14:37:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjNdICDjgIzph43jga3jgabooajnpLo=?=
=?utf-8?b?44CN44CM5bem5Y+z44Gr5Lim44G544Gm6KGo56S644CN44CM5LiK5LiL44Gr?=
=?utf-8?b?5Lim44G544Gm6KGo56S644CN44KS6KGM44GG6Zai5pWw44KS6L+95Yqg44GX?=
=?utf-8?b?44Gf44CC?=
Message-ID: <1367473035.977791.4989.nullmailer@users.sourceforge.jp>
Revision: 5223
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5223
Author: yutakapon
Date: 2013-05-02 14:37:15 +0900 (Thu, 02 May 2013)
Log Message:
-----------
「重ねて表示」「左右に並べて表示」「上下に並べて表示」を行う関数を追加した。
結局、自前でやらずに、Win32APIを利用する。
共有メモリを拡張したので、以前のTera Termとの混在は不可。
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/ttpcmn/ttcmn.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2013-05-01 15:55:25 UTC (rev 5222)
+++ trunk/teraterm/common/tttypes.h 2013-05-02 05:37:15 UTC (rev 5223)
@@ -1009,6 +1009,8 @@
* char[1] : COM16 15 14 13 12 11 10 9 ...
*/
unsigned char ComFlag[(MAXCOMPORT-1)/CHAR_BIT+1];
+ /* Previous window rect (Tera Term 4.78 or later) */
+ WINDOWPLACEMENT WinPrevRect[MAXNWIN];
} TMap;
typedef TMap far *PMap;
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2013-05-01 15:55:25 UTC (rev 5222)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2013-05-02 05:37:15 UTC (rev 5223)
@@ -838,6 +838,7 @@
return 0;
}
pm->WinList[pm->NWin++] = HWinVT;
+ memset(&pm->WinPrevRect[pm->NWin - 1], 0, sizeof(pm->WinPrevRect[pm->NWin - 1])); // RECT clear
if (pm->NWin==1) {
return 1;
}
@@ -860,6 +861,7 @@
}
for (j=i ; jNWin-1 ; j++) {
pm->WinList[j] = pm->WinList[j+1];
+ pm->WinPrevRect[j] = pm->WinPrevRect[j+1]; // RECT shift
}
if (pm->NWin>0) {
pm->NWin--;
@@ -1012,9 +1014,58 @@
void FAR PASCAL ShowAllWin(int stat) {
int i;
+ WINDOWPLACEMENT rc0;
+ RECT rc;
+ HMONITOR hMonitor;
+ MONITORINFO mi;
+ memset(&rc0, 0, sizeof(rc0));
+
for (i=0; i < pm->NWin; i++) {
- ShowWindow(pm->WinList[i], stat);
+ // \x95\x9C\x8C\xB3\x8Ew\x92\xE8\x82ŁA\x91O\x89\xF1\x82?\xF3\x91?\xAA\x8Ec\x82\xC1\x82Ă\xA2\x82\xE9\x8F?\x82?A\x83E\x83B\x83\x93\x83h\x83E\x82?\xF3\x91?\xF0\x8C\xB3\x82??\xB7\x81B
+ if (stat == SW_RESTORE && memcmp(&pm->WinPrevRect[i], &rc0, sizeof(rc0)) != 0) {
+ rc = pm->WinPrevRect[i].rcNormalPosition;
+
+ // \x91Ώ?\x82\x83j\x83^\x82?\xEE\x95\xF1\x82\xF0\x8E擾
+ hMonitor = MonitorFromRect(&rc, MONITOR_DEFAULTTONEAREST);
+ mi.cbSize = sizeof(MONITORINFO);
+ GetMonitorInfo(hMonitor, &mi);
+
+ // \x88?u\x95?\x81i\x95\x9C\x8C\xB3\x91O\x8C\xE3\x82ʼn?x\x82\xAA\x95ς\xED\x82\xC1\x82Ă\xA2\x82\xE9\x8F?\x82???\xF4\x81j
+ if (rc.right > mi.rcMonitor.right) {
+ rc.left -= rc.right - mi.rcMonitor.right;
+ rc.right = mi.rcMonitor.right;
+ }
+ if (rc.left < mi.rcMonitor.left) {
+ rc.right += mi.rcMonitor.left - rc.left;
+ rc.left = mi.rcMonitor.left;
+ }
+ if (rc.bottom > mi.rcMonitor.bottom) {
+ rc.top -= rc.bottom - mi.rcMonitor.bottom;
+ rc.bottom = mi.rcMonitor.bottom;
+ }
+ if (rc.top < mi.rcMonitor.top) {
+ rc.bottom += mi.rcMonitor.top - rc.top;
+ rc.top = mi.rcMonitor.top;
+ }
+
+ // \x83E\x83B\x83\x93\x83h\x83E\x88?u\x95\x9C\x8C\xB3
+ SetWindowPos(
+ pm->WinList[i], NULL,
+ rc.left,
+ rc.top,
+ rc.right - rc.left,
+ rc.bottom - rc.top,
+ SWP_NOZORDER);
+
+ // \x8Dő?\x82\xB5\x82Ă\xA2\x82\xBD\x82\xA9\x81H
+ if (pm->WinPrevRect[i].showCmd == SW_SHOWMAXIMIZED) {
+ ShowWindow(pm->WinList[i], SW_MAXIMIZE);
+ }
+
+ } else {
+ ShowWindow(pm->WinList[i], stat);
+ }
}
}
@@ -1028,6 +1079,7 @@
}
}
+#if 0
// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x81[\x82\xF0\x8Dl\x97\xB6\x82\xB5\x82āA\x83^\x83X\x83N\x83o\x81[\x82\xF0\x8F\x9C\x82\xA2\x82\xBD\x83f\x83B\x83X\x83v\x83\x8C\x83C\x83T\x83C\x83Y\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
static void get_desktop_size_by_multi_monitor(HWND hwnd, RECT *rect)
{
@@ -1042,21 +1094,27 @@
GetMonitorInfo(hMon, &mi);
*rect = mi.rcWork; // \x83^\x83X\x83N\x83o\x81[\x82\xF0\x8F\x9C\x82\xA2\x82\xBD\x83f\x83B\x83X\x83v\x83\x8C\x83C\x83T\x83C\x83Y
}
+#endif
-// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Side by Side)
-void FAR PASCAL ShowAllWinSidebySide(HWND myhwnd)
+// \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xF0\x92T\x82\xB5\x81A\x8C\xBB\x8D??u\x82\xF0\x8BL\x89\xAF\x82\xB3\x82\xB9\x82Ă\xA8\x82\xAD\x81B
+static void get_valid_window_and_memorize_rect(HWND myhwnd, HWND hwnd[], int *num)
{
- int i, n, width;
- HWND hwnd[MAXNWIN];
- RECT rc;
+ int i, n;
+ WINDOWPLACEMENT wndPlace;
- get_desktop_size_by_multi_monitor(myhwnd, &rc);
-
n = 0;
for (i = 0 ; i < pm->NWin ; i++) {
- if (IsIconic(pm->WinList[i]) || !IsWindowVisible(pm->WinList[i]))
+ if (IsIconic(pm->WinList[i]) || !IsWindowVisible(pm->WinList[i])) {
+ memset(&pm->WinPrevRect[i], 0, sizeof(pm->WinPrevRect[i]));
continue;
+ }
+ // \x8C\xBB\x8D??u\x82\xF0\x8Ao\x82\xA6\x82Ă\xA8\x82\xAD\x81B
+ wndPlace.length = sizeof(WINDOWPLACEMENT);
+ GetWindowPlacement(pm->WinList[i], &wndPlace);
+ pm->WinPrevRect[i] = wndPlace;
+
+ // \x8E\xA9\x95\xAA\x8E\xA9\x90g\x82?擪\x82?\xB7\x82\xE9\x81B
if (pm->WinList[i] == myhwnd) {
hwnd[n] = hwnd[0];
hwnd[0] = myhwnd;
@@ -1065,70 +1123,47 @@
}
n++;
}
- if (n <= 1) // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82??\xE3\x82??\x82?\xC0\x82\xE9
- goto error;
+ *num = n;
- width = (rc.right - rc.left) / n;
- for (i = 0 ; i < n ; i++) {
- ShowWindow(hwnd[i], SW_RESTORE);
- SetWindowPos(hwnd[i], 0,
- width*i + rc.left,
- rc.top,
- width,
- rc.bottom - rc.top,
- SWP_NOOWNERZORDER | SWP_NOZORDER);
+ // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82?\xA2\x96\x9E\x82?\xE7\x82?A\x8BL\x89\xAF\x82\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9\x81B
+ if (n <= 1) {
+ for (i = 0 ; i < pm->NWin ; i++) {
+ memset(&pm->WinPrevRect[i], 0, sizeof(pm->WinPrevRect[i]));
+ }
}
- SetFocus(hwnd[0]);
+}
-error:
- return;
+// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Side by Side)
+void FAR PASCAL ShowAllWinSidebySide(HWND myhwnd)
+{
+ int n;
+ HWND hwnd[MAXNWIN];
+
+ get_valid_window_and_memorize_rect(myhwnd, hwnd, &n);
+ if (n >= 2) // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82??\xE3\x82??\x82?\xC0\x82\xE9
+ TileWindows(NULL, MDITILE_HORIZONTAL, NULL, n, hwnd);
}
// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F?\x82?\xC0\x82??\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Stacked)
void FAR PASCAL ShowAllWinStacked(HWND myhwnd)
{
- int i, n, height;
+ int n;
HWND hwnd[MAXNWIN];
- RECT rc;
- get_desktop_size_by_multi_monitor(myhwnd, &rc);
-
- n = 0;
- for (i = 0 ; i < pm->NWin ; i++) {
- if (IsIconic(pm->WinList[i]) || !IsWindowVisible(pm->WinList[i]))
- continue;
-
- if (pm->WinList[i] == myhwnd) {
- hwnd[n] = hwnd[0];
- hwnd[0] = myhwnd;
- } else {
- hwnd[n] = pm->WinList[i];
- }
- n++;
- }
- if (n <= 1) // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82??\xE3\x82??\x82?\xC0\x82\xE9
- goto error;
-
- height = (rc.bottom - rc.top) / n;
- for (i = 0 ; i < n ; i++) {
- ShowWindow(hwnd[i], SW_RESTORE);
- SetWindowPos(hwnd[i], 0,
- rc.left,
- rc.top + height*i,
- rc.right - rc.left,
- height,
- SWP_NOOWNERZORDER | SWP_NOZORDER);
- }
- SetFocus(hwnd[0]);
-
-error:
- return;
+ get_valid_window_and_memorize_rect(myhwnd, hwnd, &n);
+ if (n >= 2) // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82??\xE3\x82??\x82?\xC0\x82\xE9
+ TileWindows(NULL, MDITILE_VERTICAL, NULL, n, hwnd);
}
// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82??\\x8E\xA6\x82\xB7\x82\xE9(Cascade)
void FAR PASCAL ShowAllWinCascade(HWND myhwnd)
{
- // TODO:
+ int n;
+ HWND hwnd[MAXNWIN];
+
+ get_valid_window_and_memorize_rect(myhwnd, hwnd, &n);
+ if (n >= 2) // \x97L\x8C\xF8\x82?E\x83B\x83\x93\x83h\x83E\x82\xAA2\x82??\xE3\x82??\x82?\xC0\x82\xE9
+ CascadeWindows(NULL, MDITILE_SKIPDISABLED, NULL, n, hwnd);
}
int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
From svnnotify @ sourceforge.jp Thu May 2 15:37:10 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 02 May 2013 15:37:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjRdICDjgIzph43jga3jgabooajnpLo=?=
=?utf-8?b?44CN44CM5bem5Y+z44Gr5Lim44G544Gm6KGo56S644CN44CM5LiK5LiL44Gr?=
=?utf-8?b?5Lim44G544Gm6KGo56S644CN44KSIFdpbmRvdyDjg6Hjg4vjg6Xjg7zjgas=?=
=?utf-8?b?6L+95Yqg44GX44Gf44CC?=
Message-ID: <1367476630.297138.21265.nullmailer@users.sourceforge.jp>
Revision: 5224
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5224
Author: yutakapon
Date: 2013-05-02 15:37:09 +0900 (Thu, 02 May 2013)
Log Message:
-----------
「重ねて表示」「左右に並べて表示」「上下に並べて表示」を Window メニューに追加した。
Modified Paths:
--------------
trunk/doc/en/html/reference/keycode.txt
trunk/doc/ja/html/reference/keycode.txt
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/teraterm/vtwin.h
trunk/teraterm/ttpcmn/ttcmn.c
-------------- next part --------------
Modified: trunk/doc/en/html/reference/keycode.txt
===================================================================
--- trunk/doc/en/html/reference/keycode.txt 2013-05-02 05:37:15 UTC (rev 5223)
+++ trunk/doc/en/html/reference/keycode.txt 2013-05-02 06:37:09 UTC (rev 5224)
@@ -432,6 +432,9 @@
[Window] Window 50810
[Window] Minimize All 50811
[Window] Restore All 50812
+[Window] Cascade 50813
+[Window] Stacked 50814
+[Window] Side by Side 50815
[Help] Index 50910
[Help] About Tera Term 50990
Modified: trunk/doc/ja/html/reference/keycode.txt
===================================================================
--- trunk/doc/ja/html/reference/keycode.txt 2013-05-02 05:37:15 UTC (rev 5223)
+++ trunk/doc/ja/html/reference/keycode.txt 2013-05-02 06:37:09 UTC (rev 5224)
@@ -442,6 +442,9 @@
[Window] Window 50810
[Window] Minimize All 50811
[Window] Restore All 50812
+[Window] Cascade 50813
+[Window] Stacked 50814
+[Window] Side by Side 50815
[Help] Index 50910
[Help] About Tera Term 50990
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2013-05-02 05:37:15 UTC (rev 5223)
+++ trunk/teraterm/common/tttypes.h 2013-05-02 06:37:09 UTC (rev 5224)
@@ -985,6 +985,9 @@
#define ID_WINDOW_WINDOW 50810
#define ID_WINDOW_MINIMIZEALL 50811
#define ID_WINDOW_RESTOREALL 50812
+#define ID_WINDOW_CASCADEALL 50813
+#define ID_WINDOW_STACKED 50814
+#define ID_WINDOW_SIDEBYSIDE 50815
#define ID_TEKWINDOW_WINDOW 51810
#define ID_TRANSFER 9 // the position on [File] menu
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2013-05-02 05:37:15 UTC (rev 5223)
+++ trunk/teraterm/teraterm/vtwin.cpp 2013-05-02 06:37:09 UTC (rev 5224)
@@ -206,6 +206,9 @@
ON_COMMAND(ID_CONTROL_SHOW_MACRO, OnShowMacroWindow)
ON_COMMAND(ID_WINDOW_WINDOW, OnWindowWindow)
ON_COMMAND(ID_WINDOW_MINIMIZEALL, OnWindowMinimizeAll)
+ ON_COMMAND(ID_WINDOW_CASCADEALL, OnWindowCascade)
+ ON_COMMAND(ID_WINDOW_STACKED, OnWindowStacked)
+ ON_COMMAND(ID_WINDOW_SIDEBYSIDE, OnWindowSidebySide)
ON_COMMAND(ID_WINDOW_RESTOREALL, OnWindowRestoreAll)
ON_COMMAND(ID_HELP_INDEX2, OnHelpIndex)
ON_COMMAND(ID_HELP_ABOUT, OnHelpAbout)
@@ -5317,6 +5320,21 @@
ShowAllWin(SW_MINIMIZE);
}
+void CVTWindow::OnWindowCascade()
+{
+ ShowAllWinCascade(HVTWin);
+}
+
+void CVTWindow::OnWindowStacked()
+{
+ ShowAllWinStacked(HVTWin);
+}
+
+void CVTWindow::OnWindowSidebySide()
+{
+ ShowAllWinSidebySide(HVTWin);
+}
+
void CVTWindow::OnWindowRestoreAll()
{
ShowAllWin(SW_RESTORE);
Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h 2013-05-02 05:37:15 UTC (rev 5223)
+++ trunk/teraterm/teraterm/vtwin.h 2013-05-02 06:37:09 UTC (rev 5224)
@@ -175,6 +175,9 @@
afx_msg void OnShowMacroWindow();
afx_msg void OnWindowWindow();
afx_msg void OnWindowMinimizeAll();
+ afx_msg void OnWindowCascade();
+ afx_msg void OnWindowStacked();
+ afx_msg void OnWindowSidebySide();
afx_msg void OnWindowRestoreAll();
afx_msg void OnHelpIndex();
afx_msg void OnHelpUsing();
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2013-05-02 05:37:15 UTC (rev 5223)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2013-05-02 06:37:09 UTC (rev 5224)
@@ -930,6 +930,15 @@
get_lang_msg("MENU_WINDOW_MINIMIZEALL", buf, buflen, "&Minimize All", langFile);
AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_MINIMIZEALL, buf);
+ get_lang_msg("MENU_WINDOW_CASCADE", buf, buflen, "&Cascade", langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_CASCADEALL, buf);
+
+ get_lang_msg("MENU_WINDOW_STACKED", buf, buflen, "&Stacked", langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_STACKED, buf);
+
+ get_lang_msg("MENU_WINDOW_SIDEBYSIDE", buf, buflen, "Side &by Side", langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_SIDEBYSIDE, buf);
+
get_lang_msg("MENU_WINDOW_RESTOREALL", buf, buflen, "&Restore All", langFile);
AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_RESTOREALL, buf);
}
From svnnotify @ sourceforge.jp Thu May 2 15:49:58 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 02 May 2013 15:49:58 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjVdICDjgIzph43jga3jgabooajnpLo=?=
=?utf-8?b?44CN44CM5bem5Y+z44Gr5Lim44G544Gm6KGo56S644CN44CM5LiK5LiL44Gr?=
=?utf-8?b?5Lim44G544Gm6KGo56S644CN44GuSTE4TuWvvuW/nOOAgg==?=
Message-ID: <1367477398.687888.20249.nullmailer@users.sourceforge.jp>
Revision: 5225
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5225
Author: yutakapon
Date: 2013-05-02 15:49:58 +0900 (Thu, 02 May 2013)
Log Message:
-----------
「重ねて表示」「左右に並べて表示」「上下に並べて表示」のI18N対応。
Modified Paths:
--------------
trunk/installer/release/lang/English.lng
trunk/installer/release/lang/French.lng
trunk/installer/release/lang/German.lng
trunk/installer/release/lang/Japanese.lng
trunk/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2013-05-02 06:37:09 UTC (rev 5224)
+++ trunk/installer/release/lang/English.lng 2013-05-02 06:49:58 UTC (rev 5225)
@@ -75,6 +75,9 @@
MENU_WINDOW=&Window
MENU_WINDOW_WINDOW=&Window
MENU_WINDOW_MINIMIZEALL=&Minimize All
+MENU_WINDOW_CASCADE=&Cascade
+MENU_WINDOW_STACKED=&Stacked
+MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&Restore All
MENU_HELP=&Help
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2013-05-02 06:37:09 UTC (rev 5224)
+++ trunk/installer/release/lang/French.lng 2013-05-02 06:49:58 UTC (rev 5225)
@@ -76,6 +76,9 @@
MENU_WINDOW=Fen\xEAtre(&W)
MENU_WINDOW_WINDOW=&Fen\xEAtre
MENU_WINDOW_MINIMIZEALL=&Minimize All
+MENU_WINDOW_CASCADE=&Cascade
+MENU_WINDOW_STACKED=&Stacked
+MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&Restore All
MENU_HELP=&Aide
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2013-05-02 06:37:09 UTC (rev 5224)
+++ trunk/installer/release/lang/German.lng 2013-05-02 06:49:58 UTC (rev 5225)
@@ -76,6 +76,9 @@
MENU_WINDOW=&Fenster
MENU_WINDOW_WINDOW=&Fenster
MENU_WINDOW_MINIMIZEALL=&Minimize All
+MENU_WINDOW_CASCADE=&Cascade
+MENU_WINDOW_STACKED=&Stacked
+MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&Restore All
MENU_HELP=&Hilfe
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2013-05-02 06:37:09 UTC (rev 5224)
+++ trunk/installer/release/lang/Japanese.lng 2013-05-02 06:49:58 UTC (rev 5225)
@@ -75,6 +75,9 @@
MENU_WINDOW=\x83E\x83B\x83\x93\x83h\x83E(&W)
MENU_WINDOW_WINDOW=\x83E\x83B\x83\x93\x83h\x83E(&W)
MENU_WINDOW_MINIMIZEALL=\x82\xB7\x82?č?\xAC\x89\xBB(&M)
+MENU_WINDOW_CASCADE=\x8Fd\x82??\\x8E\xA6(&C)
+MENU_WINDOW_STACKED=\x8F?\x82?\xC0\x82??\\x8E\xA6(&S)
+MENU_WINDOW_SIDEBYSIDE=\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6(&B)
MENU_WINDOW_RESTOREALL=\x82\xB7\x82??\x9C\x8C\xB3(&R)
MENU_HELP=\x83w\x83\x8B\x83v(&H)
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2013-05-02 06:37:09 UTC (rev 5224)
+++ trunk/installer/release/lang/Korean.lng 2013-05-02 06:49:58 UTC (rev 5225)
@@ -73,6 +73,9 @@
MENU_WINDOW=â(&W)
MENU_WINDOW_WINDOW=â \xB8\xF1\xB7\xCF(&W)
MENU_WINDOW_MINIMIZEALL=â \xC3?\xD2?(&M)
+MENU_WINDOW_CASCADE=&Cascade
+MENU_WINDOW_STACKED=&Stacked
+MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=â \xBA\xB9\xB1\xB8(&R)
MENU_HELP=\xB5\xB5\xBF\xF2\xB8\xBB(&H)
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2013-05-02 06:37:09 UTC (rev 5224)
+++ trunk/installer/release/lang/Russian.lng 2013-05-02 06:49:58 UTC (rev 5225)
@@ -76,6 +76,9 @@
MENU_WINDOW=&\xCE\xEA\xED\xEE
MENU_WINDOW_WINDOW=&\xCE\xEF\xF6\xE8\xE8
MENU_WINDOW_MINIMIZEALL=&\xD1\xE2\xE5\xF0\xED\xF3\xF2\xFC \xEE\xEA\xED\xE0
+MENU_WINDOW_CASCADE=&Cascade
+MENU_WINDOW_STACKED=&Stacked
+MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&\xC2\xEE\xF1\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC \xEE\xEA\xED\xE0
MENU_HELP=&\xCF\xEE\xEC\xEE\xF9
From svnnotify @ sourceforge.jp Thu May 2 16:10:32 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Thu, 02 May 2013 16:10:32 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjZdICDjgIzph43jga3jgabooajnpLo=?=
=?utf-8?b?44CN44CM5bem5Y+z44Gr5Lim44G544Gm6KGo56S644CN44CM5LiK5LiL44Gr?=
=?utf-8?b?5Lim44G544Gm6KGo56S644CN44Gr6Zai44GZ44KL44OJ44Kt44Ol44Oh44Oz?=
=?utf-8?b?44OI44KS6L+95Yqg44GX44Gf44CC?=
Message-ID: <1367478632.620872.17429.nullmailer@users.sourceforge.jp>
Revision: 5226
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5226
Author: yutakapon
Date: 2013-05-02 16:10:32 +0900 (Thu, 02 May 2013)
Log Message:
-----------
「重ねて表示」「左右に並べて表示」「上下に並べて表示」に関するドキュメントを追加した。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/menu/window.html
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/menu/window.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2013-05-02 06:49:58 UTC (rev 5225)
+++ trunk/doc/en/html/about/history.html 2013-05-02 07:10:32 UTC (rev 5226)
@@ -63,6 +63,7 @@
- added the DeferredLogWriteMode entry in the teraterm.ini file.
+ added the Cascade, Stacked and Side By Side under the Window menu.
Modified: trunk/doc/en/html/menu/window.html
===================================================================
--- trunk/doc/en/html/menu/window.html 2013-05-02 06:49:58 UTC (rev 5225)
+++ trunk/doc/en/html/menu/window.html 2013-05-02 07:10:32 UTC (rev 5226)
@@ -26,6 +26,22 @@
Minimize all Tera-Term window.
+
+ Cascade
+
+ Cascade, which puts windows in a single stack that has been fanned out so that the window title appear.
+
+
+ Stacked
+
+ Stacked, which puts windows in one or more vertical stacks depending on how many windows you have open.
+
+
+ Side By Side
+
+ Side by side, which places each window -open, but not maximized- on the desktop so you can see all the windows at once.
+
+
Restore All
Restore all Tera-Term window.
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2013-05-02 06:49:58 UTC (rev 5225)
+++ trunk/doc/ja/html/about/history.html 2013-05-02 07:10:32 UTC (rev 5226)
@@ -62,6 +62,7 @@
- teraterm.ini\x82\xC9DeferredLogWriteMode\x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B
+ Window\x83\x81\x83j\x83\x85\x81[\x82?u\x8Fd\x82??\\x8E\xA6\x81v\x81u\x8F?\x82?\xC0\x82??\\x8E\xA6\x81v\x81u\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6\x81v\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B
Modified: trunk/doc/ja/html/menu/window.html
===================================================================
--- trunk/doc/ja/html/menu/window.html 2013-05-02 06:49:58 UTC (rev 5225)
+++ trunk/doc/ja/html/menu/window.html 2013-05-02 07:10:32 UTC (rev 5226)
@@ -27,6 +27,22 @@
\x82\xB7\x82?Ă\xCC Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D?\xAC\x89\xBB\x82\xB5\x82?\xB7\x81B
+
+ Cascade
+
+ Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
+
+
+ Stacked
+
+ Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F?\x82?\xC0\x82??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
+
+
+ Side By Side
+
+ Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
+
+
Restore All
\x82\xB7\x82?Ă\xCC Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x92?\xED\x95\\x8E\xA6\x82?\xB5\x82?\xB7\x81B
From svnnotify @ sourceforge.jp Fri May 3 18:51:04 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Fri, 03 May 2013 18:51:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjddICDjgIzluLjjgavmiYvliY3jgas=?=
=?utf-8?b?6KGo56S644CN44KSIFdpbmRvdyDjg6Hjg4vjg6Xjg7zjgavov73liqDjgZc=?=
=?utf-8?b?44Gf44CC?=
Message-ID: <1367574664.785883.20328.nullmailer@users.sourceforge.jp>
Revision: 5227
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5227
Author: yutakapon
Date: 2013-05-03 18:51:03 +0900 (Fri, 03 May 2013)
Log Message:
-----------
「常に手前に表示」を Window メニューに追加した。
Modified Paths:
--------------
trunk/doc/en/html/reference/keycode.txt
trunk/doc/ja/html/reference/keycode.txt
trunk/teraterm/common/ttcommon.h
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/tekwin.cpp
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/teraterm/vtwin.h
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpcmn/ttpcmn.def
-------------- next part --------------
Modified: trunk/doc/en/html/reference/keycode.txt
===================================================================
--- trunk/doc/en/html/reference/keycode.txt 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/doc/en/html/reference/keycode.txt 2013-05-03 09:51:03 UTC (rev 5227)
@@ -435,6 +435,7 @@
[Window] Cascade 50813
[Window] Stacked 50814
[Window] Side by Side 50815
+[Window] TopMost 50816
[Help] Index 50910
[Help] About Tera Term 50990
Modified: trunk/doc/ja/html/reference/keycode.txt
===================================================================
--- trunk/doc/ja/html/reference/keycode.txt 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/doc/ja/html/reference/keycode.txt 2013-05-03 09:51:03 UTC (rev 5227)
@@ -445,6 +445,7 @@
[Window] Cascade 50813
[Window] Stacked 50814
[Window] Side by Side 50815
+[Window] TopMost 50816
[Help] Index 50910
[Help] About Tera Term 50990
Modified: trunk/teraterm/common/ttcommon.h
===================================================================
--- trunk/teraterm/common/ttcommon.h 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/teraterm/common/ttcommon.h 2013-05-03 09:51:03 UTC (rev 5227)
@@ -29,7 +29,7 @@
int FAR PASCAL RegWin(HWND HWinVT, HWND HWinTEK);
void FAR PASCAL UnregWin(HWND HWin);
-void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag);
+void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag, HWND myhwnd);
void FAR PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
void FAR PASCAL SelectWin(int WinId);
void FAR PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
@@ -38,6 +38,7 @@
void FAR PASCAL ShowAllWinSidebySide(HWND);
void FAR PASCAL ShowAllWinStacked(HWND);
void FAR PASCAL ShowAllWinCascade(HWND);
+void FAR PASCAL SwitchWindowTopMost(HWND myhwnd);
int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
int FAR PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/teraterm/common/tttypes.h 2013-05-03 09:51:03 UTC (rev 5227)
@@ -988,6 +988,7 @@
#define ID_WINDOW_CASCADEALL 50813
#define ID_WINDOW_STACKED 50814
#define ID_WINDOW_SIDEBYSIDE 50815
+#define ID_WINDOW_TOPMOST 50816
#define ID_TEKWINDOW_WINDOW 51810
#define ID_TRANSFER 9 // the position on [File] menu
Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/teraterm/teraterm/tekwin.cpp 2013-05-03 09:51:03 UTC (rev 5227)
@@ -217,7 +217,7 @@
}
}
else if ( SubMenu == WinMenu ) {
- SetWinMenu(WinMenu, ts.UIMsg, sizeof(ts.UIMsg), ts.UILanguageFile, 0);
+ SetWinMenu(WinMenu, ts.UIMsg, sizeof(ts.UIMsg), ts.UILanguageFile, 0, NULL);
}
}
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/teraterm/teraterm/vtwin.cpp 2013-05-03 09:51:03 UTC (rev 5227)
@@ -209,6 +209,7 @@
ON_COMMAND(ID_WINDOW_CASCADEALL, OnWindowCascade)
ON_COMMAND(ID_WINDOW_STACKED, OnWindowStacked)
ON_COMMAND(ID_WINDOW_SIDEBYSIDE, OnWindowSidebySide)
+ ON_COMMAND(ID_WINDOW_TOPMOST, OnWindowTopMost)
ON_COMMAND(ID_WINDOW_RESTOREALL, OnWindowRestoreAll)
ON_COMMAND(ID_HELP_INDEX2, OnHelpIndex)
ON_COMMAND(ID_HELP_ABOUT, OnHelpAbout)
@@ -1413,7 +1414,7 @@
}
else if (SubMenu == WinMenu)
{
- SetWinMenu(WinMenu, ts.UIMsg, sizeof(ts.UIMsg), ts.UILanguageFile, 1);
+ SetWinMenu(WinMenu, ts.UIMsg, sizeof(ts.UIMsg), ts.UILanguageFile, 1, HVTWin);
}
TTXModifyPopupMenu(SubMenu); /* TTPLUG */
@@ -5335,6 +5336,11 @@
ShowAllWinSidebySide(HVTWin);
}
+void CVTWindow::OnWindowTopMost()
+{
+ SwitchWindowTopMost(HVTWin);
+}
+
void CVTWindow::OnWindowRestoreAll()
{
ShowAllWin(SW_RESTORE);
Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/teraterm/teraterm/vtwin.h 2013-05-03 09:51:03 UTC (rev 5227)
@@ -178,6 +178,7 @@
afx_msg void OnWindowCascade();
afx_msg void OnWindowStacked();
afx_msg void OnWindowSidebySide();
+ afx_msg void OnWindowTopMost();
afx_msg void OnWindowRestoreAll();
afx_msg void OnHelpIndex();
afx_msg void OnHelpUsing();
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2013-05-03 09:51:03 UTC (rev 5227)
@@ -18,6 +18,7 @@
#include "compat_w95.h"
#include "tt_res.h"
+#include "ttcommon.h"
/* first instance flag */
static BOOL FirstInstance = TRUE;
@@ -31,6 +32,9 @@
#define TEKCLASSNAME "TEKWin32"
+static BOOL GetWindowTopMost(HWND myhwnd);
+
+
void PASCAL CopyShmemToTTSet(PTTSet ts)
{
// \x8C\xBB\x8D???\xE8\x82\xF0\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A\x82\xA9\x82\xE7\x83R\x83s\x81[\x82\xB7\x82\xE9
@@ -886,7 +890,7 @@
return '+';
}
-void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
+void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag, HWND myhwnd)
{
int i;
char Temp[MAXPATHLEN];
@@ -941,6 +945,12 @@
get_lang_msg("MENU_WINDOW_RESTOREALL", buf, buflen, "&Restore All", langFile);
AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_RESTOREALL, buf);
+
+ get_lang_msg("MENU_WINDOW_TOPMOST", buf, buflen, "&TopMost", langFile);
+ if (GetWindowTopMost(myhwnd) == TRUE)
+ AppendMenu(menu, MF_ENABLED | MF_STRING | MFS_CHECKED, ID_WINDOW_TOPMOST, buf);
+ else
+ AppendMenu(menu, MF_ENABLED | MF_STRING | MFS_UNCHECKED, ID_WINDOW_TOPMOST, buf);
}
else {
AppendMenu(menu,MF_ENABLED | MF_STRING,ID_TEKWINDOW_WINDOW, buf);
@@ -1175,6 +1185,32 @@
CascadeWindows(NULL, MDITILE_SKIPDISABLED, NULL, n, hwnd);
}
+// \x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x81u\x8F\xED\x82?\xE8\x91O\x82?\\x8E\xA6\x81v\x82ł\xA0\x82?\x81H
+static BOOL GetWindowTopMost(HWND myhwnd)
+{
+ DWORD val;
+
+ val = (DWORD)GetWindowLongPtr(myhwnd, GWL_EXSTYLE);
+ if (val & WS_EX_TOPMOST)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+// \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x81u\x8F\xED\x82?\xE8\x91O\x82?\\x8E\xA6\x81v\x82?\xB7\x82?\x82\xF0\x83g\x83O\x83\x8B\x82Ő?\xE8\x91?\xA6\x82\xE9\x81B
+void FAR PASCAL SwitchWindowTopMost(HWND myhwnd)
+{
+ HWND style;
+
+ if (GetWindowTopMost(myhwnd) == TRUE)
+ style = HWND_NOTOPMOST;
+ else
+ style = HWND_TOPMOST;
+
+ SetWindowPos(myhwnd, style, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE );
+}
+
+
int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
{
if ( ! cv->Ready ) {
Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def 2013-05-02 07:10:32 UTC (rev 5226)
+++ trunk/teraterm/ttpcmn/ttpcmn.def 2013-05-03 09:51:03 UTC (rev 5227)
@@ -50,3 +50,4 @@
ShowAllWinSidebySide @56
ShowAllWinStacked @57
ShowAllWinCascade @58
+ SwitchWindowTopMost @59
From svnnotify @ sourceforge.jp Fri May 3 18:57:52 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Fri, 03 May 2013 18:57:52 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjhdICDjgIzluLjjgavmiYvliY3jgas=?=
=?utf-8?b?6KGo56S644CN44GuSTE4TuWvvuW/nOOAgg==?=
Message-ID: <1367575072.416574.11467.nullmailer@users.sourceforge.jp>
Revision: 5228
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5228
Author: yutakapon
Date: 2013-05-03 18:57:52 +0900 (Fri, 03 May 2013)
Log Message:
-----------
「常に手前に表示」のI18N対応。
Modified Paths:
--------------
trunk/installer/release/lang/English.lng
trunk/installer/release/lang/French.lng
trunk/installer/release/lang/German.lng
trunk/installer/release/lang/Japanese.lng
trunk/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2013-05-03 09:51:03 UTC (rev 5227)
+++ trunk/installer/release/lang/English.lng 2013-05-03 09:57:52 UTC (rev 5228)
@@ -79,6 +79,7 @@
MENU_WINDOW_STACKED=&Stacked
MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&Restore All
+MENU_WINDOW_TOPMOST=&TopMost
MENU_HELP=&Help
MENU_HELP_INDEX=&Index
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2013-05-03 09:51:03 UTC (rev 5227)
+++ trunk/installer/release/lang/French.lng 2013-05-03 09:57:52 UTC (rev 5228)
@@ -80,6 +80,7 @@
MENU_WINDOW_STACKED=&Stacked
MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&Restore All
+MENU_WINDOW_TOPMOST=&TopMost
MENU_HELP=&Aide
MENU_HELP_INDEX=&Index
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2013-05-03 09:51:03 UTC (rev 5227)
+++ trunk/installer/release/lang/German.lng 2013-05-03 09:57:52 UTC (rev 5228)
@@ -80,6 +80,7 @@
MENU_WINDOW_STACKED=&Stacked
MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&Restore All
+MENU_WINDOW_TOPMOST=&TopMost
MENU_HELP=&Hilfe
MENU_HELP_INDEX=&Hilfedatei
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2013-05-03 09:51:03 UTC (rev 5227)
+++ trunk/installer/release/lang/Japanese.lng 2013-05-03 09:57:52 UTC (rev 5228)
@@ -79,6 +79,7 @@
MENU_WINDOW_STACKED=\x8F?\x82?\xC0\x82??\\x8E\xA6(&S)
MENU_WINDOW_SIDEBYSIDE=\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6(&B)
MENU_WINDOW_RESTOREALL=\x82\xB7\x82??\x9C\x8C\xB3(&R)
+MENU_WINDOW_TOPMOST=\x8F\xED\x82?\xE8\x91O\x82?\\x8E\xA6(&T)
MENU_HELP=\x83w\x83\x8B\x83v(&H)
MENU_HELP_INDEX=\x96?\x9F(&I)
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2013-05-03 09:51:03 UTC (rev 5227)
+++ trunk/installer/release/lang/Korean.lng 2013-05-03 09:57:52 UTC (rev 5228)
@@ -77,6 +77,7 @@
MENU_WINDOW_STACKED=&Stacked
MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=â \xBA\xB9\xB1\xB8(&R)
+MENU_WINDOW_TOPMOST=&TopMost
MENU_HELP=\xB5\xB5\xBF\xF2\xB8\xBB(&H)
MENU_HELP_INDEX=\xC2\xF7\xB7\xCA(&I)
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2013-05-03 09:51:03 UTC (rev 5227)
+++ trunk/installer/release/lang/Russian.lng 2013-05-03 09:57:52 UTC (rev 5228)
@@ -80,6 +80,7 @@
MENU_WINDOW_STACKED=&Stacked
MENU_WINDOW_SIDEBYSIDE=Side &By Side
MENU_WINDOW_RESTOREALL=&\xC2\xEE\xF1\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC \xEE\xEA\xED\xE0
+MENU_WINDOW_TOPMOST=&TopMost
MENU_HELP=&\xCF\xEE\xEC\xEE\xF9\xFC
MENU_HELP_INDEX=&\xCF\xEE\xE8\xF1\xEA
From svnnotify @ sourceforge.jp Fri May 3 19:07:08 2013
From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp)
Date: Fri, 03 May 2013 19:07:08 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzUyMjldICDjgIzluLjjgavmiYvliY3jgas=?=
=?utf-8?b?6KGo56S644CN44Gr6Zai44GZ44KL44OJ44Kt44Ol44Oh44Oz44OI44KS6L+9?=
=?utf-8?b?5Yqg44GX44Gf44CC?=
Message-ID: <1367575628.349725.17329.nullmailer@users.sourceforge.jp>
Revision: 5229
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5229
Author: yutakapon
Date: 2013-05-03 19:07:08 +0900 (Fri, 03 May 2013)
Log Message:
-----------
「常に手前に表示」に関するドキュメントを追加した。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/menu/window.html
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/menu/window.html
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2013-05-03 09:57:52 UTC (rev 5228)
+++ trunk/doc/en/html/about/history.html 2013-05-03 10:07:08 UTC (rev 5229)
@@ -63,7 +63,7 @@
- added the DeferredLogWriteMode entry in the teraterm.ini file.
- added the Cascade, Stacked and Side By Side under the Window menu.
+ added the Cascade, Stacked, Side By Side and TopMost under the Window menu.
Modified: trunk/doc/en/html/menu/window.html
===================================================================
--- trunk/doc/en/html/menu/window.html 2013-05-03 09:57:52 UTC (rev 5228)
+++ trunk/doc/en/html/menu/window.html 2013-05-03 10:07:08 UTC (rev 5229)
@@ -46,6 +46,12 @@
Restore all Tera-Term window.
+
+ TopMost
+
+ Places the window above all non-topmost windows.
+
+