[Ttssh2-commit] [7299] Alt+キーでメニューが開けるようにした

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2018年 12月 1日 (土) 01:50:45 JST


Revision: 7299
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7299
Author:   zmatsuo
Date:     2018-12-01 01:50:45 +0900 (Sat, 01 Dec 2018)
Log Message:
-----------
Alt+キーでメニューが開けるようにした

Modified Paths:
--------------
    branches/cmake/teraterm/common/tmfc.h
    branches/cmake/teraterm/common/tmfc_frame.cpp
    branches/cmake/teraterm/teraterm/tekwin.cpp
    branches/cmake/teraterm/teraterm/vtwin.cpp
    branches/cmake/teraterm/teraterm/vtwin.h

-------------- next part --------------
Modified: branches/cmake/teraterm/common/tmfc.h
===================================================================
--- branches/cmake/teraterm/common/tmfc.h	2018-11-30 16:50:31 UTC (rev 7298)
+++ branches/cmake/teraterm/common/tmfc.h	2018-11-30 16:50:45 UTC (rev 7299)
@@ -55,7 +55,8 @@
 	void ModifyStyleEx(DWORD dwRemove, DWORD dwAdd, UINT nFlags = 0);
 	int MessageBoxT(LPCTSTR lpText, LPCTSTR lpCaption, UINT uType);
 	int MessageBoxA(const char * lpText, const char *lpCaption, UINT uType);
-	virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	//virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
+	LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 	BOOL GetWindowRect(RECT *R);
 	BOOL SetWindowPos(HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags);
 	BOOL GetClientRect(RECT *R);
@@ -100,7 +101,7 @@
 						LPCTSTR lpszMenuName = NULL,
 						DWORD dwExStyle = 0);//,
 						//CCreateContext* pContext = NULL);
-	virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp);
+	virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp) = 0;
 	static const RECT rectDefault;
 	///
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);

Modified: branches/cmake/teraterm/common/tmfc_frame.cpp
===================================================================
--- branches/cmake/teraterm/common/tmfc_frame.cpp	2018-11-30 16:50:31 UTC (rev 7298)
+++ branches/cmake/teraterm/common/tmfc_frame.cpp	2018-11-30 16:50:45 UTC (rev 7299)
@@ -99,11 +99,6 @@
 	return self->Proc(msg, wp, lp);
 }
 
-LRESULT TTCFrameWnd::Proc(UINT msg, WPARAM wp, LPARAM lp)
-{
-	return DefWindowProc(msg, wp, lp);
-}
-
 BOOL TTCFrameWnd::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	return FALSE;
@@ -123,12 +118,12 @@
 
 void TTCFrameWnd::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
-	TTCFrameWnd::Proc(WM_SYSKEYDOWN, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
+	DefWindowProc(WM_SYSKEYDOWN, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
 }
 
 void TTCFrameWnd::OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
 {
-	TTCFrameWnd::Proc(WM_SYSKEYUP, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
+	DefWindowProc(WM_SYSKEYUP, (WPARAM)nChar, MAKELONG(nRepCnt, nFlags));
 }
 
 void TTCFrameWnd::OnClose()

Modified: branches/cmake/teraterm/teraterm/tekwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/tekwin.cpp	2018-11-30 16:50:31 UTC (rev 7298)
+++ branches/cmake/teraterm/teraterm/tekwin.cpp	2018-11-30 16:50:45 UTC (rev 7299)
@@ -933,7 +933,7 @@
 		break;
 	case WM_SETFOCUS:
 		OnSetFocus((HWND)wp);
-		TTCFrameWnd::Proc(msg, wp, lp);
+		DefWindowProc(msg, wp, lp);
 		break;
 	case WM_SIZE:
 		OnSize(wp, LOWORD(lp), HIWORD(lp));
@@ -940,7 +940,7 @@
 		break;
 	case WM_SYSCOMMAND:
 		OnSysCommand(wp, lp);
-		TTCFrameWnd::Proc(msg, wp, lp);
+		DefWindowProc(msg, wp, lp);
 		break;
 	case WM_SYSKEYDOWN:
 		OnSysKeyDown(wp, LOWORD(lp), HIWORD(lp));
@@ -990,7 +990,7 @@
 		break;
 	}
 	default:
-		retval = TTCFrameWnd::Proc(msg, wp, lp);
+		retval = DefWindowProc(msg, wp, lp);
 		break;
 	}
 				

Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp	2018-11-30 16:50:31 UTC (rev 7298)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp	2018-11-30 16:50:45 UTC (rev 7299)
@@ -1631,33 +1631,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // CVTWindow message handler
 
