summaryrefslogtreecommitdiffstats
path: root/src/frontend/mame/ui/selsoft.cpp
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2021-10-31 12:31:16 +1100
committer GitHub <noreply@github.com>2021-10-31 12:31:16 +1100
commitd64ea5331b2312f81df464fb22dcef0191216d86 (patch)
treea3f3784371da401e6a675e5b6b9734b88281a08d /src/frontend/mame/ui/selsoft.cpp
parentcfffc54b61cabc5ef9533396bf87324eb5eeb63e (diff)
-frontend: Refactored menu event handling and fixed a number of issues. (#8777)
* Moved common code for drawing about box, info viewer, and other text box menus to a base class; removed the last of the info viewer logic and the multi-line item hack from the base menu class. * Added previous/next group navigation for general inputs and plugin input selection menus. * Moved message catalog logic to lib/util, allowing osd and emu to use localised messages. * Made the base menu class use the UI manager’s feature for holding session state rather than a static map and mutex. * Improved menu event handling model, and fixed many issues, particularly with menus behaving badly when hidden/shown. * Added better support for menus that don’t participate in the usual menu stack, like the menuless sliders and the save/load state menus. * Made a number of menus refresh state when being shown after being hidden (fixes MT08121 among other issues). * Fixed indication of mounted slot option in the slot option details menu. * Improved appearance of background menus when emulation isn't running - draw all menus in the stack, and darken the background menus to make the edges of the active menu clearer. * Fixed locale issues in -listxml. -debugger: Made GUI debuggers more uniform. * Added new memory view features to Win32 debugger. * Fixed spelling of hexadecimal in Cocoa debugger and added decimal address option. * Fixed duplicate keyboard shortcut in Cocoa debugger (Shift-Cmd-D was both new device window and 64-bit float format). * Made keyboard shortcuts slightly more consistent across debuggers. -plugins: Moved input selection menu and sequence polling code to a common library. Fixed the issue that prevented keyboard inputs being mapped with -steadykey on. -docs: Started adding some documentation for MAME's internal UI, and updated the list of example front-ends. -Regenerated message catalog sources. For translators, the new strings are mostly: * The names of the inputs provided by the OS-dependent layer for things like fullscreen and video features. These show up in the user interface inputs menu. * The names for automatically generated views. These show up in the video options menu - test with a system with a lot of screens to see more variants. * The input macro plugin UI. * A few format strings for analog input assignments. * A few strings for the about box header.
Diffstat (limited to 'src/frontend/mame/ui/selsoft.cpp')
-rw-r--r--src/frontend/mame/ui/selsoft.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/frontend/mame/ui/selsoft.cpp b/src/frontend/mame/ui/selsoft.cpp
index 05ce1302a70..e0d3023050a 100644
--- a/src/frontend/mame/ui/selsoft.cpp
+++ b/src/frontend/mame/ui/selsoft.cpp
@@ -394,27 +394,25 @@ menu_select_software::~menu_select_software()
// handle
//-------------------------------------------------
-void menu_select_software::handle()
+void menu_select_software::handle(event const *ev)
{
if (m_prev_selected == nullptr)
m_prev_selected = item(0).ref;
- // ignore pause keys by swallowing them before we process the menu
- machine().ui_input().pressed(IPT_UI_PAUSE);
+ // FIXME: everything above here used run before events were processed
// process the menu
- const event *menu_event = process(PROCESS_LR_REPEAT);
- if (menu_event)
+ if (ev)
{
if (dismiss_error())
{
- // reset the error on any future event
+ // reset the error on any subsequent menu event
}
- else switch (menu_event->iptkey)
+ else switch (ev->iptkey)
{
case IPT_UI_SELECT:
- if ((get_focus() == focused_menu::MAIN) && menu_event->itemref)
- inkey_select(menu_event);
+ if ((get_focus() == focused_menu::MAIN) && ev->itemref)
+ inkey_select(ev);
break;
case IPT_UI_LEFT:
@@ -470,12 +468,12 @@ void menu_select_software::handle()
break;
default:
- if (menu_event->itemref)
+ if (ev->itemref)
{
- if (menu_event->iptkey == IPT_UI_FAVORITES)
+ if (ev->iptkey == IPT_UI_FAVORITES)
{
// handle UI_FAVORITES
- ui_software_info *swinfo = (ui_software_info *)menu_event->itemref;
+ ui_software_info *swinfo = (ui_software_info *)ev->itemref;
if ((uintptr_t)swinfo > 2)
{