ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add "Display Frame Rate" menu toggle, change accelerators

This commit is contained in:
OV2 2010-11-13 17:29:35 +01:00
parent f2e5dc3136
commit 371be9b5da
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
win32/rsrc/resource.h
View File

@ -101,7 +101,7 @@
#define IDC_MULTICART_EDITB 1092 #define IDC_MULTICART_EDITB 1092
#define IDC_PAUSESPIN 1093 #define IDC_PAUSESPIN 1093
#define IDC_DWNRIGHT 1093 #define IDC_DWNRIGHT 1093
#define IDC_SHADER_GLSL_FILE 1093 #define IDC_SHADER_GLSL_FILE 1093
#define IDC_SYNCBYRESET 1094 #define IDC_SYNCBYRESET 1094
#define IDC_DOWN 1094 #define IDC_DOWN 1094
#define IDC_SENDROM 1095 #define IDC_SENDROM 1095
@ -349,7 +349,7 @@
#define IDC_SHADER_ENABLED 3015 #define IDC_SHADER_ENABLED 3015
#define IDC_SHADER_HLSL_BROWSE 3016 #define IDC_SHADER_HLSL_BROWSE 3016
#define IDC_SHADER_GROUP 3017 #define IDC_SHADER_GROUP 3017
#define IDC_SHADER_GLSL_BROWSE 3018 #define IDC_SHADER_GLSL_BROWSE 3018
#define ID_FILE_EXIT 40001 #define ID_FILE_EXIT 40001
#define ID_WINDOW_HIDEMENUBAR 40004 #define ID_WINDOW_HIDEMENUBAR 40004
#define ID_FILE_AVI_RECORDING 40005 #define ID_FILE_AVI_RECORDING 40005
@ -475,13 +475,14 @@
#define ID_SOUND_194MS 40165 #define ID_SOUND_194MS 40165
#define ID_SOUND_210MS 40166 #define ID_SOUND_210MS 40166
#define ID_EMULATION_PAUSEWHENINACTIVE 40167 #define ID_EMULATION_PAUSEWHENINACTIVE 40167
#define ID_VIDEO_SHOWFRAMERATE 40168
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 151 #define _APS_NEXT_RESOURCE_VALUE 151
#define _APS_NEXT_COMMAND_VALUE 40168 #define _APS_NEXT_COMMAND_VALUE 40169
#define _APS_NEXT_CONTROL_VALUE 3018 #define _APS_NEXT_CONTROL_VALUE 3018
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

7
win32/rsrc/snes9x.rc
View File

@ -34,7 +34,7 @@ IDC_CURSOR_SCOPE CURSOR "nodrop.cur"
IDR_SNES9X_ACCELERATORS ACCELERATORS IDR_SNES9X_ACCELERATORS ACCELERATORS
BEGIN BEGIN
"E", ID_CHEAT_ENTER, VIRTKEY, ALT, NOINVERT "G", ID_CHEAT_ENTER, VIRTKEY, ALT, NOINVERT
"A", ID_CHEAT_SEARCH, VIRTKEY, ALT, NOINVERT "A", ID_CHEAT_SEARCH, VIRTKEY, ALT, NOINVERT
"O", ID_FILE_LOAD_GAME, VIRTKEY, CONTROL, NOINVERT "O", ID_FILE_LOAD_GAME, VIRTKEY, CONTROL, NOINVERT
VK_F5, ID_OPTIONS_DISPLAY, VIRTKEY, ALT, NOINVERT VK_F5, ID_OPTIONS_DISPLAY, VIRTKEY, ALT, NOINVERT
@ -872,7 +872,7 @@ BEGIN
MENUITEM "&Pause", ID_FILE_PAUSE MENUITEM "&Pause", ID_FILE_PAUSE
MENUITEM "Pause &When Inactive", ID_EMULATION_PAUSEWHENINACTIVE MENUITEM "Pause &When Inactive", ID_EMULATION_PAUSEWHENINACTIVE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Se&ttings...\tAlt+F8", ID_OPTIONS_SETTINGS MENUITEM "&Settings...\tAlt+F8", ID_OPTIONS_SETTINGS
END END
POPUP "&Input" POPUP "&Input"
BEGIN BEGIN
@ -947,12 +947,13 @@ BEGIN
MENUITEM "&Stretch Image\tAlt+Backspace", 40032 MENUITEM "&Stretch Image\tAlt+Backspace", 40032
MENUITEM "&Maintain Aspect Ratio", 40123 MENUITEM "&Maintain Aspect Ratio", 40123
MENUITEM "&Bilinear Filtering", ID_WINDOW_VIDMEM MENUITEM "&Bilinear Filtering", ID_WINDOW_VIDMEM
MENUITEM "Show Frame &Rate", ID_VIDEO_SHOWFRAMERATE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Display Configuration...\tAlt+F5", ID_OPTIONS_DISPLAY MENUITEM "&Display Configuration...\tAlt+F5", ID_OPTIONS_DISPLAY
END END
POPUP "&Cheat" POPUP "&Cheat"
BEGIN BEGIN
MENUITEM "&Game Genie, Pro-Action Replay Codes\tAlt+E", ID_CHEAT_ENTER MENUITEM "&Game Genie, Pro-Action Replay Codes\tAlt+G", ID_CHEAT_ENTER
MENUITEM "&Search for New Cheats", ID_CHEAT_SEARCH_MODAL MENUITEM "&Search for New Cheats", ID_CHEAT_SEARCH_MODAL
MENUITEM "Search for New Cheats (active)\tAlt+A", 40064 MENUITEM "Search for New Cheats (active)\tAlt+A", 40064
MENUITEM "&Apply Cheats", ID_CHEAT_APPLY, CHECKED MENUITEM "&Apply Cheats", ID_CHEAT_APPLY, CHECKED

6
win32/wsnes9x.cpp
View File

@ -2077,6 +2077,9 @@ LRESULT CALLBACK WinProc(
GetClientRect (GUI.hWnd, &rect); GetClientRect (GUI.hWnd, &rect);
InvalidateRect (GUI.hWnd, &rect, true); InvalidateRect (GUI.hWnd, &rect, true);
} break; } break;
case ID_VIDEO_SHOWFRAMERATE:
Settings.DisplayFrameRate = !Settings.DisplayFrameRate;
break;
case ID_SAVESCREENSHOT: case ID_SAVESCREENSHOT:
Settings.TakeScreenshot=true; Settings.TakeScreenshot=true;
break; break;
@ -3596,6 +3599,9 @@ static void CheckMenuStates ()
mii.fState |= MFS_DISABLED; mii.fState |= MFS_DISABLED;
SetMenuItemInfo (GUI.hMenu, ID_WINDOW_VIDMEM, FALSE, &mii); SetMenuItemInfo (GUI.hMenu, ID_WINDOW_VIDMEM, FALSE, &mii);
mii.fState = Settings.DisplayFrameRate ? MFS_CHECKED : MFS_UNCHECKED;
SetMenuItemInfo (GUI.hMenu, ID_VIDEO_SHOWFRAMERATE, FALSE, &mii);
mii.fState = (Settings.Paused && !Settings.StopEmulation) ? MFS_CHECKED : MFS_UNCHECKED; mii.fState = (Settings.Paused && !Settings.StopEmulation) ? MFS_CHECKED : MFS_UNCHECKED;
SetMenuItemInfo (GUI.hMenu, ID_FILE_PAUSE, FALSE, &mii); SetMenuItemInfo (GUI.hMenu, ID_FILE_PAUSE, FALSE, &mii);