OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de

[ttssh2-commit] [10035] ウィンドウの角丸抑止（DWMWCP_DONOTROUND）を設定で選べるようにした

Zurück zum Archiv-Index
scmno****@osdn***** scmno****@osdn*****
2022年 7月 5日 (火) 08:04:22 JST 

Revision: 10035
          https://osdn.net/projects/ttssh2/scm/svn/commits/10035
Author:   nmaya
Date:     2022-07-05 08:04:22 +0900 (Tue, 05 Jul 2022)
Log Message:
-----------
ウィンドウの角丸抑止（DWMWCP_DONOTROUND）を設定で選べるようにした

WindowCornerDontround を追加
デフォルトは off

ticket #44861
https://osdn.net/projects/ttssh2/ticket/44861#comment:1412:44861:1656675501

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/44861

Modified Paths:
--------------
    branches/4-stable/doc/en/html/about/history.html
    branches/4-stable/doc/en/html/setup/teraterm-win.html
    branches/4-stable/doc/en/html/setup/teraterm.html
    branches/4-stable/doc/ja/html/about/history.html
    branches/4-stable/doc/ja/html/setup/teraterm-win.html
    branches/4-stable/doc/ja/html/setup/teraterm.html
    branches/4-stable/installer/release/TERATERM.INI
    branches/4-stable/teraterm/common/tttypes.h
    branches/4-stable/teraterm/teraterm/tekwin.cpp
    branches/4-stable/teraterm/teraterm/vtwin.cpp
    branches/4-stable/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: branches/4-stable/doc/en/html/about/history.html
===================================================================
--- branches/4-stable/doc/en/html/about/history.html	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/doc/en/html/about/history.html	2022-07-04 23:04:22 UTC (rev 10035)
@@ -35,7 +35,10 @@
 <ul class="history">
   <li>Changes
     <ul>
