diff --git a/src/drivers/win/mapinput.cpp b/src/drivers/win/mapinput.cpp index 2579c737..162032f9 100644 --- a/src/drivers/win/mapinput.cpp +++ b/src/drivers/win/mapinput.cpp @@ -23,12 +23,12 @@ static struct { { EMUCMD_RESET, SCAN_R | CMD_KEY_CTRL }, { EMUCMD_PAUSE, SCAN_F2, }, - { EMUCMD_FRAME_ADVANCE, SCAN_TAB, }, - { EMUCMD_SCREENSHOT, SCAN_F9 }, + { EMUCMD_FRAME_ADVANCE, SCAN_BACKSLASH, }, + { EMUCMD_SCREENSHOT, SCAN_F12 }, { EMUCMD_HIDE_MENU_TOGGLE, SCAN_ESCAPE }, - { EMUCMD_SPEED_SLOWER, SCAN_MINUS, }, // think about these - { EMUCMD_SPEED_FASTER, SCAN_EQUAL, }, // think about these - { EMUCMD_SPEED_TURBO, SCAN_GRAVE, }, //tilde + { EMUCMD_SPEED_SLOWER, SCAN_MINUS, }, + { EMUCMD_SPEED_FASTER, SCAN_EQUAL, }, + { EMUCMD_SPEED_TURBO, SCAN_TAB, }, { EMUCMD_SAVE_SLOT_0, SCAN_0, }, { EMUCMD_SAVE_SLOT_1, SCAN_1, }, { EMUCMD_SAVE_SLOT_2, SCAN_2, }, @@ -39,36 +39,36 @@ static struct { EMUCMD_SAVE_SLOT_7, SCAN_7, }, { EMUCMD_SAVE_SLOT_8, SCAN_8, }, { EMUCMD_SAVE_SLOT_9, SCAN_9, }, - { EMUCMD_SAVE_STATE, SCAN_F5, }, - { EMUCMD_LOAD_STATE, SCAN_F7, }, + { EMUCMD_SAVE_STATE, SCAN_I, }, //adelikat, set to my defaults for lack of something better + { EMUCMD_LOAD_STATE, SCAN_P, }, //most people use the loadslotx / savestlotx style system which requires hogging all th F Keys. So I set it up in FCEUX that way. //get feedback from TAS people about these - /*{ EMUCMD_MOVIE_FRAME_DISPLAY_TOGGLE, SCAN_PERIOD, }, - { EMUCMD_FDS_EJECT_INSERT, SCAN_F8, }, - { EMUCMD_FDS_SIDE_SELECT, SCAN_F6, }, + { EMUCMD_MOVIE_FRAME_DISPLAY_TOGGLE, SCAN_PERIOD, }, + //{ EMUCMD_FDS_EJECT_INSERT, SCAN_F8, }, //These two can be removed, as they can cause nasty errors and the F keys are needed + //{ EMUCMD_FDS_SIDE_SELECT, SCAN_F6, }, { EMUCMD_MOVIE_INPUT_DISPLAY_TOGGLE, SCAN_COMMA, }, - { EMUCMD_MOVIE_READONLY_TOGGLE, SCAN_8 | CMD_KEY_SHIFT, },*/ - { EMUCMD_MISC_REWIND, SCAN_R, }, + //{ EMUCMD_MOVIE_READONLY_TOGGLE, SCAN_8 | CMD_KEY_SHIFT, },*/ + //{ EMUCMD_MISC_REWIND, SCAN_R, }, Removed until rewind is fixed? //mbg 7/31/06 - these have been removed as defaults until we decide whether hotkey philosophy permits them - //{ EMUCMD_SAVE_STATE_SLOT_0, SCAN_F10 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_1, SCAN_F1 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_2, SCAN_F2 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_3, SCAN_F3 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_4, SCAN_F4 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_5, SCAN_F5 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_6, SCAN_F6 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_7, SCAN_F7 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_8, SCAN_F8 | CMD_KEY_SHIFT, }, - //{ EMUCMD_SAVE_STATE_SLOT_9, SCAN_F9 | CMD_KEY_SHIFT, }, - //{ EMUCMD_LOAD_STATE_SLOT_0, SCAN_F10, }, - //{ EMUCMD_LOAD_STATE_SLOT_1, SCAN_F1, }, - //{ EMUCMD_LOAD_STATE_SLOT_2, SCAN_F2, }, - //{ EMUCMD_LOAD_STATE_SLOT_3, SCAN_F3, }, - //{ EMUCMD_LOAD_STATE_SLOT_4, SCAN_F4, }, - //{ EMUCMD_LOAD_STATE_SLOT_5, SCAN_F5, }, - //{ EMUCMD_LOAD_STATE_SLOT_6, SCAN_F6, }, - //{ EMUCMD_LOAD_STATE_SLOT_7, SCAN_F7, }, - //{ EMUCMD_LOAD_STATE_SLOT_8, SCAN_F8, }, - //{ EMUCMD_LOAD_STATE_SLOT_9, SCAN_F9, }, + { EMUCMD_SAVE_STATE_SLOT_0, SCAN_F10 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_1, SCAN_F1 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_2, SCAN_F2 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_3, SCAN_F3 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_4, SCAN_F4 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_5, SCAN_F5 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_6, SCAN_F6 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_7, SCAN_F7 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_8, SCAN_F8 | CMD_KEY_SHIFT, }, + { EMUCMD_SAVE_STATE_SLOT_9, SCAN_F9 | CMD_KEY_SHIFT, }, + { EMUCMD_LOAD_STATE_SLOT_0, SCAN_F10, }, + { EMUCMD_LOAD_STATE_SLOT_1, SCAN_F1, }, + { EMUCMD_LOAD_STATE_SLOT_2, SCAN_F2, }, + { EMUCMD_LOAD_STATE_SLOT_3, SCAN_F3, }, + { EMUCMD_LOAD_STATE_SLOT_4, SCAN_F4, }, + { EMUCMD_LOAD_STATE_SLOT_5, SCAN_F5, }, + { EMUCMD_LOAD_STATE_SLOT_6, SCAN_F6, }, + { EMUCMD_LOAD_STATE_SLOT_7, SCAN_F7, }, + { EMUCMD_LOAD_STATE_SLOT_8, SCAN_F8, }, + { EMUCMD_LOAD_STATE_SLOT_9, SCAN_F9, }, //{ EMUCMD_MOVIE_SLOT_0, SCAN_0 | CMD_KEY_ALT, }, //{ EMUCMD_MOVIE_SLOT_1, SCAN_1 | CMD_KEY_ALT, }, //{ EMUCMD_MOVIE_SLOT_2, SCAN_2 | CMD_KEY_ALT, }, diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 420c4131..f6b021bc 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -40,7 +40,7 @@ BEGIN POPUP "&File" BEGIN MENUITEM "&Open... Ctrl+O", MENU_OPEN_FILE - MENUITEM "&Close", MENU_CLOSE_FILE + MENUITEM "&Close Ctrl+W", MENU_CLOSE_FILE MENUITEM "&Recent", MENU_RECENT_FILES MENUITEM SEPARATOR MENUITEM "Load State From...", MENU_LOAD_STATE @@ -70,7 +70,7 @@ BEGIN POPUP "&Config" BEGIN MENUITEM "Hide Menu", MENU_HIDE_MENU - MENUITEM "Show Status Icon", MENU_SHOW_STATUS_ICON + MENUITEM "Show Movie Status Icon", MENU_SHOW_STATUS_ICON MENUITEM "Pause After Playback", MENU_PAUSEAFTERPLAYBACK MENUITEM "Enable Run in Background", MENU_RUN_IN_BACKGROUND MENUITEM "Enable Background Input", MENU_BACKGROUND_INPUT @@ -390,7 +390,7 @@ CAPTION "GUI Configuration" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "Close",BUTTON_CLOSE,64,68,56,14 - CONTROL "Load ""File Open"" dialog when FCE Ultra starts.",CB_LOAD_FILE_OPEN, + CONTROL "Load ""File Open"" dialog when FCEUX starts.",CB_LOAD_FILE_OPEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,8,164,12 CONTROL "Automatically hide menu on game load.",CB_AUTO_HIDE_MENU, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,23,164,12 @@ -679,8 +679,8 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN GROUPBOX "Full Screen Settings",65453,10,8,364,115,WS_GROUP CONTROL "Full Screen",101,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,23,145,12 - CONTROL "Enter full screen mode after file is loaded.",102, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,39,145,12 + CONTROL "Enter full screen mode after game is loaded.",102, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,39,151,12 LTEXT "Sync Method:",65452,20,82,48,10 COMBOBOX 105,72,79,93,50,CBS_DROPDOWNLIST | WS_TABSTOP LTEXT "Video Mode:",65451,20,62,42,10 diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index d4331974..59df9b94 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -1035,7 +1035,8 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) // User selected the Open File menu => Show the file selection dialog LoadNewGamey(hWnd, 0); break; - + + case ACCEL_CTRL_W: case MENU_CLOSE_FILE: // User selected the Close File menu => Close the game if necessary if(GameInfo)