RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

input/overlays: add option to lock overlay input to player one

Browse Source
This commit is contained in:
Megamouse 2023-06-26 21:42:37 +02:00
parent 9ecfecb83e
commit 7b64cd2a8e
7 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpcs3/Emu/RSX/Overlays/overlays.cpp
View File

@ -223,6 +223,11 @@ namespace rsx
continue;
}
if (pad_index > 0 && g_cfg.io.lock_overlay_input_to_player_one)
{
continue;
}
if (!pad)
{
rsx_log.fatal("Pad %d is nullptr", pad_index);

1
rpcs3/Emu/system_config.h
View File

@ -277,6 +277,7 @@ struct cfg_root : cfg::node
cfg::uint<0, 100'000> pad_sleep{this, "Pad handler sleep (microseconds)", 1'000, true};
cfg::_bool background_input_enabled{this, "Background input enabled", true, true};
cfg::_bool show_move_cursor{this, "Show move cursor", false, true};
cfg::_bool lock_overlay_input_to_player_one{this, "Lock overlay input to player one", false, true};
cfg::string midi_devices{ this, "Emulated Midi devices", "ßßß@@@ßßß@@@ßßß@@@" };
} io{ this };

3
rpcs3/Input/pad_thread.cpp
View File

@ -411,6 +411,9 @@ void pad_thread::operator()()
for (usz i = 0; i < m_pads.size() && !ps_button_pressed; i++)
{
if (i > 0 && g_cfg.io.lock_overlay_input_to_player_one)
break;
const auto& pad = m_pads[i];
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))

2
rpcs3/rpcs3qt/emu_settings_type.h
View File

@ -144,6 +144,7 @@ enum class emu_settings_type
// Input / Output
BackgroundInput,
ShowMoveCursor,
LockOvlIptToP1,
PadHandlerMode,
PadConnection,
KeyboardHandler,
@ -327,6 +328,7 @@ inline static const QMap<emu_settings_type, cfg_location> settings_location =
// Input / Output
{ emu_settings_type::BackgroundInput, { "Input/Output", "Background input enabled"}},
{ emu_settings_type::ShowMoveCursor, { "Input/Output", "Show move cursor"}},
{ emu_settings_type::LockOvlIptToP1, { "Input/Output", "Lock overlay input to player one"}},
{ emu_settings_type::PadHandlerMode, { "Input/Output", "Pad handler mode"}},
{ emu_settings_type::PadConnection, { "Input/Output", "Keep pads connected" }},
{ emu_settings_type::KeyboardHandler, { "Input/Output", "Keyboard"}},

3
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -1244,6 +1244,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
m_emu_settings->EnhanceCheckBox(ui->showMoveCursorBox, emu_settings_type::ShowMoveCursor);
SubscribeTooltip(ui->showMoveCursorBox, tooltips.settings.show_move_cursor);
m_emu_settings->EnhanceCheckBox(ui->lockOverlayInputToPlayerOne, emu_settings_type::LockOvlIptToP1);
SubscribeTooltip(ui->lockOverlayInputToPlayerOne, tooltips.settings.lock_overlay_input_to_player_one);
// Midi
const QString midi_none = m_emu_settings->m_midi_creator.get_none();
const midi_device def_midi_device{ .type = midi_device_type::keyboard, .name = midi_none.toStdString() };

7
rpcs3/rpcs3qt/settings_dialog.ui
View File

@ -1803,6 +1803,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="lockOverlayInputToPlayerOne">
<property name="text">
<string>Lock Overlay Input To Player One</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacerIoAdditionalSettings">
<property name="orientation">

2
rpcs3/rpcs3qt/tooltips.h
View File

@ -227,6 +227,8 @@ public:
const QString show_move_cursor = tr("Shows the raw position of the PS Move input.\nThis can be very helpful during calibration screens.");
const QString midi_devices = tr("Select up to 3 emulated midi devices and their type.");
const QString lock_overlay_input_to_player_one = tr("Locks the native overlay input to the first player.");
// network
const QString net_status = tr("If set to Connected, RPCS3 will allow programs to use your internet connection.");