-      <!--li>\x95\xB6\x8E\x9A\x82̈ꕔ\x82\xAA\x8C\xA9\x82\xA6\x82Ȃ\xAD\x82Ȃ\xE9\x82̂ŁAWindows 11 \x82ŃE\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li-->
+      <!--li>Windows 11 \x82\xC5 VT \x83E\x83B\x83\x93\x83h\x83E\x82\xC6 TEK \x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x90ݒ\xE8\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-win.html#WindowCornerDontround">WindowCornerDontround</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81B</li>
+        </ul></li-->
       <li>XMODEM: Fix to check all received datas and process correctly, even if received datas are accumulated.</li>
       <li>YMODEM: ignore continuous 'C' when waiting for sending.</li>
       <!--li>\x83t\x83@\x83C\x83\x8B\x83h\x83\x8D\x83b\x83v\x83_\x83C\x83A\x83\x8D\x83O\x82\xCC Send file \x82\xCC Binary \x82̃`\x83F\x83b\x83N\x83{\x83b\x83N\x83X

Modified: branches/4-stable/doc/en/html/setup/teraterm-win.html
===================================================================
--- branches/4-stable/doc/en/html/setup/teraterm-win.html	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/doc/en/html/setup/teraterm-win.html	2022-07-04 23:04:22 UTC (rev 10035)
@@ -678,5 +678,22 @@
 MouseSelectStartDelay=0
 </pre>
 
+
+<!--<h1 id="WindowCornerDontround">\x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xF0\x8Aۂ\xAD\x82\xB5\x82Ȃ\xA2</h1>
+
+<p>
+Windows 11 \x82ł̓E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ邽\x82߁A\x95\\x8E\xA6\x82\xAA\x8C\x87\x82\xAF\x82\xE9\x97̈悪\x82\xA0\x82\xE8\x82܂\xB7\x81BVT \x83E\x83B\x83\x93\x83h\x83E\x82\xC6 TEK \x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xF0\x8Aۂ\xAD\x82\xB5\x82Ȃ\xA2\x82\xBD\x82߂ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC WindowCornerDontround \x8Ds\x82\xF0\x88ȉ\xBA\x82̂悤\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+WindowCornerDontround=on
+</pre>
+
+<pre>
+Default:
+WindowCornerDontround=off
+</pre>-->
+
+
 </body>
 </html>

Modified: branches/4-stable/doc/en/html/setup/teraterm.html
===================================================================
--- branches/4-stable/doc/en/html/setup/teraterm.html	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/doc/en/html/setup/teraterm.html	2022-07-04 23:04:22 UTC (rev 10035)
@@ -107,6 +107,7 @@
  <li><a href="teraterm-win.html#savevtwinpos">Save the window position</a></li>
  <li><a href="teraterm-win.html#WindowIcon">Change the window icon</a></li>
  <li><a href="teraterm-win.html#delayselect">Delay for starting of text selection.</a></li>
+ <!--li><a href="teraterm-win.html#MouseSelectStartDelay">\x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xF0\x8Aۂ\xAD\x82\xB5\x82Ȃ\xA2</a></li-->
 </ul>
 
 <h3>Communication</h3>

Modified: branches/4-stable/doc/ja/html/about/history.html
===================================================================
--- branches/4-stable/doc/ja/html/about/history.html	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/doc/ja/html/about/history.html	2022-07-04 23:04:22 UTC (rev 10035)
@@ -35,7 +35,10 @@
 <ul class="history">
   <li>\x95ύX
     <ul>
-      <li>\x95\xB6\x8E\x9A\x82̈ꕔ\x82\xAA\x8C\xA9\x82\xA6\x82Ȃ\xAD\x82Ȃ\xE9\x82̂ŁAWindows 11 \x82ŃE\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>Windows 11 \x82\xC5 VT \x83E\x83B\x83\x93\x83h\x83E\x82\xC6 TEK \x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x90ݒ\xE8\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-win.html#WindowCornerDontround">WindowCornerDontround</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81B</li>
+        </ul></li>
       <li>XMODEM \x8E\xF3\x90M\x83f\x81[\x83^\x82\xAA\x92~\x90ς\xB5\x82Ă\xE0\x91S\x91̂𒲂ׂĐ\xB3\x82\xB5\x82\xAD\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x82悤\x82ɏC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>YMODEM \x91\x97\x90M\x91҂\xBF\x82̎\x9E\x81A\x98A\x91\xB1\x82\xB5\x82\xBD 'C' \x82𖳎\x8B\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
       <li>\x83t\x83@\x83C\x83\x8B\x83h\x83\x8D\x83b\x83v\x83_\x83C\x83A\x83\x8D\x83O\x82\xCC Send file \x82\xCC Binary \x82̃`\x83F\x83b\x83N\x83{\x83b\x83N\x83X

Modified: branches/4-stable/doc/ja/html/setup/teraterm-win.html
===================================================================
--- branches/4-stable/doc/ja/html/setup/teraterm-win.html	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/doc/ja/html/setup/teraterm-win.html	2022-07-04 23:04:22 UTC (rev 10035)
@@ -694,5 +694,21 @@
 </pre>
 
 
+<h1 id="WindowCornerDontround">\x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xF0\x8Aۂ\xAD\x82\xB5\x82Ȃ\xA2</h1>
+
+<p>
+Windows 11 \x82ł̓E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ邽\x82߁A\x95\\x8E\xA6\x82\xAA\x8C\x87\x82\xAF\x82\xE9\x97̈悪\x82\xA0\x82\xE8\x82܂\xB7\x81BVT \x83E\x83B\x83\x93\x83h\x83E\x82\xC6 TEK \x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xF0\x8Aۂ\xAD\x82\xB5\x82Ȃ\xA2\x82\xBD\x82߂ɂ́A\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC WindowCornerDontround \x8Ds\x82\xF0\x88ȉ\xBA\x82̂悤\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+WindowCornerDontround=on
+</pre>
+
+<pre>
+\x8Fȗ\xAA\x8E\x9E:
+WindowCornerDontround=off
+</pre>
+
+
 </body>
 </html>

Modified: branches/4-stable/doc/ja/html/setup/teraterm.html
===================================================================
--- branches/4-stable/doc/ja/html/setup/teraterm.html	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/doc/ja/html/setup/teraterm.html	2022-07-04 23:04:22 UTC (rev 10035)
@@ -109,6 +109,7 @@
  <li><a href="teraterm-win.html#savevtwinpos">\x83E\x83B\x83\x93\x83h\x83E\x88ʒu\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9</a></li>
  <li><a href="teraterm-win.html#WindowIcon">\x83E\x83B\x83\x93\x83h\x83E\x83A\x83C\x83R\x83\x93\x82\xF0\x95ύX\x82\xB7\x82\xE9</a></li>
  <li><a href="teraterm-win.html#delayselect">\x83}\x83E\x83X\x82ł̕\xB6\x8E\x9A\x82̑I\x91\xF0\x82̊J\x8En\x82\xF0\x92x\x82点\x82\xE9</a></li>
