Win32 - added many hotkey items as menu items

changelog.txt

@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+24-nov-2008 - adelikat - win32 - added lots of mappable hotkey items as Menu items
 23-nov-2008 - adelikat - Win32 - fixed some errors in my AVI directory override code
 23-nov-2008 - shinydoofy - movie subs now have a toggle button in the SDL build (F10 by default)
 23-nov-2008 - adelikat - movie subtitle system installed

src/driver.h

@@ -320,7 +320,7 @@ enum EFCEUI
 	FCEUI_STOPMOVIE, FCEUI_RECORDMOVIE, FCEUI_PLAYMOVIE,
 	FCEUI_OPENGAME, FCEUI_CLOSEGAME,
 	FCEUI_TASEDIT,
-	FCEUI_RESET, FCEUI_POWER,
+	FCEUI_RESET, FCEUI_POWER,FCEUI_PLAYFROMBEGINNING
 };
 
 //checks whether an EFCEUI is valid right now

src/drivers/win/res.rc

@@ -49,6 +49,9 @@ BEGIN
         MENUITEM "Record Movie...",             MENU_RECORD_MOVIE
         MENUITEM "Replay Movie...",             MENU_REPLAY_MOVIE
         MENUITEM "Stop Movie",                  MENU_STOP_MOVIE
+        MENUITEM "Play from beginning",         ID_FILE_PLAYMOVIEFROMBEGINNING
+        MENUITEM SEPARATOR
+        MENUITEM "Screenshot",                  ID_FILE_SCREENSHOT
         MENUITEM SEPARATOR
         MENUITEM "Record AVI...",               MENU_RECORD_AVI
         MENUITEM "Stop AVI",                    MENU_STOP_AVI
@@ -70,6 +73,19 @@ BEGIN
         MENUITEM "&Switch Disk Side",           MENU_SWITCH_DISK
         MENUITEM SEPARATOR
         MENUITEM "&Insert Coin",                MENU_INSERT_COIN
+        MENUITEM SEPARATOR
+        MENUITEM "Pause",                       ID_NES_PAUSE
+        MENUITEM "Frame Advance",               ID_NES_FRAMEADVANCE
+        MENUITEM "Turbo",                       ID_NES_TURBO
+        POPUP "Emulation Speed"
+        BEGIN
+            MENUITEM "Speed Up",                    ID_NES_SPEEDUP
+            MENUITEM "Slow Down",                   ID_NES_SLOWDOWN
+            MENUITEM SEPARATOR
+            MENUITEM "Slowest Speed",               ID_NES_SLOWESTSPEED
+            MENUITEM "Normal Speed",                ID_NES_NORMALSPEED
+            MENUITEM "Fastest Speed",               ID_NES_FASTESTSPEED
+        END
     END
     POPUP "&Config"
     BEGIN

src/drivers/win/resource.h

@@ -565,6 +565,18 @@
 #define ID_DISPLAY_MOVIESUBTITLES       40260
 #define ID_DISPLAY_MOVIESUBTITLESINAVI  40261
 #define ID_DISPLAY_MOVIESUBTITLES_AVI   40262
+#define ID_NES_PAUSE                    40263
+#define ID_NES_FRAMEADVANCE             40264
+#define ID_NES_SPEEDUP                  40265
+#define ID_NES_SLOWDOWN                 40266
+#define ID_NES_FASTESTSPEED             40267
+#define ID_NES_NORMALSPEED              40268
+#define ID_NES_TURBO                    40269
+#define ID_NES_SLOWESTSPEED             40270
+#define ID_NES_EMULATIONSPEED           40271
+#define ID_FILE_SCREENSHOT              40272
+#define ID_FILE_RESTARTMOVIE            40273
+#define ID_FILE_PLAYMOVIEFROMBEGINNING  40274
 #define IDC_DEBUGGER_ICONTRAY           55535
 #define MW_ValueLabel2                  65423
 #define MW_ValueLabel1                  65426
@@ -574,7 +586,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         40263
+#define _APS_NEXT_COMMAND_VALUE         40275
 #define _APS_NEXT_CONTROL_VALUE         1187
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

src/drivers/win/window.cpp

@@ -72,6 +72,7 @@ extern FCEUGI *GameInfo;
 extern int EnableAutosave;
 extern bool frameAdvanceLagSkip;
 extern bool movieSubtitles;
+extern bool turbo;
 
 // Extern functions
 
@@ -305,25 +306,30 @@ void UpdateCheckedMenuItems()
 	{
 		CheckMenuItem(fceumenu, polo2[x], *polo[x] ? MF_CHECKED : MF_UNCHECKED);
 	}
