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

add long button press to launcher for power on options 

note: currently this feels more like a hack
This commit is contained in:
Thomas Jentzsch 2019-08-13 14:06:27 +02:00
parent 798f305664
commit 654c843084
17 changed files with 110 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
docs/R77_readme.txt
View File

@ -24,30 +24,31 @@ During emulation:
Button 9 RESET Reset
Inside Launcher:
Joystick Button Action
--------------------------------------------
Up SAVE Previous game
Down RESET Next game
Left LOAD Page up
Right MODE Page down
Button 1 SKILL P1 Start selected game
Button 2 SKILL P2 Open power-on options
Button 4 COLOR,B/W Open settings
Joystick Button Action
-------------------------------------------------
Up SAVE Previous game
Down RESET Next game
Left LOAD Page up
Right MODE Page down
Button 1 SKILL P1 Start selected game
Button 2 or SKILL P2 Open power-on options
hold Button 1
Button 4 COLOR,B/W Open settings
Inside a dialog:
Joystick Button Action
------------------------------------------------------
Up SAVE Increase current setting
Down RESET Decrease current setting
Left LOAD Previous dialog element
Right MODE Next dialog element
Button 1 SKILL P1 Select element
Button 2 SKILL P2 OK
Button 3 or 4:3,16:9 Previous tab
Button 1 + Left
Button 4 or FRY Next tab
Button 1 + Right
Button 6 - Cancel
Joystick Button Action
-------------------------------------------------------
Up SAVE Increase current setting
Down RESET Decrease current setting
Left LOAD Previous dialog element
Right MODE Next dialog element
Button 1 SKILL P1 Select element
Button 2 SKILL P2 OK
Button 3 or 4:3,16:9 Previous tab
Button 1 + Left
Button 4 or FRY Next tab
Button 1 + Right
Button 6 - Cancel
Note: If you have a keyboard attached via OTG all keys work as described in
the Stella User's Guide.

2
src/gui/ContextMenu.cxx
View File

@ -286,7 +286,7 @@ void ContextMenu::handleKeyDown(StellaKey key, StellaMod mod)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ContextMenu::handleJoyDown(int stick, int button)
void ContextMenu::handleJoyDown(int stick, int button, bool longPress)
{
handleEvent(instance().eventHandler().eventForJoyButton(kMenuMode, stick, button));
}

2
src/gui/ContextMenu.hxx
View File

@ -87,7 +87,7 @@ class ContextMenu : public Dialog, public CommandSender
bool handleMouseClicks(int x, int y, MouseButton b) override;
void handleMouseWheel(int x, int y, int direction) override;
void handleKeyDown(StellaKey key, StellaMod mod) override;
void handleJoyDown(int stick, int button) override;
void handleJoyDown(int stick, int button, bool longPress) override;
void handleJoyAxis(int stick, int axis, int value, int button) override;
bool handleJoyHat(int stick, int hat, JoyHat value, int button) override;
void handleEvent(Event::Type e);

4
src/gui/Dialog.cxx
View File

@ -588,7 +588,7 @@ bool Dialog::handleMouseClicks(int x, int y, MouseButton b)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Dialog::handleJoyDown(int stick, int button)
void Dialog::handleJoyDown(int stick, int button, bool longPress)
{
Event::Type e =
instance().eventHandler().eventForJoyButton(kMenuMode, stick, button);
@ -598,7 +598,7 @@ void Dialog::handleJoyDown(int stick, int button)
if(!handleNavEvent(e) && _focusedWidget)
{
if(_focusedWidget->wantsRaw() || e == Event::NoType)
_focusedWidget->handleJoyDown(stick, button);
_focusedWidget->handleJoyDown(stick, button, longPress);
else
_focusedWidget->handleEvent(e);
}

2
src/gui/Dialog.hxx
View File

@ -137,7 +137,7 @@ class Dialog : public GuiObject
virtual void handleMouseWheel(int x, int y, int direction);
virtual void handleMouseMoved(int x, int y);
virtual bool handleMouseClicks(int x, int y, MouseButton b);
virtual void handleJoyDown(int stick, int button);
virtual void handleJoyDown(int stick, int button, bool longPress = false);
virtual void handleJoyUp(int stick, int button);
virtual void handleJoyAxis(int stick, int axis, int value, int button = JOY_CTRL_NONE);
virtual bool handleJoyHat(int stick, int hat, JoyHat value, int button = JOY_CTRL_NONE);

17
src/gui/DialogContainer.cxx
View File

@ -31,6 +31,7 @@ DialogContainer::DialogContainer(OSystem& osystem)
myTime(0),
myClickRepeatTime(0),
myButtonRepeatTime(0),
myButtonLongPressTime(0),
myAxisRepeatTime(0),
myHatRepeatTime(0)
{
@ -68,6 +69,13 @@ void DialogContainer::updateTime(uInt64 time)
myButtonRepeatTime = myTime + _REPEAT_SUSTAIN_DELAY;
}
// Joystick has been pressed long
if(myCurrentButtonDown.stick != -1 && myButtonLongPressTime < myTime)
{
activeDialog->handleJoyDown(myCurrentButtonDown.stick, myCurrentButtonDown.button, true);
myButtonLongPressTime = myButtonRepeatTime = myTime + _REPEAT_NONE;
}
// Joystick axis still pressed
if(myCurrentAxisDown.stick != -1 && myAxisRepeatTime < myTime)
{
@ -288,6 +296,7 @@ void DialogContainer::handleJoyBtnEvent(int stick, int button, bool pressed)
myCurrentButtonDown.stick = stick;
myCurrentButtonDown.button = button;
myButtonRepeatTime = myTime + (activeDialog->repeatEnabled() ? _REPEAT_INITIAL_DELAY : _REPEAT_NONE);
myButtonLongPressTime = myTime + _LONG_PRESS_DELAY;
activeDialog->handleJoyDown(stick, button);
}
@ -297,7 +306,7 @@ void DialogContainer::handleJoyBtnEvent(int stick, int button, bool pressed)
if(stick == myCurrentButtonDown.stick)
{
myCurrentButtonDown.stick = myCurrentButtonDown.button = -1;
myButtonRepeatTime = 0;
myButtonRepeatTime = myButtonLongPressTime = 0;
}
activeDialog->handleJoyUp(stick, button);
}
@ -312,6 +321,9 @@ void DialogContainer::handleJoyAxisEvent(int stick, int axis, int value, int but
// Send the event to the dialog box on the top of the stack
Dialog* activeDialog = myDialogStack.top();
// Prevent long button press in button/axis combinations
myButtonLongPressTime = myTime + _REPEAT_NONE;
// Only stop firing events if it's the current stick
if(myCurrentAxisDown.stick == stick && value == 0)
{
@ -340,6 +352,9 @@ void DialogContainer::handleJoyHatEvent(int stick, int hat, JoyHat value, int bu
// Send the event to the dialog box on the top of the stack
Dialog* activeDialog = myDialogStack.top();
// Prevent long button press in button/hat combinations
myButtonLongPressTime = myTime + _REPEAT_NONE;
// Only stop firing events if it's the current stick
if(myCurrentHatDown.stick == stick && value == JoyHat::CENTER)
{

2
src/gui/DialogContainer.hxx
View File

@ -187,6 +187,7 @@ class DialogContainer
static uInt64 _REPEAT_INITIAL_DELAY;
static uInt64 _REPEAT_SUSTAIN_DELAY;
static constexpr uInt64 _REPEAT_NONE = 1 << 24; // loooong
static constexpr uInt64 _LONG_PRESS_DELAY = 1000; // 1 second
// For continuous 'mouse down' events
struct {
@ -202,6 +203,7 @@ class DialogContainer
int button;
} myCurrentButtonDown;
uInt64 myButtonRepeatTime;
uInt64 myButtonLongPressTime;
// For continuous 'joy axis down' events
struct {

2
src/gui/EventMappingWidget.cxx
View File

@ -309,7 +309,7 @@ bool EventMappingWidget::handleKeyUp(StellaKey key, StellaMod mod)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EventMappingWidget::handleJoyDown(int stick, int button)
void EventMappingWidget::handleJoyDown(int stick, int button, bool longPress)
{
cerr << "handleJoyDown" << endl;
// Remap joystick buttons in remap mode

2
src/gui/EventMappingWidget.hxx
View File

@ -58,7 +58,7 @@ class EventMappingWidget : public Widget, public CommandSender
bool handleKeyDown(StellaKey key, StellaMod mod) override;
bool handleKeyUp(StellaKey key, StellaMod mod) override;
void handleJoyDown(int stick, int button) override;
void handleJoyDown(int stick, int button, bool longPress = false) override;
void handleJoyUp(int stick, int button) override;
void handleJoyAxis(int stick, int axis, int value, int button) override;
bool handleJoyHat(int stick, int hat, JoyHat value, int button) override;

4
src/gui/FileListWidget.cxx
View File

@ -121,6 +121,10 @@ void FileListWidget::handleCommand(CommandSender* sender, int cmd, int data, int
cmd = ItemActivated;
break;
case ListWidget::kLongButtonPressCmd:
// do nothing, let boss handle this one
break;
default:
// If we don't know about the command, send it to the parent and exit
StringListWidget::handleCommand(sender, cmd, data, id);

2
src/gui/InputDialog.cxx
View File

@ -475,7 +475,7 @@ void InputDialog::handleKeyUp(StellaKey key, StellaMod mod)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void InputDialog::handleJoyDown(int stick, int button)
void InputDialog::handleJoyDown(int stick, int button, bool longPress)
{
// Remap joystick buttons in remap mode, otherwise pass to parent dialog
if(myEmulEventMapper->remapMode())

2
src/gui/InputDialog.hxx
View File

@ -49,7 +49,7 @@ class InputDialog : public Dialog
private:
void handleKeyDown(StellaKey key, StellaMod mod) override;
void handleKeyUp(StellaKey key, StellaMod mod) override;
void handleJoyDown(int stick, int button) override;
void handleJoyDown(int stick, int button, bool longPress) override;
void handleJoyUp(int stick, int button) override;
void handleJoyAxis(int stick, int axis, int value, int button) override;
bool handleJoyHat(int stick, int hat, JoyHat value, int button) override;

31
src/gui/LauncherDialog.cxx
View File

@ -79,9 +79,9 @@
#endif
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
int x, int y, int w, int h)
: Dialog(osystem, parent, x, y, w, h),
LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
int x, int y, int w, int h)
: Dialog(osystem, parent, x, y, w, h),
myStartButton(nullptr),
myPrevDirButton(nullptr),
myOptionsButton(nullptr),
@ -90,7 +90,8 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
myPattern(nullptr),
myAllFiles(nullptr),
myRomInfoWidget(nullptr),
mySelectedItem(0)
mySelectedItem(0),
myEventHandled(false)
{
myUseMinimalUI = instance().settings().getBool("minimal_ui");
@ -466,7 +467,7 @@ void LauncherDialog::handleKeyDown(StellaKey key, StellaMod mod)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void LauncherDialog::handleJoyDown(int stick, int button)
void LauncherDialog::handleJoyDown(int stick, int button, bool longPress)
{
// open power-up options and settings for 2nd and 4th button if not mapped otherwise
Event::Type e = instance().eventHandler().eventForJoyButton(kMenuMode, stick, button);
@ -476,7 +477,19 @@ void LauncherDialog::handleJoyDown(int stick, int button)
if (button == 3 && (e == Event::Event::UITabPrev || e == Event::NoType))
openSettings();
else
Dialog::handleJoyDown(stick, button);
{
myEventHandled = false;
myList->setFlags(Widget::FLAG_WANTS_RAWDATA); // allow handling long button press
Dialog::handleJoyDown(stick, button, longPress);
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void LauncherDialog::handleJoyUp(int stick, int button)
{
if (!myEventHandled)
Dialog::handleJoyUp(stick, button);
myList->clearFlags(Widget::FLAG_WANTS_RAWDATA); // stop allowing to handle long button press
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -547,6 +560,11 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd,
updateUI();
break;
case ListWidget::kLongButtonPressCmd:
myGlobalProps->open();
myEventHandled = true;
break;
case kQuitCmd:
close();
instance().eventHandler().quit();
@ -557,6 +575,7 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd,
FilesystemNode node(instance().settings().getString("romdir"));
if(!(node.exists() && node.isDirectory()))
node = FilesystemNode("~");
myList->setDirectory(node);
break;
}

4
src/gui/LauncherDialog.hxx
View File

@ -91,7 +91,8 @@ class LauncherDialog : public Dialog
void handleKeyDown(StellaKey key, StellaMod mod) override;
void handleMouseDown(int x, int y, MouseButton b, int clickCount) override;
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
void handleJoyDown(int stick, int button) override;
void handleJoyDown(int stick, int button, bool longPress) override;
void handleJoyUp(int stick, int button) override;
Event::Type getJoyAxisEvent(int stick, int axis, int value, int button) override;
void loadConfig() override;
@ -130,6 +131,7 @@ class LauncherDialog : public Dialog
bool myShowOnlyROMs;
bool myUseMinimalUI;
bool myEventHandled;
enum {
kPrevDirCmd = 'PRVD',

24
src/gui/ListWidget.cxx
View File

@ -25,6 +25,7 @@
#include "FrameBuffer.hxx"
#include "StellaKeys.hxx"
#include "TimerManager.hxx"
#include "EventHandler.hxx"
#include "ListWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -323,6 +324,29 @@ bool ListWidget::handleKeyDown(StellaKey key, StellaMod mod)
return handled;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ListWidget::handleJoyDown(int stick, int button, bool longPress)
{
if (longPress)
sendCommand(ListWidget::kLongButtonPressCmd, _selectedItem, _id);
Event::Type e = _boss->instance().eventHandler().eventForJoyButton(kMenuMode, stick, button);
// handle UISelect event on button up
if(e != Event::UISelect)
handleEvent(e);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ListWidget::handleJoyUp(int stick, int button)
{
Event::Type e = _boss->instance().eventHandler().eventForJoyButton(kMenuMode, stick, button);
// handle UISelect event on button up
if(e == Event::UISelect)
handleEvent(e);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool ListWidget::handleEvent(Event::Type e)
{

3
src/gui/ListWidget.hxx
View File

@ -31,6 +31,7 @@ class ListWidget : public EditableWidget
public:
enum {
kDoubleClickedCmd = 'LIdb', // double click on item - 'data' will be item index
kLongButtonPressCmd = 'LIlb', // long button press
kActivatedCmd = 'LIac', // item activated by return/enter - 'data' will be item index
kDataChangedCmd = 'LIch', // item data changed - 'data' will be item index
kRClickedCmd = 'LIrc', // right click on item - 'data' will be item index
@ -71,6 +72,8 @@ class ListWidget : public EditableWidget
void handleMouseWheel(int x, int y, int direction) override;
bool handleText(char text) override;
bool handleKeyDown(StellaKey key, StellaMod mod) override;
void handleJoyDown(int stick, int button, bool longPress) override;
void handleJoyUp(int stick, int button) override;
bool handleEvent(Event::Type e) override;
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;

5
src/gui/Widget.hxx
View File

@ -77,7 +77,7 @@ class Widget : public GuiObject
virtual void handleMouseMoved(int x, int y) { }
virtual void handleMouseWheel(int x, int y, int direction) { }
virtual bool handleMouseClicks(int x, int y, MouseButton b) { return false; }
virtual void handleJoyDown(int stick, int button) { }
virtual void handleJoyDown(int stick, int button, bool longPress = false) { }
virtual void handleJoyUp(int stick, int button) { }
virtual void handleJoyAxis(int stick, int axis, int value, int button = JOY_CTRL_NONE) { }
virtual bool handleJoyHat(int stick, int hat, JoyHat value, int button = JOY_CTRL_NONE) { return false; }
@ -176,7 +176,6 @@ class Widget : public GuiObject
Widget& operator=(Widget&&) = delete;
};
/* StaticTextWidget */
class StaticTextWidget : public Widget
{
@ -212,7 +211,6 @@ class StaticTextWidget : public Widget
StaticTextWidget& operator=(StaticTextWidget&&) = delete;
};
/* ButtonWidget */
class ButtonWidget : public StaticTextWidget, public CommandSender
{
@ -262,7 +260,6 @@ class ButtonWidget : public StaticTextWidget, public CommandSender
ButtonWidget& operator=(ButtonWidget&&) = delete;
};
/* CheckboxWidget */
class CheckboxWidget : public ButtonWidget
{