Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-08 11:33:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Implemented a "Pause When Not Focused" menu option (default false). Pause toggle overrides this.

Browse Source
This commit is contained in:
szdarkhack 2013-10-11 14:53:25 +03:00
parent fc8aa7bd8f
commit 1116b59910
5 changed files with 356 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Config.cpp
View File

@ -86,6 +86,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
general->Get("WindowY", &iWindowY, 100);
general->Get("WindowWidth", &iWindowWidth, 0); // 0 will be automatically reset later (need to do the AdjustWindowRect dance).
general->Get("WindowHeight", &iWindowHeight, 0);
general->Get("PauseOnLostFocus", &bPauseOnLostFocus, false);
#endif
IniFile::Section *recent = iniFile.GetOrCreateSection("Recent");
@ -287,6 +288,7 @@ void Config::Save() {
general->Set("WindowY", iWindowY);
general->Set("WindowWidth", iWindowWidth);
general->Set("WindowHeight", iWindowHeight);
general->Set("PauseOnLostFocus", bPauseOnLostFocus);
#endif
general->Set("Language", sLanguageIni);
general->Set("NumWorkerThreads", iNumWorkerThreads);

1
Core/Config.h
View File

@ -42,6 +42,7 @@ public:
bool bScreenshotsAsPNG;
bool bEnableLogging;
#ifdef _WIN32
bool bPauseOnLostFocus;
bool bTopMost;
std::string sFont;
#endif

24
Windows/WndMainWindow.cpp
View File

@ -509,6 +509,7 @@ namespace MainWindow
// Options menu
TranslateMenuItem(ID_OPTIONS_TOPMOST);
TranslateMenuItem(ID_OPTIONS_PAUSE_FOCUS);
TranslateMenuItem(ID_OPTIONS_MORE_SETTINGS);
TranslateMenuItem(ID_OPTIONS_CONTROLS);
TranslateMenuItem(ID_OPTIONS_STRETCHDISPLAY);
@ -1010,14 +1011,27 @@ namespace MainWindow
LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
int wmId, wmEvent;
std::string fn;
static bool noFocusPause = false; // TOGGLE_PAUSE state to override pause on lost focus
switch (message) {
case WM_CREATE:
break;
case WM_ACTIVATE:
if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE) {
g_activeWindow = WINDOW_MAINWINDOW;
{
bool pause = true;
if (wParam == WA_ACTIVE || wParam == WA_CLICKACTIVE) {
g_activeWindow = WINDOW_MAINWINDOW;
pause = false;
}
if (!noFocusPause && g_Config.bPauseOnLostFocus && globalUIState == UISTATE_INGAME) {
if (pause != Core_IsStepping()) { // != is xor for bools
if (disasmWindow[0])
SendMessage(disasmWindow[0]->GetDlgHandle(), WM_COMMAND, IDC_STOPGO, 0);
else
Core_EnableStepping(pause);
}
}
}
break;
@ -1119,6 +1133,7 @@ namespace MainWindow
else
Core_EnableStepping(true);
}
noFocusPause = !noFocusPause; // If we pause, override pause on lost focus
break;
case ID_EMULATION_STOP:
@ -1359,6 +1374,10 @@ namespace MainWindow
W32Util::MakeTopMost(hWnd, g_Config.bTopMost);
break;
case ID_OPTIONS_PAUSE_FOCUS:
g_Config.bPauseOnLostFocus = !g_Config.bPauseOnLostFocus;
break;
case ID_OPTIONS_CONTROLS:
NativeMessageReceived("control mapping", "");
break;
@ -1597,6 +1616,7 @@ namespace MainWindow
CHECKITEM(ID_OPTIONS_VSYNC, g_Config.bVSync);
CHECKITEM(ID_OPTIONS_FXAA, g_Config.bFXAA);
CHECKITEM(ID_OPTIONS_TOPMOST, g_Config.bTopMost);
CHECKITEM(ID_OPTIONS_PAUSE_FOCUS, g_Config.bPauseOnLostFocus);
CHECKITEM(ID_EMULATION_SOUND, g_Config.bEnableSound);
CHECKITEM(ID_TEXTURESCALING_DEPOSTERIZE, g_Config.bTexDeposterize);
CHECKITEM(ID_EMULATION_CHEATS, g_Config.bEnableCheats);

618
Windows/ppsspp.rc
View File

@ -2,133 +2,12 @@
//
#include "resource.h"
#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
// Neutral (Default) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// IMAGE
//
IDB_IMAGE_PSP IMAGE "pspmode.png"
/////////////////////////////////////////////////////////////////////////////
//
// RT_MANIFEST
//
1 RT_MANIFEST "rt_manif.bin"
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDR_ACCELS ACCELERATORS
BEGIN
"O", ID_FILE_LOAD, VIRTKEY, CONTROL, NOINVERT
"W", ID_EMULATION_STOP, VIRTKEY, CONTROL, NOINVERT
"B", ID_EMULATION_RESET, VIRTKEY, CONTROL, NOINVERT
"T", ID_EMULATION_CHEATS, VIRTKEY, CONTROL, NOINVERT
"D", ID_DEBUG_DISASSEMBLY, VIRTKEY, CONTROL, NOINVERT
"G", ID_DEBUG_GEDEBUGGER, VIRTKEY, CONTROL, NOINVERT
"L", ID_DEBUG_LOG, VIRTKEY, CONTROL, NOINVERT
"E", ID_DEBUG_MEMORYCHECKS, VIRTKEY, CONTROL, NOINVERT
"F", ID_DEBUG_MEMORYSEARCH, VIRTKEY, CONTROL, NOINVERT
"M", ID_DEBUG_MEMORYVIEW, VIRTKEY, CONTROL, NOINVERT
"R", ID_DEBUG_REGISTERS, VIRTKEY, CONTROL, NOINVERT
VK_F3, ID_FILE_SAVESTATE_NEXT_SLOT, VIRTKEY, NOINVERT
VK_F2, ID_FILE_QUICKSAVESTATE, VIRTKEY, NOINVERT
VK_F4, ID_FILE_QUICKLOADSTATE, VIRTKEY, NOINVERT
"1", ID_OPTIONS_RESOLUTIONDUMMY, VIRTKEY, CONTROL, NOINVERT
VK_F5, ID_OPTIONS_BUFFEREDRENDERINGDUMMY, VIRTKEY, NOINVERT
VK_F7, ID_OPTIONS_FRAMESKIPDUMMY, VIRTKEY, NOINVERT
VK_F6, ID_OPTIONS_HARDWARETRANSFORM, VIRTKEY, NOINVERT
VK_F12, ID_DEBUG_TAKESCREENSHOT, VIRTKEY, NOINVERT
VK_F8, ID_TOGGLE_PAUSE, VIRTKEY, NOINVERT
VK_RETURN, ID_OPTIONS_FULLSCREEN, ALT, VIRTKEY, NOINVERT
VK_F11, ID_OPTIONS_FULLSCREEN, VIRTKEY, NOINVERT
END
IDR_DEBUGACCELS ACCELERATORS
BEGIN
"B", ID_DEBUG_ADDBREAKPOINT, VIRTKEY, CONTROL, NOINVERT
"R", ID_DEBUG_DSIPLAYREGISTERLIST, VIRTKEY, CONTROL, NOINVERT
"L", ID_DEBUG_DSIPLAYFUNCTIONLIST, VIRTKEY, CONTROL, NOINVERT
"1", ID_DEBUG_DISPLAYMEMVIEW, VIRTKEY, CONTROL, NOINVERT
"2", ID_DEBUG_DISPLAYBREAKPOINTLIST, VIRTKEY, CONTROL, NOINVERT
"3", ID_DEBUG_DISPLAYTHREADLIST, VIRTKEY, CONTROL, NOINVERT
"4", ID_DEBUG_DISPLAYSTACKFRAMELIST, VIRTKEY, CONTROL, NOINVERT
VK_F7, ID_TOGGLE_PAUSE, VIRTKEY, NOINVERT
VK_F8, ID_DEBUG_STEPOUT, VIRTKEY, NOINVERT
VK_F9, ID_DEBUG_RUNTOLINE, VIRTKEY, NOINVERT
VK_F10, ID_DEBUG_STEPOVER, VIRTKEY, NOINVERT
VK_F11, ID_DEBUG_STEPINTO, VIRTKEY, NOINVERT
VK_F11, ID_DEBUG_STEPOUT, VIRTKEY, SHIFT, NOINVERT
"X", ID_DEBUG_HIDEBOTTOMTABS, VIRTKEY, CONTROL, NOINVERT
"Y", ID_DEBUG_TOGGLEBOTTOMTABTITLES, VIRTKEY, CONTROL, NOINVERT
END
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
#include "version.rc"
#endif // Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
/////////////////////////////////////////////////////////////////////////////
//
@ -160,11 +39,11 @@ BEGIN
CONTROL "",IDC_LEFTTABS,"SysTabControl32",TCS_BUTTONS | TCS_FOCUSNEVER,1,63,78,15
LISTBOX IDC_FUNCTIONLIST,1,83,103,255,LBS_SORT | LBS_NOINTEGRALHEIGHT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "VFPU",IDC_SHOWVFPU,83,63,24,12
CONTROL "",IDC_BREAKPOINTLIST,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_BREAKPOINTLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER,1,338,513,93
CONTROL "Custom2",IDC_DEBUGMEMVIEW,"CtrlMemView",WS_BORDER,1,338,513,93
CONTROL "",IDC_THREADLIST,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_STACKFRAMES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_DEBUG_BOTTOMTABS,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,1,338,513,93
CONTROL "",IDC_THREADLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER,1,338,513,93
CONTROL "",IDC_STACKFRAMES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER,1,338,513,93
CONTROL "",IDC_DEBUG_BOTTOMTABS,"SysTabControl32",TCS_FOCUSNEVER,1,338,513,93
END
IDD_GEDEBUGGER DIALOGEX 0, 0, 500, 400
@ -176,35 +55,48 @@ BEGIN
PUSHBUTTON "Step Draw",IDC_GEDBG_STEPDRAW,0,0,48,14
PUSHBUTTON "Step Into",IDC_GEDBG_STEP,52,0,48,14
PUSHBUTTON "Resume",IDC_GEDBG_RESUME,104,0,48,14
CONTROL "",IDC_GEDBG_TEX,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,10,20,128,128
CONTROL "",IDC_GEDBG_FRAME,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,148,20,256,136
CONTROL "",IDC_GEDBG_MAINTAB,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,10,216,480,180
CONTROL "",IDC_GEDBG_TEX,"SimpleGLWindow",0x0,10,20,128,128
CONTROL "",IDC_GEDBG_FRAME,"SimpleGLWindow",0x0,148,20,256,136
CONTROL "",IDC_GEDBG_MAINTAB,"SysTabControl32",TCS_FOCUSNEVER,10,216,480,180
EDITTEXT IDC_GEDBG_FRAMEBUFADDR,148,192,128,12,ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_GEDBG_TEXADDR,10,152,128,12,ES_READONLY | NOT WS_BORDER
CONTROL "",IDC_GEDBG_FBTABS,"SysTabControl32",TCS_BUTTONS | TCS_FOCUSNEVER,384,192,110,12
END
IDD_GEDBG_TAB_VALUES DIALOGEX 0, 0, 316, 183
STYLE DS_SETFONT | WS_CHILD | DS_CONTROL
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
CAPTION "Dialog"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "",IDC_GEDBG_VALUES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER | WS_TABSTOP,7,7,217,86
CONTROL "",IDC_GEDBG_VALUES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,217,86
END
IDD_TABDISPLAYLISTS DIALOGEX 0, 0, 316, 183
STYLE DS_SETFONT | WS_CHILD | DS_CONTROL
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_CAPTION
CAPTION "Dialog"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "",IDC_GEDBG_LISTS_ALLLISTS,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER | WS_TABSTOP,7,7,217,86
CONTROL "",IDC_GEDBG_LISTS_STACK,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER | WS_TABSTOP,7,95,302,81
CONTROL "",IDC_GEDBG_LISTS_ALLLISTS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,217,86
CONTROL "",IDC_GEDBG_LISTS_STACK,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,95,302,81
CONTROL "",IDC_GEDBG_LISTS_SELECTEDLIST,"CtrlDisplayListView",WS_BORDER,225,7,84,89
END
#include "aboutbox.rc"
IDD_ABOUTBOX DIALOGEX 0, 0, 301, 163
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "About"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,243,140,50,14
ICON IDI_PPSSPP,IDC_STATIC,10,9,21,20
LTEXT "PPSSPP",IDC_VERSION,40,8,127,9
LTEXT "Copyright (c) by Henrik Rydgård the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
LTEXT "All trademarks are property of their respective owners.\nThe emulator is for educational and development purposes only and it may not be used to play games you do not legally own.",IDC_STATIC,40,102,253,24
LTEXT "PSP emulator and debugger",IDC_STATIC,40,19,253,8
LTEXT "CISO decompression code by BOOSTER",IDC_STATIC,48,73,240,8
LTEXT "PSPSDK by #pspdev (freenode)",IDC_STATIC,48,62,240,8
LTEXT "zlib by Jean-loup Gailly (compression) and Mark Adler (decompression)",IDC_STATIC,48,85,240,8
LTEXT "Additional credits:",IDC_STATIC,40,49,253,8
END
IDD_MEMORY DIALOGEX 0, 0, 566, 287
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
@ -349,7 +241,6 @@ IDI_PPSSPP ICON "ppsspp.ico"
IDI_STOP ICON "icon1.ico"
IDI_STOPDISABLE ICON "stop1.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu
@ -359,135 +250,132 @@ IDR_MENU1 MENU
BEGIN
POPUP "File"
BEGIN
MENUITEM "Load", ID_FILE_LOAD
MENUITEM "Open Directory...", ID_FILE_LOAD_DIR
MENUITEM "Open from MS:/PSP/GAME...", ID_FILE_LOAD_MEMSTICK
MENUITEM "Load", ID_FILE_LOAD
MENUITEM "Open Directory...", ID_FILE_LOAD_DIR
MENUITEM "Open from MS:/PSP/GAME...", ID_FILE_LOAD_MEMSTICK
MENUITEM SEPARATOR
MENUITEM "Open Memory Stick", ID_FILE_MEMSTICK
MENUITEM "Open Memory Stick", ID_FILE_MEMSTICK
MENUITEM SEPARATOR
POPUP "Savestate Slot"
BEGIN
MENUITEM "&1", ID_FILE_SAVESTATE_SLOT_1
MENUITEM "&2", ID_FILE_SAVESTATE_SLOT_2
MENUITEM "&3", ID_FILE_SAVESTATE_SLOT_3
MENUITEM "&4", ID_FILE_SAVESTATE_SLOT_4
MENUITEM "&5", ID_FILE_SAVESTATE_SLOT_5
END
MENUITEM "Load State", ID_FILE_QUICKLOADSTATE
MENUITEM "Save State", ID_FILE_QUICKSAVESTATE
MENUITEM "Load State File...", ID_FILE_LOADSTATEFILE
MENUITEM "Save State File...", ID_FILE_SAVESTATEFILE
BEGIN
MENUITEM "&1", ID_FILE_SAVESTATE_SLOT_1
MENUITEM "&2", ID_FILE_SAVESTATE_SLOT_2
MENUITEM "&3", ID_FILE_SAVESTATE_SLOT_3
MENUITEM "&4", ID_FILE_SAVESTATE_SLOT_4
MENUITEM "&5", ID_FILE_SAVESTATE_SLOT_5
END
MENUITEM "Load State", ID_FILE_QUICKLOADSTATE
MENUITEM "Save State", ID_FILE_QUICKSAVESTATE
MENUITEM "Load State File...", ID_FILE_LOADSTATEFILE
MENUITEM "Save State File...", ID_FILE_SAVESTATEFILE
MENUITEM SEPARATOR
MENUITEM "Exit", ID_FILE_EXIT
MENUITEM "Exit", ID_FILE_EXIT
END
POPUP "Emulation"
BEGIN
MENUITEM "Run", ID_TOGGLE_PAUSE
MENUITEM "Stop", ID_EMULATION_STOP
MENUITEM "Reset", ID_EMULATION_RESET
MENUITEM "Run", ID_TOGGLE_PAUSE
MENUITEM "Stop", ID_EMULATION_STOP
MENUITEM "Reset", ID_EMULATION_RESET
END
POPUP "Debug"
BEGIN
MENUITEM "Load Map File...", ID_DEBUG_LOADMAPFILE
MENUITEM "Save Map File...", ID_DEBUG_SAVEMAPFILE
MENUITEM "Reset Symbol Table", ID_DEBUG_RESETSYMBOLTABLE
MENUITEM "Load Map File...", ID_DEBUG_LOADMAPFILE
MENUITEM "Save Map File...", ID_DEBUG_SAVEMAPFILE
MENUITEM "Reset Symbol Table", ID_DEBUG_RESETSYMBOLTABLE
MENUITEM SEPARATOR
MENUITEM "Dump Next Frame to Log", ID_DEBUG_DUMPNEXTFRAME
MENUITEM "Take Screenshot", ID_DEBUG_TAKESCREENSHOT
MENUITEM "Dump Next Frame to Log", ID_DEBUG_DUMPNEXTFRAME
MENUITEM "Take Screenshot", ID_DEBUG_TAKESCREENSHOT
MENUITEM SEPARATOR
MENUITEM "Show Debug Statistics", ID_DEBUG_SHOWDEBUGSTATISTICS
MENUITEM "Ignore Illegal Reads/Writes", ID_DEBUG_IGNOREILLEGALREADS
MENUITEM "Run on Load", ID_DEBUG_RUNONLOAD
MENUITEM "Show Debug Statistics", ID_DEBUG_SHOWDEBUGSTATISTICS
MENUITEM "Ignore Illegal Reads/Writes", ID_DEBUG_IGNOREILLEGALREADS
MENUITEM "Run on Load", ID_DEBUG_RUNONLOAD
MENUITEM SEPARATOR
MENUITEM "Disassembly", ID_DEBUG_DISASSEMBLY
MENUITEM "GE Debugger...", ID_DEBUG_GEDEBUGGER
MENUITEM "Log Console", ID_DEBUG_LOG
MENUITEM "Memory View...", ID_DEBUG_MEMORYVIEW
MENUITEM "Disassembly", ID_DEBUG_DISASSEMBLY
MENUITEM "GE Debugger...", ID_DEBUG_GEDEBUGGER
MENUITEM "Log Console", ID_DEBUG_LOG
MENUITEM "Memory View...", ID_DEBUG_MEMORYVIEW
END
POPUP "Options"
BEGIN
MENUITEM "Keep PPSSPP On Top", ID_OPTIONS_TOPMOST
MENUITEM "More Settings...", ID_OPTIONS_MORE_SETTINGS
MENUITEM "Control Mapping...", ID_OPTIONS_CONTROLS
MENUITEM "Keep PPSSPP On Top", ID_OPTIONS_TOPMOST
MENUITEM "Pause When Not Focused", ID_OPTIONS_PAUSE_FOCUS
MENUITEM "More Settings...", ID_OPTIONS_MORE_SETTINGS
MENUITEM "Control Mapping...", ID_OPTIONS_CONTROLS
MENUITEM SEPARATOR
MENUITEM "Stretch to Display", ID_OPTIONS_STRETCHDISPLAY
MENUITEM "Fullscreen", ID_OPTIONS_FULLSCREEN
MENUITEM "VSync", ID_OPTIONS_VSYNC
MENUITEM "FXAA antialiasing", ID_OPTIONS_FXAA
MENUITEM "Stretch to Display", ID_OPTIONS_STRETCHDISPLAY
MENUITEM "Fullscreen", ID_OPTIONS_FULLSCREEN
MENUITEM "VSync", ID_OPTIONS_VSYNC
MENUITEM "FXAA antialiasing", ID_OPTIONS_FXAA
POPUP "Rendering Resolution"
BEGIN
MENUITEM "Auto", ID_OPTIONS_SCREENAUTO
MENUITEM "&1x", ID_OPTIONS_SCREEN1X
MENUITEM "&2x", ID_OPTIONS_SCREEN2X
MENUITEM "&3x", ID_OPTIONS_SCREEN3X
MENUITEM "&4x", ID_OPTIONS_SCREEN4X
MENUITEM "&5x", ID_OPTIONS_SCREEN5X
MENUITEM "&6x", ID_OPTIONS_SCREEN6X
MENUITEM "&7x", ID_OPTIONS_SCREEN7X
MENUITEM "&8x", ID_OPTIONS_SCREEN8X
MENUITEM "&9x", ID_OPTIONS_SCREEN9X
MENUITEM "&10x", ID_OPTIONS_SCREEN10X
MENUITEM "Auto", ID_OPTIONS_SCREENAUTO
MENUITEM "&1x", ID_OPTIONS_SCREEN1X
MENUITEM "&2x", ID_OPTIONS_SCREEN2X
MENUITEM "&3x", ID_OPTIONS_SCREEN3X
MENUITEM "&4x", ID_OPTIONS_SCREEN4X
MENUITEM "&5x", ID_OPTIONS_SCREEN5X
MENUITEM "&6x", ID_OPTIONS_SCREEN6X
MENUITEM "&7x", ID_OPTIONS_SCREEN7X
MENUITEM "&8x", ID_OPTIONS_SCREEN8X
MENUITEM "&9x", ID_OPTIONS_SCREEN9X
MENUITEM "&10x", ID_OPTIONS_SCREEN10X
END
POPUP "Window Size"
BEGIN
MENUITEM "&1x", ID_OPTIONS_WINDOW1X
MENUITEM "&2x", ID_OPTIONS_WINDOW2X
MENUITEM "&3x", ID_OPTIONS_WINDOW3X
MENUITEM "&4x", ID_OPTIONS_WINDOW4X
MENUITEM "&1x", ID_OPTIONS_WINDOW1X
MENUITEM "&2x", ID_OPTIONS_WINDOW2X
MENUITEM "&3x", ID_OPTIONS_WINDOW3X
MENUITEM "&4x", ID_OPTIONS_WINDOW4X
END
POPUP "Rendering Mode"
BEGIN
MENUITEM "Non-Buffered Rendering", ID_OPTIONS_NONBUFFEREDRENDERING
MENUITEM "Buffered Rendering", ID_OPTIONS_BUFFEREDRENDERING
MENUITEM "Read Framebuffers To Memory (CPU)", ID_OPTIONS_READFBOTOMEMORYCPU
MENUITEM "Read Framebuffers To Memory (GPU)", ID_OPTIONS_READFBOTOMEMORYGPU
END
POPUP "Frame Skipping"
BEGIN
MENUITEM "Off", ID_OPTIONS_FRAMESKIP_0
MENUITEM "Auto", ID_OPTIONS_FRAMESKIP_AUTO
MENUITEM "&1", ID_OPTIONS_FRAMESKIP_1
MENUITEM "&2", ID_OPTIONS_FRAMESKIP_2
MENUITEM "&3", ID_OPTIONS_FRAMESKIP_3
MENUITEM "&4", ID_OPTIONS_FRAMESKIP_4
MENUITEM "&5", ID_OPTIONS_FRAMESKIP_5
MENUITEM "&6", ID_OPTIONS_FRAMESKIP_6
MENUITEM "&7", ID_OPTIONS_FRAMESKIP_7
MENUITEM "&8", ID_OPTIONS_FRAMESKIP_8
END
POPUP "Texture Filtering"
BEGIN
MENUITEM "Auto", ID_OPTIONS_TEXTUREFILTERING_AUTO
MENUITEM "Nearest", ID_OPTIONS_NEARESTFILTERING
MENUITEM "Linear", ID_OPTIONS_LINEARFILTERING
MENUITEM "Linear on FMV", ID_OPTIONS_LINEARFILTERING_CG
END
POPUP "Rendering Mode"
BEGIN
MENUITEM "Non-Buffered Rendering", ID_OPTIONS_NONBUFFEREDRENDERING
MENUITEM "Buffered Rendering", ID_OPTIONS_BUFFEREDRENDERING
MENUITEM "Read Framebuffers To Memory (CPU)", ID_OPTIONS_READFBOTOMEMORYCPU
MENUITEM "Read Framebuffers To Memory (GPU)", ID_OPTIONS_READFBOTOMEMORYGPU
END
POPUP "Frame Skipping"
BEGIN
MENUITEM "Off", ID_OPTIONS_FRAMESKIP_0
MENUITEM "Auto", ID_OPTIONS_FRAMESKIP_AUTO
MENUITEM "&1", ID_OPTIONS_FRAMESKIP_1
MENUITEM "&2", ID_OPTIONS_FRAMESKIP_2
MENUITEM "&3", ID_OPTIONS_FRAMESKIP_3
MENUITEM "&4", ID_OPTIONS_FRAMESKIP_4
MENUITEM "&5", ID_OPTIONS_FRAMESKIP_5
MENUITEM "&6", ID_OPTIONS_FRAMESKIP_6
MENUITEM "&7", ID_OPTIONS_FRAMESKIP_7
MENUITEM "&8", ID_OPTIONS_FRAMESKIP_8
END
POPUP "Texture Filtering"
BEGIN
MENUITEM "Auto", ID_OPTIONS_TEXTUREFILTERING_AUTO
MENUITEM "Nearest", ID_OPTIONS_NEARESTFILTERING
MENUITEM "Linear", ID_OPTIONS_LINEARFILTERING
MENUITEM "Linear on FMV", ID_OPTIONS_LINEARFILTERING_CG
END
POPUP "Texture Scaling"
BEGIN
MENUITEM "Off", ID_TEXTURESCALING_OFF
MENUITEM "&2x", ID_TEXTURESCALING_2X
MENUITEM "&3x", ID_TEXTURESCALING_3X
MENUITEM "&4x", ID_TEXTURESCALING_4X
MENUITEM "&5x", ID_TEXTURESCALING_5X
MENUITEM "Off", ID_TEXTURESCALING_OFF
MENUITEM "&2x", ID_TEXTURESCALING_2X
MENUITEM "&3x", ID_TEXTURESCALING_3X
MENUITEM "&4x", ID_TEXTURESCALING_4X
MENUITEM "&5x", ID_TEXTURESCALING_5X
MENUITEM SEPARATOR
MENUITEM "xBRZ", ID_TEXTURESCALING_XBRZ
MENUITEM "Hybrid", ID_TEXTURESCALING_HYBRID
MENUITEM "Bicubic", ID_TEXTURESCALING_BICUBIC
MENUITEM "Hybrid + Bicubic", ID_TEXTURESCALING_HYBRID_BICUBIC
MENUITEM "xBRZ", ID_TEXTURESCALING_XBRZ
MENUITEM "Hybrid", ID_TEXTURESCALING_HYBRID
MENUITEM "Bicubic", ID_TEXTURESCALING_BICUBIC
MENUITEM "Hybrid + Bicubic", ID_TEXTURESCALING_HYBRID_BICUBIC
MENUITEM SEPARATOR
MENUITEM "Deposterize", ID_TEXTURESCALING_DEPOSTERIZE
MENUITEM "Deposterize", ID_TEXTURESCALING_DEPOSTERIZE
END
MENUITEM "Hardware Transform", ID_OPTIONS_HARDWARETRANSFORM
MENUITEM "Vertex Cache", ID_OPTIONS_VERTEXCACHE
MENUITEM "Show FPS Counter", ID_OPTIONS_SHOWFPS
MENUITEM "Hardware Transform", ID_OPTIONS_HARDWARETRANSFORM
MENUITEM "Vertex Cache", ID_OPTIONS_VERTEXCACHE
MENUITEM "Show FPS Counter", ID_OPTIONS_SHOWFPS
MENUITEM SEPARATOR
MENUITEM "Enable Sound", ID_EMULATION_SOUND, CHECKED
MENUITEM "Enable Sound", ID_EMULATION_SOUND, CHECKED
MENUITEM SEPARATOR
MENUITEM "Enable Cheats", ID_EMULATION_CHEATS
MENUITEM "Enable Cheats", ID_EMULATION_CHEATS
END
END
@ -495,80 +383,234 @@ IDR_POPUPMENUS MENU
BEGIN
POPUP "memview"
BEGIN
MENUITEM "Go to in Disasm", ID_MEMVIEW_GOTOINDISASM
MENUITEM "Copy address", ID_MEMVIEW_COPYADDRESS
MENUITEM "Go to in Disasm", ID_MEMVIEW_GOTOINDISASM
MENUITEM "Copy address", ID_MEMVIEW_COPYADDRESS
MENUITEM SEPARATOR
MENUITEM "Copy Value", ID_MEMVIEW_COPYVALUE
MENUITEM "Dump...", ID_MEMVIEW_DUMP
MENUITEM "Copy Value", ID_MEMVIEW_COPYVALUE
MENUITEM "Dump...", ID_MEMVIEW_DUMP
END
POPUP "disasm"
BEGIN
MENUITEM "Copy Address", ID_DISASM_COPYADDRESS
MENUITEM "Copy Instruction (Hex)", ID_DISASM_COPYINSTRUCTIONHEX
MENUITEM "Copy Instruction (Disasm)", ID_DISASM_COPYINSTRUCTIONDISASM
MENUITEM "Disassemble to File", ID_DISASM_DISASSEMBLETOFILE
MENUITEM "Copy Address", ID_DISASM_COPYADDRESS
MENUITEM "Copy Instruction (Hex)", ID_DISASM_COPYINSTRUCTIONHEX
MENUITEM "Copy Instruction (Disasm)", ID_DISASM_COPYINSTRUCTIONDISASM
MENUITEM "Disassemble to File", ID_DISASM_DISASSEMBLETOFILE
MENUITEM SEPARATOR
MENUITEM "Assemble Opcode", ID_DISASM_ASSEMBLE
MENUITEM "Assemble Opcode", ID_DISASM_ASSEMBLE
MENUITEM SEPARATOR
MENUITEM "Run to Cursor", ID_DISASM_RUNTOHERE
MENUITEM "Jump to Cursor", ID_DISASM_SETPCTOHERE
MENUITEM "Toggle Breakpoint", ID_DISASM_TOGGLEBREAKPOINT
MENUITEM "Follow Branch", ID_DISASM_FOLLOWBRANCH
MENUITEM "Run to Cursor", ID_DISASM_RUNTOHERE
MENUITEM "Jump to Cursor", ID_DISASM_SETPCTOHERE
MENUITEM "Toggle Breakpoint", ID_DISASM_TOGGLEBREAKPOINT
MENUITEM "Follow Branch", ID_DISASM_FOLLOWBRANCH
MENUITEM SEPARATOR
MENUITEM "Show Dynarec Results", ID_DISASM_DYNARECRESULTS
MENUITEM "Go to in Memory View", ID_DISASM_GOTOINMEMORYVIEW
MENUITEM "Show Dynarec Results", ID_DISASM_DYNARECRESULTS
MENUITEM "Go to in Memory View", ID_DISASM_GOTOINMEMORYVIEW
MENUITEM SEPARATOR
MENUITEM "Kill Function", ID_DISASM_ADDHLE
MENUITEM "Rename Function...", ID_DISASM_RENAMEFUNCTION
MENUITEM "Kill Function", ID_DISASM_ADDHLE
MENUITEM "Rename Function...", ID_DISASM_RENAMEFUNCTION
END
POPUP "funclist"
BEGIN
MENUITEM "Kill Function", ID_FUNCLIST_KILLFUNCTION
MENUITEM "Kill Function", ID_FUNCLIST_KILLFUNCTION
END
POPUP "reglist"
BEGIN
MENUITEM "Go to in Memory View", ID_REGLIST_GOTOINMEMORYVIEW
MENUITEM "Go to in Disasm", ID_REGLIST_GOTOINDISASM
MENUITEM "Go to in Memory View", ID_REGLIST_GOTOINMEMORYVIEW
MENUITEM "Go to in Disasm", ID_REGLIST_GOTOINDISASM
MENUITEM SEPARATOR
MENUITEM "Copy Value", ID_REGLIST_COPYVALUE
MENUITEM "Change...", ID_REGLIST_CHANGE
MENUITEM "Copy Value", ID_REGLIST_COPYVALUE
MENUITEM "Change...", ID_REGLIST_CHANGE
END
POPUP "controls"
BEGIN
MENUITEM "Disable", ID_CONTROLS_KEY_DISABLE
MENUITEM "Disable", ID_CONTROLS_KEY_DISABLE
END
POPUP "breakpointlist"
BEGIN
MENUITEM "Enable", ID_DISASM_DISABLEBREAKPOINT
MENUITEM "Edit", ID_DISASM_EDITBREAKPOINT
POPUP "breakpointlist"
BEGIN
MENUITEM "Enable", ID_DISASM_DISABLEBREAKPOINT
MENUITEM "Edit", ID_DISASM_EDITBREAKPOINT
MENUITEM SEPARATOR
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "threadlist"
BEGIN
MENUITEM "Force Resume", ID_DISASM_THREAD_FORCERUN
MENUITEM "Terminate", ID_DISASM_THREAD_KILL
END
POPUP "newbreakpoint"
BEGIN
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "displaylistview"
BEGIN
MENUITEM "Copy Address", ID_DISASM_COPYADDRESS
MENUITEM "Copy Instruction (Hex)", ID_DISASM_COPYINSTRUCTIONHEX
MENUITEM "Copy Instruction (Disasm)", ID_DISASM_COPYINSTRUCTIONDISASM
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "threadlist"
BEGIN
MENUITEM "Force Resume", ID_DISASM_THREAD_FORCERUN
MENUITEM "Terminate", ID_DISASM_THREAD_KILL
END
POPUP "newbreakpoint"
BEGIN
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "displaylistview"
BEGIN
MENUITEM "Copy Address", ID_DISASM_COPYADDRESS
MENUITEM "Copy Instruction (Hex)", ID_DISASM_COPYINSTRUCTIONHEX
MENUITEM "Copy Instruction (Disasm)", ID_DISASM_COPYINSTRUCTIONDISASM
MENUITEM SEPARATOR
MENUITEM "Run to Cursor", ID_DISASM_RUNTOHERE
MENUITEM "Jump to Cursor", ID_DISASM_SETPCTOHERE
MENUITEM "Set Stall" ID_GEDBG_SETSTALLADDR
MENUITEM "Toggle Breakpoint", ID_DISASM_TOGGLEBREAKPOINT
MENUITEM "Run to Cursor", ID_DISASM_RUNTOHERE
MENUITEM "Jump to Cursor", ID_DISASM_SETPCTOHERE
MENUITEM "Set Stall", ID_GEDBG_SETSTALLADDR
MENUITEM "Toggle Breakpoint", ID_DISASM_TOGGLEBREAKPOINT
MENUITEM SEPARATOR
MENUITEM "Go to Displaylist PC", ID_GEDBG_GOTOPC
MENUITEM "Go to Address...", ID_GEDBG_GOTOADDR
MENUITEM "Go to in Memory View", ID_DISASM_GOTOINMEMORYVIEW
END
MENUITEM "Go to Displaylist PC", ID_GEDBG_GOTOPC
MENUITEM "Go to Address...", ID_GEDBG_GOTOADDR
MENUITEM "Go to in Memory View", ID_DISASM_GOTOINMEMORYVIEW
END
END
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Neutral (Default) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
#pragma code_page(1253)
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// IMAGE
//
IDB_IMAGE_PSP IMAGE "pspmode.png"
/////////////////////////////////////////////////////////////////////////////
//
// RT_MANIFEST
//
1 RT_MANIFEST "rt_manif.bin"
/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//
IDR_ACCELS ACCELERATORS
BEGIN
"O", ID_FILE_LOAD, VIRTKEY, CONTROL, NOINVERT
"W", ID_EMULATION_STOP, VIRTKEY, CONTROL, NOINVERT
"B", ID_EMULATION_RESET, VIRTKEY, CONTROL, NOINVERT
"T", ID_EMULATION_CHEATS, VIRTKEY, CONTROL, NOINVERT
"D", ID_DEBUG_DISASSEMBLY, VIRTKEY, CONTROL, NOINVERT
"G", ID_DEBUG_GEDEBUGGER, VIRTKEY, CONTROL, NOINVERT
"L", ID_DEBUG_LOG, VIRTKEY, CONTROL, NOINVERT
"E", ID_DEBUG_MEMORYCHECKS, VIRTKEY, CONTROL, NOINVERT
"F", ID_DEBUG_MEMORYSEARCH, VIRTKEY, CONTROL, NOINVERT
"M", ID_DEBUG_MEMORYVIEW, VIRTKEY, CONTROL, NOINVERT
"R", ID_DEBUG_REGISTERS, VIRTKEY, CONTROL, NOINVERT
VK_F3, ID_FILE_SAVESTATE_NEXT_SLOT, VIRTKEY, NOINVERT
VK_F2, ID_FILE_QUICKSAVESTATE, VIRTKEY, NOINVERT
VK_F4, ID_FILE_QUICKLOADSTATE, VIRTKEY, NOINVERT
"1", ID_OPTIONS_RESOLUTIONDUMMY, VIRTKEY, CONTROL, NOINVERT
VK_F5, ID_OPTIONS_BUFFEREDRENDERINGDUMMY, VIRTKEY, NOINVERT
VK_F7, ID_OPTIONS_FRAMESKIPDUMMY, VIRTKEY, NOINVERT
VK_F6, ID_OPTIONS_HARDWARETRANSFORM, VIRTKEY, NOINVERT
VK_F12, ID_DEBUG_TAKESCREENSHOT, VIRTKEY, NOINVERT
VK_F8, ID_TOGGLE_PAUSE, VIRTKEY, NOINVERT
VK_RETURN, ID_OPTIONS_FULLSCREEN, VIRTKEY, ALT, NOINVERT
VK_F11, ID_OPTIONS_FULLSCREEN, VIRTKEY, NOINVERT
END
IDR_DEBUGACCELS ACCELERATORS
BEGIN
"B", ID_DEBUG_ADDBREAKPOINT, VIRTKEY, CONTROL, NOINVERT
"R", ID_DEBUG_DSIPLAYREGISTERLIST, VIRTKEY, CONTROL, NOINVERT
"L", ID_DEBUG_DSIPLAYFUNCTIONLIST, VIRTKEY, CONTROL, NOINVERT
"1", ID_DEBUG_DISPLAYMEMVIEW, VIRTKEY, CONTROL, NOINVERT
"2", ID_DEBUG_DISPLAYBREAKPOINTLIST, VIRTKEY, CONTROL, NOINVERT
"3", ID_DEBUG_DISPLAYTHREADLIST, VIRTKEY, CONTROL, NOINVERT
"4", ID_DEBUG_DISPLAYSTACKFRAMELIST, VIRTKEY, CONTROL, NOINVERT
VK_F7, ID_TOGGLE_PAUSE, VIRTKEY, NOINVERT
VK_F8, ID_DEBUG_STEPOUT, VIRTKEY, NOINVERT
VK_F9, ID_DEBUG_RUNTOLINE, VIRTKEY, NOINVERT
VK_F10, ID_DEBUG_STEPOVER, VIRTKEY, NOINVERT
VK_F11, ID_DEBUG_STEPINTO, VIRTKEY, NOINVERT
VK_F11, ID_DEBUG_STEPOUT, VIRTKEY, SHIFT, NOINVERT
"X", ID_DEBUG_HIDEBOTTOMTABS, VIRTKEY, CONTROL, NOINVERT
"Y", ID_DEBUG_TOGGLEBOTTOMTABTITLES, VIRTKEY, CONTROL, NOINVERT
END
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,9,1
PRODUCTVERSION 0,0,9,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x0L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "PPSSPP PSP emulator"
VALUE "CompanyName", "Henrik Rydgard Inc."
VALUE "FileDescription", "PPSSPP"
VALUE "FileVersion", "0, 0, 9, 1"
VALUE "InternalName", "PPSSPPEmu"
VALUE "LegalCopyright", "Copyright (C) 2006-2013 by Henrik Rydgard"
VALUE "LegalTrademarks", "All product names are trademarks of their respective owners."
VALUE "OriginalFilename", "PPSSPP.exe"
VALUE "ProductName", "PPSSPP"
VALUE "ProductVersion", "0, 0, 9, 1"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

1
Windows/resource.h
View File

@ -290,6 +290,7 @@
#define ID_GEDBG_SETSTALLADDR 40130
#define ID_GEDBG_GOTOPC 40131
#define ID_GEDBG_GOTOADDR 40132
#define ID_OPTIONS_PAUSE_FOCUS 40133
// Dummy option to let the buffered rendering hotkey cycle through all the options.
#define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500