-	CheckMenuItem(fceumenu, MENU_CONFIG_BINDSAVES, bindSavestate?MF_CHECKED : MF_UNCHECKED);
+	//NES Menu
-	CheckMenuItem(fceumenu, MENU_DISPLAY_FA_LAGSKIP, frameAdvanceLagSkip?MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem(fceumenu, ID_NES_PAUSE, EmulationPaused ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem(fceumenu, MENU_DISPLAY_LAGCOUNTER, lagCounterDisplay?MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem(fceumenu, ID_NES_TURBO, turbo ? 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_DISPLAY_MOVIESUBTITLES, movieSubtitles?MF_CHECKED:MF_UNCHECKED);
-	CheckMenuItem(fceumenu, ID_DISPLAY_MOVIESUBTITLES_AVI, subtitlesOnAVI?MF_CHECKED:MF_UNCHECKED);
 
+	//Config Menu
 	CheckMenuItem(fceumenu, MENU_PAUSEAFTERPLAYBACK, pauseAfterPlayback ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(fceumenu, MENU_RUN_IN_BACKGROUND, eoptions & EO_BGRUN ? MF_CHECKED : MF_UNCHECKED);
-
-	CheckMenuItem(fceumenu, MENU_ALTERNATE_AB, GetAutoFireDesynch() ? MF_CHECKED : MF_UNCHECKED);
-
 	CheckMenuItem(fceumenu, MENU_BACKGROUND_INPUT, EnableBackgroundInput ? MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(fceumenu, MENU_ENABLE_AUTOSAVE, EnableAutosave ? MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem(fceumenu, MENU_DISPLAY_FA_LAGSKIP, frameAdvanceLagSkip?MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem(fceumenu, MENU_CONFIG_BINDSAVES, bindSavestate?MF_CHECKED : MF_UNCHECKED);
 
+	//Config - Display SubMenu
+	CheckMenuItem(fceumenu, MENU_DISPLAY_LAGCOUNTER, lagCounterDisplay?MF_CHECKED : MF_UNCHECKED);
 	CheckMenuItem(fceumenu, ID_DISPLAY_FRAMECOUNTER, frame_display ? MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem(fceumenu, ID_DISPLAY_MOVIESUBTITLES, movieSubtitles?MF_CHECKED:MF_UNCHECKED);
+	CheckMenuItem(fceumenu, ID_DISPLAY_MOVIESUBTITLES_AVI, subtitlesOnAVI?MF_CHECKED:MF_UNCHECKED);
+	CheckMenuItem(fceumenu, MENU_DISPLAY_BG, bg?MF_CHECKED:MF_UNCHECKED);
+	CheckMenuItem(fceumenu, MENU_DISPLAY_OBJ, spr?MF_CHECKED:MF_UNCHECKED);
 	
+	//Tools Menu
+	CheckMenuItem(fceumenu, MENU_ALTERNATE_AB, GetAutoFireDesynch() ? MF_CHECKED : MF_UNCHECKED);
 
+	//AutoFire Patterns
 	int AutoFirePatternIDs[] = {
 		MENU_AUTOFIRE_PATTERN_1,
 		MENU_AUTOFIRE_PATTERN_2,
@@ -1210,6 +1216,10 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 				FCEUI_StopMovie();
 				break;
 
+			case ID_FILE_PLAYMOVIEFROMBEGINNING:
+				FCEUI_MoviePlayFromBeginning();
+				break;
+
 			case MENU_RECORD_AVI:
 				// Record AVI menu was selected
 				FCEUD_AviRecordTo();
@@ -1274,6 +1284,37 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 				UpdateCheckedMenuItems();
 				break;
 
+			case ID_FILE_SCREENSHOT:
+				FCEUI_SaveSnapshot();
+				break;
+
+			case ID_NES_PAUSE:
+				EmulationPaused ^= 1;
+				UpdateCheckedMenuItems();
+				break;
+			case ID_NES_FRAMEADVANCE:
+				FCEUI_FrameAdvance();
+				break;
+			case ID_NES_SPEEDUP:
+				FCEUD_SetEmulationSpeed(3);
+				break;
+			case ID_NES_SLOWDOWN:
+				FCEUD_SetEmulationSpeed(1);
+				break;
+			case ID_NES_SLOWESTSPEED:
+				FCEUD_SetEmulationSpeed(0);
+				break;
+			case ID_NES_NORMALSPEED:
+				FCEUD_SetEmulationSpeed(2);
+				break;
+			case ID_NES_FASTESTSPEED:
+				FCEUD_SetEmulationSpeed(4);
+				break;
+			case ID_NES_TURBO:
+				FCEUD_TurboToggle();
+				break;
+
+
 			}
 		}
 		break;
@@ -1357,6 +1398,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 		EnableMenuItem(fceumenu,MENU_RECORD_MOVIE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_RECORDMOVIE)?MF_ENABLED:MF_GRAYED));
 		EnableMenuItem(fceumenu,MENU_REPLAY_MOVIE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_PLAYMOVIE)?MF_ENABLED:MF_GRAYED));
 		EnableMenuItem(fceumenu,MENU_STOP_MOVIE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_STOPMOVIE)?MF_ENABLED:MF_GRAYED));
+		EnableMenuItem(fceumenu,ID_FILE_PLAYMOVIEFROMBEGINNING,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_PLAYFROMBEGINNING)?MF_ENABLED:MF_GRAYED));
 		EnableMenuItem(fceumenu,MENU_SAVE_STATE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_SAVESTATE)?MF_ENABLED:MF_GRAYED));
 		EnableMenuItem(fceumenu,MENU_LOAD_STATE,MF_BYCOMMAND | (FCEU_IsValidUI(FCEUI_LOADSTATE)?MF_ENABLED:MF_GRAYED));
 		EnableMenuItem(fceumenu,MENU_STOP_AVI,MF_BYCOMMAND | (FCEUI_AviIsRecording()?MF_ENABLED:MF_GRAYED));
