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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2019-06-15 12:10:28 +02:00
parent 65cb17e736 af1703c24a
commit b85bbbdcdc
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/common/PKeyboardHandler.cxx
View File

@ -398,16 +398,19 @@ EventSet PhysicalKeyboardHandler::RightJoystickEvents = {
Event::JoystickOneFire, Event::JoystickOneFire5, Event::JoystickOneFire9 Event::JoystickOneFire, Event::JoystickOneFire5, Event::JoystickOneFire9
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventSet PhysicalKeyboardHandler::LeftPaddlesEvents = { EventSet PhysicalKeyboardHandler::LeftPaddlesEvents = {
Event::PaddleZeroDecrease, Event::PaddleZeroIncrease, Event::PaddleZeroAnalog, Event::PaddleZeroFire, Event::PaddleZeroDecrease, Event::PaddleZeroIncrease, Event::PaddleZeroAnalog, Event::PaddleZeroFire,
Event::PaddleOneDecrease, Event::PaddleOneIncrease, Event::PaddleOneAnalog, Event::PaddleOneFire, Event::PaddleOneDecrease, Event::PaddleOneIncrease, Event::PaddleOneAnalog, Event::PaddleOneFire,
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventSet PhysicalKeyboardHandler::RightPaddlesEvents = { EventSet PhysicalKeyboardHandler::RightPaddlesEvents = {
Event::PaddleTwoDecrease, Event::PaddleTwoIncrease, Event::PaddleTwoAnalog, Event::PaddleTwoFire, Event::PaddleTwoDecrease, Event::PaddleTwoIncrease, Event::PaddleTwoAnalog, Event::PaddleTwoFire,
Event::PaddleThreeDecrease, Event::PaddleThreeIncrease, Event::PaddleThreeAnalog, Event::PaddleThreeFire, Event::PaddleThreeDecrease, Event::PaddleThreeIncrease, Event::PaddleThreeAnalog, Event::PaddleThreeFire,
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventSet PhysicalKeyboardHandler::LeftKeypadEvents = { EventSet PhysicalKeyboardHandler::LeftKeypadEvents = {
Event::KeyboardZero1, Event::KeyboardZero2, Event::KeyboardZero3, Event::KeyboardZero1, Event::KeyboardZero2, Event::KeyboardZero3,
Event::KeyboardZero4, Event::KeyboardZero5, Event::KeyboardZero6, Event::KeyboardZero4, Event::KeyboardZero5, Event::KeyboardZero6,
@ -415,6 +418,7 @@ EventSet PhysicalKeyboardHandler::LeftKeypadEvents = {
Event::KeyboardZeroStar, Event::KeyboardZero0, Event::KeyboardZeroPound, Event::KeyboardZeroStar, Event::KeyboardZero0, Event::KeyboardZeroPound,
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EventSet PhysicalKeyboardHandler::RightKeypadEvents = { EventSet PhysicalKeyboardHandler::RightKeypadEvents = {
Event::KeyboardOne1, Event::KeyboardOne2, Event::KeyboardOne3, Event::KeyboardOne1, Event::KeyboardOne2, Event::KeyboardOne3,
Event::KeyboardOne4, Event::KeyboardOne5, Event::KeyboardOne6, Event::KeyboardOne4, Event::KeyboardOne5, Event::KeyboardOne6,
@ -526,6 +530,7 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
#endif #endif
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultMenuMapping = { PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultMenuMapping = {
{Event::UIUp, KBDK_UP}, {Event::UIUp, KBDK_UP},
{Event::UIDown, KBDK_DOWN}, {Event::UIDown, KBDK_DOWN},
@ -567,6 +572,7 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultMenuM
#endif #endif
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultJoystickMapping = { PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultJoystickMapping = {
{Event::JoystickZeroUp, KBDK_UP}, {Event::JoystickZeroUp, KBDK_UP},
{Event::JoystickZeroDown, KBDK_DOWN}, {Event::JoystickZeroDown, KBDK_DOWN},
@ -586,6 +592,7 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultJoyst
{Event::JoystickOneFire9, KBDK_7}, {Event::JoystickOneFire9, KBDK_7},
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultPaddleMapping = { PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultPaddleMapping = {
{Event::PaddleZeroDecrease, KBDK_RIGHT}, {Event::PaddleZeroDecrease, KBDK_RIGHT},
{Event::PaddleZeroIncrease, KBDK_LEFT}, {Event::PaddleZeroIncrease, KBDK_LEFT},
@ -604,6 +611,7 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultPaddl
{Event::PaddleThreeFire, KBDK_6}, {Event::PaddleThreeFire, KBDK_6},
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultKeypadMapping = { PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultKeypadMapping = {
{Event::KeyboardZero1, KBDK_1}, {Event::KeyboardZero1, KBDK_1},
{Event::KeyboardZero2, KBDK_2}, {Event::KeyboardZero2, KBDK_2},
@ -632,24 +640,25 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultKeypa
{Event::KeyboardOnePound, KBDK_SLASH}, {Event::KeyboardOnePound, KBDK_SLASH},
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalKeyboardHandler::StellaKeySet PhysicalKeyboardHandler::CompuMateKeys = { PhysicalKeyboardHandler::StellaKeySet PhysicalKeyboardHandler::CompuMateKeys = {
{KBDK_0}, {KBDK_1}, {KBDK_2}, {KBDK_3}, {KBDK_4}, KBDK_0, KBDK_1, KBDK_2, KBDK_3, KBDK_4,
{KBDK_5}, {KBDK_6}, {KBDK_7}, {KBDK_8}, {KBDK_9}, KBDK_5, KBDK_6, KBDK_7, KBDK_8, KBDK_9,
{KBDK_A}, {KBDK_B}, {KBDK_C}, {KBDK_D}, {KBDK_E}, KBDK_A, KBDK_B, KBDK_C, KBDK_D, KBDK_E,
{KBDK_F}, {KBDK_G}, {KBDK_H}, {KBDK_I}, {KBDK_J}, KBDK_F, KBDK_G, KBDK_H, KBDK_I, KBDK_J,
{KBDK_K}, {KBDK_L}, {KBDK_M}, {KBDK_N}, {KBDK_O}, KBDK_K, KBDK_L, KBDK_M, KBDK_N, KBDK_O,
{KBDK_P}, {KBDK_Q}, {KBDK_R}, {KBDK_S}, {KBDK_T}, KBDK_P, KBDK_Q, KBDK_R, KBDK_S, KBDK_T,
{KBDK_U}, {KBDK_V}, {KBDK_W}, {KBDK_X}, {KBDK_Y}, KBDK_U, KBDK_V, KBDK_W, KBDK_X, KBDK_Y,
{KBDK_Z}, KBDK_Z,
{KBDK_COMMA}, KBDK_COMMA,
{KBDK_PERIOD}, KBDK_PERIOD,
{KBDK_RETURN}, {KBDK_KP_ENTER}, KBDK_RETURN, KBDK_KP_ENTER,
{KBDK_SPACE}, KBDK_SPACE,
{KBDK_BACKSPACE}, KBDK_BACKSPACE,
{KBDK_EQUALS}, KBDK_EQUALS,
{KBDK_MINUS}, KBDK_MINUS,
{KBDK_SLASH}, KBDK_SLASH,
{KBDK_LEFTBRACKET}, KBDK_LEFTBRACKET,
{KBDK_RIGHTBRACKET}, KBDK_RIGHTBRACKET,
{KBDK_APOSTROPHE} KBDK_APOSTROPHE
}; };