diff options
author | 2024-04-26 06:26:22 +1000 | |
---|---|---|
committer | 2024-04-26 06:26:22 +1000 | |
commit | f91b896cda8343fc41f069b32b7ef527364bdea1 (patch) | |
tree | 105ca2e24d44ae9ceac3f540abf07b4f00086cde /docs/source | |
parent | 3b618bd7f04b8164fbcbb1fc106502e05ee85d6a (diff) |
input/input_sdl.cpp: Added an SDL lightgun provider.
This does essentially the same thing as the Win32 lightgun provider,
mapping the absolute pointer position over the window to gun axes.
Also added a bunch of const in the windows input handling code.
docs: Bumped version, as features that are not in a releaesd version of
MAME are now documented.
Diffstat (limited to 'docs/source')
-rw-r--r-- | docs/source/commandline/commandline-all.rst | 71 | ||||
-rw-r--r-- | docs/source/commandline/commandline-index.rst | 6 | ||||
-rw-r--r-- | docs/source/commandline/sdlconfig.rst | 17 | ||||
-rw-r--r-- | docs/source/conf.py | 4 |
4 files changed, 54 insertions, 44 deletions
diff --git a/docs/source/commandline/commandline-all.rst b/docs/source/commandline/commandline-all.rst index 89f7dac1287..fe093cc0d86 100644 --- a/docs/source/commandline/commandline-all.rst +++ b/docs/source/commandline/commandline-all.rst @@ -775,24 +775,24 @@ OSD-related Options * - **Microsoft Windows** - win - dwrite - - none - auto - - - sdl [#UIFPSDLWindows]_. + - sdl [#UIFPSDLWindows]_ + - none * - **macOS** - - - - none - auto - osx - sdl + - none * - **Linux** - - - - none - auto - - sdl + - none .. rubric:: Footnotes @@ -816,26 +816,19 @@ Example: :stub-columns: 0 * - **Microsoft Windows** - - auto [#KBIPAutoWindows]_. + - auto [#KBIPAutoWindows]_ - rawinput - dinput - win32 + - sdl [#KBIPSDLWindows]_ - none - - sdl [#KBIPSDLWindows]_. * - **SDL (macOS and Linux)** - - auto [#KBIPAutoSDL]_. + - auto [#KBIPAutoSDL]_ - - - - - none - sdl - * - **Linux** - - auto [#KBIPAutoSDL]_. - - - - - - - none - - sdl .. rubric:: Footnotes @@ -868,26 +861,19 @@ Example: :stub-columns: 0 * - **Microsoft Windows** - - auto [#MIPAutoWindows]_. + - auto [#MIPAutoWindows]_ - rawinput - dinput - win32 + - sdl [#MIPSDLWindows]_ - none - - sdl [#MIPSDLWindows]_. * - **SDL (macOS and Linux)** - - auto [#MIPAutoSDL]_. + - auto [#MIPAutoSDL]_ - - - - - none - sdl - * - **Linux** - - auto [#MIPAutoSDL]_. - - - - - - - none - - sdl .. rubric:: Footnotes @@ -916,36 +902,37 @@ Example: :stub-columns: 0 * - **Microsoft Windows** - - auto [#LGIPAutoWindows]_. + - auto [#LGIPAutoWindows]_ - rawinput - win32 - - none - - + - sdl [#LGIPSDLWindows]_ - + - none * - **macOS** - - auto [#LGIPAutoSDL]_. + - auto [#LGIPAutoSDL]_ - - - - none - - + - sdl - + - none * - **Linux** - - auto [#LGIPAutoLinux]_. + - auto [#LGIPAutoSDL]_ - - - - none - - + - sdl - x11 + - none .. rubric:: Footnotes .. [#LGIPAutoWindows] On Windows, auto will try ``rawinput`` with fallback to ``win32``, or ``none`` if it doesn't find any. -.. [#LGIPAutoSDL] On non-Linux SDL, ``auto`` will default to ``none``. +.. [#LGIPSDLWindows] SDL support on Windows requires that you compile MAME with + the support in. By default SDL is not included in Windows + builds of MAME. -.. [#LGIPAutoLinux] On SDL/Linux, ``auto`` will default to ``x11``, or ``none`` - if it doesn't find any. +.. [#LGIPAutoSDL] On SDL, ``auto`` will default to ``sdl``. Example: .. code-block:: bash @@ -964,15 +951,15 @@ Example: :stub-columns: 0 * - **Microsoft Windows** - - auto [#JIPAutoWindows]_. + - auto [#JIPAutoWindows]_ - winhybrid - dinput - xinput - - sdlgame - - sdljoy + - sdlgame [#JIPSDLWindows]_ + - sdljoy [#JIPSDLWindows]_ - none * - **SDL** - - auto [#JIPAutoSDL]_. + - auto [#JIPAutoSDL]_ - - - @@ -984,6 +971,10 @@ Example: .. [#JIPAutoWindows] On Windows native, auto will default to ``winhybrid``. +.. [#JIPSDLWindows] SDL support on Windows requires that you compile MAME with + the support in. By default SDL is not included in Windows + builds of MAME. + .. [#JIPAutoSDL] On SDL, auto will default to ``sdlgame``. winhybrid diff --git a/docs/source/commandline/commandline-index.rst b/docs/source/commandline/commandline-index.rst index 50500066d6f..c62dfef518b 100644 --- a/docs/source/commandline/commandline-index.rst +++ b/docs/source/commandline/commandline-index.rst @@ -423,10 +423,12 @@ SDL Keyboard Mapping | :ref:`keymap_file <mame-scommandline-keymapfile>` -SDL Joystick Mapping +SDL Input Options ~~~~~~~~~~~~~~~~~~~~ -| :ref:`sixaxis <mame-scommandline-sixaxis>` +| :ref:`[no]enable_touch <mame-scommandline-enabletouch>` +| :ref:`[no]sixaxis <mame-scommandline-sixaxis>` +| :ref:`[no]dual_lightgun <mame-scommandline-duallightgun>` SDL Lightgun Mapping diff --git a/docs/source/commandline/sdlconfig.rst b/docs/source/commandline/sdlconfig.rst index df04865a390..3d3582fa69e 100644 --- a/docs/source/commandline/sdlconfig.rst +++ b/docs/source/commandline/sdlconfig.rst @@ -80,6 +80,23 @@ SDL Input Options undesirable behaviour with other controllers. Only affects the ``sdljoy`` joystick provider. Default is OFF (**-nosixaxis**) +.. _mame-scommandline-duallightgun: + +**-[no]dual_lightgun** / **-[no]dual** + + Controls whether or not MAME attempts to track two lightguns that appear as + a single mouse. This option requires the :ref:`lightgun option + <mame-commandline-nolightgun>` to be on and the :ref:`lightgunprovider + option <mame-commandline-lightgunprovider>` to be set to *sdl*. + + This option supports dual lightgun setups that work by setting the mouse + pointer location at the moment a lightgun trigger is activated. The primary + and secondary triggers on the first lightgun correspond to the first and + second mouse buttons, and the primary and secondary triggers on the second + lightgun correspond to the third and fourth mouse buttons. + + The default is OFF (**-nodual_lightgun**). + SDL Lightgun Mapping -------------------- diff --git a/docs/source/conf.py b/docs/source/conf.py index 4f5f06b3e52..0b78ef7a53e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2024, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.265' +version = '0.266' # The full version, including alpha/beta/rc tags. -release = '0.265' +release = '0.266' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |