TV effects (cannot be remapped, only active in TIA mode)
+TV effects (can be remapped, only active in TIA mode)
| Cmd + 6 | |||
| Decrease scanline intensity | +Select previous 'Custom' mode attribute (*) | Shift-Alt + 7 | Shift-Cmd + 7 |
| Increase scanline intensity | +Select next 'Custom' mode attribute (*) | Alt + 7 | Cmd + 7 |
| Select previous 'Custom' mode attribute (*) | +Decrease 'Custom' selected attribute value (*) | +Shift-Alt + 8 | +Shift-Cmd + 8 | +
| Increase 'Custom' selected attribute value (*) | +Alt + 8 | +Cmd + 8 | +|
| Toggle 'phosphor' effect | +Alt + p | +Cmd + p | +|
| Decrease 'phosphor' blend in phosphor mode | Shift-Alt + 9 | Shift-Cmd + 9 | |
| Select next 'Custom' mode attribute (*) | +Increase 'phosphor' blend in phosphor mode | Alt + 9 | Cmd + 9 |
| Decrease 'Custom' selected attribute value (*) | +Decrease scanline intensity | Shift-Alt + 0 | Shift-Cmd + 0 |
| Increase 'Custom' selected attribute value (*) | +Increase scanline intensity | Alt + 0 | Cmd + 0 |
Developer Keys in TIA mode (cannot be remapped)
+Developer Keys in TIA mode (can be remapped)
| Cmd + n | |||||
| Toggle all TIA objects | +Alt + Comma | +Cmd + Comma | +|||
| Toggle TIA Player0 collisions | Shift-Alt + z | @@ -1462,31 +1456,31 @@||||
| Toggle TIA 'Fixed Debug Colors' mode | -Alt + Comma | -Cmd + Comma | +Toggle all TIA collisions | +Shift-Alt + Comma | +Shift-Cmd + Comma |
| Toggle all TIA objects | +Toggle TIA 'Fixed Debug Colors' mode | Alt + . | Cmd + . | ||
| Toggle all TIA collisions | -Shift-Alt + . | -Shift-Cmd + . | +Toggle PAL color-loss effect | +Control + L | +Control + L |
| Toggle TV 'jitter' effect | +Toggle TV 'Jitter' effect | Alt + j | Cmd + j |
Other Keys (cannot be remapped, except those marked with (*) which can be mapped to a 2nd key)
+Other Keys (can be remapped)
| Key (macOS) | |||
|---|---|---|---|
| Switch to next larger zoom level in windowed mode, + toggle stretching in fullscreen mode | +Alt + = | +Cmd + = | +|
| Switch to next smaller zoom level in windowed mode, + toggle stretching in fullscreen mode | +Alt + - | +Cmd + - | +|
| Toggle fullscreen/windowed mode | Alt + Enter | @@ -1513,6 +1521,30 @@Shift-Control + f | |
| Switch palette (Standard/Z26/User) | +Control + p | +Control + p | +|
| Toggle sound on/off | +Control + ] | +Control + ] | +|
| Decrease volume | +Alt + [ | +Cmd + [ | +|
| Increase volume | +Alt + ] | +Cmd + ] | +|
| Switch mouse between controller emulation modes (see Game Properties - Controller) | Control + 0 | @@ -1545,47 +1577,17 @@||
| Emulate 'frying' effect (TIA mode) (*) | +Emulate 'frying' effect (TIA mode) | Backspace | Backspace |
| Go to parent directory (UI mode) (*) | +Go to parent directory (UI mode) | Backspace | Backspace |
| Toggle 'phosphor' effect | -Alt + p | -Cmd + p | -|
| Decrease 'phosphor' blend in phosphor mode | -Alt + i | -Cmd + i | -|
| Increase 'phosphor' blend in phosphor mode | -Alt + o | -Cmd + o | -|
| Switch palette (Standard/Z26/User) | -Control + p | -Control + p | -|
| Toggle PAL color-loss effect | -Control + L | -Control + L | -|
| Save continuous PNG snapshots (per interval defined in Snapshot Settings) | Alt + s | diff --git a/src/common/KeyMap.cxx b/src/common/KeyMap.cxx index e34a5f1cc..7386f2593 100644 --- a/src/common/KeyMap.cxx +++ b/src/common/KeyMap.cxx @@ -132,11 +132,6 @@ string KeyMap::getDesc(const int mode, const int key, const int mod) const string KeyMap::getEventMappingDesc(const Event::Type event, const int mode) const { ostringstream buf; -#ifndef BSPF_MACOS - string modifier = "Ctrl"; -#else - string control = "Cmd"; -#endif for (auto item : myMap) { diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx index 51b991f60..2fa28a20c 100644 --- a/src/common/PKeyboardHandler.cxx +++ b/src/common/PKeyboardHandler.cxx @@ -168,15 +168,15 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod setDefaultKey(Event::VidModeComposite , KBDK_4, KBDM_ALT); setDefaultKey(Event::VidModeBad , KBDK_5, KBDM_ALT); setDefaultKey(Event::VidModeCustom , KBDK_6, KBDM_ALT); - setDefaultKey(Event::ScanlinesDecrease , KBDK_7, KBDM_SHIFT | KBDM_ALT); - setDefaultKey(Event::ScanlinesIncrease , KBDK_7, KBDM_ALT); - setDefaultKey(Event::PreviousAttribute , KBDK_9, KBDM_SHIFT | KBDM_ALT); - setDefaultKey(Event::NextAttribute , KBDK_9, KBDM_ALT); - setDefaultKey(Event::DecreaseAttribute , KBDK_0, KBDM_SHIFT | KBDM_ALT); - setDefaultKey(Event::IncreaseAttribute , KBDK_0, KBDM_ALT); - setDefaultKey(Event::DecreasePhosphor , KBDK_I, KBDM_ALT); - setDefaultKey(Event::IncreasePhosphor , KBDK_O, KBDM_ALT); + setDefaultKey(Event::PreviousAttribute , KBDK_7, KBDM_SHIFT | KBDM_ALT); + setDefaultKey(Event::NextAttribute , KBDK_7, KBDM_ALT); + setDefaultKey(Event::DecreaseAttribute , KBDK_8, KBDM_SHIFT | KBDM_ALT); + setDefaultKey(Event::IncreaseAttribute , KBDK_8, KBDM_ALT); + setDefaultKey(Event::DecreasePhosphor , KBDK_9, KBDM_SHIFT | KBDM_ALT); + setDefaultKey(Event::IncreasePhosphor , KBDK_9, KBDM_ALT); setDefaultKey(Event::TogglePhosphor , KBDK_P, KBDM_ALT); + setDefaultKey(Event::ScanlinesDecrease , KBDK_0, KBDM_SHIFT | KBDM_ALT); + setDefaultKey(Event::ScanlinesIncrease , KBDK_0, KBDM_ALT); setDefaultKey(Event::ToggleColorLoss , KBDK_L, KBDM_CTRL); setDefaultKey(Event::TogglePalette , KBDK_P, KBDM_CTRL); setDefaultKey(Event::ToggleJitter , KBDK_J, KBDM_ALT); @@ -204,9 +204,9 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod setDefaultKey(Event::ToggleBLBit , KBDK_B, KBDM_ALT); setDefaultKey(Event::TogglePFCollision , KBDK_N, KBDM_SHIFT | KBDM_ALT); setDefaultKey(Event::TogglePFBit , KBDK_N, KBDM_ALT); - setDefaultKey(Event::ToggleFixedColors , KBDK_COMMA, KBDM_ALT); - setDefaultKey(Event::ToggleCollisions , KBDK_PERIOD, KBDM_SHIFT | KBDM_ALT); - setDefaultKey(Event::ToggleBits , KBDK_PERIOD, KBDM_ALT); + setDefaultKey(Event::ToggleCollisions , KBDK_COMMA, KBDM_SHIFT | KBDM_ALT); + setDefaultKey(Event::ToggleBits , KBDK_COMMA, KBDM_ALT); + setDefaultKey(Event::ToggleFixedColors , KBDK_PERIOD, KBDM_ALT); setDefaultKey(Event::Rewind1Menu , KBDK_LEFT, KBDM_ALT); setDefaultKey(Event::Rewind10Menu , KBDK_LEFT, KBDM_SHIFT | KBDM_ALT); diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 77ae9bcf8..d9de7a218 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -1527,6 +1527,12 @@ void EventHandler::setState(EventHandlerState state) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] = { + { Event::Quit, "Quit", "", false }, + { Event::ExitMode, "Exit current Stella mode", "", false }, + { Event::OptionsMenuMode, "Enter options menu UI", "", false }, + { Event::CmdMenuMode, "Toggle command menu UI", "", false }, + { Event::DebuggerMode, "Toggle debugger mode", "", false }, + { Event::ConsoleSelect, "Select", "", true }, { Event::ConsoleReset, "Reset", "", true }, { Event::ConsoleColor, "Color TV", "", true }, @@ -1543,60 +1549,7 @@ EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] = { Event::ChangeState, "Change state", "", false }, { Event::LoadState, "Load state", "", false }, { Event::TakeSnapshot, "Snapshot", "", false }, - { Event::Fry, "Fry cartridge", "", false }, - { Event::VidmodeDecrease, "Previous zoom level", "", false }, - { Event::VidmodeIncrease, "Next zoom level", "", false }, - { Event::ToggleFullScreen, "Toggle fullscreen", "", false }, - - { Event::VidmodeStd, "Disable TV effects", "", false }, - { Event::VidmodeRGB, "Select 'RGB' preset", "", false }, - { Event::VidmodeSVideo, "Select 'S-Video' preset", "", false }, - { Event::VidModeComposite, "Select 'Composite' preset", "", false }, - { Event::VidModeBad, "Select 'Badly adjusted' preset", "", false }, - { Event::VidModeCustom, "Select 'Custom' preset", "", false }, - { Event::PreviousAttribute, "Select previous 'Custom' attribute", "", false }, - { Event::NextAttribute, "Select next 'Custom' attribute", "", false }, - { Event::DecreaseAttribute, "Decrease selected 'Custom' attribute", "", false }, - { Event::IncreaseAttribute, "Increase selected 'Custom' attribute", "", false }, - { Event::ScanlinesDecrease, "Decrease scanlines", "", false }, - { Event::ScanlinesIncrease, "Increase scanlines", "", false }, - { Event::TogglePhosphor, "Toggle 'phosphor' effect", "", false }, - { Event::DecreasePhosphor, "Decrease 'phosphor' blend", "", false }, - { Event::IncreasePhosphor, "Increase 'phosphor' blend", "", false }, - { Event::DecreaseFormat, "Decrease display format", "", false }, - { Event::IncreaseFormat, "Increase display format", "", false }, - { Event::TogglePalette, "Switch palette (Standard/Z26/User)", "", false }, -#ifdef PNG_SUPPORT - { Event::ToggleContSnapshots, "Save cont. PNG snapsh. (as defined)", "", false }, - { Event::ToggleContSnapshotsFrame,"Save cont. PNG snapsh. (every frame)", "", false }, -#endif - { Event::ToggleTimeMachine, "Toggle 'Time Machine' mode", "", false }, - - { Event::VolumeDecrease, "Decrease volume", "", false }, - { Event::VolumeIncrease, "Increase volume", "", false }, - { Event::SoundToggle, "Toggle sound", "", false }, { Event::PauseMode, "Pause", "", false }, - { Event::OptionsMenuMode, "Enter options menu UI", "", false }, - { Event::CmdMenuMode, "Toggle command menu UI", "", false }, - - { Event::TimeMachineMode, "Toggle Time Machine UI", "", false }, - { Event::Rewind, "Rewind game one state", "", false }, - { Event::Unwind, "Unwind game one state", "", false }, - { Event::Rewind1Menu, "Rewind one state & enter TM UI", "", false }, - { Event::Rewind10Menu, "Rewind 10 states & enter TM UI", "", false }, - { Event::RewindAllMenu, "Rewind all states & enter TM UI", "", false }, - { Event::Unwind1Menu, "Unwind one state & enter TM UI", "", false }, - { Event::Unwind10Menu, "Unwind 10 states & enter TM UI", "", false }, - { Event::UnwindAllMenu, "Unwind all states & enter TM UI", "", false }, - - { Event::DebuggerMode, "Toggle debugger mode", "", false }, - { Event::ReloadConsole, "Reload current ROM/load next game", "", false }, - { Event::ExitMode, "Exit current Stella mode", "", false }, - { Event::Quit, "Quit", "", false }, - - { Event::HandleMouseControl, "Disable TV effects", "", false }, - { Event::ToggleGrabMouse, "Select 'RGB' preset", "", false }, - { Event::ToggleSAPortOrder, "Select 'S-Video' preset", "", false }, { Event::JoystickZeroUp, "P0 Joystick Up", "", true }, { Event::JoystickZeroDown, "P0 Joystick Down", "", true }, @@ -1659,6 +1612,72 @@ EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] = { Event::KeyboardOneStar, "P1 Keyboard *", "", true }, { Event::KeyboardOne0, "P1 Keyboard 0", "", true }, { Event::KeyboardOnePound, "P1 Keyboard #", "", true }, + // TV effects: + { Event::VidmodeStd, "Disable TV effects", "", false }, + { Event::VidmodeRGB, "Select 'RGB' preset", "", false }, + { Event::VidmodeSVideo, "Select 'S-Video' preset", "", false }, + { Event::VidModeComposite, "Select 'Composite' preset", "", false }, + { Event::VidModeBad, "Select 'Badly adjusted' preset", "", false }, + { Event::VidModeCustom, "Select 'Custom' preset", "", false }, + { Event::PreviousAttribute, "Select previous 'Custom' attribute", "", false }, + { Event::NextAttribute, "Select next 'Custom' attribute", "", false }, + { Event::DecreaseAttribute, "Decrease selected 'Custom' attribute", "", false }, + { Event::IncreaseAttribute, "Increase selected 'Custom' attribute", "", false }, + { Event::TogglePhosphor, "Toggle 'phosphor' effect", "", false }, + { Event::DecreasePhosphor, "Decrease 'phosphor' blend", "", false }, + { Event::IncreasePhosphor, "Increase 'phosphor' blend", "", false }, + { Event::ScanlinesDecrease, "Decrease scanlines", "", false }, + { Event::ScanlinesIncrease, "Increase scanlines", "", false }, + // Developer keys: + { Event::ToggleFrameStats, "Toggle frame stats", "", false }, + { Event::ToggleP0Bit, "Toggle TIA Player0 object", "", false }, + { Event::ToggleP0Collision, "Toggle TIA Player0 collisions", "", false }, + { Event::ToggleP1Bit, "Toggle TIA Player1 object", "", false }, + { Event::ToggleP1Collision, "Toggle TIA Player1 collisions", "", false }, + { Event::ToggleM0Bit, "Toggle TIA Missile0 object", "", false }, + { Event::ToggleM0Collision, "Toggle TIA Missile0 collisions", "", false }, + { Event::ToggleM1Bit, "Toggle TIA Missile1 object", "", false }, + { Event::ToggleM1Collision, "Toggle TIA Missile1 collisions", "", false }, + { Event::ToggleBLBit, "Toggle TIA Ball object", "", false }, + { Event::ToggleBLCollision, "Toggle TIA Ball collisions", "", false }, + { Event::TogglePFBit, "Toggle TIA Playfield object", "", false }, + { Event::TogglePFCollision, "Toggle TIA Playfield collisions", "", false }, + { Event::ToggleBits, "Toggle all TIA objects", "", false }, + { Event::ToggleCollisions, "Toggle all TIA collisions", "", false }, + { Event::ToggleFixedColors, "Toggle TIA 'Fixed Debug Colors' mode", "", false }, + { Event::ToggleColorLoss, "Toggle PAL color-loss effect", "", false }, + { Event::ToggleJitter, "Toggle TV 'Jitter' effect", "", false }, + // Other keys: + { Event::VidmodeDecrease, "Previous zoom level", "", false }, + { Event::VidmodeIncrease, "Next zoom level", "", false }, + { Event::ToggleFullScreen, "Toggle fullscreen", "", false }, + { Event::DecreaseFormat, "Decrease display format", "", false }, + { Event::IncreaseFormat, "Increase display format", "", false }, + { Event::TogglePalette, "Switch palette (Standard/Z26/User)", "", false }, + { Event::SoundToggle, "Toggle sound", "", false }, + { Event::VolumeDecrease, "Decrease volume", "", false }, + { Event::VolumeIncrease, "Increase volume", "", false }, + + { Event::HandleMouseControl, "Switch mouse emulation modes", "", false }, + { Event::ToggleGrabMouse, "Toggle grab mouse", "", false }, + { Event::ToggleSAPortOrder, "Swap Stelladaptor port ordering", "", false }, + { Event::ReloadConsole, "Reload current ROM/load next game", "", false }, + { Event::Fry, "Fry cartridge", "", false }, + +#ifdef PNG_SUPPORT + { Event::ToggleContSnapshots, "Save cont. PNG snapsh. (as defined)", "", false }, + { Event::ToggleContSnapshotsFrame,"Save cont. PNG snapsh. (every frame)", "", false }, +#endif + { Event::ToggleTimeMachine, "Toggle 'Time Machine' mode", "", false }, + { Event::TimeMachineMode, "Toggle 'Time Machine' UI", "", false }, + { Event::Rewind, "Rewind game one state", "", false }, + { Event::Rewind1Menu, "Rewind one state & enter TM UI", "", false }, + { Event::Rewind10Menu, "Rewind 10 states & enter TM UI", "", false }, + { Event::RewindAllMenu, "Rewind all states & enter TM UI", "", false }, + { Event::Unwind, "Unwind game one state", "", false }, + { Event::Unwind1Menu, "Unwind one state & enter TM UI", "", false }, + { Event::Unwind10Menu, "Unwind 10 states & enter TM UI", "", false }, + { Event::UnwindAllMenu, "Unwind all states & enter TM UI", "", false }, { Event::Combo1, "Combo 1", "", false }, { Event::Combo2, "Combo 2", "", false }, @@ -1675,26 +1694,7 @@ EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] = { Event::Combo13, "Combo 13", "", false }, { Event::Combo14, "Combo 14", "", false }, { Event::Combo15, "Combo 15", "", false }, - { Event::Combo16, "Combo 16", "", false }, - - { Event::ToggleFrameStats, "Toggle frame stats", "", false }, - { Event::ToggleP0Bit, "Toggle TIA Player0 object", "", false }, - { Event::ToggleP0Collision, "Toggle TIA Player0 collisions", "", false }, - { Event::ToggleP1Bit, "Toggle TIA Player1 object", "", false }, - { Event::ToggleP1Collision, "Toggle TIA Player1 collisions", "", false }, - { Event::ToggleM0Bit, "Toggle TIA Missile0 object", "", false }, - { Event::ToggleM0Collision, "Toggle TIA Missile0 collisions", "", false }, - { Event::ToggleM1Bit, "Toggle TIA Missile1 object", "", false }, - { Event::ToggleM1Collision, "Toggle TIA Missile1 collisions", "", false }, - { Event::ToggleBLBit, "Toggle TIA Ball object", "", false }, - { Event::ToggleBLCollision, "Toggle TIA Ball collisions", "", false }, - { Event::TogglePFBit, "Toggle TIA Playfield object", "", false }, - { Event::TogglePFCollision, "Toggle TIA Playfield collisions", "", false }, - { Event::ToggleFixedColors, "Toggle TIA 'Fixed Debug Colors' mode", "", false }, - { Event::ToggleBits, "Toggle all TIA objects", "", false }, - { Event::ToggleCollisions, "Toggle all TIA collisions", "", false }, - { Event::ToggleColorLoss, "Toggle PAL color-loss effect", "", false }, - { Event::ToggleJitter, "Toggle TV 'Jitter' effect", "", false } + { Event::Combo16, "Combo 16", "", false } }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -