summaryrefslogtreecommitdiffstats
path: root/src/osd/modules/input/input_sdlcommon.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/osd/modules/input/input_sdlcommon.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/osd/modules/input/input_sdlcommon.cpp')
-rw-r--r--src/osd/modules/input/input_sdlcommon.cpp25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp
index 9f2b7661379..92e3653e4d1 100644
--- a/src/osd/modules/input/input_sdlcommon.cpp
+++ b/src/osd/modules/input/input_sdlcommon.cpp
@@ -23,19 +23,26 @@
// MAME headers
#include "emu.h"
-#include "osdepend.h"
+
#include "ui/uimain.h"
#include "uiinput.h"
+
#include "window.h"
+
+#include "util/language.h"
+
+#include "osdepend.h"
#include "strconv.h"
#include "../../sdl/osdsdl.h"
#include "input_common.h"
#include "input_sdlcommon.h"
+
#define GET_WINDOW(ev) window_from_id((ev)->windowID)
//#define GET_WINDOW(ev) ((ev)->windowID)
+
static std::shared_ptr<sdl_window_info> window_from_id(Uint32 windowID)
{
SDL_Window *sdl_window = SDL_GetWindowFromID(windowID);
@@ -165,16 +172,10 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
break;
// alt-enter for fullscreen
case IPT_OSD_1:
- entry.configure_osd("TOGGLE_FULLSCREEN", "Toggle Fullscreen");
+ entry.configure_osd("TOGGLE_FULLSCREEN", N_p("input-name", "Toggle Fullscreen"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_ENTER, KEYCODE_LALT);
break;
- // disable UI_SELECT when LALT is down, this stops selecting
- // things in the menu when toggling fullscreen with LALT+ENTER
- /* case IPT_UI_SELECT:
- entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_ENTER, input_seq::not_code, KEYCODE_LALT);
- break;*/
-
// page down for fastforward (must be OSD_3 as per src/emu/ui.c)
case IPT_UI_FAST_FORWARD:
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_PGDN);
@@ -197,13 +198,13 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
// LCTRL-F5 to toggle OpenGL filtering
case IPT_OSD_5:
- entry.configure_osd("TOGGLE_FILTER", "Toggle Filter");
+ entry.configure_osd("TOGGLE_FILTER", N_p("input-name", "Toggle Filter"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F5, KEYCODE_LCONTROL);
break;
// LCTRL-F6 to decrease OpenGL prescaling
case IPT_OSD_6:
- entry.configure_osd("DECREASE_PRESCALE", "Decrease Prescaling");
+ entry.configure_osd("DECREASE_PRESCALE", N_p("input-name", "Decrease Prescaling"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F6, KEYCODE_LCONTROL);
break;
// add a Not lcrtl condition to the toggle cheat key
@@ -213,13 +214,13 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
// LCTRL-F7 to increase OpenGL prescaling
case IPT_OSD_7:
- entry.configure_osd("INCREASE_PRESCALE", "Increase Prescaling");
+ entry.configure_osd("INCREASE_PRESCALE", N_p("input-name", "Increase Prescaling"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F7, KEYCODE_LCONTROL);
break;
// lshift-lalt-F12 for fullscreen video (BGFX)
case IPT_OSD_8:
- entry.configure_osd("RENDER_AVI", "Record Rendered Video");
+ entry.configure_osd("RENDER_AVI", N_p("input-name", "Record Rendered Video"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, KEYCODE_LSHIFT, KEYCODE_LALT);
break;