archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmjoy: simplify get_next_button_press

Browse source
This commit is contained in:
Megamouse 2024-08-08 04:23:58 +02:00
parent 961239ac8d
commit b95aa7a28c
1 changed files with 26 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

97
rpcs3/Input/mm_joystick_handler.cpp
View file

@ -283,9 +283,30 @@ PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std:
std::string name; std::string name;
} pressed_button{}; } pressed_button{};
const auto set_button_press = [this, &pressed_button](const u16 value, const u64& keycode, const std::string& name) const auto set_button_press = [&](const u64& keycode, const std::string& name, std::string_view type, u16 threshold)
{ {
const u16 min_value = m_min_button_values.contains(keycode) ? m_min_button_values[keycode] : 0; if (!get_blacklist && m_blacklist.contains(keycode))
return;
const u16 value = data[keycode];
u16& min_value = m_min_button_values[keycode];
if (first_call || value < min_value)
{
min_value = value;
return;
}
if (value <= threshold)
return;
if (get_blacklist)
{
m_blacklist.insert(keycode);
input_log.error("MMJOY Calibration: Added %s [ %d = %s ] to blacklist. Value = %d", type, keycode, name, value);
return;
}
const u16 diff = std::abs(min_value - value); const u16 diff = std::abs(min_value - value);
if (diff > button_press_threshold && value > pressed_button.value) if (diff > button_press_threshold && value > pressed_button.value)
@ -296,56 +317,12 @@ PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std:
for (const auto& [keycode, name] : axis_list) for (const auto& [keycode, name] : axis_list)
{ {
if (!get_blacklist && m_blacklist.contains(keycode)) set_button_press(keycode, name, "axis"sv, m_thumb_threshold);
continue;
const u16 value = data[keycode];
u16& min_value = m_min_button_values[keycode];
if (first_call || value < min_value)
{
min_value = value;
continue;
}
if (value <= m_thumb_threshold)
continue;
if (get_blacklist)
{
m_blacklist.insert(keycode);
input_log.error("MMJOY Calibration: Added axis [ %d = %s ] to blacklist. Value = %d", keycode, name, value);
continue;
}
set_button_press(value, keycode, name);
} }
for (const auto& [keycode, name] : pov_list) for (const auto& [keycode, name] : pov_list)
{ {
if (!get_blacklist && m_blacklist.contains(keycode)) set_button_press(keycode, name, "pov"sv, 0);
continue;
const u16 value = data[keycode];
u16& min_value = m_min_button_values[keycode];
if (first_call || value < min_value)
{
min_value = value;
continue;
}
if (value <= 0)
continue;
if (get_blacklist)
{
m_blacklist.insert(keycode);
input_log.error("MMJOY Calibration: Added pov [ %d = %s ] to blacklist. Value = %d", keycode, name, value);
continue;
}
set_button_press(value, keycode, name);
} }
for (const auto& [keycode, name] : button_list) for (const auto& [keycode, name] : button_list)
@ -353,29 +330,7 @@ PadHandlerBase::connection mm_joystick_handler::get_next_button_press(const std:
if (keycode == NO_BUTTON) if (keycode == NO_BUTTON)
continue; continue;
if (!get_blacklist && m_blacklist.contains(keycode)) set_button_press(keycode, name, "button"sv, 0);
continue;
const u16 value = data[keycode];
u16& min_value = m_min_button_values[keycode];
if (first_call || value < min_value)
{
min_value = value;
continue;
}
if (value <= 0)
continue;
if (get_blacklist)
{
m_blacklist.insert(keycode);
input_log.error("MMJOY Calibration: Added button [ %d = %s ] to blacklist. Value = %d", keycode, name, value);
continue;
}
set_button_press(value, keycode, name);
} }
if (first_call) if (first_call)