Prevent bad window size when Vcc.ini is missing

config.c
  prevent write bad window size (x or y < 20 pixels) to inifile
  clean up reloading of custom keymap
keyboardLayout.c
  add home key mapping to custom keymap fallback

Author: ejaquay

config.c

@@ -221,7 +221,14 @@ void LoadConfig(SystemState *LCState)
 unsigned char WriteIniFile(void)
 {
 	POINT tp = GetCurWindowSize();
-	CurrentConfig.Resize = 1;
+	CurrentConfig.Resize = 1;      // How to restore default window size?
+
+	// Prevent bad window size being written to the inifile
+	if ((tp.x < 20) || (tp.y < 20)) {
+		tp.x = 640;
+		tp.y = 480;
+	}
+
 	GetCurrentModule(CurrentConfig.ModulePath);
 	ValidatePath(CurrentConfig.ModulePath);
 	ValidatePath(CurrentConfig.ExternalBasicImage);
@@ -449,8 +456,6 @@ LRESULT CALLBACK Config(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 					SoundInit(EmuState.WindowHandle,SoundCards[TempConfig.SndOutDev].Guid,TempConfig.AudioRate);
 
 				CurrentConfig=TempConfig;
-
-				if (CurrentConfig.KeyMap == kKBLayoutCustom) LoadCustomKeyMap(GetKeyMapFilePath());
 				vccKeyboardBuildRuntimeTable((keyboardlayout_e)CurrentConfig.KeyMap);
 
 				Right=TempRight;
@@ -477,8 +482,6 @@ LRESULT CALLBACK Config(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 					SoundInit(EmuState.WindowHandle,SoundCards[TempConfig.SndOutDev].Guid,TempConfig.AudioRate);
 
 				CurrentConfig=TempConfig;
-
-	            if (CurrentConfig.KeyMap == kKBLayoutCustom) LoadCustomKeyMap(GetKeyMapFilePath());
 				vccKeyboardBuildRuntimeTable((keyboardlayout_e)CurrentConfig.KeyMap);
 
 				Right=TempRight;
@@ -917,19 +920,23 @@ LRESULT CALLBACK InputConfig(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar
         break;
 
     case WM_COMMAND:
-        if (LOWORD(wParam)==IDC_KEYMAPED) {
-            // Insure custom keyboard is selected (unless canceled).
-            if (CurrentConfig.KeyMap != 3) {
-                TempConfig.KeyMap = 3;
-			    SendDlgItemMessage(hDlg,IDC_KBCONFIG,CB_SETCURSEL,(WPARAM)TempConfig.KeyMap,0);
-            }
-
+		// If Custom keymap button pushed
+		if (LOWORD(wParam)==IDC_KEYMAPED) {
+			// Insure custom keyboard is selected.
+			if (TempConfig.KeyMap != kKBLayoutCustom) {
+				TempConfig.KeyMap = kKBLayoutCustom;
+				SendDlgItemMessage(hDlg,IDC_KBCONFIG,CB_SETCURSEL,
+				       (WPARAM)TempConfig.KeyMap,0);
+			}
+			// Run the keymap editor
 			DialogBox( EmuState.WindowInstance, (LPCTSTR) IDD_KEYMAPEDIT, hDlg,
                        (DLGPROC) KeyMapProc );
-        } else {
-			TempConfig.KeyMap = (unsigned char)
-								SendDlgItemMessage(hDlg,IDC_KBCONFIG,CB_GETCURSEL,0,0);
+		} else {
+		    // Set temporary keymap to the one currently selected
+		    TempConfig.KeyMap = (unsigned char)
+			      SendDlgItemMessage(hDlg,IDC_KBCONFIG,CB_GETCURSEL,0,0);
 		}
+
         break;
     }
     return(0);

keyboardLayout.c

@@ -576,6 +576,7 @@ keytranslationentry_t keyTranslationsCustom[MAX_CTRANSTBLSIZ] =
 
 	{ DIK_RETURN,     0,             64,     0,     0,    0 }, //   ENTER
 	{ DIK_NUMPAD7,    0,             64,     1,     0,    0 }, //   HOME (CLEAR)
+	{ DIK_HOME,       0,             64,     1,     0,    0 }, //   HOME (CLEAR)
 	{ DIK_ESCAPE,     0,             64,     2,     0,    0 }, //   ESCAPE (BREAK)
 	{ DIK_NUMPAD1,    0,             64,     7,     8,    6 }, //   END OF LINE (SHIFT)(RIGHT)
 	{ DIK_NUMPADPERIOD, 0,           64,     4,     8,    5 }, //   DELETE (CTRL)(LEFT)