提交: bce40a24fca0ccc793d1eb8bc3e435788997102b - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• 修訂: bce40a24fca0ccc793d1eb8bc3e435788997102b (tree)
• 時間: 2022-06-25 09:42:15
• 作者: nmaya <nmaya@user...>
• Commiter: nmaya

Log Message

VT ウィンドウと TEK ウィンドウで Windows 11 の角丸が無効になるようにした

ticket #44861

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable@10018 f5f01b69-1e22-0410-acbf-894ab4bd6246

Change Summary

• modified: doc/en/html/about/history.html
• modified: doc/ja/html/about/history.html
• modified: teraterm/common/compat_win.cpp
• modified: teraterm/common/compat_win.h
• modified: teraterm/teraterm/tekwin.cpp
• modified: teraterm/teraterm/vtwin.cpp

差異

--- a/doc/en/html/about/history.html
+++ b/doc/en/html/about/history.html
@@ -35,6 +35,7 @@
 <ul class="history">
   <li>Changes
     <ul>
+      <!--li>文字の一部が見えなくなるので、Windows 11 でウィンドウの角が丸くならないようにした。</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>ファイルドロップダイアログの Send file の Binary のチェックボックス

--- a/doc/ja/html/about/history.html
+++ b/doc/ja/html/about/history.html
@@ -35,6 +35,7 @@
 <ul class="history">
   <li>変更
     <ul>
+      <li>文字の一部が見えなくなるので、Windows 11 でウィンドウの角が丸くならないようにした。</li>
       <li>XMODEM 受信データが蓄積しても全体を調べて正しく処理するように修正した。</li>
       <li>YMODEM 送信待ちの時、連続した 'C' を無視するようにした。</li>
       <li>ファイルドロップダイアログの Send file の Binary のチェックボックス

--- a/teraterm/common/compat_win.cpp
+++ b/teraterm/common/compat_win.cpp
@@ -49,6 +49,9 @@ HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT lprc, DWORD dwFlags);
 BOOL (WINAPI *pAdjustWindowRectEx)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle);
 BOOL (WINAPI *pAdjustWindowRectExForDpi)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi);
 
+// dwmapi.dll
+HRESULT (WINAPI *pDwmSetWindowAttribute)(HWND hwnd, DWORD dwAttribute, LPCVOID pvAttribute, DWORD cbAttribute);
+
 static const APIInfo Lists_user32[] = {
 	{ "SetLayeredWindowAttributes", (void **)&pSetLayeredWindowAttributes },
 	{ "SetThreadDpiAwarenessContext", (void **)&pSetThreadDpiAwarenessContext },
@@ -79,11 +82,17 @@ static const APIInfo Lists_Shcore[] = {
 	{},
 };
 
+static const APIInfo Lists_dwmapi[] = { // Windows Vista or later
+	{ "DwmSetWindowAttribute", (void **)&pDwmSetWindowAttribute },
+	{},
+};
+
 static const DllInfo DllInfos[] = {
 	{ _T("user32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_user32 },
 	{ _T("msimg32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_msimg32 },
 	{ _T("gdi32.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_gdi32 },
 	{ _T("Shcore.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_Shcore },
+	{ _T("dwmapi.dll"), DLL_LOAD_LIBRARY_SYSTEM, DLL_ACCEPT_NOT_EXIST, Lists_dwmapi },
 	{},
 };
 

--- a/teraterm/common/compat_win.h
+++ b/teraterm/common/compat_win.h
@@ -67,6 +67,17 @@ typedef enum MONITOR_DPI_TYPE {
 #define OPENFILENAME_SIZE_VERSION_400A	76
 #endif
 
+// 10.0.22000 or later
+#define DWMWA_WINDOW_CORNER_PREFERENCE 33
+#if !defined(DWM_WINDOW_CORNER_PREFERENCE)
+typedef enum  {
+  DWMWCP_DEFAULT = 0,
+  DWMWCP_DONOTROUND = 1,
+  DWMWCP_ROUND = 2,
+  DWMWCP_ROUNDSMALL = 3
+} DWM_WINDOW_CORNER_PREFERENCE;
+#endif
+
 extern BOOL (WINAPI *pAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 extern BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
 extern HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT lprc, DWORD dwFlags);
@@ -90,6 +101,9 @@ extern BOOL (WINAPI *pRemoveFontResourceExW)(LPCWSTR name, DWORD fl, PVOID pdv);
 #define pRemoveFontResourceEx	pRemoveFontResourceExA
 #endif // !UNICODE
 
+// dwmapi.dll
+extern HRESULT (WINAPI *pDwmSetWindowAttribute)(HWND hwnd, DWORD dwAttribute, LPCVOID pvAttribute, DWORD cbAttribute);
+
 void WinCompatInit();
 
 #ifdef __cplusplus

--- a/teraterm/teraterm/tekwin.cpp
+++ b/teraterm/teraterm/tekwin.cpp
@@ -46,6 +46,7 @@
 #include <htmlhelp.h>
 #include "dlglib.h"
 #include <tchar.h>
+#include "compat_win.h"
 
 #define TEKClassName _T("TEKWin32")
 
@@ -96,11 +97,19 @@ CTEKWindow::CTEKWindow(HINSTANCE hInstance)
 		rect.bottom = rect.top + 400; //temporary height
 	}
 	Create(hInstance, TEKClassName, _T("Tera Term"), Style, rect, ::GetDesktopWindow(), NULL);
+
 //--------------------------------------------------------
 	HTEKWin = GetSafeHwnd();
 	if (HTEKWin == NULL) {
 		return;
 	}
+
+	// Windows 11 でウィンドウの角が丸くならないようにする
+	if (pDwmSetWindowAttribute != NULL) {
+		DWM_WINDOW_CORNER_PREFERENCE preference = DWMWCP_DONOTROUND;
+		pDwmSetWindowAttribute(HTEKWin, DWMWA_WINDOW_CORNER_PREFERENCE, &preference, sizeof(preference));
+	}
+
 	tk.HWin = HTEKWin;
 	// register this window to the window list
 	RegWin(HVTWin,HTEKWin);

--- a/teraterm/teraterm/vtwin.cpp
+++ b/teraterm/teraterm/vtwin.cpp
@@ -718,6 +718,13 @@ CVTWindow::CVTWindow(HINSTANCE hInstance)
 	/*--------- Init2 -----------------*/
 	HVTWin = GetSafeHwnd();
 	if (HVTWin == NULL) return;
+
+	// Windows 11 でウィンドウの角が丸くならないようにする
+	if (pDwmSetWindowAttribute != NULL) {
+		DWM_WINDOW_CORNER_PREFERENCE preference = DWMWCP_DONOTROUND;
+		pDwmSetWindowAttribute(HVTWin, DWMWA_WINDOW_CORNER_PREFERENCE, &preference, sizeof(preference));
+	}
+
 	// register this window to the window list
 	SerialNo = RegWin(HVTWin,NULL);