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

fix fullscreen toggle in menu modes 

made 'Quit' event configurable
This commit is contained in:
thrust26 2019-05-26 22:20:33 +02:00
parent a9e4531104
commit bb7c3c429c
3 changed files with 50 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/common/PKeyboardHandler.cxx
View File

@ -148,6 +148,11 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
setDefaultKey(Event::TimeMachineMode , KBDK_T); setDefaultKey(Event::TimeMachineMode , KBDK_T);
setDefaultKey(Event::DebuggerMode , KBDK_GRAVE); setDefaultKey(Event::DebuggerMode , KBDK_GRAVE);
setDefaultKey(Event::LauncherMode , KBDK_ESCAPE); setDefaultKey(Event::LauncherMode , KBDK_ESCAPE);
#ifdef BSPF_MACOS
setDefaultKey(Event::Quit , KBDK_Q, KBDM_ALT);
#else
setDefaultKey(Event::Quit , KBDK_Q, KBDM_CTRL);
#endif
setDefaultKey(Event::VidmodeDecrease , KBDK_MINUS, KBDM_ALT); setDefaultKey(Event::VidmodeDecrease , KBDK_MINUS, KBDM_ALT);
setDefaultKey(Event::VidmodeIncrease , KBDK_EQUALS, KBDM_ALT); setDefaultKey(Event::VidmodeIncrease , KBDK_EQUALS, KBDM_ALT);
@ -182,26 +187,31 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
break; break;
case kMenuMode: case kMenuMode:
setDefaultKey(Event::UIUp , KBDK_UP); setDefaultKey(Event::UIUp , KBDK_UP);
setDefaultKey(Event::UIDown , KBDK_DOWN); setDefaultKey(Event::UIDown , KBDK_DOWN);
setDefaultKey(Event::UILeft , KBDK_LEFT); setDefaultKey(Event::UILeft , KBDK_LEFT);
setDefaultKey(Event::UIRight , KBDK_RIGHT); setDefaultKey(Event::UIRight , KBDK_RIGHT);
setDefaultKey(Event::UIHome , KBDK_HOME); setDefaultKey(Event::UIHome , KBDK_HOME);
setDefaultKey(Event::UIEnd , KBDK_END); setDefaultKey(Event::UIEnd , KBDK_END);
setDefaultKey(Event::UIPgUp , KBDK_PAGEUP); setDefaultKey(Event::UIPgUp , KBDK_PAGEUP);
setDefaultKey(Event::UIPgDown , KBDK_PAGEDOWN); setDefaultKey(Event::UIPgDown , KBDK_PAGEDOWN);
setDefaultKey(Event::UISelect , KBDK_RETURN); setDefaultKey(Event::UISelect , KBDK_RETURN);
setDefaultKey(Event::UICancel , KBDK_ESCAPE); setDefaultKey(Event::UICancel , KBDK_ESCAPE);
setDefaultKey(Event::UINavPrev , KBDK_TAB, KBDM_SHIFT); setDefaultKey(Event::UINavPrev , KBDK_TAB, KBDM_SHIFT);
setDefaultKey(Event::UINavNext , KBDK_TAB); setDefaultKey(Event::UINavNext , KBDK_TAB);
setDefaultKey(Event::UITabPrev , KBDK_TAB, KBDM_SHIFT|KBDM_CTRL); setDefaultKey(Event::UITabPrev , KBDK_TAB, KBDM_SHIFT|KBDM_CTRL);
setDefaultKey(Event::UITabNext , KBDK_TAB, KBDM_CTRL); setDefaultKey(Event::UITabNext , KBDK_TAB, KBDM_CTRL);
setDefaultKey(Event::UIPrevDir , KBDK_BACKSPACE); setDefaultKey(Event::UIPrevDir , KBDK_BACKSPACE);
setDefaultKey(Event::ToggleFullScreen, KBDK_RETURN, KBDM_ALT); setDefaultKey(Event::ToggleFullScreen , KBDK_RETURN, KBDM_ALT);
#ifdef BSPF_MACOS
setDefaultKey(Event::Quit , KBDK_Q, KBDM_ALT);
#else
setDefaultKey(Event::Quit , KBDK_Q, KBDM_CTRL);
#endif
// FIXME - use the R77 define in the final release // FIXME - use the R77 define in the final release
// use the '1' define for testing // use the '1' define for testing
@ -323,9 +333,10 @@ void PhysicalKeyboardHandler::handleEvent(StellaKey key, StellaMod mod, bool pre
default: default:
#ifdef GUI_SUPPORT #ifdef GUI_SUPPORT
if(myHandler.hasOverlay()) if (myHandler.hasOverlay())
myHandler.overlay().handleKeyEvent(key, mod, pressed); myHandler.overlay().handleKeyEvent(key, mod, pressed);
#endif #endif
myHandler.handleEvent(myKeyMap.get(kMenuMode, key, mod), pressed);
break; break;
} }
} }
@ -338,19 +349,6 @@ bool PhysicalKeyboardHandler::handleAltEvent(StellaKey key, StellaMod mod, bool
if(StellaModTest::isAlt(mod) && pressed) if(StellaModTest::isAlt(mod) && pressed)
{ {
EventHandlerState estate = myHandler.state(); EventHandlerState estate = myHandler.state();
#ifdef BSPF_MACOS
// These keys work in all states
if(key == KBDK_Q)
{
myHandler.handleEvent(Event::Quit);
}
else
#endif
if (key == KBDK_RETURN)
{
int i = 0;
}
if(key == KBDK_TAB) if(key == KBDK_TAB)
{ {
@ -358,8 +356,9 @@ bool PhysicalKeyboardHandler::handleAltEvent(StellaKey key, StellaMod mod, bool
myAltKeyCounter = 1; myAltKeyCounter = 1;
return true; return true;
} }
// State rewinding must work in pause mode too // State rewinding must work in pause mode too
else if(estate == EventHandlerState::EMULATION || estate == EventHandlerState::PAUSE) if(estate == EventHandlerState::EMULATION || estate == EventHandlerState::PAUSE)
{ {
switch(key) switch(key)
{ {
@ -492,13 +491,8 @@ bool PhysicalKeyboardHandler::handleControlEvent(StellaKey key, StellaMod mod, b
if(StellaModTest::isControl(mod) && pressed && myUseCtrlKeyFlag) if(StellaModTest::isControl(mod) && pressed && myUseCtrlKeyFlag)
{ {
EventHandlerState estate = myHandler.state(); EventHandlerState estate = myHandler.state();
// These keys work in all states
if(key == KBDK_Q)
{
myHandler.handleEvent(Event::Quit);
}
// These only work when in emulation mode // These only work when in emulation mode
else if(estate == EventHandlerState::EMULATION || estate == EventHandlerState::PAUSE) if(estate == EventHandlerState::EMULATION || estate == EventHandlerState::PAUSE)
{ {
switch(key) switch(key)
{ {

52
src/emucore/EventHandler.cxx
View File

@ -820,24 +820,6 @@ void EventHandler::setActionMappings(EventMode mode)
} }
#endif #endif
// There are some keys which are hardcoded. These should be represented too.
string prepend = "";
string modifier;
#ifndef BSPF_MACOS
modifier = "Ctrl";
#else
modifier = "Cmd";
#endif
if(event == Event::Quit)
prepend = modifier + "+Q (*)";
// else if ...
if(key == "")
key = prepend;
else if(prepend != "")
key = prepend + ", " + key;
if(key != "") if(key != "")
list[i].key = key; list[i].key = key;
} }
@ -1492,24 +1474,26 @@ EventHandler::ActionList EventHandler::ourEmulActionList[EMUL_ACTIONLIST_SIZE] =
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventHandler::ActionList EventHandler::ourMenuActionList[MENU_ACTIONLIST_SIZE] = { EventHandler::ActionList EventHandler::ourMenuActionList[MENU_ACTIONLIST_SIZE] = {
{ Event::UIUp, "Move Up", "", false }, { Event::UIUp, "Move Up", "", false },
{ Event::UIDown, "Move Down", "", false }, { Event::UIDown, "Move Down", "", false },
{ Event::UILeft, "Move Left", "", false }, { Event::UILeft, "Move Left", "", false },
{ Event::UIRight, "Move Right", "", false }, { Event::UIRight, "Move Right", "", false },
{ Event::UIHome, "Home", "", false }, { Event::UIHome, "Home", "", false },
{ Event::UIEnd, "End", "", false }, { Event::UIEnd, "End", "", false },
{ Event::UIPgUp, "Page Up", "", false }, { Event::UIPgUp, "Page Up", "", false },
{ Event::UIPgDown, "Page Down", "", false }, { Event::UIPgDown, "Page Down", "", false },
{ Event::UIOK, "OK", "", false }, { Event::UIOK, "OK", "", false },
{ Event::UICancel, "Cancel", "", false }, { Event::UICancel, "Cancel", "", false },
{ Event::UISelect, "Select item", "", false }, { Event::UISelect, "Select item", "", false },
{ Event::UINavPrev, "Previous object", "", false }, { Event::UINavPrev, "Previous object", "", false },
{ Event::UINavNext, "Next object", "", false }, { Event::UINavNext, "Next object", "", false },
{ Event::UITabPrev, "Previous tab", "", false }, { Event::UITabPrev, "Previous tab", "", false },
{ Event::UITabNext, "Next tab", "", false }, { Event::UITabNext, "Next tab", "", false },
{ Event::UIPrevDir, "Parent directory", "", false } { Event::UIPrevDir, "Parent directory", "", false },
{ Event::ToggleFullScreen, "Toggle fullscreen", "", false },
{ Event::Quit, "Quit", "", false }
}; };

2
src/emucore/EventHandler.hxx
View File

@ -368,7 +368,7 @@ class EventHandler
COMBO_SIZE = 16, COMBO_SIZE = 16,
EVENTS_PER_COMBO = 8, EVENTS_PER_COMBO = 8,
EMUL_ACTIONLIST_SIZE = 98 + COMBO_SIZE, EMUL_ACTIONLIST_SIZE = 98 + COMBO_SIZE,
MENU_ACTIONLIST_SIZE = 16 MENU_ACTIONLIST_SIZE = 18
; ;
/** /**