提交: 20b51fb0784b4095e999b86081418c89e9c0b76d - Tera_Term_Testing (git)

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

Commit MetaInfo

• 修訂: 20b51fb0784b4095e999b86081418c89e9c0b76d (tree)
• 時間: 2022-06-24 23:04:22
• 作者: zmatsuo <zmatsuo@user...>
• Commiter: zmatsuo

Log Message

ツリー付きプロパティーに拡張した

- TTCPropSheetDlg をツリー付きにできるようにした

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@10016 f5f01b69-1e22-0410-acbf-894ab4bd6246

Change Summary

• modified: teraterm/common/tmfc_propdlg.cpp
• modified: teraterm/common/tmfc_propdlg.h

差異

--- a/teraterm/common/tmfc_propdlg.cpp
+++ b/teraterm/common/tmfc_propdlg.cpp
@@ -26,24 +26,152 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <windows.h>
+#include <commctrl.h>
+#include <wchar.h>
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+
 #include "ttlib.h"
 #include "dlglib.h"
 
 #include "tmfc_propdlg.h"
 
 #define REWRITE_TEMPLATE	1
+#define TREE_WIDTH 200
+#define CONTROL_SPACE 5
+
+BOOL TTCPropSheetDlg::m_TreeViewInit = FALSE;
+
 // quick hack :-(
-HINSTANCE TTCPropSheetDlg::ghInstance;
 class TTCPropSheetDlg* TTCPropSheetDlg::gTTCPS;
 
+TTCPropSheetDlg::TTCPropSheetDlg(HINSTANCE hInstance, HWND hParentWnd, const wchar_t *uilangfile)
+{
+	m_hInst = hInstance;
+	m_hWnd = 0;
+	m_hParentWnd = hParentWnd;
+	m_UiLanguageFile = _wcsdup(uilangfile);
+	memset(&m_psh, 0, sizeof(m_psh));
+	m_psh.dwSize = sizeof(m_psh);
+	m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK;
+	//m_psh.dwFlags |= PSH_PROPTITLE;		// 「のプロパティー」が追加される?
+	m_psh.hwndParent = hParentWnd;
+	m_psh.hInstance = hInstance;
+	m_psh.pfnCallback = PropSheetProc;
+	m_Page = NULL;
+	m_PageCount = 0;
+	m_TreeView = m_TreeViewInit;
+}
+
+TTCPropSheetDlg::~TTCPropSheetDlg()
+{
+	free((void*)m_psh.pszCaption);
+	free(m_UiLanguageFile);
+
+	for (int i = 0; i < m_PageCount; i++) {
+		free(m_Page[i].path);
+		m_Page[i].path = NULL;
+	}
+	free(m_Page);
+}
+
+void TTCPropSheetDlg::SetTreeViewMode(BOOL enable)
+{
+	m_TreeViewInit = enable;
+}
+
+void TTCPropSheetDlg::AddPage(HPROPSHEETPAGE hpage, const wchar_t *path)
+{
+	TTPropSheetPage *p =
+		(TTPropSheetPage *)realloc(m_Page, sizeof(TTPropSheetPage) * (m_PageCount + 1));
+	if (p == NULL) {
+		return;
+	}
+	m_Page = p;
+	m_Page[m_PageCount].hPsp = hpage;
+	m_Page[m_PageCount].path = (path == NULL) ? NULL : _wcsdup(path);
+	m_PageCount++;
+}
+
+void TTCPropSheetDlg::SetCaption(const wchar_t* caption)
+{
+	free((void*)m_psh.pszCaption);
+	m_psh.pszCaption = _wcsdup(caption);
+}
+
+INT_PTR TTCPropSheetDlg::DoModal()
+{
+	INT_PTR result;
+	int i;
+	HPROPSHEETPAGE *hPsp = (HPROPSHEETPAGE *)malloc(sizeof(HPROPSHEETPAGE) * m_PageCount);
+	for(i = 0; i < m_PageCount; i++) {
+		hPsp[i] = m_Page[i].hPsp;
+	}
+	m_psh.nPages = m_PageCount;
+	m_psh.phpage = hPsp;
+	gTTCPS = this;
+	result = PropertySheetW(&m_psh);
+	free(hPsp);
+	return result;
+}
+
 LRESULT CALLBACK TTCPropSheetDlg::WndProc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	switch(msg){
 	case WM_INITDIALOG:
 	case WM_SHOWWINDOW: {
+		if (m_TreeView) {
+			AddTreeControl();
+		}
 		CenterWindow(dlg, m_hParentWnd);
 		break;
 		}
+	case WM_NOTIFY: {
+		NMHDR *nmhdr = (NMHDR *)lParam;
+		switch(nmhdr->code) {
+#if 0
+		// TVN_SELCHANGED があれば不要、そのうち消す
+		case TVN_SELCHANGINGW:
+		case TVN_SELCHANGING: {
+			NMTREEVIEWW *pnmtv = (LPNMTREEVIEWW)lParam;
+			TVITEMW item;
+			item.mask = TVIF_PARAM;
+			item.hItem = pnmtv->itemNew.hItem;
+			SendMessageW(m_hWndTV, TVM_GETITEMW, 0, (LPARAM)&item);
+			WPARAM page_index = item.lParam;
+			SendMessageW(m_hWnd, PSM_SETCURSEL, page_index, 0);
+			break;
+		}
+#endif
+		case TVN_SELCHANGEDW:
+		case TVN_SELCHANGED: {
+			// ツリービューが選択された、タブを切り替える
+			NMTREEVIEWW *pnmtv = (LPNMTREEVIEWW)lParam;
+			TVITEMW item;
+			item.mask = TVIF_PARAM;
+			item.hItem = pnmtv->itemNew.hItem;
+			SendMessageW(m_hWndTV, TVM_GETITEMW, 0, (LPARAM)&item);
+			WPARAM page_index = item.lParam;
+			SendMessageW(m_hWnd, PSM_SETCURSEL, page_index, 0);
+			break;
+		}
+		case TCN_SELCHANGE: {
+			// タブが切り替わるときに発生、ツリービューと同期
+			//		タブをマウスでクリック、
+			// 		タブにフォーカスがあるときに左右キー
+			//		CTRL+PgUp,PgDn や CTRL+TABでは発生しない?? TCN_KEYDOWNで処理が必要?
+			HWND hTab = PropSheet_GetTabControl(dlg);
+			int cur_sel = TabCtrl_GetCurSel(hTab);
+			HTREEITEM item = GetTreeItem(cur_sel, TVI_ROOT);
+			if (TreeView_GetSelection(m_hWndTV) != item) {
+				TreeView_SelectItem(m_hWndTV, item);
+			}
+			break;
+		}
+		}
+	}
 	}
 	SetWindowLongPtrW(dlg, GWLP_WNDPROC, m_OrgProc);
 	SetWindowLongPtrW(dlg, GWLP_USERDATA, m_OrgUserData);
