F10 brings up config menu when in Full Screen mode

Author: ejaquay

Vcc.c

@@ -112,6 +112,7 @@ void save_key_down(unsigned char kb_char, unsigned char OEMscan);
 void raise_saved_keys(void);
 void FunctionHelpBox(HWND);
 void SetupClock(void);
+HMENU GetConfMenu();
 
 // Globals
 static 	HANDLE hEMUThread ;
@@ -123,6 +124,9 @@ static	HANDLE hEMUQuit;
 static char g_szAppName[MAX_LOADSTRING] = "";
 bool BinaryRunning;
 static unsigned char FlagEmuStop=TH_RUNNING;
+
+bool IsShiftKeyDown(void);
+
 //static CRITICAL_SECTION  FrameRender;
 /*--------------------------------------------------------------------------*/
 int APIENTRY WinMain(HINSTANCE hInstance,
@@ -528,13 +532,20 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 				break;
 
 				case DIK_F10:
-					if (!IsShiftKeyDown() && EmuState.FullScreen) {
+				{
+					HMENU hMenu = NULL;
+					if ( IsShiftKeyDown() ) {
+						hMenu = GetConfMenu();
+					} else {
+						hMenu = RefreshDynamicMenu();
+					}
+					if (hMenu && EmuState.FullScreen) {
 						RECT r;
-						HMENU hMenu=RefreshDynamicMenu();
 						GetClientRect(hWnd,&r);
-						TrackPopupMenu(hMenu, TPM_CENTERALIGN|TPM_VCENTERALIGN,
-							r.right/2, r.bottom/2, 0, hWnd, NULL);
+						TrackPopupMenu(hMenu,TPM_CENTERALIGN|TPM_VCENTERALIGN,
+							r.right/2,r.bottom/2,0,hWnd,NULL);
 					}
+				}
 				break;
 
 				case DIK_F11:
@@ -558,7 +569,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 				break;
 
 				default:
-					// send other keystrokes to the emulator if it is active
+					// send shift and other keystrokes to the emulator if it is active
 					if ( EmuState.EmulationRunning )
 					{
 						vccKeyboardHandleKey(kb_char, OEMscan, kEventKeyDown);
@@ -567,6 +578,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 					}
 					break;
 			}
+
 			return 0;
 			break;
 
@@ -813,13 +825,9 @@ BOOL CALLBACK FunctionKeys(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 			SendDlgItemMessage(hDlg,IDC_TITLE,WM_SETTEXT,0,(LPARAM)(LPCSTR)g_szAppName);
 			return TRUE;
 		case WM_CLOSE:
-			EndDialog(hDlg, LOWORD(wParam));
-			return TRUE;
 		case WM_COMMAND:
-			switch (LOWORD(wParam))
-			case IDOK:
-				SendMessage (hDlg, WM_CLOSE, 0, 0);
-			break;
+			EndDialog(hDlg, wParam);
+			return TRUE;
 	}
     return FALSE;
 }
@@ -1082,3 +1090,25 @@ void FunctionHelpBox(HWND hWnd)
 	DialogBox(EmuState.WindowInstance,
 			MAKEINTRESOURCE(IDD_FUNCTION_KEYS),hWnd,FunctionKeys);
 }
+
+HMENU GetConfMenu()
+{
+	static HMENU hMenu = NULL;
+	if (hMenu == NULL) {
+		hMenu = CreatePopupMenu();
+		AppendMenu(hMenu,MF_STRING,ID_AUDIO_CONFIG,"Audio");
+		AppendMenu(hMenu,MF_STRING,ID_CPU_CONFIG,"Cpu");
+		AppendMenu(hMenu,MF_STRING,ID_DISPLAY_CONFIG,"Display");
+		AppendMenu(hMenu,MF_STRING,ID_KEYBOARD_CONFIG,"Keyboard");
+		AppendMenu(hMenu,MF_STRING,ID_JOYSTICKS_CONFIG,"Joysticks");
+		AppendMenu(hMenu,MF_STRING,ID_TAPE_CONFIG,"Tape");
+		AppendMenu(hMenu,MF_STRING,ID_BITBANGER_CONFIG,"BitBanger");
+	}
+	return hMenu;
+}
+
+bool IsShiftKeyDown()
+{
+  return (GetKeyState(VK_SHIFT) & 0x8000) != 0;
+}
+

Vcc.rc

@@ -172,7 +172,7 @@ BEGIN
     LTEXT " F7   Pause Toggle"        IDC_STATIC,5,60,85,10
     LTEXT " F8   Toggle Throttle",    IDC_STATIC,5,70,85,10
     LTEXT " F9   Stop/Start reset",   IDC_STATIC,5,80,85,10
-    LTEXT "F10  Cartridge Menu",      IDC_STATIC,5,90,85,10
+    LTEXT "F10  FS Cart Menu",        IDC_STATIC,5,90,85,10
     LTEXT "F11  Toggle Fullscreen",   IDC_STATIC,5,100,85,10
     LTEXT "F12  Function Keys",       IDC_STATIC,5,110,85,10
     LTEXT "Shifted",          IDC_STATIC,110,8,50,10
@@ -183,8 +183,8 @@ BEGIN
     LTEXT "Swap Joysticks",   IDC_STATIC,100,60,60,10
     LTEXT "Overclock Toggle", IDC_STATIC,100,70,60,10
     LTEXT "---",              IDC_STATIC,115,80,40,10
-    LTEXT "---",              IDC_STATIC,115,90,40,10
-    LTEXT "Toggle FS Status", IDC_STATIC,100,100,60,10
+    LTEXT "FS Config Menu",   IDC_STATIC,100,90,60,10
+    LTEXT "FS Toggle Status", IDC_STATIC,100,100,60,10
     LTEXT "Take Screenshot",  IDC_STATIC,100,110,60,10
     DEFPUSHBUTTON "OK",IDOK,57,126,50,15
 END

keyboard.c

@@ -57,7 +57,6 @@ This file is part of VCC (Virtual Color Computer).
 unsigned char SetMouseStatus(unsigned char, unsigned char);
 bool pasting = false;  //Are the keyboard functions in the middle of a paste operation?
 bool GetNextScanInPasteQueue(unsigned char col);
-bool IsShiftKeyDown();
 
 /*****************************************************************************/
 //	Global variables
@@ -635,6 +634,3 @@ bool GetNextScanInPasteQueue(unsigned char col)
 	}
 	return true;
 }
-bool IsShiftKeyDown() {
-	return IsShift;
-}

keyboard.h

@@ -88,4 +88,3 @@ extern "C"
 bool GetPaste();
 void SetPaste(bool);
 void PasteIntoQueue(std::string txt);
-bool IsShiftKeyDown();

sdc/sdc.rc

@@ -136,7 +136,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_MODULE_NAME         "SDC emulator"
+    IDS_MODULE_NAME         "SDC simulator"
     IDS_VERSION             "1.0"
     IDS_CATNUMBER           ""
 END

tcc1014mmu.c

@@ -232,7 +232,7 @@ void LoadRom(void)
 				"coco3.rom load failed\n"
 				"Close this then\n"
 				"check ROM path.\n",
-				"Error", MB_TASKMODAL | MB_TOPMOST);
+				"Error", MB_TASKMODAL | MB_TOPMOST | MB_SETFOREGROUND);
 	}
 	return;
 }