mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-19 19:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt/input: accumulate button presses between gui refresh
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 gcc (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm clang (push) Waiting to run
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 clang (push) Waiting to run
Details
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Details

Browse source 
Fixes dropped input between gui refreshes
This commit is contained in:
Megamouse 2025-04-14 08:17:29 +02:00
parent 0964c0356b
commit 746b438500
2 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -449,6 +449,7 @@ void pad_settings_dialog::InitButtons()
{
std::lock_guard lock(m_input_mutex);
data = m_input_callback_data;
m_input_callback_data.values.clear();
m_input_callback_data.has_new_data = false;
}
@ -498,17 +499,18 @@ void pad_settings_dialog::InitButtons()
// Enable Button Remapping
update_preview(data.pad_name, true, data.battery_level, data.preview_values[0], data.preview_values[1], data.preview_values[2], data.preview_values[3], data.preview_values[4], data.preview_values[5]);
if (data.val <= 0 || data.status == PadHandlerBase::connection::no_data)
// Handle Button Presses
for (const input_callback_data::input_values& values : data.values)
{
return;
}
if (values.val <= 0) continue;
cfg_log.notice("get_next_button_press: %s device %s button %s pressed with value %d", m_handler->m_type, data.pad_name, data.name, data.val);
cfg_log.notice("get_next_button_press: %s device %s button %s pressed with value %d", m_handler->m_type, data.pad_name, values.button_name, values.val);
if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end && m_button_id == data.button_id)
{
m_cfg_entries[m_button_id].insert_key(data.name, m_enable_multi_binding);
ReactivateButtons();
if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end && m_button_id == values.button_id)
{
m_cfg_entries[m_button_id].insert_key(values.button_name, m_enable_multi_binding);
ReactivateButtons();
}
}
});
@ -559,35 +561,47 @@ void pad_settings_dialog::InitButtons()
const PadHandlerBase::gui_call_type call_type = first_call ? PadHandlerBase::gui_call_type::reset_input : PadHandlerBase::gui_call_type::normal;
const PadHandlerBase::connection status = m_handler->get_next_button_press(m_device_name,
[this, button_id](u16 val, std::string name, std::string pad_name, u32 battery_level, pad_preview_values preview_values)
[this, button_id](u16 val, std::string button_name, std::string pad_name, u32 battery_level, pad_preview_values preview_values)
{
std::lock_guard lock(m_input_mutex);
m_input_callback_data.val = val;
m_input_callback_data.name = std::move(name);
m_input_callback_data.pad_name = std::move(pad_name);
if (m_input_callback_data.pad_name != pad_name)
{
m_input_callback_data = {};
m_input_callback_data.pad_name = std::move(pad_name);
}
m_input_callback_data.battery_level = battery_level;
m_input_callback_data.preview_values = std::move(preview_values);
m_input_callback_data.has_new_data = true;
m_input_callback_data.status = PadHandlerBase::connection::connected;
m_input_callback_data.button_id = button_id;
if (val > 0)
{
m_input_callback_data.values.push_back(input_callback_data::input_values
{
.button_name = std::move(button_name),
.button_id = button_id,
.val = val,
});
}
},
[this, button_id](std::string pad_name)
[this](std::string pad_name)
{
std::lock_guard lock(m_input_mutex);
m_input_callback_data = {};
m_input_callback_data.pad_name = std::move(pad_name);
m_input_callback_data.has_new_data = true;
m_input_callback_data.status = PadHandlerBase::connection::disconnected;
m_input_callback_data.button_id = button_id;
},
call_type, buttons);
if (status == PadHandlerBase::connection::no_data)
{
std::lock_guard lock(m_input_mutex);
m_input_callback_data.pad_name = m_device_name;
if (m_input_callback_data.pad_name != m_device_name)
{
m_input_callback_data = {};
m_input_callback_data.pad_name = m_device_name;
}
m_input_callback_data.has_new_data = true;
m_input_callback_data.status = status;
m_input_callback_data.button_id = button_id;
}
}
});

11
rpcs3/rpcs3qt/pad_settings_dialog.h
View file

@ -170,12 +170,17 @@ private:
{
PadHandlerBase::connection status = PadHandlerBase::connection::disconnected;
bool has_new_data = false;
u32 button_id = button_ids::id_pad_begin;
u16 val = 0;
std::string name;
std::string pad_name;
u32 battery_level = 0;
std::array<int, 6> preview_values{};
struct input_values
{
std::string button_name;
u32 button_id = button_ids::id_pad_begin;
u16 val = 0;
};
std::vector<input_values> values;
} m_input_callback_data;
// Input thread. Its Callback handles the input