diff options
Diffstat (limited to 'docs/source/usingmame')
-rw-r--r-- | docs/source/usingmame/mamemenus.rst | 49 | ||||
-rw-r--r-- | docs/source/usingmame/ui.rst | 40 |
2 files changed, 45 insertions, 44 deletions
diff --git a/docs/source/usingmame/mamemenus.rst b/docs/source/usingmame/mamemenus.rst index a7010a082fe..672a9c7796a 100644 --- a/docs/source/usingmame/mamemenus.rst +++ b/docs/source/usingmame/mamemenus.rst @@ -12,17 +12,18 @@ Introduction ------------ To show the :ref:`main menu <menus-main>` while running an emulated system in -MAME, press the **Config Menu** key or button (**Tab** by default). If the -emulated system has keyboard inputs, you may need to press the **UI Toggle** key -or button (**Scroll Lock**, or **Forward Delete** on macOS, by default) to -enable user interface controls first. You can dismiss a menu by pressing the -**UI Cancel** key or button (**Escape** by default). Dismissing a menu will -return to its parent menu, or to the running system in the case of the main -menu. - -You can hide a menu and return to the running system by pressing the **Config -Menu** key or button. Pressing the **Config Menu** key or button again will -jump back to the same menu. This is useful when testing changes to settings. +MAME, press the **Show/Hide Menu** key or button (**Tab** by default). If the +emulated system has keyboard inputs, you may need to press the +**Toggle UI Controls** key or button (**Scroll Lock**, or **Forward Delete** on +macOS, by default) to enable user interface controls first. You can dismiss a +menu by pressing the **UI Back** key or button (**Escape** by default). +Dismissing a menu will return to its parent menu, or to the running system in +the case of the main menu. + +You can hide a menu and return to the running system by pressing the +**Show/Hide Menu** key or button. Pressing the **Show/Hide Menu** key or button +again will jump back to the same menu. This is useful when testing changes to +settings. Emulated system inputs are ignored while menus are displayed. You can still pause or resume the running system while most menus are displayed by pressing @@ -43,17 +44,17 @@ For more information on navigating menus, :ref:`see the relevant section Main menu --------- -The main menu is shown when you press the **Config Menu** key or button while +The main menu is shown when you press the **Show/Hide Menu** key or button while running an emulated system or while the system information screen is displayed. It provides access to menus used to change settings, control various features, and show information about the running system and MAME itself. -If you press the **Config Menu** key or button to show the main menu while the -system information screen is displayed, the emulated system will not start until -the main menu is dismissed (either by selecting **Start System**, pressing the -**UI Cancel** key or button, or pressing the **Config Menu** key or button). -This can be useful for mounting media images or changing DIP switches and -machine configuration settings before the emulated system starts. +If you press the **Show/Hide Menu** key or button to show the main menu while +the system information screen is displayed, the emulated system will not start +until the main menu is dismissed (either by selecting **Start System**, pressing +the **UI Back** key or button, or pressing the **Show/Hide Menu** key or +button). This can be useful for mounting media images or changing DIP switches +and machine configuration settings before the emulated system starts. Input Settings Shows the :ref:`Input Settings <menus-inputopts>` menu, where you can assign @@ -127,13 +128,13 @@ Cheat Plugin Options Shows the Plugin Options menu, where you can access settings for enabled plugins. This item is not shown if no plugins are enabled, or if the main - menu is shown before the emulated system starts (by pressing the Config Menu - key/button while the system information screen is displayed). + menu is shown before the emulated system starts (by pressing the Show/Hide + Menu key/button while the system information screen is displayed). External DAT View Shows the info viewer, which displays information loaded from various external support files. This item is not shown if the :ref:`data plugin <plugins-data>` is not enabled, or if the main menu is shown before the - emulated system starts (by pressing the Config Menu key/button while the + emulated system starts (by pressing the Show/Hide Menu key/button while the system information screen is displayed). Add To Favorites/Remove From Favorites Adds the running system to the favourites list, or removes it if it’s @@ -144,13 +145,13 @@ About MAME Select New System Shows the system selection menu, where you can select a system to start a new emulation session. This item is not shown if the main menu is shown - before the emulated system starts (by pressing the Config Menu key/button + before the emulated system starts (by pressing the Show/Hide Menu key/button while the system information screen is displayed). Close Menu/Start System Closes the main menu, returning control of the running system. Shows **Start System** if the main menu is shown before the emulated system - starts (by pressing the Config Menu key/button while the system information - screen is displayed). + starts (by pressing the Show/Hide Menu key/button while the system + information screen is displayed). .. _menus-inputopts: diff --git a/docs/source/usingmame/ui.rst b/docs/source/usingmame/ui.rst index f7ca2a41aa1..60bb55618a2 100644 --- a/docs/source/usingmame/ui.rst +++ b/docs/source/usingmame/ui.rst @@ -20,13 +20,13 @@ The default settings for the most important controls to know when running an emulated system, and the settings they correspond to in case you want to change them, are as follows: -Scroll Lock, or Forward Delete on macOS (UI Toggle) +Scroll Lock, or Forward Delete on macOS (Toggle UI Controls) For emulated systems with keyboard inputs, enable or disable UI controls. (MAME starts with UI controls disabled for systems with keyboard inputs unless the :ref:`ui_active option <mame-commandline-uiactive>` is on.) -Tab (Config Menu) +Tab (Show/Hide Menu) Show or hide the menu during emulation. -Escape (UI Cancel) +Escape (UI Back and UI Cancel) Return to the system selection menu, or exit if MAME was started with a system specified (from the command line or using an :ref:`external front-end <frontends>`). @@ -60,7 +60,7 @@ Return/Enter keypad Enter (UI Select) Select the highlighted menu item. Forward Delete, or Fn+Delete on some compact keyboards (UI Clear) Clear setting or reset to default value. -Escape (UI Cancel) +Escape (UI Back and UI Cancel) Clear the search if searching the menu, otherwise close the menu, returning to the previous menu, or returning to the emulated system in the case of the main menu (there’s usually an item at the bottom of the menu for the same @@ -92,18 +92,24 @@ most important UI controls have joystick assignments by default: * Move the first joystick left or right in the X axis to adjust settings. * Press the first button on the first joystick to select the highlighted menu item. +* If the first joystick has at least three buttons, press the second button on + the first joystick to close the menu, returning to the previous menu, or + returning to the emulated system in the case of the main menu (there’s usually + an item at the bottom of the menu for the same purpose). -For gamepad-style controllers, the left analog thumb stick usually controls UI -navigation. You may find it convenient to assign directional pad controls to UI -navigation in addition to or in place of the left thumb stick. +For gamepad-style controllers, the left analog thumb stick and directional pad +usually control UI navigation. Depending on the controller, the right analog +thumb stick, triggers and additional buttons may automatically be assigned to UI +inputs. Check the **User Interface** input assignments menu to see how controls +are assigned. If you want to be able to use MAME with a game controller without needing a keyboard, you’ll need to assign joystick buttons (or combinations of buttons) to these controls as well: -* **Config Menu** to show or dismiss the menu during emulation -* **UI Cancel** to close menus, return to the system selection menu, or exit - MAME +* **Show/Hide Menu** to show or hide the menu during emulation +* **UI Back** to close menus +* **UI Cancel** to return to the system selection menu or exit MAME * **UI Clear** isn’t essential for basic emulation, but it’s used to clear or reset some settings to defaults * **UI Home**, **UI End**, **UI Page Up**, **UI Page Down**, **UI Previous @@ -138,8 +144,8 @@ pointing device: * Click toolbar items to select them, or hover over them to see a description. If you have enough additional mouse buttons, you may want to assign button -combinations to the **Config Menu**, **Pause** and/or **UI Cancel** inputs to -make it possible to use MAME without a keyboard. +combinations to the **Show/Hide Menu**, **Pause**, **UI Back** and/or +**UI Cancel** inputs to make it possible to use MAME without a keyboard. .. _ui-inptcfg: @@ -220,10 +226,7 @@ input or a combination of inputs for a logical **and** operation: * Press a key or button or move an analog control twice to add a **not** item to the **and** operation. Pressing the same key or button or moving the same analog control additional times toggles the **not** on and off. -* Pressing **UI Cancel** (**Escape** by default) *before* activating any other - controls clears the setting or restores the default assignment. -* Press **UI Cancel** *after* activating another control to leave the setting - unchanged. +* Press **UI Cancel** (**Escape** by default) to leave the setting unchanged. * The new setting is shown below the menu. Wait one second after activating an input to accept the new setting. @@ -344,10 +347,7 @@ When you select an axis setting, MAME will wait for you to enter an input: direction of the control on or off. * When appending to a setting, move an analog control other than the last assigned control or press a key or button to add an **or** operation. -* Pressing **UI Cancel** (**Escape** by default) *before* activating any other - controls clears the setting or restores the default assignment. -* Pressing **UI Cancel** *after* activating another control leaves the setting - unchanged. +* Pressing **UI Cancel** (**Escape** by default) leaves the setting unchanged. * The new setting is shown below the menu. Wait one second after moving an analog control to accept the new setting. |