@@ -51,6 +179,23 @@ LRESULT CALLBACK TTCPropSheetDlg::WndProc(HWND dlg, UINT msg, WPARAM wParam, LPA
 	m_OrgProc = SetWindowLongPtrW(dlg, GWLP_WNDPROC, (LONG_PTR)WndProcStatic);
 	m_OrgUserData = SetWindowLongPtrW(dlg, GWLP_USERDATA, (LONG_PTR)this);
 
+#if 0
+	// 		?? CTRL+PgUp,PgDn ではこのメッセージは発生しない
+	// そのうち消す
+	switch(msg){
+	case PSM_CHANGED:
+	case PSM_SETCURSEL:
+	case PSM_SETCURSELID: {
+		if (m_TreeView) {
+			HWND hTab = PropSheet_GetTabControl(dlg);
+			int cur_sel = TabCtrl_GetCurSel(hTab);
+			int a = 0;
+		}
+
+		break;
+	}
+	}
+#endif
 	return result;
 }
 
@@ -63,15 +208,16 @@ LRESULT CALLBACK TTCPropSheetDlg::WndProcStatic(HWND dlg, UINT msg, WPARAM wPara
 int CALLBACK TTCPropSheetDlg::PropSheetProc(HWND hWnd, UINT msg, LPARAM lp)
 {
 	switch (msg) {
-	case PSCB_PRECREATE:
-	{
+	case PSCB_PRECREATE: {
 #if defined(REWRITE_TEMPLATE)
 		// テンプレートの内容を書き換える
 		// http://home.att.ne.jp/banana/akatsuki/doc/atlwtl/atlwtl15-01/index.html
+		TTCPropSheetDlg*self = gTTCPS;
+		HINSTANCE hInst = self->m_hInst;
 		size_t PrevTemplSize;
 		size_t NewTemplSize;
 		DLGTEMPLATE *NewTempl =
-			TTGetNewDlgTemplate(ghInstance, (DLGTEMPLATE *)lp,
+			TTGetNewDlgTemplate(hInst, (DLGTEMPLATE *)lp,
 								&PrevTemplSize, &NewTemplSize);
 		NewTempl->style &= ~DS_CONTEXTHELP;		// check DLGTEMPLATEEX
 		memcpy((void *)lp, NewTempl, NewTemplSize);
@@ -79,8 +225,7 @@ int CALLBACK TTCPropSheetDlg::PropSheetProc(HWND hWnd, UINT msg, LPARAM lp)
 #endif
 		break;
 	}
-	case PSCB_INITIALIZED:
-	{
+	case PSCB_INITIALIZED: {
 		static const DlgTextInfo TextInfos[] = {
 			{ IDOK, "BTN_OK" },
 			{ IDCANCEL, "BTN_CANCEL" },
@@ -97,44 +242,227 @@ int CALLBACK TTCPropSheetDlg::PropSheetProc(HWND hWnd, UINT msg, LPARAM lp)
 	return 0;
 }
 
-void TTCPropSheetDlg::AddPage(HPROPSHEETPAGE page)
+static void MoveChildWindows(HWND hWnd, int nDx, int nDy)
 {
-	hPsp[m_PageCount] = page;
-	m_PageCount++;
+	HWND hChildWnd = GetWindow(hWnd, GW_CHILD);
+	while (hChildWnd != NULL) {
+		RECT rect;
+		GetWindowRect(hChildWnd, &rect);
+		int x = rect.left + nDx;
+		int y = rect.top + nDy;
+		POINT p;
+		p.x = x;
+		p.y = y;
+		ScreenToClient(hWnd, &p);
+		x = p.x;
+		y = p.y;
+		SetWindowPos(hChildWnd, NULL, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+
+		hChildWnd = GetNextWindow(hChildWnd, GW_HWNDNEXT);
+	}
 }
 
-TTCPropSheetDlg::TTCPropSheetDlg(HINSTANCE hInstance, HWND hParentWnd, const wchar_t *uilangfile)
+HTREEITEM TTCPropSheetDlg::GetTreeItem(int nPage, HTREEITEM hParent)
 {
-	m_hInst = hInstance;
-	m_hWnd = 0;
-	m_hParentWnd = hParentWnd;
-	m_UiLanguageFile = _wcsdup(uilangfile);
-	memset(&m_psh, 0, sizeof(m_psh));
-	m_psh.dwSize = sizeof(m_psh);
-	m_psh.dwFlags = PSH_DEFAULT | PSH_NOAPPLYNOW | PSH_USECALLBACK;
-	//m_psh.dwFlags |= PSH_PROPTITLE;		// 「のプロパティー」が追加される?
-	m_psh.hwndParent = hParentWnd;
-	m_psh.hInstance = hInstance;
-	m_psh.pfnCallback = PropSheetProc;
-	m_PageCount = 0;
+	HTREEITEM hItem = TreeView_GetChild(m_hWndTV, hParent);
+	while (hItem) {
+		TVITEMW item;
+		item.hItem = hItem;
+		item.mask = TVIF_PARAM;
+		TreeView_GetItem(m_hWndTV, &item);
+
+		if (item.lParam == nPage) {
+			// 見つかった
+			return hItem;
+		}
+
+		// 子
+		HTREEITEM hItemFound = GetTreeItem(nPage, hItem);
+		if (hItemFound != NULL) {
+			// 見つかった
+			return hItemFound;
+		}
+
+		// 次
+		hItem = TreeView_GetNextItem(m_hWndTV, hItem, TVGN_NEXT);
+	}
+
+	return NULL;
 }
-TTCPropSheetDlg::~TTCPropSheetDlg()
+
+/**
+ *	パスを作成して返す
+ *		存在していたらそれを返す
+ *	@param	path		L"path1/path2/path3"
+ *	@param	HTREEITEM	呼び出し元はTVI_ROOT (再帰用)
+ *	@param	page_index	作成したパスに設定するpage_index(0...)
+ *	@return	HTREEITEM
+ */
+HTREEITEM TTCPropSheetDlg::CreatePath(const wchar_t *path, HTREEITEM hParent, int page_index)
 {
-	free((void*)m_psh.pszCaption);
-	free(m_UiLanguageFile);
+	if (path == NULL || path[0] == 0) {
+		return hParent;
+	}
+
+	wchar_t *path_cur = _wcsdup(path);
+	wchar_t *path_next = NULL;
+	wchar_t *p = wcschr(path_cur, L'/');
+	if (p != NULL) {
+		path_next = p + 1;
+		*p = 0;
+	}
+
+	// パスが既に存在しているか?
+	HTREEITEM hItem = TreeView_GetChild(m_hWndTV, hParent);
+	while (hItem) {
+		wchar_t text[MAX_PATH];
+		TVITEMW item;
+		item.hItem = hItem;
+		item.mask = TVIF_TEXT;
+		item.cchTextMax = _countof(text);
+		item.pszText = text;
+		// TreeView_GetItem(m_hWndTV, &item);
+		SendMessageW(m_hWndTV, TVM_GETITEMW, 0, (LPARAM)&item);
+
+		if (wcscmp(item.pszText, path_cur) ==0) {
+			// 存在している
+			if (path_next != NULL) {
+				// 再帰、次を探す
+				hItem = CreatePath(path_next, hItem, page_index);
+			}
+			free(path_cur);
+			return hItem;
+		}
+
+		// 次
+		hItem = TreeView_GetNextItem(m_hWndTV, hItem, TVGN_NEXT);
+	}
+
+	// 見つからない、作る
+	TVINSERTSTRUCTW tvi;
+	tvi.hParent = hParent;
+	tvi.hInsertAfter = TVI_LAST;
+	tvi.item.mask = TVIF_TEXT | TVIF_PARAM;
+	tvi.item.pszText = (wchar_t *)path_cur;
+	tvi.item.lParam = (LPARAM)page_index;
+	//TreeView_InsertItem(m_hWndTV, &tvi);
+	hItem = (HTREEITEM)SendMessageW(m_hWndTV, TVM_INSERTITEMW, 0, (LPARAM)&tvi);
+
+	if (path_next != NULL) {
+		// 再帰で探す(見つからず、作ることになる)
+		hItem = CreatePath(path_next, hItem, page_index);
+	}
+
+	free(path_cur);
+	return hItem;
 }
 
-void TTCPropSheetDlg::SetCaption(const wchar_t* caption)
+void TTCPropSheetDlg::CreateTree(HWND dlg)
 {
-	free((void*)m_psh.pszCaption);
-	m_psh.pszCaption = _wcsdup(caption);
+	HWND hTab = PropSheet_GetTabControl(dlg);
+	const int nPageCount = TabCtrl_GetItemCount(hTab);
+
+	// シート(木の葉)を追加する
+	for (int i = 0; i < nPageCount; i++) {
+		// ページのタイトル取得
+		wchar_t page_title[MAX_PATH];
+		TCITEMW	ti;
+		ZeroMemory(&ti, sizeof(ti));
+		ti.mask = TCIF_TEXT;
+		ti.cchTextMax = _countof(page_title);
+		ti.pszText = page_title;
+		//TabCtrl_GetItem(hTab, i, &ti);
+		SendMessageW(hTab, TCM_GETITEMW, (WPARAM)i, (LPARAM)&ti);
+
+		// パス(枝)を作る
+		wchar_t *path = m_Page[i].path;
+		HTREEITEM hItem = CreatePath(path, TVI_ROOT, i);
+
+		// シートを追加する
+		TVINSERTSTRUCTW tvi;
+		tvi.hParent = hItem;
+		tvi.hInsertAfter = TVI_LAST;
+		tvi.item.mask = TVIF_TEXT | TVIF_PARAM;
+		tvi.item.pszText = page_title;
+		tvi.item.lParam = (LPARAM)i;
+		//hItem = TreeView_InsertItem(m_hWndTV, &tvi);
+		hItem = (HTREEITEM)SendMessageW(m_hWndTV, TVM_INSERTITEMW, 0, (LPARAM)&tvi);
+	}
 }
 
-INT_PTR TTCPropSheetDlg::DoModal()
+void TTCPropSheetDlg::AddTreeControl()
 {
-	m_psh.nPages = m_PageCount;
-	m_psh.phpage = hPsp;
-	ghInstance = m_hInst;
-	gTTCPS = this;
-	return PropertySheetW(&m_psh);
+	HWND hTab = PropSheet_GetTabControl(m_hWnd);
+
+	// ツリーで選択できるのでタブは1行設定にする
+	SetWindowLongPtr(hTab, GWL_STYLE, GetWindowLongPtr(hTab, GWL_STYLE) & ~TCS_MULTILINE);
+
+#if 0
+	// タブを消して領域を移動しようとしたがうまくいかなかった
+	// そのうちこのブロックは消す
+	const bool m_HideTab = true;
+	if (m_HideTab) {
+		// タブ部分を隠す
+		ShowWindow(hTab, SW_HIDE);
+		EnableWindow(hTab, FALSE);
+
+		// タブ部分のサイズ(高さ)
+		RECT item_rect;
+		TabCtrl_GetItemRect(hTab, 0, &item_rect);
+		const int item_height = item_rect.bottom - item_rect.top;
+
+		// tab controlのタブ分、ダイアログを小さくする
+		RECT dlg_rect;
+		GetWindowRect(m_hWnd, &dlg_rect);
+		int w = dlg_rect.right - dlg_rect.left;
+		int h = dlg_rect.bottom - dlg_rect.top - item_height;
+		SetWindowPos(m_hWnd, NULL, 0, 0, w, h, SWP_NOZORDER | SWP_NOMOVE);
+
+		// タブコントロールをタブ分上に移動する
+		RECT tab_rect;
+		GetWindowRect(hTab, &tab_rect);
+
+		POINT start;
+		start.x = tab_rect.left;
+		start.y = tab_rect.top - item_height;
+		ScreenToClient(m_hWnd, &start);
+		SetWindowPos(hTab, NULL, start.x, start.y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+	}
+#endif
+
+	// ツリーコントロールの位置を決める
+	RECT tree_rect;
+	GetWindowRect(hTab, &tree_rect);
+ 	int tree_w = TREE_WIDTH;
+	int tree_h = tree_rect.bottom - tree_rect.top;
+	POINT pt;
+	pt.x = tree_rect.left;
+	pt.y = tree_rect.top;
+	ScreenToClient(m_hWnd, &pt);
+
+	// ツリーコントロール分ダイアログのサイズを大きくする
+	RECT dlg_rect;
+	GetWindowRect(m_hWnd, &dlg_rect);
+	int w = dlg_rect.right - dlg_rect.left + TREE_WIDTH + CONTROL_SPACE;
+	int h = dlg_rect.bottom - dlg_rect.top;
+	SetWindowPos(m_hWnd, NULL, 0, 0, w, h, SWP_NOZORDER | SWP_NOMOVE);
+
+	// ダイアログのサイズを大きくした分、コントロールを移動する
+	MoveChildWindows(m_hWnd, TREE_WIDTH + CONTROL_SPACE, 0);
+
+	const DWORD	dwTreeStyle =
+		TVS_SHOWSELALWAYS|TVS_TRACKSELECT|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS;
+	m_hWndTV = CreateWindowExW(0,
+							   WC_TREEVIEWW,
+							   L"Tree View",
+							   WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP | dwTreeStyle,
+							   pt.x,
+							   pt.y,
+							   tree_w,
+							   tree_h,
+							   m_hWnd,
+							   NULL,
+							   m_hInst,
+							   NULL);
+	CreateTree(m_hWnd);
 }

--- a/teraterm/common/tmfc_propdlg.h
+++ b/teraterm/common/tmfc_propdlg.h
@@ -37,26 +37,39 @@ public:
 	TTCPropSheetDlg(HINSTANCE hInstance, HWND hParentWnd, const wchar_t *uilangfile);
 	virtual ~TTCPropSheetDlg();
 	INT_PTR DoModal();
-	void AddPage(HPROPSHEETPAGE page);
+	void AddPage(HPROPSHEETPAGE page, const wchar_t *path = NULL);
 	void SetCaption(const wchar_t *caption);
+	static void SetTreeViewMode(BOOL enable);
 
 private:
+	HWND m_hWnd;
+	HWND m_hParentWnd;
+	HINSTANCE m_hInst;
+	wchar_t *m_UiLanguageFile;
+
 	static int CALLBACK PropSheetProc(HWND hWnd, UINT msg, LPARAM lParam);
 	static LRESULT CALLBACK WndProcStatic(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam);
-	static HINSTANCE ghInstance;
 	static class TTCPropSheetDlg *gTTCPS;
 	LRESULT CALLBACK WndProc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam);
+	LONG_PTR m_OrgProc;
+	LONG_PTR m_OrgUserData;
 
 	PROPSHEETHEADERW m_psh;
-	HWND m_hWnd;
-	HWND m_hParentWnd;
-	HINSTANCE m_hInst;
-
 	int m_PageCount;
-	HPROPSHEETPAGE hPsp[9];
+	struct TTPropSheetPage {
+		HPROPSHEETPAGE hPsp;
+		wchar_t *path;
+	};
+	TTPropSheetPage *m_Page;
 
-	LONG_PTR m_OrgProc;
-	LONG_PTR m_OrgUserData;
+	// tree control
+	BOOL m_TreeView;
+	HWND m_hWndTV;
+	void AddTreeControl();
+	void CreateTree(HWND dlg);
+	HTREEITEM CreatePath(const wchar_t *path, HTREEITEM hParent, int data);
+	HTREEITEM GetTreeItem(int nPage, HTREEITEM hParent);
 
-	wchar_t *m_UiLanguageFile;
+	// 初期値
+	static BOOL m_TreeViewInit;
 };