From d64ea5331b2312f81df464fb22dcef0191216d86 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 31 Oct 2021 12:31:16 +1100 Subject: -frontend: Refactored menu event handling and fixed a number of issues. (#8777) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. --- src/frontend/mame/ui/filesel.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/frontend/mame/ui/filesel.cpp') diff --git a/src/frontend/mame/ui/filesel.cpp b/src/frontend/mame/ui/filesel.cpp index 1ddabffbb23..ea5c1e02e37 100644 --- a/src/frontend/mame/ui/filesel.cpp +++ b/src/frontend/mame/ui/filesel.cpp @@ -478,18 +478,17 @@ void menu_file_selector::populate(float &customtop, float &custombottom) // handle //------------------------------------------------- -void menu_file_selector::handle() +void menu_file_selector::handle(event const *ev) { // process the menu - event const *const event = process(0); - if (event) + if (ev) { - if (event->iptkey == IPT_SPECIAL) + if (ev->iptkey == IPT_SPECIAL) { // if it's any other key and we're not maxed out, update - type_search_char(event->unichar); + type_search_char(ev->unichar); } - else if (event->iptkey == IPT_UI_CANCEL) + else if (ev->iptkey == IPT_UI_CANCEL) { // reset the char buffer also in this case if (!m_filename.empty()) @@ -498,10 +497,10 @@ void menu_file_selector::handle() ui().popup_time(ERROR_MESSAGE_TIME, "%s", m_filename); } } - else if (event->itemref && (event->iptkey == IPT_UI_SELECT)) + else if (ev->itemref && (ev->iptkey == IPT_UI_SELECT)) { // handle selections - select_item(*reinterpret_cast(event->itemref)); + select_item(*reinterpret_cast(ev->itemref)); // reset the char buffer when pressing IPT_UI_SELECT m_filename.clear(); @@ -556,13 +555,12 @@ void menu_select_rw::populate(float &customtop, float &custombottom) // handle //------------------------------------------------- -void menu_select_rw::handle() +void menu_select_rw::handle(event const *ev) { // process the menu - const event *event = process(0); - if (event != nullptr && event->iptkey == IPT_UI_SELECT) + if (ev && ev->iptkey == IPT_UI_SELECT) { - m_result = result_from_itemref(event->itemref); + m_result = result_from_itemref(ev->itemref); stack_pop(); } } -- cgit v1.2.3-70-g09d2