Commit: 635c5add480b9e5411e88488035f7200207402b7 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 635c5add480b9e5411e88488035f7200207402b7 (tree)
• l'heure: 2008-10-12 01:15:23
• Auteur: John E. <tdragon@user...>
• Commiter: John E.

Message de Log

UI code restructured

Change Summary

• modified: instselect.cpp
• delete: main.c
• add: main.cpp
• modified: mainwnd.c
• modified: mingw-get.cbp
• modified: pkg_index.cpp
• modified: pkg_index.hpp
• delete: ui.hpp
• delete: ui_windowed.cpp => ui.cpp

Modification

--- a/instselect.cpp
+++ b/instselect.cpp
@@ -272,9 +272,7 @@ static BOOL CALLBACK InstSelProc
 }
 
 
-extern "C" void SelectInst
- (HINSTANCE hinstance,
-  HWND hparent)
+extern "C" void SelectInst(HINSTANCE hinstance, HWND hparent)
 {
 	if (!DialogBox(hinstance, MAKEINTRESOURCE(IDD_INSTSEL), hparent,
 	 InstSelProc) || !g_inst_loc[0])

--- a/main.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-
-int UI_Windowed(HINSTANCE);
-
-int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
-{
-	return UI_Windowed(hInstance);
-}

--- /dev/null
+++ b/main.cpp
@@ -0,0 +1,24 @@
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <string>
+#include "pkg_index.hpp"
+
+
+extern "C" HWND CreateMainWnd(HINSTANCE);
+extern "C" int MainMessageLoop(HWND);
+std::string GetBinDir();
+extern "C" void SelectInst(HINSTANCE, HWND);
+
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
+{
+	HWND mainwnd = CreateMainWnd(hInstance);
+	if (!mainwnd)
+		return 1;
+
+	PkgIndex::LoadManifest(GetBinDir() + "\\mingw_avail.mft");
+
+	SelectInst(hInstance, mainwnd);
+
+	return MainMessageLoop(mainwnd);
+}

--- a/mainwnd.c
+++ b/mainwnd.c
@@ -90,11 +90,11 @@ static void InsertColumn
 
 void SelectInst(HINSTANCE, HWND);
 const char* Pkg_GetSubItemText(LPARAM, int);
-void UI_NotifyCategoryChange(int);
-void UI_SortListView(int);
-void UI_OnListViewSelect(int);
+void UI_OnCategoryChange(int, HWND);
+void UI_SortListView(int, HWND);
+void UI_OnListViewSelect(int, HWND);
 void DescWnd_SetHWND(HWND);
-void UI_OnStateCycle(int);
+void UI_OnStateCycle(int, HWND);
 const char* Pkg_GetInstalledVersion(LPARAM);
 int Pkg_GetSelectedAction(LPARAM);
 void Pkg_SelectAction(LPARAM, int);
@@ -197,7 +197,7 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 		case IDC_CATLIST:
 			if (HIWORD(wParam) == LBN_SELCHANGE)
 			{
-				UI_NotifyCategoryChange(ListBox_GetCurSel((HWND)lParam));
+				UI_OnCategoryChange(ListBox_GetCurSel((HWND)lParam), hwndDlg);
 				return TRUE;
 			}
 			break;
@@ -218,12 +218,12 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				}
 				return 0;
 			case LVN_COLUMNCLICK:
-				UI_SortListView(((LPNMLISTVIEW)lParam)->iSubItem);
+				UI_SortListView(((LPNMLISTVIEW)lParam)->iSubItem, hwndDlg);
 				return 0;
 			case LVN_ITEMCHANGED:
 				if ((((LPNMLISTVIEW)lParam)->uChanged & LVIF_STATE)
 				 && (((LPNMLISTVIEW)lParam)->uNewState & LVIS_SELECTED))
-					UI_OnListViewSelect(((LPNMLISTVIEW)lParam)->iItem);
+					UI_OnListViewSelect(((LPNMLISTVIEW)lParam)->iItem, hwndDlg);
 				return 0;
 			case NM_CLICK:
 				{
@@ -237,7 +237,7 @@ static BOOL CALLBACK MainWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 					if ((lvhti.flags & LVHT_ONITEMICON)
 					 && !(lvhti.flags & LVHT_ONITEMLABEL)
 					 && lvhti.iItem >= 0)
-						UI_OnStateCycle(lvhti.iItem);
+						UI_OnStateCycle(lvhti.iItem, hwndDlg);
 				}
 				return 0;
 			case NM_RCLICK:
