From 93fe0ea8bd2951b40feca48ff0b33099d8cf76ee Mon Sep 17 00:00:00 2001
From: mpohoreski <mpohoreski@b5e51362-a710-0410-a134-be2176fc2e42>
Date: Tue, 17 Feb 2009 02:13:18 +0000
Subject: [PATCH] CtrlReset cleanup, Ctrl-F2 = CtrlReset

---
 source/Frame.cpp | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/source/Frame.cpp b/source/Frame.cpp
index 84448613..54e976db 100644
--- a/source/Frame.cpp
+++ b/source/Frame.cpp
@@ -108,6 +108,7 @@ void    SetUsingCursor (BOOL);
 static bool FileExists(string strFilename);
 
 bool	g_bScrollLock_FullSpeed = false;
+bool	g_bFreshReset = false;
 
 // Prototypes:
 static void DrawCrosshairs (int x, int y);
@@ -1287,6 +1288,12 @@ void ProcessButtonClick (int button) {
       break;
 
     case BTN_RUN:
+		if( g_bCtrlKey )
+		{
+			CtrlReset();
+			return;
+		}
+
 		if (g_nAppMode == MODE_LOGO)
 		{
 			DiskBoot();
@@ -1494,7 +1501,8 @@ void RelayEvent (UINT message, WPARAM wparam, LPARAM lparam) {
 }
 
 //===========================================================================
-void ResetMachineState () {
+void ResetMachineState ()
+{
   DiskReset();		// Set floppymotoron=0
   g_bFullSpeed = 0;	// Might've hit reset in middle of InternalCpuExecute() - so beep may get (partially) muted
 
@@ -1514,6 +1522,25 @@ void ResetMachineState () {
   SoundCore_SetFade(FADE_NONE);
 }
 
+
+//===========================================================================
+void CtrlReset()
+{
+	// Ctrl+Reset
+	if (!IS_APPLE2)
+		MemResetPaging();
+
+	DiskReset();
+	KeybReset();
+	if (!IS_APPLE2)
+		VideoResetState();	// Switch Alternate char set off
+	MB_Reset();
+
+	CpuReset();
+	g_bFreshReset = true;
+}
+
+
 //===========================================================================
 void SetFullScreenMode ()
 {