diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 83468338c..684491faa 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -2786,325 +2786,325 @@ void EventHandler::exitEmulation(bool checkLauncher) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EventHandler::EmulActionList EventHandler::ourEmulActionList = { { - { Event::Quit, "Quit", "" }, - { Event::ReloadConsole, "Reload current ROM/load next game", "" }, - { Event::PreviousMultiCartRom, "Load previous multicart game", "" }, - { Event::ExitMode, "Exit current Stella menu/mode", "" }, - { Event::OptionsMenuMode, "Enter Options menu UI", "" }, - { Event::CmdMenuMode, "Toggle Commands menu UI", "" }, - { Event::HighScoresMenuMode, "Toggle High Scores UI", "" }, - { Event::PlusRomsSetupMode, "Toggle PlusROMs setup UI", "" }, - { Event::TogglePauseMode, "Toggle Pause mode", "" }, - { Event::StartPauseMode, "Start Pause mode", "" }, - { Event::Fry, "Fry cartridge", "" }, - { Event::DecreaseSpeed, "Decrease emulation speed", "" }, - { Event::IncreaseSpeed, "Increase emulation speed", "" }, - { Event::ToggleTurbo, "Toggle 'Turbo' mode", "" }, - { Event::DebuggerMode, "Toggle Debugger mode", "" }, + { Event::Quit, "Quit" }, + { Event::ReloadConsole, "Reload current ROM/load next game" }, + { Event::PreviousMultiCartRom, "Load previous multicart game" }, + { Event::ExitMode, "Exit current Stella menu/mode" }, + { Event::OptionsMenuMode, "Enter Options menu UI" }, + { Event::CmdMenuMode, "Toggle Commands menu UI" }, + { Event::HighScoresMenuMode, "Toggle High Scores UI" }, + { Event::PlusRomsSetupMode, "Toggle PlusROMs setup UI" }, + { Event::TogglePauseMode, "Toggle Pause mode" }, + { Event::StartPauseMode, "Start Pause mode" }, + { Event::Fry, "Fry cartridge" }, + { Event::DecreaseSpeed, "Decrease emulation speed" }, + { Event::IncreaseSpeed, "Increase emulation speed" }, + { Event::ToggleTurbo, "Toggle 'Turbo' mode" }, + { Event::DebuggerMode, "Toggle Debugger mode" }, - { Event::ConsoleSelect, "Select", "" }, - { Event::ConsoleReset, "Reset", "" }, - { Event::ConsoleColor, "Color TV", "" }, - { Event::ConsoleBlackWhite, "Black & White TV", "" }, - { Event::ConsoleColorToggle, "Toggle Color / B&W TV", "" }, - { Event::Console7800Pause, "7800 Pause Key", "" }, - { Event::ConsoleLeftDiffA, "Left Difficulty A", "" }, - { Event::ConsoleLeftDiffB, "Left Difficulty B", "" }, - { Event::ConsoleLeftDiffToggle, "Toggle Left Difficulty", "" }, - { Event::ConsoleRightDiffA, "Right Difficulty A", "" }, - { Event::ConsoleRightDiffB, "Right Difficulty B", "" }, - { Event::ConsoleRightDiffToggle, "Toggle Right Difficulty", "" }, - { Event::SaveState, "Save state", "" }, - { Event::SaveAllStates, "Save all TM states of current game", "" }, - { Event::PreviousState, "Change to previous state slot", "" }, - { Event::NextState, "Change to next state slot", "" }, - { Event::ToggleAutoSlot, "Toggle automatic state slot change", "" }, - { Event::LoadState, "Load state", "" }, - { Event::LoadAllStates, "Load saved TM states for current game", "" }, + { Event::ConsoleSelect, "Select" }, + { Event::ConsoleReset, "Reset" }, + { Event::ConsoleColor, "Color TV" }, + { Event::ConsoleBlackWhite, "Black & White TV" }, + { Event::ConsoleColorToggle, "Toggle Color / B&W TV" }, + { Event::Console7800Pause, "7800 Pause Key" }, + { Event::ConsoleLeftDiffA, "Left Difficulty A" }, + { Event::ConsoleLeftDiffB, "Left Difficulty B" }, + { Event::ConsoleLeftDiffToggle, "Toggle Left Difficulty" }, + { Event::ConsoleRightDiffA, "Right Difficulty A" }, + { Event::ConsoleRightDiffB, "Right Difficulty B" }, + { Event::ConsoleRightDiffToggle, "Toggle Right Difficulty" }, + { Event::SaveState, "Save state" }, + { Event::SaveAllStates, "Save all TM states of current game" }, + { Event::PreviousState, "Change to previous state slot" }, + { Event::NextState, "Change to next state slot" }, + { Event::ToggleAutoSlot, "Toggle automatic state slot change" }, + { Event::LoadState, "Load state" }, + { Event::LoadAllStates, "Load saved TM states for current game" }, #ifdef PNG_SUPPORT - { Event::TakeSnapshot, "Snapshot", "" }, - { Event::ToggleContSnapshots, "Save continuous snapsh. (as defined)", "" }, - { Event::ToggleContSnapshotsFrame,"Save continuous snapsh. (every frame)", "" }, + { Event::TakeSnapshot, "Snapshot" }, + { Event::ToggleContSnapshots, "Save continuous snapsh. (as defined)" }, + { Event::ToggleContSnapshotsFrame,"Save continuous snapsh. (every frame)" }, #endif // Global keys: - { Event::PreviousSettingGroup, "Select previous setting group", "" }, - { Event::NextSettingGroup, "Select next setting group", "" }, - { Event::PreviousSetting, "Select previous setting", "" }, - { Event::NextSetting, "Select next setting", "" }, - { Event::SettingDecrease, "Decrease current setting", "" }, - { Event::SettingIncrease, "Increase current setting", "" }, + { Event::PreviousSettingGroup, "Select previous setting group" }, + { Event::NextSettingGroup, "Select next setting group" }, + { Event::PreviousSetting, "Select previous setting" }, + { Event::NextSetting, "Select next setting" }, + { Event::SettingDecrease, "Decrease current setting" }, + { Event::SettingIncrease, "Increase current setting" }, // Controllers: - { Event::LeftJoystickUp, "Left Joystick Up", "" }, - { Event::LeftJoystickDown, "Left Joystick Down", "" }, - { Event::LeftJoystickLeft, "Left Joystick Left", "" }, - { Event::LeftJoystickRight, "Left Joystick Right", "" }, - { Event::LeftJoystickFire, "Left Joystick Fire", "" }, - { Event::LeftJoystickFire5, "Left Booster Top Booster Button", "" }, - { Event::LeftJoystickFire9, "Left Booster Handle Grip Trigger", "" }, + { Event::LeftJoystickUp, "Left Joystick Up" }, + { Event::LeftJoystickDown, "Left Joystick Down" }, + { Event::LeftJoystickLeft, "Left Joystick Left" }, + { Event::LeftJoystickRight, "Left Joystick Right" }, + { Event::LeftJoystickFire, "Left Joystick Fire" }, + { Event::LeftJoystickFire5, "Left Top Booster Button, Button 'C'" }, + { Event::LeftJoystickFire9, "Left Handle Grip Trigger, Button '3'" }, - { Event::RightJoystickUp, "Right Joystick Up", "" }, - { Event::RightJoystickDown, "Right Joystick Down", "" }, - { Event::RightJoystickLeft, "Right Joystick Left", "" }, - { Event::RightJoystickRight, "Right Joystick Right", "" }, - { Event::RightJoystickFire, "Right Joystick Fire", "" }, - { Event::RightJoystickFire5, "Right Booster Top Booster Button", "" }, - { Event::RightJoystickFire9, "Right Booster Handle Grip Trigger", "" }, + { Event::RightJoystickUp, "Right Joystick Up" }, + { Event::RightJoystickDown, "Right Joystick Down" }, + { Event::RightJoystickLeft, "Right Joystick Left" }, + { Event::RightJoystickRight, "Right Joystick Right" }, + { Event::RightJoystickFire, "Right Joystick Fire" }, + { Event::RightJoystickFire5, "Right Top Booster Button, Button 'C'" }, + { Event::RightJoystickFire9, "Right Handle Grip Trigger, Button '3'" }, - { Event::QTJoystickThreeUp, "QuadTari Joystick 3 Up", "" }, - { Event::QTJoystickThreeDown, "QuadTari Joystick 3 Down", "" }, - { Event::QTJoystickThreeLeft, "QuadTari Joystick 3 Left", "" }, - { Event::QTJoystickThreeRight, "QuadTari Joystick 3 Right", "" }, - { Event::QTJoystickThreeFire, "QuadTari Joystick 3 Fire", "" }, + { Event::QTJoystickThreeUp, "QuadTari Joystick 3 Up" }, + { Event::QTJoystickThreeDown, "QuadTari Joystick 3 Down" }, + { Event::QTJoystickThreeLeft, "QuadTari Joystick 3 Left" }, + { Event::QTJoystickThreeRight, "QuadTari Joystick 3 Right" }, + { Event::QTJoystickThreeFire, "QuadTari Joystick 3 Fire" }, - { Event::QTJoystickFourUp, "QuadTari Joystick 4 Up", "" }, - { Event::QTJoystickFourDown, "QuadTari Joystick 4 Down", "" }, - { Event::QTJoystickFourLeft, "QuadTari Joystick 4 Left", "" }, - { Event::QTJoystickFourRight, "QuadTari Joystick 4 Right", "" }, - { Event::QTJoystickFourFire, "QuadTari Joystick 4 Fire", "" }, + { Event::QTJoystickFourUp, "QuadTari Joystick 4 Up" }, + { Event::QTJoystickFourDown, "QuadTari Joystick 4 Down" }, + { Event::QTJoystickFourLeft, "QuadTari Joystick 4 Left" }, + { Event::QTJoystickFourRight, "QuadTari Joystick 4 Right" }, + { Event::QTJoystickFourFire, "QuadTari Joystick 4 Fire" }, - { Event::LeftPaddleAAnalog, "Left Paddle A Analog", "" }, - { Event::LeftPaddleAIncrease, "Left Paddle A Turn Left", "" }, - { Event::LeftPaddleADecrease, "Left Paddle A Turn Right", "" }, - { Event::LeftPaddleAFire, "Left Paddle A Fire", "" }, + { Event::LeftPaddleAAnalog, "Left Paddle A Analog" }, + { Event::LeftPaddleAIncrease, "Left Paddle A Turn Left" }, + { Event::LeftPaddleADecrease, "Left Paddle A Turn Right" }, + { Event::LeftPaddleAFire, "Left Paddle A Fire" }, - { Event::LeftPaddleBAnalog, "Left Paddle B Analog", "" }, - { Event::LeftPaddleBIncrease, "Left Paddle B Turn Left", "" }, - { Event::LeftPaddleBDecrease, "Left Paddle B Turn Right", "" }, - { Event::LeftPaddleBFire, "Left Paddle B Fire", "" }, + { Event::LeftPaddleBAnalog, "Left Paddle B Analog" }, + { Event::LeftPaddleBIncrease, "Left Paddle B Turn Left" }, + { Event::LeftPaddleBDecrease, "Left Paddle B Turn Right" }, + { Event::LeftPaddleBFire, "Left Paddle B Fire" }, - { Event::RightPaddleAAnalog, "Right Paddle A Analog", "" }, - { Event::RightPaddleAIncrease, "Right Paddle A Turn Left", "" }, - { Event::RightPaddleADecrease, "Right Paddle A Turn Right", "" }, - { Event::RightPaddleAFire, "Right Paddle A Fire", "" }, + { Event::RightPaddleAAnalog, "Right Paddle A Analog" }, + { Event::RightPaddleAIncrease, "Right Paddle A Turn Left" }, + { Event::RightPaddleADecrease, "Right Paddle A Turn Right" }, + { Event::RightPaddleAFire, "Right Paddle A Fire" }, - { Event::RightPaddleBAnalog, "Right Paddle B Analog", "" }, - { Event::RightPaddleBIncrease, "Right Paddle B Turn Left", "" }, - { Event::RightPaddleBDecrease, "Right Paddle B Turn Right", "" }, - { Event::RightPaddleBFire, "Right Paddle B Fire", "" }, + { Event::RightPaddleBAnalog, "Right Paddle B Analog" }, + { Event::RightPaddleBIncrease, "Right Paddle B Turn Left" }, + { Event::RightPaddleBDecrease, "Right Paddle B Turn Right" }, + { Event::RightPaddleBFire, "Right Paddle B Fire" }, - { Event::QTPaddle3AFire, "QuadTari Paddle 3A Fire", "" }, - { Event::QTPaddle3BFire, "QuadTari Paddle 3B Fire", "" }, - { Event::QTPaddle4AFire, "QuadTari Paddle 4A Fire", "" }, - { Event::QTPaddle4BFire, "QuadTari Paddle 4B Fire", "" }, + { Event::QTPaddle3AFire, "QuadTari Paddle 3A Fire" }, + { Event::QTPaddle3BFire, "QuadTari Paddle 3B Fire" }, + { Event::QTPaddle4AFire, "QuadTari Paddle 4A Fire" }, + { Event::QTPaddle4BFire, "QuadTari Paddle 4B Fire" }, - { Event::LeftKeyboard1, "Left Keyboard 1", "" }, - { Event::LeftKeyboard2, "Left Keyboard 2", "" }, - { Event::LeftKeyboard3, "Left Keyboard 3", "" }, - { Event::LeftKeyboard4, "Left Keyboard 4", "" }, - { Event::LeftKeyboard5, "Left Keyboard 5", "" }, - { Event::LeftKeyboard6, "Left Keyboard 6", "" }, - { Event::LeftKeyboard7, "Left Keyboard 7", "" }, - { Event::LeftKeyboard8, "Left Keyboard 8", "" }, - { Event::LeftKeyboard9, "Left Keyboard 9", "" }, - { Event::LeftKeyboardStar, "Left Keyboard *", "" }, - { Event::LeftKeyboard0, "Left Keyboard 0", "" }, - { Event::LeftKeyboardPound, "Left Keyboard #", "" }, + { Event::LeftKeyboard1, "Left Keyboard 1" }, + { Event::LeftKeyboard2, "Left Keyboard 2" }, + { Event::LeftKeyboard3, "Left Keyboard 3" }, + { Event::LeftKeyboard4, "Left Keyboard 4" }, + { Event::LeftKeyboard5, "Left Keyboard 5" }, + { Event::LeftKeyboard6, "Left Keyboard 6" }, + { Event::LeftKeyboard7, "Left Keyboard 7" }, + { Event::LeftKeyboard8, "Left Keyboard 8" }, + { Event::LeftKeyboard9, "Left Keyboard 9" }, + { Event::LeftKeyboardStar, "Left Keyboard *" }, + { Event::LeftKeyboard0, "Left Keyboard 0" }, + { Event::LeftKeyboardPound, "Left Keyboard #" }, - { Event::RightKeyboard1, "Right Keyboard 1", "" }, - { Event::RightKeyboard2, "Right Keyboard 2", "" }, - { Event::RightKeyboard3, "Right Keyboard 3", "" }, - { Event::RightKeyboard4, "Right Keyboard 4", "" }, - { Event::RightKeyboard5, "Right Keyboard 5", "" }, - { Event::RightKeyboard6, "Right Keyboard 6", "" }, - { Event::RightKeyboard7, "Right Keyboard 7", "" }, - { Event::RightKeyboard8, "Right Keyboard 8", "" }, - { Event::RightKeyboard9, "Right Keyboard 9", "" }, - { Event::RightKeyboardStar, "Right Keyboard *", "" }, - { Event::RightKeyboard0, "Right Keyboard 0", "" }, - { Event::RightKeyboardPound, "Right Keyboard #", "" }, + { Event::RightKeyboard1, "Right Keyboard 1" }, + { Event::RightKeyboard2, "Right Keyboard 2" }, + { Event::RightKeyboard3, "Right Keyboard 3" }, + { Event::RightKeyboard4, "Right Keyboard 4" }, + { Event::RightKeyboard5, "Right Keyboard 5" }, + { Event::RightKeyboard6, "Right Keyboard 6" }, + { Event::RightKeyboard7, "Right Keyboard 7" }, + { Event::RightKeyboard8, "Right Keyboard 8" }, + { Event::RightKeyboard9, "Right Keyboard 9" }, + { Event::RightKeyboardStar, "Right Keyboard *" }, + { Event::RightKeyboard0, "Right Keyboard 0" }, + { Event::RightKeyboardPound, "Right Keyboard #" }, - { Event::LeftDrivingAnalog, "Left Driving Analog", "" }, - { Event::LeftDrivingCCW, "Left Driving Turn Left", "" }, - { Event::LeftDrivingCW, "Left Driving Turn Right", "" }, - { Event::LeftDrivingFire, "Left Driving Fire", "" }, + { Event::LeftDrivingAnalog, "Left Driving Analog" }, + { Event::LeftDrivingCCW, "Left Driving Turn Left" }, + { Event::LeftDrivingCW, "Left Driving Turn Right" }, + { Event::LeftDrivingFire, "Left Driving Fire" }, - { Event::RightDrivingAnalog, "Right Driving Analog", "" }, - { Event::RightDrivingCCW, "Right Driving Turn Left", "" }, - { Event::RightDrivingCW, "Right Driving Turn Right", "" }, - { Event::RightDrivingFire, "Right Driving Fire", "" }, + { Event::RightDrivingAnalog, "Right Driving Analog" }, + { Event::RightDrivingCCW, "Right Driving Turn Left" }, + { Event::RightDrivingCW, "Right Driving Turn Right" }, + { Event::RightDrivingFire, "Right Driving Fire" }, // Video - { Event::ToggleInter, "Toggle display interpolation", "" }, - { Event::VidmodeDecrease, "Previous zoom level", "" }, - { Event::VidmodeIncrease, "Next zoom level", "" }, - { Event::ToggleFullScreen, "Toggle fullscreen", "" }, + { Event::ToggleInter, "Toggle display interpolation" }, + { Event::VidmodeDecrease, "Previous zoom level" }, + { Event::VidmodeIncrease, "Next zoom level" }, + { Event::ToggleFullScreen, "Toggle fullscreen" }, #ifdef ADAPTABLE_REFRESH_SUPPORT - { Event::ToggleAdaptRefresh, "Toggle fullscreen refresh rate adapt", "" }, + { Event::ToggleAdaptRefresh, "Toggle fullscreen refresh rate adapt" }, #endif - { Event::OverscanDecrease, "Decrease overscan in fullscreen mode", "" }, - { Event::OverscanIncrease, "Increase overscan in fullscreen mode", "" }, - { Event::ToggleCorrectAspectRatio,"Toggle aspect ratio correct scaling", "" }, - { Event::VSizeAdjustDecrease, "Decrease vertical display size", "" }, - { Event::VSizeAdjustIncrease, "Increase vertical display size", "" }, - { Event::VCenterDecrease, "Move display up", "" }, - { Event::VCenterIncrease, "Move display down", "" }, - { Event::FormatDecrease, "Decrease TV format", "" }, - { Event::FormatIncrease, "Increase TV format", "" }, + { Event::OverscanDecrease, "Decrease overscan in fullscreen mode" }, + { Event::OverscanIncrease, "Increase overscan in fullscreen mode" }, + { Event::ToggleCorrectAspectRatio,"Toggle aspect ratio correct scaling" }, + { Event::VSizeAdjustDecrease, "Decrease vertical display size" }, + { Event::VSizeAdjustIncrease, "Increase vertical display size" }, + { Event::VCenterDecrease, "Move display up" }, + { Event::VCenterIncrease, "Move display down" }, + { Event::FormatDecrease, "Decrease TV format" }, + { Event::FormatIncrease, "Increase TV format" }, // Palette settings - { Event::PaletteDecrease, "Switch to previous palette", "" }, - { Event::PaletteIncrease, "Switch to next palette", "" }, - { Event::PreviousPaletteAttribute,"Select previous palette attribute", "" }, - { Event::NextPaletteAttribute, "Select next palette attribute", "" }, - { Event::PaletteAttributeDecrease,"Decrease selected palette attribute", "" }, - { Event::PaletteAttributeIncrease,"Increase selected palette attribute", "" }, + { Event::PaletteDecrease, "Switch to previous palette" }, + { Event::PaletteIncrease, "Switch to next palette" }, + { Event::PreviousPaletteAttribute,"Select previous palette attribute" }, + { Event::NextPaletteAttribute, "Select next palette attribute" }, + { Event::PaletteAttributeDecrease,"Decrease selected palette attribute" }, + { Event::PaletteAttributeIncrease,"Increase selected palette attribute" }, // Blargg TV effects: - { Event::VidmodeStd, "Disable TV effects", "" }, - { Event::VidmodeRGB, "Select 'RGB' preset", "" }, - { Event::VidmodeSVideo, "Select 'S-Video' preset", "" }, - { Event::VidModeComposite, "Select 'Composite' preset", "" }, - { Event::VidModeBad, "Select 'Badly adjusted' preset", "" }, - { Event::VidModeCustom, "Select 'Custom' preset", "" }, - { Event::PreviousVideoMode, "Select previous TV effect mode preset", "" }, - { Event::NextVideoMode, "Select next TV effect mode preset", "" }, - { Event::PreviousAttribute, "Select previous 'Custom' attribute", "" }, - { Event::NextAttribute, "Select next 'Custom' attribute", "" }, - { Event::DecreaseAttribute, "Decrease selected 'Custom' attribute", "" }, - { Event::IncreaseAttribute, "Increase selected 'Custom' attribute", "" }, + { Event::VidmodeStd, "Disable TV effects" }, + { Event::VidmodeRGB, "Select 'RGB' preset" }, + { Event::VidmodeSVideo, "Select 'S-Video' preset" }, + { Event::VidModeComposite, "Select 'Composite' preset" }, + { Event::VidModeBad, "Select 'Badly adjusted' preset" }, + { Event::VidModeCustom, "Select 'Custom' preset" }, + { Event::PreviousVideoMode, "Select previous TV effect mode preset" }, + { Event::NextVideoMode, "Select next TV effect mode preset" }, + { Event::PreviousAttribute, "Select previous 'Custom' attribute" }, + { Event::NextAttribute, "Select next 'Custom' attribute" }, + { Event::DecreaseAttribute, "Decrease selected 'Custom' attribute" }, + { Event::IncreaseAttribute, "Increase selected 'Custom' attribute" }, // Other TV effects - { Event::TogglePhosphor, "Toggle 'phosphor' effect", "" }, - { Event::PhosphorDecrease, "Decrease 'phosphor' blend", "" }, - { Event::PhosphorIncrease, "Increase 'phosphor' blend", "" }, - { Event::ScanlinesDecrease, "Decrease scanlines", "" }, - { Event::ScanlinesIncrease, "Increase scanlines", "" }, - { Event::PreviousScanlineMask, "Switch to previous scanline mask", "" }, - { Event::NextScanlineMask, "Switch to next scanline mask", "" }, + { Event::TogglePhosphor, "Toggle 'phosphor' effect" }, + { Event::PhosphorDecrease, "Decrease 'phosphor' blend" }, + { Event::PhosphorIncrease, "Increase 'phosphor' blend" }, + { Event::ScanlinesDecrease, "Decrease scanlines" }, + { Event::ScanlinesIncrease, "Increase scanlines" }, + { Event::PreviousScanlineMask, "Switch to previous scanline mask" }, + { Event::NextScanlineMask, "Switch to next scanline mask" }, // Audio - { Event::SoundToggle, "Toggle sound", "" }, - { Event::VolumeDecrease, "Decrease volume", "" }, - { Event::VolumeIncrease, "Increase volume", "" }, + { Event::SoundToggle, "Toggle sound" }, + { Event::VolumeDecrease, "Decrease volume" }, + { Event::VolumeIncrease, "Increase volume" }, // Devices & Ports: - { Event::DecreaseDeadzone, "Decrease digital dead zone", "" }, - { Event::IncreaseDeadzone, "Increase digital dead zone", "" }, - { Event::DecAnalogDeadzone, "Decrease analog dead zone", "" }, - { Event::IncAnalogDeadzone, "Increase analog dead zone", "" }, - { Event::DecAnalogSense, "Decrease analog paddle sensitivity", "" }, - { Event::IncAnalogSense, "Increase analog paddle sensitivity", "" }, - { Event::DecAnalogLinear, "Decrease analog paddle linearity", "" }, - { Event::IncAnalogLinear, "Increase analog paddle linearity", "" }, - { Event::DecDejtterAveraging, "Decrease paddle dejitter averaging", "" }, - { Event::IncDejtterAveraging, "Increase paddle dejitter averaging", "" }, - { Event::DecDejtterReaction, "Decrease paddle dejitter reaction", "" }, - { Event::IncDejtterReaction, "Increase paddle dejitter reaction", "" }, - { Event::DecDigitalSense, "Decrease digital paddle sensitivity", "" }, - { Event::IncDigitalSense, "Increase digital paddle sensitivity", "" }, - { Event::ToggleAutoFire, "Toggle auto fire", "" }, - { Event::DecreaseAutoFire, "Decrease auto fire speed", "" }, - { Event::IncreaseAutoFire, "Increase auto fire speed", "" }, - { Event::ToggleFourDirections, "Toggle allow four joystick directions", "" }, - { Event::ToggleKeyCombos, "Toggle use of modifier key combos", "" }, - { Event::ToggleSAPortOrder, "Swap Stelladaptor port ordering", "" }, + { Event::DecreaseDeadzone, "Decrease digital dead zone" }, + { Event::IncreaseDeadzone, "Increase digital dead zone" }, + { Event::DecAnalogDeadzone, "Decrease analog dead zone" }, + { Event::IncAnalogDeadzone, "Increase analog dead zone" }, + { Event::DecAnalogSense, "Decrease analog paddle sensitivity" }, + { Event::IncAnalogSense, "Increase analog paddle sensitivity" }, + { Event::DecAnalogLinear, "Decrease analog paddle linearity" }, + { Event::IncAnalogLinear, "Increase analog paddle linearity" }, + { Event::DecDejtterAveraging, "Decrease paddle dejitter averaging" }, + { Event::IncDejtterAveraging, "Increase paddle dejitter averaging" }, + { Event::DecDejtterReaction, "Decrease paddle dejitter reaction" }, + { Event::IncDejtterReaction, "Increase paddle dejitter reaction" }, + { Event::DecDigitalSense, "Decrease digital paddle sensitivity" }, + { Event::IncDigitalSense, "Increase digital paddle sensitivity" }, + { Event::ToggleAutoFire, "Toggle auto fire" }, + { Event::DecreaseAutoFire, "Decrease auto fire speed" }, + { Event::IncreaseAutoFire, "Increase auto fire speed" }, + { Event::ToggleFourDirections, "Toggle allow four joystick directions" }, + { Event::ToggleKeyCombos, "Toggle use of modifier key combos" }, + { Event::ToggleSAPortOrder, "Swap Stelladaptor port ordering" }, // Devices & Ports related properties - { Event::PreviousLeftPort, "Select previous left controller", "" }, - { Event::NextLeftPort, "Select next left controller", "" }, - { Event::PreviousRightPort, "Select previous right controller", "" }, - { Event::NextRightPort, "Select next right controller", "" }, - { Event::ToggleSwapPorts, "Toggle swap ports", "" }, - { Event::ToggleSwapPaddles, "Toggle swap paddles", "" }, + { Event::PreviousLeftPort, "Select previous left controller" }, + { Event::NextLeftPort, "Select next left controller" }, + { Event::PreviousRightPort, "Select previous right controller" }, + { Event::NextRightPort, "Select next right controller" }, + { Event::ToggleSwapPorts, "Toggle swap ports" }, + { Event::ToggleSwapPaddles, "Toggle swap paddles" }, // Mouse - { Event::PrevMouseAsController, "Select previous mouse controls", "" }, - { Event::NextMouseAsController, "Select next mouse controls", "" }, - { Event::DecMousePaddleSense, "Decrease mouse paddle sensitivity", "" }, - { Event::IncMousePaddleSense, "Increase mouse paddle sensitivity", "" }, - { Event::DecMouseTrackballSense, "Decrease mouse trackball sensitivity", "" }, - { Event::IncMouseTrackballSense, "Increase mouse trackball sensitivity", "" }, - { Event::DecreaseDrivingSense, "Decrease driving sensitivity", "" }, - { Event::IncreaseDrivingSense, "Increase driving sensitivity", "" }, - { Event::PreviousCursorVisbility, "Select prev. cursor visibility mode", "" }, - { Event::NextCursorVisbility, "Select next cursor visibility mode", "" }, - { Event::ToggleGrabMouse, "Toggle grab mouse", "" }, + { Event::PrevMouseAsController, "Select previous mouse controls" }, + { Event::NextMouseAsController, "Select next mouse controls" }, + { Event::DecMousePaddleSense, "Decrease mouse paddle sensitivity" }, + { Event::IncMousePaddleSense, "Increase mouse paddle sensitivity" }, + { Event::DecMouseTrackballSense, "Decrease mouse trackball sensitivity" }, + { Event::IncMouseTrackballSense, "Increase mouse trackball sensitivity" }, + { Event::DecreaseDrivingSense, "Decrease driving sensitivity" }, + { Event::IncreaseDrivingSense, "Increase driving sensitivity" }, + { Event::PreviousCursorVisbility, "Select prev. cursor visibility mode" }, + { Event::NextCursorVisbility, "Select next cursor visibility mode" }, + { Event::ToggleGrabMouse, "Toggle grab mouse" }, // Mouse related properties - { Event::PreviousMouseControl, "Select previous mouse emulation mode", "" }, - { Event::NextMouseControl, "Select next mouse emulation mode", "" }, - { Event::DecreaseMouseAxesRange, "Decrease mouse axes range", "" }, - { Event::IncreaseMouseAxesRange, "Increase mouse axes range", "" }, + { Event::PreviousMouseControl, "Select previous mouse emulation mode" }, + { Event::NextMouseControl, "Select next mouse emulation mode" }, + { Event::DecreaseMouseAxesRange, "Decrease mouse axes range" }, + { Event::IncreaseMouseAxesRange, "Increase mouse axes range" }, // Time Machine - { Event::ToggleTimeMachine, "Toggle 'Time Machine' mode", "" }, - { Event::TimeMachineMode, "Toggle 'Time Machine' UI", "" }, - { Event::RewindPause, "Rewind one state & enter Pause mode", "" }, - { Event::Rewind1Menu, "Rewind one state & enter TM UI", "" }, - { Event::Rewind10Menu, "Rewind 10 states & enter TM UI", "" }, - { Event::RewindAllMenu, "Rewind all states & enter TM UI", "" }, - { Event::UnwindPause, "Unwind one state & enter Pause mode", "" }, - { Event::Unwind1Menu, "Unwind one state & enter TM UI", "" }, - { Event::Unwind10Menu, "Unwind 10 states & enter TM UI", "" }, - { Event::UnwindAllMenu, "Unwind all states & enter TM UI", "" }, - { Event::TogglePlayBackMode, "Toggle 'Time Machine' playback mode", "" }, + { Event::ToggleTimeMachine, "Toggle 'Time Machine' mode" }, + { Event::TimeMachineMode, "Toggle 'Time Machine' UI" }, + { Event::RewindPause, "Rewind one state & enter Pause mode" }, + { Event::Rewind1Menu, "Rewind one state & enter TM UI" }, + { Event::Rewind10Menu, "Rewind 10 states & enter TM UI" }, + { Event::RewindAllMenu, "Rewind all states & enter TM UI" }, + { Event::UnwindPause, "Unwind one state & enter Pause mode" }, + { Event::Unwind1Menu, "Unwind one state & enter TM UI" }, + { Event::Unwind10Menu, "Unwind 10 states & enter TM UI" }, + { Event::UnwindAllMenu, "Unwind all states & enter TM UI" }, + { Event::TogglePlayBackMode, "Toggle 'Time Machine' playback mode" }, // Developer: - { Event::ToggleDeveloperSet, "Toggle developer settings sets", "" }, - { Event::ToggleFrameStats, "Toggle frame stats", "" }, - { Event::ToggleP0Bit, "Toggle TIA Player0 object", "" }, - { Event::ToggleP0Collision, "Toggle TIA Player0 collisions", "" }, - { Event::ToggleP1Bit, "Toggle TIA Player1 object", "" }, - { Event::ToggleP1Collision, "Toggle TIA Player1 collisions", "" }, - { Event::ToggleM0Bit, "Toggle TIA Missile0 object", "" }, - { Event::ToggleM0Collision, "Toggle TIA Missile0 collisions", "" }, - { Event::ToggleM1Bit, "Toggle TIA Missile1 object", "" }, - { Event::ToggleM1Collision, "Toggle TIA Missile1 collisions", "" }, - { Event::ToggleBLBit, "Toggle TIA Ball object", "" }, - { Event::ToggleBLCollision, "Toggle TIA Ball collisions", "" }, - { Event::TogglePFBit, "Toggle TIA Playfield object", "" }, - { Event::TogglePFCollision, "Toggle TIA Playfield collisions", "" }, - { Event::ToggleBits, "Toggle all TIA objects", "" }, - { Event::ToggleCollisions, "Toggle all TIA collisions", "" }, - { Event::ToggleFixedColors, "Toggle TIA 'Fixed Debug Colors' mode", "" }, - { Event::ToggleColorLoss, "Toggle PAL color-loss effect", "" }, - { Event::ToggleJitter, "Toggle TV scanline 'Jitter' effect", "" }, - { Event::JitterSenseDecrease, "Decrease TV 'Jitter' sensitivity", "" }, - { Event::JitterSenseIncrease, "Increase TV 'Jitter' sensitivity", "" }, - { Event::JitterRecDecrease, "Decrease TV 'Jitter' roll", "" }, - { Event::JitterRecIncrease, "Increase TV 'Jitter' roll", "" }, + { Event::ToggleDeveloperSet, "Toggle developer settings sets" }, + { Event::ToggleFrameStats, "Toggle frame stats" }, + { Event::ToggleP0Bit, "Toggle TIA Player0 object" }, + { Event::ToggleP0Collision, "Toggle TIA Player0 collisions" }, + { Event::ToggleP1Bit, "Toggle TIA Player1 object" }, + { Event::ToggleP1Collision, "Toggle TIA Player1 collisions" }, + { Event::ToggleM0Bit, "Toggle TIA Missile0 object" }, + { Event::ToggleM0Collision, "Toggle TIA Missile0 collisions" }, + { Event::ToggleM1Bit, "Toggle TIA Missile1 object" }, + { Event::ToggleM1Collision, "Toggle TIA Missile1 collisions" }, + { Event::ToggleBLBit, "Toggle TIA Ball object" }, + { Event::ToggleBLCollision, "Toggle TIA Ball collisions" }, + { Event::TogglePFBit, "Toggle TIA Playfield object" }, + { Event::TogglePFCollision, "Toggle TIA Playfield collisions" }, + { Event::ToggleBits, "Toggle all TIA objects" }, + { Event::ToggleCollisions, "Toggle all TIA collisions" }, + { Event::ToggleFixedColors, "Toggle TIA 'Fixed Debug Colors' mode" }, + { Event::ToggleColorLoss, "Toggle PAL color-loss effect" }, + { Event::ToggleJitter, "Toggle TV scanline 'Jitter' effect" }, + { Event::JitterSenseDecrease, "Decrease TV 'Jitter' sensitivity" }, + { Event::JitterSenseIncrease, "Increase TV 'Jitter' sensitivity" }, + { Event::JitterRecDecrease, "Decrease TV 'Jitter' roll" }, + { Event::JitterRecIncrease, "Increase TV 'Jitter' roll" }, // Combo - { Event::Combo1, "Combo 1", "" }, - { Event::Combo2, "Combo 2", "" }, - { Event::Combo3, "Combo 3", "" }, - { Event::Combo4, "Combo 4", "" }, - { Event::Combo5, "Combo 5", "" }, - { Event::Combo6, "Combo 6", "" }, - { Event::Combo7, "Combo 7", "" }, - { Event::Combo8, "Combo 8", "" }, - { Event::Combo9, "Combo 9", "" }, - { Event::Combo10, "Combo 10", "" }, - { Event::Combo11, "Combo 11", "" }, - { Event::Combo12, "Combo 12", "" }, - { Event::Combo13, "Combo 13", "" }, - { Event::Combo14, "Combo 14", "" }, - { Event::Combo15, "Combo 15", "" }, - { Event::Combo16, "Combo 16", "" }, + { Event::Combo1, "Combo 1" }, + { Event::Combo2, "Combo 2" }, + { Event::Combo3, "Combo 3" }, + { Event::Combo4, "Combo 4" }, + { Event::Combo5, "Combo 5" }, + { Event::Combo6, "Combo 6" }, + { Event::Combo7, "Combo 7" }, + { Event::Combo8, "Combo 8" }, + { Event::Combo9, "Combo 9" }, + { Event::Combo10, "Combo 10" }, + { Event::Combo11, "Combo 11" }, + { Event::Combo12, "Combo 12" }, + { Event::Combo13, "Combo 13" }, + { Event::Combo14, "Combo 14" }, + { Event::Combo15, "Combo 15" }, + { Event::Combo16, "Combo 16" }, } }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EventHandler::MenuActionList EventHandler::ourMenuActionList = { { - { Event::UIHelp, "Open context-sensitive help", "" }, + { Event::UIHelp, "Open context-sensitive help" }, - { Event::UIUp, "Move Up", "" }, - { Event::UIDown, "Move Down", "" }, - { Event::UILeft, "Move Left", "" }, - { Event::UIRight, "Move Right", "" }, + { Event::UIUp, "Move Up" }, + { Event::UIDown, "Move Down" }, + { Event::UILeft, "Move Left" }, + { Event::UIRight, "Move Right" }, - { Event::UIHome, "Home", "" }, - { Event::UIEnd, "End", "" }, - { Event::UIPgUp, "Page Up", "" }, - { Event::UIPgDown, "Page Down", "" }, + { Event::UIHome, "Home" }, + { Event::UIEnd, "End" }, + { Event::UIPgUp, "Page Up" }, + { Event::UIPgDown, "Page Down" }, - { Event::UIOK, "OK", "" }, - { Event::UICancel, "Cancel", "" }, - { Event::UISelect, "Select item", "" }, + { Event::UIOK, "OK" }, + { Event::UICancel, "Cancel" }, + { Event::UISelect, "Select item" }, - { Event::UINavPrev, "Previous object", "" }, - { Event::UINavNext, "Next object", "" }, - { Event::UITabPrev, "Previous tab", "" }, - { Event::UITabNext, "Next tab", "" }, + { Event::UINavPrev, "Previous object" }, + { Event::UINavNext, "Next object" }, + { Event::UITabPrev, "Previous tab" }, + { Event::UITabNext, "Next tab" }, - { Event::UIPrevDir, "Parent directory", "" }, - { Event::ToggleFullScreen, "Toggle fullscreen", "" }, - { Event::Quit, "Quit", "" } + { Event::UIPrevDir, "Parent directory" }, + { Event::ToggleFullScreen, "Toggle fullscreen" }, + { Event::Quit, "Quit" } } }; // Event groups diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx index 4a95e3ef3..64f474807 100644 --- a/src/gui/InputDialog.cxx +++ b/src/gui/InputDialog.cxx @@ -53,7 +53,7 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent, VGAP = Dialog::vGap(); // Set real dimensions - setSize(48 * fontWidth + PopUpWidget::dropDownWidth(_font) + HBORDER * 2, + setSize(49 * fontWidth + PopUpWidget::dropDownWidth(_font) + HBORDER * 2, _th + VGAP * 3 + lineHeight + 13 * (lineHeight + VGAP) + VGAP * 9 + buttonHeight + VBORDER * 3, max_w, max_h);