+ <li><a href="teraterm-win.html#MouseSelectStartDelay">\x83E\x83B\x83\x93\x83h\x83E\x82̊p\x82\xF0\x8Aۂ\xAD\x82\xB5\x82Ȃ\xA2</a></li>
 </ul>
 
 <h3>\x92ʐM</h3>

Modified: branches/4-stable/installer/release/TERATERM.INI
===================================================================
--- branches/4-stable/installer/release/TERATERM.INI	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/installer/release/TERATERM.INI	2022-07-04 23:04:22 UTC (rev 10035)
@@ -742,6 +742,9 @@
 ; `wait4all' macro command
 Wait4allMacroCommand=off
 
+; rounded corner preference for VT/TEK window
+WindowCornerDontround=off
+
 ; allow the sequences related to window control
 WindowCtrlSequence=on
 

Modified: branches/4-stable/teraterm/common/tttypes.h
===================================================================
--- branches/4-stable/teraterm/common/tttypes.h	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/teraterm/common/tttypes.h	2022-07-04 23:04:22 UTC (rev 10035)
@@ -710,6 +710,7 @@
 	int RunningVersion;
 	DWORD SelectStartDelay;
 	int EtermLookfeel_BGIgnoreThemeFile;	// eterm_lookfeel_t \x82̃\x81\x83\x93\x83o\x81[\x82\xBE\x82\xC1\x82\xBD
+	WORD WindowCornerDontround;
 };
 
 typedef struct tttset TTTSet, *PTTSet;

Modified: branches/4-stable/teraterm/teraterm/tekwin.cpp
===================================================================
--- branches/4-stable/teraterm/teraterm/tekwin.cpp	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/teraterm/teraterm/tekwin.cpp	2022-07-04 23:04:22 UTC (rev 10035)
@@ -105,7 +105,7 @@
 	}
 
 	// Windows 11 \x82ŃE\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9
-	if (pDwmSetWindowAttribute != NULL) {
+	if (ts.WindowCornerDontround && pDwmSetWindowAttribute != NULL) {
 		DWM_WINDOW_CORNER_PREFERENCE preference = DWMWCP_DONOTROUND;
 		pDwmSetWindowAttribute(HTEKWin, DWMWA_WINDOW_CORNER_PREFERENCE, &preference, sizeof(preference));
 	}

Modified: branches/4-stable/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/4-stable/teraterm/teraterm/vtwin.cpp	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/teraterm/teraterm/vtwin.cpp	2022-07-04 23:04:22 UTC (rev 10035)
@@ -720,7 +720,7 @@
 	if (HVTWin == NULL) return;
 
 	// Windows 11 \x82ŃE\x83B\x83\x93\x83h\x83E\x82̊p\x82\xAA\x8Aۂ\xAD\x82Ȃ\xE7\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9
-	if (pDwmSetWindowAttribute != NULL) {
+	if (ts.WindowCornerDontround && pDwmSetWindowAttribute != NULL) {
 		DWM_WINDOW_CORNER_PREFERENCE preference = DWMWCP_DONOTROUND;
 		pDwmSetWindowAttribute(HVTWin, DWMWA_WINDOW_CORNER_PREFERENCE, &preference, sizeof(preference));
 	}

Modified: branches/4-stable/teraterm/ttpset/ttset.c
===================================================================
--- branches/4-stable/teraterm/ttpset/ttset.c	2022-06-29 17:56:56 UTC (rev 10034)
+++ branches/4-stable/teraterm/ttpset/ttset.c	2022-07-04 23:04:22 UTC (rev 10035)
@@ -2244,6 +2244,9 @@
 	ReadFont3("Tera Term", "DlgFont", NULL, FName,
 			  ts->DialogFontName, sizeof(ts->DialogFontName),
 			  &ts->DialogFontPoint, &ts->DialogFontCharSet);
+
+	// rounded corner preference for VT/TEK window
+	ts->WindowCornerDontround = GetOnOff(Section, "WindowCornerDontround", FName, FALSE);
 }
 
 void PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -3570,6 +3573,9 @@
 				ts->DialogFontPoint,
 				ts->DialogFontCharSet);
 	WritePrivateProfileStringA("Tera Term", "DlgFont", Temp, FName);
+
+	// // rounded corner preference for VT/TEK window
+	WriteOnOff(Section, "WindowCornerDontround", FName, ts->WindowCornerDontround);
 }
 
 #define VTEditor "VT editor keypad"

ttssh2-commit メーリングリストの案内
Zurück zum Archiv-Index