diff --git a/src/drivers/win/help/fceux.chm b/src/drivers/win/help/fceux.chm index 31d99bba..49c0bb8b 100644 Binary files a/src/drivers/win/help/fceux.chm and b/src/drivers/win/help/fceux.chm differ diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 8fc06643..36639671 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -247,13 +247,13 @@ BEGIN MENUITEM MFT_SEPARATOR MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY,MFT_STRING,MFS_ENABLED MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE,MFT_STRING,MFS_ENABLED - MENUITEM "PasteInsert\tShift+V", ID_EDIT_PASTEINSERT,MFT_STRING,MFS_ENABLED + MENUITEM "PasteInsert\tCtrl+Shift+V", ID_EDIT_PASTEINSERT,MFT_STRING,MFS_ENABLED MENUITEM "Cut\tCtrl+X", ID_EDIT_CUT,MFT_STRING,MFS_ENABLED MENUITEM MFT_SEPARATOR MENUITEM "Clear\tDel", ID_EDIT_CLEAR,MFT_STRING,MFS_ENABLED MENUITEM "Delete\tCtrl+Del", ID_EDIT_DELETE,MFT_STRING,MFS_ENABLED MENUITEM "Clone\tCtrl+Ins", ID_EDIT_CLONEFRAMES,MFT_STRING,MFS_ENABLED - MENUITEM "Insert\tShift+Ins", ID_EDIT_INSERTFRAMES,MFT_STRING,MFS_ENABLED + MENUITEM "Insert\tCtrl+Shift+Ins", ID_EDIT_INSERTFRAMES,MFT_STRING,MFS_ENABLED MENUITEM "Insert # of Frames\tIns", ID_EDIT_INSERT,MFT_STRING,MFS_ENABLED MENUITEM MFT_SEPARATOR MENUITEM "Truncate movie", ID_EDIT_TRUNCATE,MFT_STRING,MFS_ENABLED @@ -277,8 +277,8 @@ BEGIN MENUITEM "Set max Undo levels", ID_CONFIG_SETMAXUNDOLEVELS,MFT_STRING,MFS_ENABLED MENUITEM "Set Autosave period", ID_CONFIG_SETAUTOSAVEPERIOD,MFT_STRING,MFS_ENABLED MENUITEM MFT_SEPARATOR - MENUITEM "Branches restore entire Movie", ID_CONFIG_BRANCHESRESTOREFULLMOVIE,MFT_STRING,MFS_ENABLED MENUITEM "Branches work only when Recording", ID_CONFIG_BRANCHESWORKONLYWHENRECORDING,MFT_STRING,MFS_ENABLED + MENUITEM "Branches restore entire Movie", ID_CONFIG_BRANCHESRESTOREFULLMOVIE,MFT_STRING,MFS_ENABLED MENUITEM "HUD in Branch screenshots", ID_CONFIG_HUDINBRANCHSCREENSHOTS,MFT_STRING,MFS_ENABLED MENUITEM MFT_SEPARATOR MENUITEM "Bind Markers to Input", ID_CONFIG_BINDMARKERSTOINPUT,MFT_STRING,MFS_ENABLED @@ -2192,7 +2192,9 @@ BEGIN "C", ACCEL_CTRL_C, VIRTKEY, CONTROL, NOINVERT VK_DELETE, ACCEL_CTRL_DELETE, VIRTKEY, CONTROL, NOINVERT VK_DOWN, ACCEL_CTRL_DOWN, VIRTKEY, CONTROL, NOINVERT + VK_END, ACCEL_CTRL_END, VIRTKEY, CONTROL, NOINVERT "F", ACCEL_CTRL_F, VIRTKEY, CONTROL, NOINVERT + VK_HOME, ACCEL_CTRL_HOME, VIRTKEY, CONTROL, NOINVERT VK_INSERT, ACCEL_CTRL_INSERT, VIRTKEY, CONTROL, NOINVERT VK_LEFT, ACCEL_CTRL_LEFT, VIRTKEY, CONTROL, NOINVERT VK_NEXT, ACCEL_CTRL_PGDN, VIRTKEY, CONTROL, NOINVERT @@ -2212,18 +2214,16 @@ BEGIN VK_INSERT, ACCEL_INS, VIRTKEY, NOINVERT VK_NEXT, ACCEL_PGDN, VIRTKEY, NOINVERT VK_PRIOR, ACCEL_PGUP, VIRTKEY, NOINVERT - VK_INSERT, ACCEL_SHIFT_INS, VIRTKEY, SHIFT, NOINVERT + VK_DOWN, ACCEL_SHIFT_DOWN, VIRTKEY, SHIFT, NOINVERT + VK_END, ACCEL_SHIFT_END, VIRTKEY, SHIFT, NOINVERT + VK_HOME, ACCEL_SHIFT_HOME, VIRTKEY, SHIFT, NOINVERT + VK_INSERT, ACCEL_CTRL_SHIFT_INS, VIRTKEY, SHIFT, CONTROL, NOINVERT + VK_LEFT, ACCEL_SHIFT_LEFT, VIRTKEY, SHIFT, NOINVERT VK_NEXT, ACCEL_SHIFT_PGDN, VIRTKEY, SHIFT, NOINVERT VK_PRIOR, ACCEL_SHIFT_PGUP, VIRTKEY, SHIFT, NOINVERT - "V", ACCEL_SHIFT_V, VIRTKEY, SHIFT, NOINVERT - VK_HOME, ACCEL_CTRL_HOME, VIRTKEY, CONTROL, NOINVERT - VK_END, ACCEL_CTRL_END, VIRTKEY, CONTROL, NOINVERT - VK_HOME, ACCEL_SHIFT_HOME, VIRTKEY, SHIFT, NOINVERT - VK_END, ACCEL_SHIFT_END, VIRTKEY, SHIFT, NOINVERT - VK_UP, ACCEL_SHIFT_UP, VIRTKEY, SHIFT, NOINVERT - VK_DOWN, ACCEL_SHIFT_DOWN, VIRTKEY, SHIFT, NOINVERT - VK_LEFT, ACCEL_SHIFT_LEFT, VIRTKEY, SHIFT, NOINVERT VK_RIGHT, ACCEL_SHIFT_RIGHT, VIRTKEY, SHIFT, NOINVERT + VK_UP, ACCEL_SHIFT_UP, VIRTKEY, SHIFT, NOINVERT + "V", ACCEL_CTRL_SHIFT_V, VIRTKEY, SHIFT, CONTROL, NOINVERT END IDR_RWACCELERATOR ACCELERATORS diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 1aa40e99..acf6d381 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -931,6 +931,7 @@ #define ID_EDIT_CLONEFRAME 40459 #define ID_EDIT_CLONEFRAMES 40460 #define ACCEL_SHIFT_INS 40461 +#define ACCEL_CTRL_SHIFT_INS 40461 #define ID_SELECTED_CLONE 40463 #define ID_CONFIG_Q 40464 #define ACCEL_CTRL_Z 40465 @@ -1026,7 +1027,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 206 -#define _APS_NEXT_COMMAND_VALUE 40562 +#define _APS_NEXT_COMMAND_VALUE 40563 #define _APS_NEXT_CONTROL_VALUE 1281 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/src/drivers/win/taseditor/taseditor_config.cpp b/src/drivers/win/taseditor/taseditor_config.cpp index 2f791a89..a235f1f9 100644 --- a/src/drivers/win/taseditor/taseditor_config.cpp +++ b/src/drivers/win/taseditor/taseditor_config.cpp @@ -75,7 +75,7 @@ TASEDITOR_CONFIG::TASEDITOR_CONFIG() autopause_at_finish = true; tooltips = true; current_pattern = 0; - pattern_skips_lag = false; + pattern_skips_lag = true; pattern_recording = false; last_author[0] = 0; // empty name diff --git a/src/drivers/win/taseditor/taseditor_window.cpp b/src/drivers/win/taseditor/taseditor_window.cpp index 91771c6a..2755aed6 100644 --- a/src/drivers/win/taseditor/taseditor_window.cpp +++ b/src/drivers/win/taseditor/taseditor_window.cpp @@ -842,27 +842,7 @@ BOOL CALLBACK WndprocTasEditor(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara else splicer.Paste(); break; - case ACCEL_SHIFT_V: - { - // hack to allow entering Shift-V into edit control even though accelerator steals the input message - char insert_v[] = "v"; - char insert_V[] = "V"; - if (markers_manager.marker_note_edit == MARKER_NOTE_EDIT_UPPER) - { - if (GetKeyState(VK_CAPITAL) & 1) - SendMessage(playback.hwndPlaybackMarkerEdit, EM_REPLACESEL, true, (LPARAM)insert_v); - else - SendMessage(playback.hwndPlaybackMarkerEdit, EM_REPLACESEL, true, (LPARAM)insert_V); - } else if (markers_manager.marker_note_edit == MARKER_NOTE_EDIT_LOWER) - { - if (GetKeyState(VK_CAPITAL) & 1) - SendMessage(selection.hwndSelectionMarkerEdit, EM_REPLACESEL, true, (LPARAM)insert_v); - else - SendMessage(selection.hwndSelectionMarkerEdit, EM_REPLACESEL, true, (LPARAM)insert_V); - } else - splicer.PasteInsert(); - break; - } + case ACCEL_CTRL_SHIFT_V: case ID_EDIT_PASTEINSERT: if (markers_manager.marker_note_edit == MARKER_NOTE_EDIT_UPPER) SendMessage(playback.hwndPlaybackMarkerEdit, WM_PASTE, 0, 0); @@ -885,7 +865,7 @@ BOOL CALLBACK WndprocTasEditor(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara case ID_CONTEXT_SELECTED_INSERTFRAMES2: splicer.InsertNumFrames(); break; - case ACCEL_SHIFT_INS: + case ACCEL_CTRL_SHIFT_INS: case ID_EDIT_INSERTFRAMES: case ID_CONTEXT_SELECTED_INSERTFRAMES: splicer.InsertFrames(); diff --git a/vc/Help/fceux.hnd b/vc/Help/fceux.hnd index ccbdd2a6..786e8c7e 100644 Binary files a/vc/Help/fceux.hnd and b/vc/Help/fceux.hnd differ