Fixed auto-selecting tabs and matched titles. Fixed selecting mods.

Author: mpaterakis

gui-helper-win.c

@@ -128,6 +128,12 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPara
 					if (res != LB_ERR)
 					{
 						selected_index = res;
+						int tabIndex = TabCtrl_GetCurSel(hWndTab);
+						int tabSize = sizeof(tabCounts) / sizeof(tabCounts[0]);
+						for (int i = 0; i < tabIndex; i++)
+						{
+							selected_index += tabCounts[i];
+						}
 						PostQuitMessage(WM_QUIT);
 					}
 					break;
@@ -157,7 +163,7 @@ int ShowMessageBox(const char* title, const char* message)
 	return MessageBox(NULL, message, title, MB_OK | MB_ICONEXCLAMATION);
 }
 
-int SelectionDialog(const wchar_t* title, int count, const char** list, int modsCount, const char** modsList, int selection)
+int SelectionDialog(const char* title, int count, const char** list, int modsCount, const char** modsList, int selection)
 {
 	INITCOMMONCONTROLSEX icex;
 	icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
@@ -201,7 +207,7 @@ int SelectionDialog(const wchar_t* title, int count, const char** list, int mods
 
 	RegisterClassExW(&wc);
 
-	const wchar_t* unicodeTitle = title;
+	const wchar_t* unicodeTitle = ConvertStringToUnicode(title);
 
 	hWnd = CreateWindowExW(
 		WS_EX_CLIENTEDGE,
@@ -214,34 +220,40 @@ int SelectionDialog(const wchar_t* title, int count, const char** list, int mods
 		hInstance, NULL
 	);
 
-	//free(unicodeTitle);
+	free(unicodeTitle);
 
-	for (int i = 0; i < count; ++i)
+	// Find current tab and selection, and populate the ListBox
+	int tabIndex;
+	int tabSize = sizeof(tabCounts) / sizeof(tabCounts[0]);
+	for (tabIndex = 0; tabIndex < tabSize; tabIndex++)
 	{
-		wchar_t * unicodeGameName = ConvertStringToUnicode(list[i]);
-		SendMessageW(hWndList, LB_ADDSTRING, 0, (LPARAM)(LPCWSTR)unicodeGameName);
-		free(unicodeGameName);
+		if (tabCounts[tabIndex] < selection) {
+			selection -= tabCounts[tabIndex];
+		} else {
+			break;
+		}
 	}
+	PopulateListBoxWithSelection(tabIndex, selection);
 
-	SendMessageW(hWndList, LB_SETCURSEL, selection, 0);
-
+	// Show window and get all events
 	ShowWindow(hWnd, SW_SHOWNORMAL);
 
-	// TODO: Start at where game is matched
-	PopulateListBox(0);
-
 	while (GetMessage(&Msg, NULL, 0, 0))
 	{
 		TranslateMessage(&Msg);
 		DispatchMessage(&Msg);
 	}
 
+	// Return the current selection
 	return selected_index;
 }
 
-void PopulateListBox(int tabIndex)
+// Load values into current ListBox with a highlighted option
+void PopulateListBoxWithSelection(int tabIndex, int selection)
 {
-	SendMessage(hWndList, LB_RESETCONTENT, 0, 0);
+	SendMessageW(hWndList, LB_RESETCONTENT, 0, 0);
+	/*SendMessageW(hWndList, TCM_SETCURSEL, 0, (LPARAM)tabIndex);*/
+	TabCtrl_SetCurSel(hWndTab, tabIndex);
 
 	for (int i = 0; i < tabCounts[tabIndex]; ++i)
 	{
@@ -250,11 +262,17 @@ void PopulateListBox(int tabIndex)
 		free(unicode);
 	}
 
-	if (tabCounts[tabIndex] > 0) {
-		SendMessage(hWndList, LB_SETCURSEL, 0, 0);
+	if (selection > -1) {
+		SendMessageW(hWndList, LB_SETCURSEL, selection, 0);
 	}
 }
 
+// Load valuies into current ListBox without a highlighted option
+void PopulateListBox(int tabIndex)
+{
+	PopulateListBoxWithSelection(tabIndex, -1);
+}
+
 
 // Convert ANSI string to unicode (char to widechar)
 wchar_t* ConvertStringToUnicode(const char* string)

gui-helper.h

@@ -2,15 +2,15 @@
 #define GUI_HELPER_H
 
 int ShowMessageBox(const char* title, const char* message);
+void PopulateListBoxWithSelection(int tabIndex, int selection);
 void PopulateListBox(int tabIndex);
 
-#if defined(_WIN32) || defined(WIN32)
-int SelectionDialog(const wchar_t* title, int count, const char** list, int modsCount, const char** modsList, int selection);
 
+int SelectionDialog(const char * title, int count, const char** list, int modsCount, const char** modsList, int selection);
+
+#if defined(_WIN32) || defined(WIN32)
 // This function is only used in Windows. It shouldn't exist, but we have to deal with Microsoft.
 wchar_t * ConvertStringToUnicode(const char* string);
-#else
-int SelectionDialog(const char* title, int count, const char** list, int modsCount, const char** modsList, int selection);
 #endif
 
 #endif

sgdboop.c

@@ -946,20 +946,10 @@ struct nonSteamApp* selectNonSteamApp(char* sgdbName, struct nonSteamApp* apps,
 	struct nonSteamApp* appData = malloc(sizeof(nonSteamApp));
 
 	// Create title string
-	#if OS_Windows
-	wchar_t* sgdbNameW = ConvertStringToUnicode(sgdbName);
-	wchar_t* title = malloc((40 + wcslen(sgdbNameW)) * sizeof(wchar_t));
-
-	wcscpy(title, L"SGDBoop: Pick a game for '");
-	wcscat(title, sgdbNameW);
-	wcscat(title, L"'");
-	free(sgdbNameW);
-	#else
 	char* title = malloc(40 + strlen(sgdbName));
 	strcpy(title, "SGDBoop: Pick a game for '");
 	strcat(title, sgdbName);
 	strcat(title, "'");
-	#endif
 
 	// Sort values
 	qsort(values, _nonSteamAppsCount, sizeof(const char*), compareStrings);
@@ -974,6 +964,15 @@ struct nonSteamApp* selectNonSteamApp(char* sgdbName, struct nonSteamApp* apps,
 		}
 	}
 
+	if (selection < 0) {
+		for (int i = 0; i < _modsCount; i++) {
+			if (strcmp_i(modsValues[i], sgdbName) == 0) {
+				selection = i + _nonSteamAppsCount;
+				break;
+			}
+		}
+	}
+
 	// Create selection dialog
 	int retval = SelectionDialog(title, _nonSteamAppsCount, (const char**)values, _modsCount, (const char**)modsValues, selection);
 
@@ -987,14 +986,26 @@ struct nonSteamApp* selectNonSteamApp(char* sgdbName, struct nonSteamApp* apps,
 		exit(0);
 	}
 
+
 	// Find match
-	for (int i = 0; i < _nonSteamAppsCount; i++) {
-		if (strcmp(apps[i].name, values[retval]) == 0) {
-			strcpy(appData->appid, apps[i].appid);
-			strcpy(appData->name, apps[i].name);
-			appData->index = apps[i].index;
-			strcpy(appData->appid_old, apps[i].appid_old);
-			strcpy(appData->type, apps[i].type);
+	struct nonSteamApp * matchedStruct;
+	char ** matchedValues;
+	if (retval >= _nonSteamAppsCount) {
+		retval -= _nonSteamAppsCount;
+		matchedStruct = appsMods;
+		matchedValues = modsValues;
+	} else {
+		matchedStruct = apps;
+		matchedValues = values;
+	}
+
+	for (int i = 0; i < _nonSteamAppsCount + _modsCount; i++) {
+		if (strcmp(matchedStruct[i].name, matchedValues[retval]) == 0) {
+			strcpy(appData->appid, matchedStruct[i].appid);
+			strcpy(appData->name, matchedStruct[i].name);
+			appData->index = matchedStruct[i].index;
+			strcpy(appData->appid_old, matchedStruct[i].appid_old);
+			strcpy(appData->type, matchedStruct[i].type);
 			break;
 		}
 	}