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

redefine a few default keys (in TV effects and toggle bits/collisions) 

reorder listing of emulation actions according to documentation
update documentation
This commit is contained in:
thrust26 2019-05-28 23:02:02 +02:00
parent c8223c105b
commit 43af1a0005
4 changed files with 167 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
docs/index.html
View File

@ -741,38 +741,6 @@
<td>&nbsp;</td>
</tr>
<tr>
<td>Switch to next <i>larger</i> zoom level in windowed mode,
</br>toggle stretching in fullscreen mode</td>
<td>Alt + =</td>
<td>Cmd + =</td>
</tr>
<tr>
<td>Switch to next <i>smaller</i> zoom level in windowed mode,
</br>toggle stretching in fullscreen mode</td>
<td>Alt + -</td>
<td>Cmd + -</td>
</tr>
<tr>
<td>Decrease volume</td>
<td>Alt + [</td>
<td>Cmd + [</td>
</tr>
<tr>
<td>Increase volume</td>
<td>Alt + ]</td>
<td>Cmd + ]</td>
</tr>
<tr>
<td>Toggle sound on/off</td>
<td>Control + ]</td>
<td>Control + ]</td>
</tr>
</table>
@ -1287,7 +1255,7 @@
</table>
<p><b>TV effects (cannot be remapped, only active in TIA mode)</b></p>
<p><b>TV effects (can be remapped, only active in TIA mode)</b></p>
<table BORDER=2 cellpadding=4>
<tr>
@ -1326,35 +1294,55 @@
<td>Cmd + 6</td>
</tr>
<tr>
<td>Decrease scanline intensity</td>
<td>Select previous 'Custom' mode attribute (*)</td>
<td>Shift-Alt + 7</td>
<td>Shift-Cmd + 7</td>
</tr>
<tr>
<td>Increase scanline intensity</td>
<td>Select next 'Custom' mode attribute (*)</td>
<td>Alt + 7</td>
<td>Cmd + 7</td>
</tr>
<tr>
<td>Select previous 'Custom' mode attribute (*)</td>
<td>Decrease 'Custom' selected attribute value (*)</td>
<td>Shift-Alt + 8</td>
<td>Shift-Cmd + 8</td>
</tr>
<tr>
<td>Increase 'Custom' selected attribute value (*)</td>
<td>Alt + 8</td>
<td>Cmd + 8</td>
</tr>
<tr>
<td>Toggle 'phosphor' effect</td>
<td>Alt + p</td>
<td>Cmd + p</td>
</tr>
<tr>
<td>Decrease 'phosphor' blend in phosphor mode</td>
<td>Shift-Alt + 9</td>
<td>Shift-Cmd + 9</td>
</tr>
<tr>
<td>Select next 'Custom' mode attribute (*)</td>
<td>Increase 'phosphor' blend in phosphor mode</td>
<td>Alt + 9</td>
<td>Cmd + 9</td>
</tr>
<tr>
<td>Decrease 'Custom' selected attribute value (*)</td>
<td>Decrease scanline intensity</td>
<td>Shift-Alt + 0</td>
<td>Shift-Cmd + 0</td>
</tr>
<tr>
<td>Increase 'Custom' selected attribute value (*)</td>
<td>Increase scanline intensity</td>
<td>Alt + 0</td>
<td>Cmd + 0</td>
</tr>
<tr>
<td colspan="3"><center><font size="-1">
Items marked as (*) are only available in 'Custom' preset mode</font></center></td>
@ -1362,7 +1350,7 @@
</table>
<a name="DeveloperKeys"></a>
<p><b>Developer Keys in TIA mode (cannot be remapped)</b></p>
<p><b>Developer Keys in TIA mode (can be remapped)</b></p>
<table BORDER=2 cellpadding=4>
<tr>
@ -1425,6 +1413,12 @@
<td>Cmd + n</td>
</tr>
<tr>
<td>Toggle all TIA objects</td>
<td>Alt + Comma</td>
<td>Cmd + Comma</td>
</tr>
<tr>
<td>Toggle TIA Player0 collisions</td>
<td>Shift-Alt + z</td>
@ -1462,31 +1456,31 @@
</tr>
<tr>
<td>Toggle TIA 'Fixed Debug Colors' mode</td>
<td>Alt + Comma</td>
<td>Cmd + Comma</td>
<td>Toggle all TIA collisions</td>
<td>Shift-Alt + Comma</td>
<td>Shift-Cmd + Comma</td>
</tr>
<tr>
<td>Toggle all TIA objects</td>
<td>Toggle TIA 'Fixed Debug Colors' mode</td>
<td>Alt + .</td>
<td>Cmd + .</td>
</tr>
<tr>
<td>Toggle all TIA collisions</td>
<td>Shift-Alt + .</td>
<td>Shift-Cmd + .</td>
<td>Toggle PAL color-loss effect</td>
<td>Control + L</td>
<td>Control + L</td>
</tr>
<tr>
<td>Toggle TV 'jitter' effect</td>
<td>Toggle TV 'Jitter' effect</td>
<td>Alt + j</td>
<td>Cmd + j</td>
</tr>
</table>
<p><b>Other Keys (cannot be remapped, except those marked with (*) which can be mapped to a 2nd key)</b></p>
<p><b>Other Keys (can be remapped)</b></p>
<table BORDER=2 cellpadding=4>
<tr>
@ -1495,6 +1489,20 @@
<th>Key (macOS)</th>
</tr>
<tr>
<td>Switch to next <i>larger</i> zoom level in windowed mode,
</br>toggle stretching in fullscreen mode</td>
<td>Alt + =</td>
<td>Cmd + =</td>
</tr>
<tr>
<td>Switch to next <i>smaller</i> zoom level in windowed mode,
</br>toggle stretching in fullscreen mode</td>
<td>Alt + -</td>
<td>Cmd + -</td>
</tr>
<tr>
<td>Toggle fullscreen/windowed mode</td>
<td>Alt + Enter</td>
@ -1513,6 +1521,30 @@
<td>Shift-Control + f</td>
</tr>
<tr>
<td>Switch palette (Standard/Z26/User)</td>
<td>Control + p</td>
<td>Control + p</td>
</tr>
<tr>
<td>Toggle sound on/off</td>
<td>Control + ]</td>
<td>Control + ]</td>
</tr>
<tr>
<td>Decrease volume</td>
<td>Alt + [</td>
<td>Cmd + [</td>
</tr>
<tr>
<td>Increase volume</td>
<td>Alt + ]</td>
<td>Cmd + ]</td>
</tr>
<tr>
<td>Switch mouse between controller emulation modes (see <b>Game Properties - <a href="#Controller">Controller</a></b>)</td>
<td>Control + 0</td>
@ -1545,47 +1577,17 @@
</tr>
<tr>
<td>Emulate 'frying' effect (TIA mode) (*)</td>
<td>Emulate 'frying' effect (TIA mode)</td>
<td>Backspace</td>
<td>Backspace</td>
</tr>
<tr>
<td>Go to parent directory (UI mode) (*)</td>
<td>Go to parent directory (UI mode)</td>
<td>Backspace</td>
<td>Backspace</td>
</tr>
<tr>
<td>Toggle 'phosphor' effect</td>
<td>Alt + p</td>
<td>Cmd + p</td>
</tr>
<tr>
<td>Decrease 'phosphor' blend in phosphor mode</td>
<td>Alt + i</td>
<td>Cmd + i</td>
</tr>
<tr>
<td>Increase 'phosphor' blend in phosphor mode</td>
<td>Alt + o</td>
<td>Cmd + o</td>
</tr>
<tr>
<td>Switch palette (Standard/Z26/User)</td>
<td>Control + p</td>
<td>Control + p</td>
</tr>
<tr>
<td>Toggle PAL color-loss effect</td>
<td>Control + L</td>
<td>Control + L</td>
</tr>
<tr>
<td>Save continuous PNG snapshots (per interval defined in <a href="#Snapshots"><b>Snapshot Settings</b></a>)</td>
<td>Alt + s</td>

5
src/common/KeyMap.cxx
View File

@ -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)
{

22
src/common/PKeyboardHandler.cxx
View File

@ -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);

146
src/emucore/EventHandler.cxx
View File

@ -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 }
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -