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

Win32: add quit hotkey

This commit is contained in:
OV2 2011-11-12 21:01:46 +01:00
parent 342f773958
commit 9215fba453
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
win32/wlanguage.h
View File

@ -289,7 +289,7 @@ Nintendo is a trade mark.")
#define HOTKEYS_LABEL_3_11 TEXT("Turbo Right mode") #define HOTKEYS_LABEL_3_11 TEXT("Turbo Right mode")
#define HOTKEYS_LABEL_3_12 TEXT("Turbo Down mode") #define HOTKEYS_LABEL_3_12 TEXT("Turbo Down mode")
//#define HOTKEYS_LABEL_4_12 "Interpolate Mode 7" //#define HOTKEYS_LABEL_4_12 "Interpolate Mode 7"
//#define HOTKEYS_LABEL_4_13 "BG Layering hack" #define HOTKEYS_LABEL_4_13 TEXT("Quit Snes9x")
// gaming buttons and axes // gaming buttons and axes
#define GAMEDEVICE_JOYNUMPREFIX "(J%x)" // don't change this #define GAMEDEVICE_JOYNUMPREFIX "(J%x)" // don't change this

12
win32/wsnes9x.cpp
View File

@ -562,6 +562,7 @@ struct SCustomKeys CustomKeys = {
{0,0}}, // Select save slot 9 {0,0}}, // Select save slot 9
{'R',CUSTKEY_CTRL_MASK|CUSTKEY_SHIFT_MASK}, // Reset Game {'R',CUSTKEY_CTRL_MASK|CUSTKEY_SHIFT_MASK}, // Reset Game
{0,0}, // Toggle Cheats {0,0}, // Toggle Cheats
{0,0},
}; };
@ -1225,6 +1226,11 @@ int HandleKeyMessage(WPARAM wParam, LPARAM lParam)
S9xReportControllers(); S9xReportControllers();
} }
} }
if(wParam == CustomKeys.QuitS9X.key
&& modifiers == CustomKeys.QuitS9X.modifiers)
{
PostMessage(GUI.hWnd,WM_CLOSE,(WPARAM)NULL,(LPARAM)(NULL));
}
//if(wParam == CustomKeys.BGLHack.key //if(wParam == CustomKeys.BGLHack.key
//&& modifiers == CustomKeys.BGLHack.modifiers) //&& modifiers == CustomKeys.BGLHack.modifiers)
//{ //{
@ -7775,7 +7781,7 @@ static void set_hotkeyinfo(HWND hDlg)
SendDlgItemMessage(hDlg,IDC_HOTKEY1+i,WM_USER+44,CustomKeys.SelectSave[i].key,CustomKeys.SelectSave[i].modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY1+i,WM_USER+44,CustomKeys.SelectSave[i].key,CustomKeys.SelectSave[i].modifiers);
SendDlgItemMessage(hDlg,IDC_HOTKEY11,WM_USER+44,0,0); SendDlgItemMessage(hDlg,IDC_HOTKEY11,WM_USER+44,0,0);
SendDlgItemMessage(hDlg,IDC_HOTKEY12,WM_USER+44,0,0); SendDlgItemMessage(hDlg,IDC_HOTKEY12,WM_USER+44,0,0);
SendDlgItemMessage(hDlg,IDC_HOTKEY13,WM_USER+44,0,0); SendDlgItemMessage(hDlg,IDC_HOTKEY13,WM_USER+44,CustomKeys.QuitS9X.key,CustomKeys.QuitS9X.modifiers);
break; break;
} }
@ -7843,8 +7849,9 @@ static void set_hotkeyinfo(HWND hDlg)
_stprintf(temp, TEXT("Select Slot %d"), i); _stprintf(temp, TEXT("Select Slot %d"), i);
SetDlgItemText(hDlg,IDC_LABEL_HK1+i,temp); SetDlgItemText(hDlg,IDC_LABEL_HK1+i,temp);
} }
for(int i = 10 ; i < 13 ; i++) for(int i = 10 ; i < 12 ; i++)
SetDlgItemText(hDlg,IDC_LABEL_HK1+i,INPUTCONFIG_LABEL_UNUSED); SetDlgItemText(hDlg,IDC_LABEL_HK1+i,INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_HK13,HOTKEYS_LABEL_4_13);
break; break;
} }
@ -8003,6 +8010,7 @@ switch(msg)
if(index == 0) CustomKeys.SaveScreenShot.key = wParam, CustomKeys.SaveScreenShot.modifiers = modifiers; if(index == 0) CustomKeys.SaveScreenShot.key = wParam, CustomKeys.SaveScreenShot.modifiers = modifiers;
if(index == 1) CustomKeys.ToggleCheats.key = wParam, CustomKeys.ToggleCheats.modifiers = modifiers; if(index == 1) CustomKeys.ToggleCheats.key = wParam, CustomKeys.ToggleCheats.modifiers = modifiers;
// if(index == 3) CustomKeys.BGLHack.key = wParam, CustomKeys.BGLHack.modifiers = modifiers; // if(index == 3) CustomKeys.BGLHack.key = wParam, CustomKeys.BGLHack.modifiers = modifiers;
if(index == 3) CustomKeys.QuitS9X.key = wParam, CustomKeys.QuitS9X.modifiers = modifiers;
break; break;
case IDC_SLOTPLUS: case IDC_SLOTPLUS:

1
win32/wsnes9x.h
View File

@ -465,6 +465,7 @@ struct SCustomKeys {
SCustomKey SelectSave [10]; SCustomKey SelectSave [10];
SCustomKey ResetGame; SCustomKey ResetGame;
SCustomKey ToggleCheats; SCustomKey ToggleCheats;
SCustomKey QuitS9X;
}; };
struct SJoypad { struct SJoypad {