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

reorder events 

rename scanline adjust in input dialog
fix v-center input naming
This commit is contained in:
thrust26 2020-01-12 12:42:20 +01:00
parent 4580484835
commit 3e9a9a7a2a
2 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/emucore/Event.hxx
View File

@ -38,12 +38,10 @@ class Event
enum Type enum Type
{ {
NoType = 0, NoType = 0,
ConsoleColor, ConsoleBlackWhite, ConsoleColor, ConsoleBlackWhite, ConsoleColorToggle, Console7800Pause,
ConsoleLeftDiffA, ConsoleLeftDiffB, ConsoleLeftDiffA, ConsoleLeftDiffB, ConsoleLeftDiffToggle,
ConsoleRightDiffA, ConsoleRightDiffB, ConsoleRightDiffA, ConsoleRightDiffB, ConsoleRightDiffToggle,
ConsoleSelect, ConsoleReset, ConsoleSelect, ConsoleReset,
ConsoleLeftDiffToggle, ConsoleRightDiffToggle, ConsoleColorToggle,
Console7800Pause,
JoystickZeroUp, JoystickZeroDown, JoystickZeroLeft, JoystickZeroRight, JoystickZeroUp, JoystickZeroDown, JoystickZeroLeft, JoystickZeroRight,
JoystickZeroFire, JoystickZeroFire5, JoystickZeroFire9, JoystickZeroFire, JoystickZeroFire5, JoystickZeroFire9,
@ -65,48 +63,6 @@ class Event
KeyboardOne7, KeyboardOne8, KeyboardOne9, KeyboardOne7, KeyboardOne8, KeyboardOne9,
KeyboardOneStar, KeyboardOne0, KeyboardOnePound, KeyboardOneStar, KeyboardOne0, KeyboardOnePound,
Combo1, Combo2, Combo3, Combo4, Combo5, Combo6, Combo7, Combo8,
Combo9, Combo10, Combo11, Combo12, Combo13, Combo14, Combo15, Combo16,
MouseAxisXMove, MouseAxisYMove,
MouseButtonLeftValue, MouseButtonRightValue,
ChangeState, LoadState, SaveState, TakeSnapshot, Quit,
TogglePauseMode, OptionsMenuMode, CmdMenuMode, TimeMachineMode, DebuggerMode, ExitMode,
Fry, VolumeDecrease, VolumeIncrease, SoundToggle, VidmodeDecrease, VidmodeIncrease,
RewindPause, UnwindPause,
UIUp, UIDown, UILeft, UIRight, UIHome, UIEnd, UIPgUp, UIPgDown,
UISelect, UINavPrev, UINavNext, UIOK, UICancel, UIPrevDir,
UITabPrev, UITabNext,
ToggleFullScreen,
VidmodeStd, VidmodeRGB, VidmodeSVideo, VidModeComposite, VidModeBad, VidModeCustom,
PreviousAttribute, NextAttribute, DecreaseAttribute, IncreaseAttribute,
ScanlinesDecrease, ScanlinesIncrease, VCenterDecrease, VCenterIncrease,
ScanlineAdjustDecrease, ScanlineAdjustIncrease,
ToggleP0Collision, ToggleP0Bit, ToggleP1Collision, ToggleP1Bit,
ToggleM0Collision, ToggleM0Bit, ToggleM1Collision, ToggleM1Bit,
ToggleBLCollision, ToggleBLBit, TogglePFCollision, TogglePFBit,
ToggleCollisions, ToggleBits, ToggleFixedColors,
PhosphorDecrease, PhosphorIncrease, TogglePhosphor, ToggleJitter,
ToggleFrameStats, ToggleTimeMachine,
ToggleContSnapshots, ToggleContSnapshotsFrame,
ToggleColorLoss, TogglePalette,
HandleMouseControl, ToggleGrabMouse, ToggleSAPortOrder,
FormatDecrease, FormatIncrease, ReloadConsole,
Rewind1Menu, Rewind10Menu, RewindAllMenu,
Unwind1Menu, Unwind10Menu, UnwindAllMenu,
StartPauseMode, SaveAllStates, LoadAllStates,
OverscanDecrease, OverscanIncrease,
ToggleAutoSlot,
CompuMateFunc, CompuMateShift, CompuMateFunc, CompuMateShift,
CompuMate0, CompuMate1, CompuMate2, CompuMate3, CompuMate4, CompuMate0, CompuMate1, CompuMate2, CompuMate3, CompuMate4,
CompuMate5, CompuMate6, CompuMate7, CompuMate8, CompuMate9, CompuMate5, CompuMate6, CompuMate7, CompuMate8, CompuMate9,
@ -121,8 +77,47 @@ class Event
CompuMateQuote, CompuMateBackspace, CompuMateEquals, CompuMatePlus, CompuMateQuote, CompuMateBackspace, CompuMateEquals, CompuMatePlus,
CompuMateSlash, CompuMateSlash,
ToggleInter, Combo1, Combo2, Combo3, Combo4, Combo5, Combo6, Combo7, Combo8,
MouseAxisXValue, MouseAxisYValue, Combo9, Combo10, Combo11, Combo12, Combo13, Combo14, Combo15, Combo16,
UIUp, UIDown, UILeft, UIRight, UIHome, UIEnd, UIPgUp, UIPgDown,
UISelect, UINavPrev, UINavNext, UIOK, UICancel, UIPrevDir,
UITabPrev, UITabNext,
HandleMouseControl, ToggleGrabMouse,
MouseAxisXMove, MouseAxisYMove, MouseAxisXValue, MouseAxisYValue,
MouseButtonLeftValue, MouseButtonRightValue,
Quit, ReloadConsole, Fry,
TogglePauseMode, StartPauseMode,
OptionsMenuMode, CmdMenuMode, DebuggerMode, ExitMode,
TakeSnapshot, ToggleContSnapshots, ToggleContSnapshotsFrame,
ChangeState, LoadState, SaveState,
SaveAllStates, LoadAllStates,
ToggleAutoSlot, ToggleTimeMachine, TimeMachineMode,
Rewind1Menu, Rewind10Menu, RewindAllMenu,
Unwind1Menu, Unwind10Menu, UnwindAllMenu,
RewindPause, UnwindPause,
FormatDecrease, FormatIncrease, TogglePalette, ToggleColorLoss,
ToggleFullScreen, VidmodeDecrease, VidmodeIncrease,
VCenterDecrease, VCenterIncrease, ScanlineAdjustDecrease, ScanlineAdjustIncrease,
OverscanDecrease, OverscanIncrease,
VidmodeStd, VidmodeRGB, VidmodeSVideo, VidModeComposite, VidModeBad, VidModeCustom,
PreviousAttribute, NextAttribute, DecreaseAttribute, IncreaseAttribute,
ScanlinesDecrease, ScanlinesIncrease,
PhosphorDecrease, PhosphorIncrease, TogglePhosphor, ToggleInter, ToggleJitter,
VolumeDecrease, VolumeIncrease, SoundToggle,
ToggleP0Collision, ToggleP0Bit, ToggleP1Collision, ToggleP1Bit,
ToggleM0Collision, ToggleM0Bit, ToggleM1Collision, ToggleM1Bit,
ToggleBLCollision, ToggleBLBit, TogglePFCollision, TogglePFBit,
ToggleCollisions, ToggleBits, ToggleFixedColors,
ToggleFrameStats, ToggleSAPortOrder,
LastType LastType
}; };
@ -137,7 +132,7 @@ class Event
}; };
// Event list version, update if the id of existing event types changed // Event list version, update if the id of existing event types changed
static constexpr Int32 VERSION = 1; static constexpr Int32 VERSION = 2;
using EventSet = std::set<Event::Type>; using EventSet = std::set<Event::Type>;

