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

Fix #721

This commit is contained in:
thrust26 2020-11-07 10:53:40 +01:00
parent 106494ad8e
commit d43b348332
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/PKeyboardHandler.cxx
View File

@ -62,7 +62,9 @@ PhysicalKeyboardHandler::PhysicalKeyboardHandler(OSystem& system, EventHandler&
setDefaultMapping(Event::NoType, EventMode::kEmulationMode, updateDefaults); setDefaultMapping(Event::NoType, EventMode::kEmulationMode, updateDefaults);
setDefaultMapping(Event::NoType, EventMode::kMenuMode, updateDefaults); setDefaultMapping(Event::NoType, EventMode::kMenuMode, updateDefaults);
#ifdef GUI_SUPPORT
setDefaultMapping(Event::NoType, EventMode::kEditMode, updateDefaults); setDefaultMapping(Event::NoType, EventMode::kEditMode, updateDefaults);
#endif // DEBUG
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -102,6 +104,7 @@ void PhysicalKeyboardHandler::setDefaultKey(EventMapping map, Event::Type event,
// Otherwise, only reset the given event // Otherwise, only reset the given event
bool eraseAll = !updateDefaults && (event == Event::NoType); bool eraseAll = !updateDefaults && (event == Event::NoType);
#ifdef GUI_SUPPORT
// Swap Y and Z for QWERTZ keyboards // Swap Y and Z for QWERTZ keyboards
if(mode == EventMode::kEditMode && myHandler.isQwertz()) if(mode == EventMode::kEditMode && myHandler.isQwertz())
{ {
@ -110,6 +113,7 @@ void PhysicalKeyboardHandler::setDefaultKey(EventMapping map, Event::Type event,
else if(map.key == KBDK_Y) else if(map.key == KBDK_Y)
map.key = KBDK_Z; map.key = KBDK_Z;
} }
#endif
if (updateDefaults) if (updateDefaults)
{ {
@ -163,11 +167,13 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
setDefaultKey(item, event, EventMode::kMenuMode, updateDefaults); setDefaultKey(item, event, EventMode::kMenuMode, updateDefaults);
break; break;
#ifdef GUI_SUPPORT
case EventMode::kEditMode: case EventMode::kEditMode:
// Edit mode events are always set because they are not saved // Edit mode events are always set because they are not saved
for(const auto& item: FixedEditMapping) for(const auto& item: FixedEditMapping)
setDefaultKey(item, event, EventMode::kEditMode); setDefaultKey(item, event, EventMode::kEditMode);
break; break;
#endif
default: default:
break; break;
@ -667,6 +673,7 @@ PhysicalKeyboardHandler::DefaultMenuMapping = {
#endif #endif
}; };
#ifdef GUI_SUPPORT
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::EventMappingArray
PhysicalKeyboardHandler::FixedEditMapping = { PhysicalKeyboardHandler::FixedEditMapping = {
@ -746,6 +753,7 @@ PhysicalKeyboardHandler::FixedEditMapping = {
{Event::EndEdit, KBDK_KP_ENTER}, {Event::EndEdit, KBDK_KP_ENTER},
{Event::AbortEdit, KBDK_ESCAPE}, {Event::AbortEdit, KBDK_ESCAPE},
}; };
#endif
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultJoystickMapping = { PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultJoystickMapping = {

2
src/common/PKeyboardHandler.hxx
View File

@ -133,7 +133,9 @@ class PhysicalKeyboardHandler
// Controller menu and common emulation mappings // Controller menu and common emulation mappings
static EventMappingArray DefaultMenuMapping; static EventMappingArray DefaultMenuMapping;
#ifdef GUI_SUPPORT
static EventMappingArray FixedEditMapping; static EventMappingArray FixedEditMapping;
#endif
static EventMappingArray DefaultCommonMapping; static EventMappingArray DefaultCommonMapping;
// Controller specific mappings // Controller specific mappings
static EventMappingArray DefaultJoystickMapping; static EventMappingArray DefaultJoystickMapping;