@@ -406,16 +406,13 @@ static int ProcessQueuedMessages(HWND wnd)
 	{
 		if (msg.message == WM_QUIT)
 			return 1;
-		if (TranslateAccelerator(wnd, g_haccel, &msg))
+		if (!TranslateAccelerator(wnd, g_haccel, &msg))
 		{
-		}
-		else if (IsDialogMessage(wnd, &msg))
-		{
-		}
-		else
-		{
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
+			if (!IsDialogMessage(wnd, &msg))
+			{
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+			}
 		}
 	}
 	return 0;
@@ -453,16 +450,13 @@ int MainMessageLoop(HWND wnd)
 	MSG msg;
 	while (GetMessage(&msg, NULL, 0, 0))
 	{
-		if (TranslateAccelerator(wnd, g_haccel, &msg))
+		if (!TranslateAccelerator(wnd, g_haccel, &msg))
 		{
-		}
-		else if (IsDialogMessage(wnd, &msg))
-		{
-		}
-		else
-		{
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
+			if (!IsDialogMessage(wnd, &msg))
+			{
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+			}
 		}
 	}
 	return msg.wParam;

--- a/mingw-get.cbp
+++ b/mingw-get.cbp
@@ -64,9 +64,7 @@
 		<Unit filename="instselect.cpp">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="main.c">
-			<Option compilerVar="CC" />
-		</Unit>
+		<Unit filename="main.cpp" />
 		<Unit filename="mainwnd.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -100,8 +98,7 @@
 		<Unit filename="tinyxml\tinyxmlparser.cpp" />
 		<Unit filename="tracked_install.cpp" />
 		<Unit filename="tracked_install.hpp" />
-		<Unit filename="ui.hpp" />
-		<Unit filename="ui_windowed.cpp" />
+		<Unit filename="ui.cpp" />
 		<Unit filename="versioning.c">
 			<Option compilerVar="CC" />
 		</Unit>

--- a/pkg_index.cpp
+++ b/pkg_index.cpp
@@ -16,7 +16,6 @@
 char PkgIndex::sm_lasterror[2048] = {0};
 std::vector< std::string > PkgIndex::sm_index_categories;
 PkgIndex::StringIntMap PkgIndex::sm_id_categories;
-std::list< Package::Ref >PkgIndex::sm_packages;
 PkgIndex::StringPackageMap PkgIndex::sm_id_packages;
 
 
@@ -52,13 +51,13 @@ int PkgIndex::CategoryIndex(const char* cat_id)
 
 PkgIndex::PackageIter PkgIndex::Packages_Begin()
 {
-	return sm_packages.begin();
+	return sm_id_packages.begin();
 }
 
 
 PkgIndex::PackageIter PkgIndex::Packages_End()
 {
-	return sm_packages.end();
+	return sm_id_packages.end();
 }
 
 
@@ -84,7 +83,6 @@ bool PkgIndex::LoadManifest(const std::string& mfile)
 			continue;
 		sm_id_categories[id] = sm_index_categories.size();
 		sm_index_categories.push_back(name);
-		UI::NotifyNewCategory(name);
 	}
 	for (TiXmlElement* package_el =
 	  TiXmlHandle(doc.RootElement()->FirstChildElement("package-collection")).
@@ -100,7 +98,6 @@ bool PkgIndex::LoadManifest(const std::string& mfile)
 			continue;
 		Package::Ref newpkg(new Package(id, package_el));
 		InsertPackage(newpkg);
-		UI::NotifyNewPackage(*newpkg);
 	}
 	return true;
 }

--- a/pkg_index.hpp
+++ b/pkg_index.hpp
@@ -25,8 +25,8 @@ public:
 	static const char* GetCategory(int cat);
 	static int CategoryIndex(const char* cat_id);
 
-	typedef std::list< RefType< Package >::Ref >::const_iterator
-	 PackageIter;
+	typedef std::map< std::string, RefType< Package >::Ref > StringPackageMap;
+	typedef StringPackageMap::const_iterator PackageIter;
 	static PackageIter Packages_Begin();
 	static PackageIter Packages_End();
 
@@ -38,8 +38,6 @@ private:
 	static std::vector< std::string > sm_index_categories;
 	typedef std::map< std::string, int > StringIntMap;
 	static StringIntMap sm_id_categories;
-	static std::list< RefType< Package >::Ref > sm_packages;
-	typedef std::map< std::string, RefType< Package >::Ref > StringPackageMap;
 	static StringPackageMap sm_id_packages;
 };
 

--- a/ui_windowed.cpp
+++ b/ui.cpp
@@ -1,43 +1,22 @@
+/** \file ui.cpp
+ *
+ * Created: JohnE, 2008-10-11
+ */
 
-#include "ui.hpp"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
 #include <climits>
-#include <list>
-#include "resource.h"
 #include "package.hpp"
 #include "pkg_index.hpp"
 #include "pkg_const.h"
