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

fix #566 (fry button)

This commit is contained in:
thrust26 2020-02-02 11:54:00 +01:00
parent 9250059086
commit 6a436c25bd
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/index.html
View File

@ -1278,17 +1278,17 @@
<tr><td>Shift </td><td>Shift (left or right) </td></tr>
<tr><td>Enter </td><td>Return/Enter </td></tr>
<tr><td>Space </td><td>Space </td></tr>
<tr><td>Func-Space </td><td>Backspace </td></tr>
<tr><td>+ </td><td>+ or Shift-1 </td></tr>
<tr><td>- </td><td>- or Shift-2</td></tr>
<tr><td>* </td><td>Shift-3 </td></tr>
<tr><td>/ </td><td>/ or Shift-4 </td></tr>
<tr><td>= </td><td>= or Shift-5 </td></tr>
<tr><td>? </td><td>? (Shift-/) or Shift-6 </td></tr>
<tr><td>$ </td><td>Shift-7 </td></tr>
<tr><td>[ </td><td>[ or Shift-8 </td></tr>
<tr><td>] </td><td>] or Shift-9 </td></tr>
<tr><td>&quot; </td><td>" (Shift-') or Shift-0 </td></tr>
<tr><td>Func-Space </td><td>Shift + Backspace </td></tr>
<tr><td>+ </td><td>+ or Shift + 1 </td></tr>
<tr><td>- </td><td>- or Shift + 2</td></tr>
<tr><td>* </td><td>Shift + 3 </td></tr>
<tr><td>/ </td><td>/ or Shift + 4 </td></tr>
<tr><td>= </td><td>= or Shift + 5 </td></tr>
<tr><td>? </td><td>? (Shift + /) or Shift + 6 </td></tr>
<tr><td>$ </td><td>Shift + 7 </td></tr>
<tr><td>[ </td><td>[ or Shift + 8 </td></tr>
<tr><td>] </td><td>] or Shift + 9 </td></tr>
<tr><td>&quot; </td><td>" (Shift + ') or Shift + 0 </td></tr>
</table>

14
src/common/PKeyboardHandler.cxx
View File

@ -413,12 +413,9 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
{Event::ConsoleSelect, KBDK_F1},
{Event::ConsoleReset, KBDK_F2},
{Event::ConsoleColor, KBDK_F3},
{Event::ConsoleBlackWhite, KBDK_F4},
{Event::Console7800Pause, KBDK_F3, MOD3},
{Event::ConsoleLeftDiffA, KBDK_F5},
{Event::ConsoleLeftDiffB, KBDK_F6},
{Event::ConsoleRightDiffA, KBDK_F7},
{Event::ConsoleRightDiffB, KBDK_F8},
{Event::SaveState, KBDK_F9},
{Event::SaveAllStates, KBDK_F9, MOD3},
{Event::PreviousState, KBDK_F10, KBDM_SHIFT},
@ -427,7 +424,6 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
{Event::LoadState, KBDK_F11},
{Event::LoadAllStates, KBDK_F11, MOD3},
{Event::TakeSnapshot, KBDK_F12},
{Event::Fry, KBDK_BACKSPACE},
{Event::TogglePauseMode, KBDK_PAUSE},
{Event::OptionsMenuMode, KBDK_TAB},
{Event::CmdMenuMode, KBDK_BACKSLASH},
@ -516,6 +512,11 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
{Event::ConsoleRightDiffToggle, KBDK_F8}, // front ("SKILL P2")
{Event::CmdMenuMode, KBDK_F13}, // back ("4:3","16:9")
{Event::ExitMode, KBDK_BACKSPACE}, // back ("FRY")
#else // defining duplicate keys must be avoided!
{Event::ConsoleBlackWhite, KBDK_F4},
{Event::ConsoleLeftDiffB, KBDK_F6},
{Event::ConsoleRightDiffB, KBDK_F8},
{Event::Fry, KBDK_BACKSPACE},
#endif
};
@ -550,7 +551,6 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultMenuM
{Event::UITabPrev, KBDK_TAB, KBDM_SHIFT | KBDM_CTRL},
{Event::UITabNext, KBDK_TAB, KBDM_CTRL},
{Event::UIPrevDir, KBDK_BACKSPACE},
{Event::ToggleFullScreen, KBDK_RETURN, MOD3},
#ifdef BSPF_MACOS
@ -569,6 +569,8 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultMenuM
//{Event::NoType, KBDK_F4}, // back ("COLOR","B/W")
{Event::UITabPrev, KBDK_F13}, // back ("4:3","16:9")
{Event::UITabNext, KBDK_BACKSPACE}, // back (FRY)
#else // defining duplicate keys must be avoided!
{Event::UIPrevDir, KBDK_BACKSPACE},
#endif
};
@ -704,7 +706,7 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::CompuMateMap
{Event::CompuMateRightBracket, KBDK_RIGHTBRACKET},
{Event::CompuMateMinus, KBDK_MINUS},
{Event::CompuMateQuote, KBDK_APOSTROPHE, KBDM_SHIFT},
{Event::CompuMateBackspace, KBDK_BACKSPACE},
{Event::CompuMateBackspace, KBDK_BACKSPACE, KBDM_SHIFT},
{Event::CompuMateEquals, KBDK_EQUALS},
{Event::CompuMatePlus, KBDK_EQUALS, KBDM_SHIFT},
{Event::CompuMateSlash, KBDK_SLASH}