Win32 - toggle item to restore old input display (saves in config as well)

src/drivers/win/config.cpp

@@ -63,6 +63,7 @@ extern int CurrentState;
 extern bool pauseWhileActive; //adelikat: Cheats dialog
 extern bool AVIdisableMovieMessages;
 extern bool replaceP2StartWithMicrophone;
+extern bool oldInputDisplay;
 
 //window positions and sizes:
 extern int ChtPosX,ChtPosY;
@@ -275,6 +276,7 @@ static CFGSTRUCT fceuconfig[] = {
 	AC(AutoFireOffset),
 	AC(DesynchAutoFire),
 	AC(lagCounterDisplay),
+	AC(oldInputDisplay),
 	AC(movieSubtitles),
 	AC(subtitlesOnAVI),
 	AC(bindSavestate),

src/drivers/win/res.rc

@@ -122,6 +122,8 @@ BEGIN
                 MENUITEM "&1 player",                   MENU_INPUTDISPLAY_1
                 MENUITEM "&2 player",                   MENU_INPUTDISPLAY_2
                 MENUITEM "&4 player",                   MENU_INPUTDISPLAY_4
+                MENUITEM SEPARATOR
+                MENUITEM "old style disp.",             ID_INPUTDISPLAY_OLDSTYLEDISP
             END
             MENUITEM "&Lag Counter",                MENU_DISPLAY_LAGCOUNTER
             MENUITEM "&Frame Counter",              ID_DISPLAY_FRAMECOUNTER
@@ -261,7 +263,7 @@ BEGIN
             MENUITEM "&Ram",                        MENU_MV_FILE_DUMP_RAM
             MENUITEM "&PPU Memory",                 MENU_MV_FILE_DUMP_PPU
         END
-        MENUITEM "&Goto Address\tCtrl+A",           MENU_MV_FILE_GOTO_ADDRESS
+        MENUITEM "&Goto Address\tCtrl+A",       MENU_MV_FILE_GOTO_ADDRESS
         MENUITEM SEPARATOR
         MENUITEM "&Close\tAlt+F4",              ID_MEMWVIEW_FILE_CLOSE
     END
@@ -424,7 +426,7 @@ CHEATCONTEXTMENUS MENU
 BEGIN
     POPUP "CheatListPopup"
     BEGIN
-	    MENUITEM "Toggle Cheat\tDbl-Clk",       CHEAT_CONTEXT_TOGGLECHEAT
+        MENUITEM "Toggle Cheat\tDbl-Clk",       CHEAT_CONTEXT_TOGGLECHEAT
         MENUITEM "Poke Cheat Value",            CHEAT_CONTEXT_POKECHEATVALUE
         MENUITEM "Goto In Hex Editor",          CHEAT_CONTEXT_GOTOINHEXEDITOR
     END
@@ -434,7 +436,7 @@ DEBUGCONTEXTMENUS MENU
 BEGIN
     POPUP "DebugListPopup"
     BEGIN
-	    MENUITEM "Toggle Breakpoint\tDbl-Clk",  DEBUGGER_CONTEXT_TOGGLEBREAK
+        MENUITEM "Toggle Breakpoint\tDbl-Clk",  DEBUGGER_CONTEXT_TOGGLEBREAK
     END
 END
 

src/drivers/win/resource.h

@@ -268,7 +268,6 @@
 #define IDC_CHEAT_CHECK_NE_BY           401
 #define IDC_WINSIZE_MUL_Y               401
 #define CHECK_ENABLE_FOURSCORE          401
-#define CHECK_ENABLE_MICROPHONE			407
 #define IDC_CHEAT_CHECK_GT_BY           402
 #define IDC_FORCE_INT_VIDEO_SCALARS     402
 #define IDC_CHEAT_CHECK_LT_BY           403
@@ -277,6 +276,7 @@
 #define IDC_VIDEOCONFIG_ASPECT_X        404
 #define IDC_VIDEOCONFIG_ASPECT_Y        405
 #define IDC_VIDEOCONFIG_SCALER_WIN      406
+#define CHECK_ENABLE_MICROPHONE         407
 #define CTL_TINT_TRACKBAR               500
 #define CTL_VOLUME_TRACKBAR             500
 #define IDC_SCANLINE_FIRST_NTSC         500
@@ -781,6 +781,7 @@
 #define ID_AVI_DISABLEMOV               40403
 #define ID_AVI_DISMOVIEMESS             40404
 #define ID_AVI_DISMOVIEMESSAGE          40405
+#define ID_INPUTDISPLAY_OLDSTYLEDISP    40406
 #define IDC_DEBUGGER_ICONTRAY           55535
 #define MW_ValueLabel2                  65423
 #define MW_ValueLabel1                  65426
@@ -790,7 +791,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        160
-#define _APS_NEXT_COMMAND_VALUE         40406
+#define _APS_NEXT_COMMAND_VALUE         40407
 #define _APS_NEXT_CONTROL_VALUE         1257
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

src/drivers/win/window.cpp

@@ -108,6 +108,7 @@ extern bool AutoSS;			//flag for whether an auto-save has been made
 extern int newppu;
 extern BOOL CALLBACK ReplayMetadataDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);	//Metadata dialog
 extern bool CheckFileExists(const char* filename);	//Receives a filename (fullpath) and checks to see if that file exists
+extern bool oldInputDisplay;
 
 //AutoFire-----------------------------------------------
 void ShowNetplayConsole(void); //mbg merge 7/17/06 YECH had to add
@@ -403,6 +404,7 @@ void UpdateCheckedMenuItems()
 	CheckMenuItem(fceumenu, ID_DISPLAY_FRAMECOUNTER, frame_display ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(fceumenu, MENU_DISPLAY_BG, bg?MF_CHECKED:MF_UNCHECKED);
 	CheckMenuItem(fceumenu, MENU_DISPLAY_OBJ, spr?MF_CHECKED:MF_UNCHECKED);
+	CheckMenuItem(fceumenu, ID_INPUTDISPLAY_OLDSTYLEDISP, oldInputDisplay?MF_CHECKED:MF_UNCHECKED);
 
 	//Config - Movie Options, no longer in menu
 	//CheckMenuItem(fceumenu, ID_DISPLAY_MOVIESUBTITLES, movieSubtitles?MF_CHECKED:MF_UNCHECKED);
@@ -1759,6 +1761,10 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 				input_display = 4;
 				UpdateCheckedMenuItems();
 				break;
+			case ID_INPUTDISPLAY_OLDSTYLEDISP:
+				oldInputDisplay ^= 1;
+				UpdateCheckedMenuItems();
+				break;
 			case MENU_DISPLAY_LAGCOUNTER:
 				lagCounterDisplay ^= 1;
 				UpdateCheckedMenuItems();