12
src/emucore/EventHandler.cxx
View File

@ -1844,15 +1844,15 @@ EventHandler::EmulActionList EventHandler::ourEmulActionList = { {
{ Event::KeyboardOne0, "P1 Keyboard 0", "" }, { Event::KeyboardOne0, "P1 Keyboard 0", "" },
{ Event::KeyboardOnePound, "P1 Keyboard #", "" }, { Event::KeyboardOnePound, "P1 Keyboard #", "" },
// Video // Video
{ Event::VidmodeDecrease, "Previous zoom level", "" },
{ Event::VidmodeIncrease, "Next zoom level", "" },
{ Event::ToggleFullScreen, "Toggle fullscreen", "" }, { Event::ToggleFullScreen, "Toggle fullscreen", "" },
{ Event::OverscanDecrease, "Decrease overscan in fullscreen mode", "" }, { Event::OverscanDecrease, "Decrease overscan in fullscreen mode", "" },
{ Event::OverscanIncrease, "Increase overscan in fullscreen mode", "" }, { Event::OverscanIncrease, "Increase overscan in fullscreen mode", "" },
{ Event::VCenterIncrease, "Move display up", "" }, { Event::VidmodeDecrease, "Previous zoom level", "" },
{ Event::VCenterDecrease, "Move display down", "" }, { Event::VidmodeIncrease, "Next zoom level", "" },
{ Event::ScanlineAdjustIncrease, "Increase scanline adjust", "" }, { Event::ScanlineAdjustIncrease, "Increase vertical display size", "" },
{ Event::ScanlineAdjustDecrease, "Decrease scanline adjust", "" }, { Event::ScanlineAdjustDecrease, "Decrease vertical display size", "" },
{ Event::VCenterDecrease, "Move display up", "" },
{ Event::VCenterIncrease, "Move display down", "" },
{ Event::FormatDecrease, "Decrease display format", "" }, { Event::FormatDecrease, "Decrease display format", "" },
{ Event::FormatIncrease, "Increase display format", "" }, { Event::FormatIncrease, "Increase display format", "" },
{ Event::TogglePalette, "Switch palette (Standard/Z26/User)", "" }, { Event::TogglePalette, "Switch palette (Standard/Z26/User)", "" },