-LRESULT CVTWindow::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
-{
-	LRESULT Result;
-
-	if (message == MsgDlgHelp) {
-		OnDlgHelp(wParam,lParam);
-		return 0;
-	}
-	else if ((ts.HideTitle>0) &&
-	         (message == WM_NCHITTEST)) {
-		Result = CFrameWnd::DefWindowProc(message,wParam,lParam);
-		if ((Result==HTCLIENT) && AltKey()) {
-#ifdef ALPHABLEND_TYPE2
-			if(ShiftKey())
-				Result = HTBOTTOMRIGHT;
-			else
-				Result = HTCAPTION;
-#else
-			Result = HTCAPTION;
-#endif
-		}
-		return Result;
-	}
-
-	return (CFrameWnd::DefWindowProc(message,wParam,lParam));
-}
-
 BOOL CVTWindow::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	WORD wID = LOWORD(wParam);
@@ -2129,7 +2102,7 @@
 				DefaultShowDialog = !DoNotShowDialog;
 			}
 		}
-			 
+
 		switch (DropType) {
 		case DROP_TYPE_CANCEL:
 		default:
@@ -2805,7 +2778,7 @@
 		return;
 	}
 
-//	CFrameWnd::OnSysChar(nChar, nRepCnt, nFlags);
+	CFrameWnd::DefWindowProc(WM_SYSCHAR, nChar, MAKELONG(nRepCnt, nFlags));
 }
 
 // \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
@@ -6026,7 +5999,7 @@
 		return 0;
 	}
 	preTime = currentTime;
-		
+
 	DpiChanged();
 	return TRUE;
 }
@@ -6034,6 +6007,10 @@
 LRESULT CVTWindow::Proc(UINT msg, WPARAM wp, LPARAM lp)
 {
 	LRESULT retval = 0;
+	if (msg == MsgDlgHelp) {
+		OnDlgHelp(wp,lp);
+		return 0;
+	}
 	switch(msg)
 	{
 	case WM_ACTIVATE:
@@ -6099,7 +6076,7 @@
 		break;
 	case WM_NCLBUTTONDBLCLK:
 		OnNcLButtonDblClk((UINT)wp, MAKEPOINTS(lp));
-		TTCFrameWnd::Proc(msg, wp, lp);
+		DefWindowProc(msg, wp, lp);
 		break;
 	case WM_NCRBUTTONDOWN:
 		OnNcRButtonDown((UINT)wp, MAKEPOINTS(lp));
@@ -6120,7 +6097,7 @@
 		break;
 	case WM_SETFOCUS:
 		OnSetFocus((HWND)wp);
-		TTCFrameWnd::Proc(msg, wp, lp);
+		DefWindowProc(msg, wp, lp);
 		break;
 	case WM_SIZE:
 		OnSize(wp, LOWORD(lp), HIWORD(lp));
@@ -6128,9 +6105,11 @@
 	case WM_SIZING:
 		OnSizing(wp, (LPRECT)lp);
 		break;
+#if 1
 	case WM_SYSCHAR:
 		OnSysChar(wp, LOWORD(lp), HIWORD(lp));
 		break;
+#endif
 #if 0	// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
 	case WM_SYSCOLORCHANGE:
 		break;
@@ -6137,7 +6116,7 @@
 #endif
 	case WM_SYSCOMMAND:
 		OnSysCommand(wp, lp);
-		TTCFrameWnd::Proc(msg, wp, lp);
+		DefWindowProc(msg, wp, lp);
 		break;
 	case WM_SYSKEYDOWN:
 		OnSysKeyDown(wp, LOWORD(lp), HIWORD(lp));
@@ -6153,7 +6132,7 @@
 		break;
 	case WM_DEVICECHANGE:
 		OnDeviceChange((UINT)wp, (DWORD_PTR)lp);
-		TTCFrameWnd::Proc(msg, wp, lp);
+		DefWindowProc(msg, wp, lp);
 		break;
 	case WM_IME_COMPOSITION:
 		OnIMEComposition(wp, lp);
@@ -6313,8 +6292,24 @@
 		}
 		break;
 	}
+	case WM_NCHITTEST: {
+		retval = CFrameWnd::DefWindowProc(msg, wp ,lp);
+		if (ts.HideTitle>0) {
+			if ((retval == HTCLIENT) && AltKey()) {
+#ifdef ALPHABLEND_TYPE2
+			if(ShiftKey())
+				retval = HTBOTTOMRIGHT;
+			else
+				retval = HTCAPTION;
+#else
+			retval = HTCAPTION;
+#endif
+			}
+		}
+	}
+		break;
 	default:
-		retval = TTCFrameWnd::Proc(msg, wp, lp);
+		retval = DefWindowProc(msg, wp, lp);
 		break;
 	}
 	return retval;

Modified: branches/cmake/teraterm/teraterm/vtwin.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.h	2018-11-30 16:50:31 UTC (rev 7298)
+++ branches/cmake/teraterm/teraterm/vtwin.h	2018-11-30 16:50:45 UTC (rev 7299)
@@ -79,7 +79,6 @@
 
 	//{{AFX_VIRTUAL(CVTWindow)
 	protected:
-	virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 	//}}AFX_VIRTUAL
 


Ttssh2-commit メーリングリストの案内
Back to archive index