From b6b5b02d1dc2df90c7c65508692aea55c43d6fd7 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Mon, 5 Apr 2021 22:00:38 +0200 Subject: [PATCH] Swapped (Shift+)Backspace keys between Frying and CompuMate Backspace --- docs/index.html | 6 +++--- src/common/PKeyboardHandler.cxx | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/index.html b/docs/index.html index 25be9c99d..ad55d4eb5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1318,7 +1318,7 @@ Shift Shift (left or right) Enter Return/Enter Space Space - Func-Space Shift + Backspace + Func-Space Backspace + + or Shift + 1 - - or Shift + 2 * Shift + 3 @@ -1998,8 +1998,8 @@ Emulate 'frying' effect - Backspace - Backspace + Shift + Backspace + Shift + Backspace Decrease emulation speed (disables 'Turbo' mode) diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx index 11bee0ac7..b57adf153 100644 --- a/src/common/PKeyboardHandler.cxx +++ b/src/common/PKeyboardHandler.cxx @@ -748,7 +748,7 @@ PhysicalKeyboardHandler::DefaultCommonMapping = { { Event::ConsoleBlackWhite, KBDK_F4 }, { Event::ConsoleLeftDiffB, KBDK_F6 }, { Event::ConsoleRightDiffB, KBDK_F8 }, - { Event::Fry, KBDK_BACKSPACE }, + { Event::Fry, KBDK_BACKSPACE, KBDM_SHIFT }, #endif }; @@ -1049,7 +1049,9 @@ PhysicalKeyboardHandler::CompuMateMapping = { {Event::CompuMateRightBracket, KBDK_RIGHTBRACKET}, {Event::CompuMateMinus, KBDK_MINUS}, {Event::CompuMateQuote, KBDK_APOSTROPHE, KBDM_SHIFT}, - {Event::CompuMateBackspace, KBDK_BACKSPACE, KBDM_SHIFT}, +#ifndef RETRON77 + {Event::CompuMateBackspace, KBDK_BACKSPACE}, +#endif {Event::CompuMateEquals, KBDK_EQUALS}, {Event::CompuMatePlus, KBDK_EQUALS, KBDM_SHIFT}, {Event::CompuMateSlash, KBDK_SLASH}