+#include "resource.h"
 
 
-static HWND g_hmainwnd = 0;
-
-
-extern "C" HWND CreateMainWnd(HINSTANCE);
-extern "C" int MainMessageLoop(HWND);
-extern "C" void SelectInst(HINSTANCE, HWND);
-std::string GetBinDir();
-
-extern "C" int UI_Windowed(HINSTANCE hinstance)
-{
-	g_hmainwnd = CreateMainWnd(hinstance);
-	if (!g_hmainwnd)
-		return 1;
-
-	PkgIndex::LoadManifest(GetBinDir() + "\\mingw_avail.mft");
-
-	SelectInst(hinstance, g_hmainwnd);
-
-	return MainMessageLoop(g_hmainwnd);
-}
-
-
-static void LVAddPackage(const Package& pkg)
+static void LVAddPackage(HWND hlist, const Package& pkg)
 {
-	HWND hlist = GetDlgItem(g_hmainwnd, IDC_COMPLIST);
 	LVITEM lvi;
 	lvi.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
 	lvi.iItem = INT_MAX;
@@ -56,15 +35,15 @@ static void LVAddPackage(const Package& pkg)
 	}
 	if (lvi.iItem == 0)
 	{
-		ListView_SetItemState(GetDlgItem(g_hmainwnd, IDC_COMPLIST), 0,
+		ListView_SetItemState(hlist, 0,
 		 LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
 	}
 }
 
 
-extern "C" void UI_NotifyCategoryChange(int sel)
+extern "C" void UI_OnCategoryChange(int sel, HWND hmainwnd)
 {
-	ListView_DeleteAllItems(GetDlgItem(g_hmainwnd, IDC_COMPLIST));
+	ListView_DeleteAllItems(GetDlgItem(hmainwnd, IDC_COMPLIST));
 	bool have_item = false;
 	if (sel == 0)
 	{
@@ -72,7 +51,7 @@ extern "C" void UI_NotifyCategoryChange(int sel)
 		 it != PkgIndex::Packages_End();
 		 ++it)
 		{
-			LVAddPackage(**it);
+			LVAddPackage(GetDlgItem(hmainwnd, IDC_COMPLIST), *it->second);
 			have_item = true;
 		}
 	}
@@ -82,46 +61,46 @@ extern "C" void UI_NotifyCategoryChange(int sel)
 		 it != PkgIndex::Packages_End();
 		 ++it)
 		{
-			if ((*it)->m_categories.count(sel - 1) > 0)
+			if (it->second->m_categories.count(sel - 1) > 0)
 			{
-				LVAddPackage(**it);
+				LVAddPackage(GetDlgItem(hmainwnd, IDC_COMPLIST), *it->second);
 				have_item = true;
 			}
 		}
 	}
 	if (have_item)
 	{
-		ListView_SetItemState(GetDlgItem(g_hmainwnd, IDC_COMPLIST), 0,
+		ListView_SetItemState(GetDlgItem(hmainwnd, IDC_COMPLIST), 0,
 		 LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
 	}
 	else
 	{
-		Static_SetText(GetDlgItem(g_hmainwnd, IDC_DESCTITLE), "");
-		Edit_SetText(GetDlgItem(g_hmainwnd, IDC_FULLDESC), "");
-		ComboBox_ResetContent(GetDlgItem(g_hmainwnd, IDC_INSTVERSION));
-		EnableWindow(GetDlgItem(g_hmainwnd, IDC_INSTVERSION), FALSE);
+		Static_SetText(GetDlgItem(hmainwnd, IDC_DESCTITLE), "");
+		Edit_SetText(GetDlgItem(hmainwnd, IDC_FULLDESC), "");
+		ComboBox_ResetContent(GetDlgItem(hmainwnd, IDC_INSTVERSION));
+		EnableWindow(GetDlgItem(hmainwnd, IDC_INSTVERSION), FALSE);
 	}
 }
 
 
 void DescWnd_SetDescription(const std::string&);
 
-extern "C" void UI_OnListViewSelect(int sel)
+extern "C" void UI_OnListViewSelect(int sel, HWND hmainwnd)
 {
 	LVITEM lvitem;
 	lvitem.iItem = sel;
 	lvitem.iSubItem = 0;
 	lvitem.mask = LVIF_PARAM;
-	ListView_GetItem(GetDlgItem(g_hmainwnd, IDC_COMPLIST), &lvitem);
+	ListView_GetItem(GetDlgItem(hmainwnd, IDC_COMPLIST), &lvitem);
 	Package* pkg = reinterpret_cast< Package* >(lvitem.lParam);
-	Edit_SetText(GetDlgItem(g_hmainwnd, IDC_FULLDESC),
+	Edit_SetText(GetDlgItem(hmainwnd, IDC_FULLDESC),
 	 pkg->m_description.c_str());
-	Static_SetText(GetDlgItem(g_hmainwnd, IDC_DESCTITLE),
+	Static_SetText(GetDlgItem(hmainwnd, IDC_DESCTITLE),
 	 pkg->m_title.c_str());
-	ComboBox_ResetContent(GetDlgItem(g_hmainwnd, IDC_INSTVERSION));
+	ComboBox_ResetContent(GetDlgItem(hmainwnd, IDC_INSTVERSION));
 	if (pkg->m_versions.size() > 0)
 	{
-		EnableWindow(GetDlgItem(g_hmainwnd, IDC_INSTVERSION), TRUE);
+		EnableWindow(GetDlgItem(hmainwnd, IDC_INSTVERSION), TRUE);
 		std::string vstr;
 		for (std::vector< PkgVersion::Ref >::const_iterator it = pkg->m_versions.begin();
 		 it != pkg->m_versions.end();
@@ -132,29 +111,29 @@ extern "C" void UI_OnListViewSelect(int sel)
 			else
 				vstr = "Stable: ";
 			vstr += (*it)->m_version;
-			ComboBox_AddString(GetDlgItem(g_hmainwnd, IDC_INSTVERSION),
+			ComboBox_AddString(GetDlgItem(hmainwnd, IDC_INSTVERSION),
 			 vstr.c_str());
 		}
 		pkg->m_selected_version = 0;
-		ComboBox_SetCurSel(GetDlgItem(g_hmainwnd, IDC_INSTVERSION), 0);
+		ComboBox_SetCurSel(GetDlgItem(hmainwnd, IDC_INSTVERSION), 0);
 	}
 	else
 	{
 		pkg->m_selected_version = -1;
-		EnableWindow(GetDlgItem(g_hmainwnd, IDC_INSTVERSION), FALSE);
+		EnableWindow(GetDlgItem(hmainwnd, IDC_INSTVERSION), FALSE);
 	}
 }
 
 
 extern "C" int VersionCompare(const char*, const char*);
 
-extern "C" void UI_OnStateCycle(int sel)
+extern "C" void UI_OnStateCycle(int sel, HWND hmainwnd)
 {
 	LVITEM lvitem;
 	lvitem.iItem = sel;
 	lvitem.iSubItem = 0;
 	lvitem.mask = LVIF_PARAM;
-	ListView_GetItem(GetDlgItem(g_hmainwnd, IDC_COMPLIST), &lvitem);
+	ListView_GetItem(GetDlgItem(hmainwnd, IDC_COMPLIST), &lvitem);
 	Package* pkg = reinterpret_cast< Package* >(lvitem.lParam);
 	if (pkg->m_installed_version.length() > 0)
 	{
@@ -172,7 +151,7 @@ extern "C" void UI_OnStateCycle(int sel)
 	}
 	lvitem.mask = LVIF_IMAGE;
 	lvitem.iImage = pkg->GetStateImage(); 
-	ListView_SetItem(GetDlgItem(g_hmainwnd, IDC_COMPLIST), &lvitem);
+	ListView_SetItem(GetDlgItem(hmainwnd, IDC_COMPLIST), &lvitem);
 }
 
 
@@ -226,7 +205,7 @@ int CALLBACK LVSortCompare(LPARAM lp1, LPARAM lp2, LPARAM lpsort)
 };
 
 
-extern "C" void UI_SortListView(int column)
+extern "C" void UI_SortListView(int column, HWND hmainwnd)
 {
 	static int cur_column = 0;
 
@@ -236,11 +215,12 @@ extern "C" void UI_SortListView(int column)
 		cur_column = column;
 
 	LVSortType st(cur_column % 6, (cur_column >= 6));
-	ListView_SortItems(GetDlgItem(g_hmainwnd, IDC_COMPLIST), LVSortCompare,
+	ListView_SortItems(GetDlgItem(hmainwnd, IDC_COMPLIST), LVSortCompare,
 	 reinterpret_cast< LPARAM >(&st));
 }
 
 
+#if 0
 void UI::ResetLists()
 {
 	ListBox_SetCurSel(GetDlgItem(g_hmainwnd, IDC_CATLIST), 0);
@@ -263,3 +243,4 @@ void UI::NotifyNewPackage(const Package& pkg)
 	if (sel <= 0 || pkg.m_categories.count(sel - 1) > 0)
 		LVAddPackage(pkg);
 }
+#endif

--- a/ui.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef UI_HPP_INC
-#define UI_HPP_INC
-
-
-#include <string>
-
-
-class Package;
-
-
-class UI
-{
-public:
-	static void ResetLists();
-	static void NotifyNewCategory(const char* name);
-	static void NotifyNewPackage(const Package& pkg);
-};
-
-
-#endif // UI_HPP_INC