@@ -1824,6 +1866,16 @@ void UpdateMenuHotkeys()
 	combined = "Stop Movie\t" + combo;
 	ChangeMenuItemText(MENU_STOP_MOVIE, combined); 
 
+	//Play Movie from Beginning
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MOVIE_PLAY_FROM_BEGINNING]);
+	combined = "Play from beginning\t" + combo;
+	ChangeMenuItemText(ID_FILE_PLAYMOVIEFROMBEGINNING, combined); 
+
+	//Screenshot
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SCREENSHOT]);
+	combined = "Screenshot\t" + combo;
+	ChangeMenuItemText(ID_FILE_SCREENSHOT, combined); 
+
 	//Record AVI
 	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_AVI_RECORD_AS]);
 	combined = "Record AVI...\t" + combo;
@@ -1860,6 +1912,46 @@ void UpdateMenuHotkeys()
 	combined = "&Insert Coin\t" + combo;
 	ChangeMenuItemText(MENU_INSERT_COIN, combined);
 
+	//Pause
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_PAUSE]);
+	combined = "Pause\t" + combo;
+	ChangeMenuItemText(ID_NES_PAUSE, combined);
+
+	//Frame Advance
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_FRAME_ADVANCE]);
+	combined = "Frame Advance\t" + combo;
+	ChangeMenuItemText(ID_NES_FRAMEADVANCE, combined);
+
+	//Turbo
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_TURBO_TOGGLE]);
+	combined = "Turbo\t" + combo;
+	ChangeMenuItemText(ID_NES_TURBO, combined);
+
+	//Speed Up
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_FASTER]);
+	combined = "Speed Up\t" + combo;
+	ChangeMenuItemText(ID_NES_SPEEDUP, combined);
+
+	//Slow Down
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWER]);
+	combined = "Slow Down\t" + combo;
+	ChangeMenuItemText(ID_NES_SLOWDOWN, combined);
+
+	//Slowest Speed
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_SLOWEST]);
+	combined = "Slowest Speeed\t" + combo;
+	ChangeMenuItemText(ID_NES_SLOWESTSPEED, combined);
+
+	//Normal Speed
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_NORMAL]);
+	combined = "Normal Speed\t" + combo;
+	ChangeMenuItemText(ID_NES_NORMALSPEED, combined);
+
+	//Fastest Speed
+	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_SPEED_FASTEST]);
+	combined = "Fastest Speed\t" + combo;
+	ChangeMenuItemText(ID_NES_FASTESTSPEED, combined);
+
 	//-------------------------------Config-------------------------------------
 	//Hide Menu
 	combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_HIDE_MENU_TOGGLE]);

src/fceu.cpp

@@ -937,6 +937,7 @@ bool FCEU_IsValidUI(EFCEUI ui)
 		break;
 
 	case FCEUI_STOPMOVIE:
+	case FCEUI_PLAYFROMBEGINNING:
 		return FCEUMOV_Mode(MOVIEMODE_PLAY|MOVIEMODE_RECORD);
 
 	case FCEUI_STOPAVI: