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

Merge branch 'master' into cellAtracXdec

Browse source
This commit is contained in:
Elad 2025-01-14 09:51:16 +02:00 • committed by GitHub
commit 28135b6a7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 121 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
rpcs3/Input/raw_mouse_config.cpp
View file

@ -4,22 +4,6 @@
LOG_CHANNEL(cfg_log, "CFG");
std::string mouse_button_id(int code)
{
switch (code)
{
case CELL_MOUSE_BUTTON_1: return "Button 1";
case CELL_MOUSE_BUTTON_2: return "Button 2";
case CELL_MOUSE_BUTTON_3: return "Button 3";
case CELL_MOUSE_BUTTON_4: return "Button 4";
case CELL_MOUSE_BUTTON_5: return "Button 5";
case CELL_MOUSE_BUTTON_6: return "Button 6";
case CELL_MOUSE_BUTTON_7: return "Button 7";
case CELL_MOUSE_BUTTON_8: return "Button 8";
}
return "";
}
cfg::string& raw_mouse_config::get_button_by_index(int index)
{
switch (index)
@ -52,6 +36,28 @@ cfg::string& raw_mouse_config::get_button(int code)
}
}
std::string raw_mouse_config::get_button_name(std::string_view value)
{
if (raw_mouse_button_map.contains(value))
{
return std::string(value);
}
return "";
}
std::string raw_mouse_config::get_button_name(s32 button_code)
{
for (const auto& [name, code] : raw_mouse_button_map)
{
if (code == button_code)
{
return std::string(name);
}
}
return "";
}
raw_mice_config::raw_mice_config()
{
for (u32 i = 0; i < ::size32(players); i++)

19
rpcs3/Input/raw_mouse_config.h
View file

@ -5,7 +5,21 @@
#include <array>
std::string mouse_button_id(int code);
#ifdef _WIN32
#include <windows.h>
#endif
static const std::map<std::string_view, int> raw_mouse_button_map
{
{ "", 0 },
#ifdef _WIN32
{ "Button 1", RI_MOUSE_BUTTON_1_UP },
{ "Button 2", RI_MOUSE_BUTTON_2_UP },
{ "Button 3", RI_MOUSE_BUTTON_3_UP },
{ "Button 4", RI_MOUSE_BUTTON_4_UP },
{ "Button 5", RI_MOUSE_BUTTON_5_UP },
#endif
};
struct raw_mouse_config : cfg::node
{
@ -27,6 +41,9 @@ public:
cfg::string& get_button_by_index(int index);
cfg::string& get_button(int code);
static std::string get_button_name(std::string_view value);
static std::string get_button_name(s32 button_code);
};
struct raw_mice_config : cfg::node

79
rpcs3/Input/raw_mouse_handler.cpp
View file

@ -27,6 +27,18 @@ static inline void draw_overlay_cursor(u32 index, s32 x_pos, s32 y_pos, s32 x_ma
[[maybe_unused]] static inline void draw_overlay_cursor(u32, s32, s32, s32, s32) {}
#endif
#ifdef _WIN32
const std::unordered_map<int, raw_mouse::mouse_button> raw_mouse::btn_pairs =
{
{ 0, {}},
{ RI_MOUSE_BUTTON_1_UP, mouse_button{ RI_MOUSE_BUTTON_1_DOWN, RI_MOUSE_BUTTON_1_UP }},
{ RI_MOUSE_BUTTON_2_UP, mouse_button{ RI_MOUSE_BUTTON_2_DOWN, RI_MOUSE_BUTTON_2_UP }},
{ RI_MOUSE_BUTTON_3_UP, mouse_button{ RI_MOUSE_BUTTON_3_DOWN, RI_MOUSE_BUTTON_3_UP }},
{ RI_MOUSE_BUTTON_4_UP, mouse_button{ RI_MOUSE_BUTTON_4_DOWN, RI_MOUSE_BUTTON_4_UP }},
{ RI_MOUSE_BUTTON_5_UP, mouse_button{ RI_MOUSE_BUTTON_5_DOWN, RI_MOUSE_BUTTON_5_UP }},
};
#endif
LOG_CHANNEL(input_log, "Input");
raw_mice_config g_cfg_raw_mouse;
@ -70,24 +82,14 @@ void raw_mouse::reload_config()
void raw_mouse::set_index(u32 index)
{
m_index = index;
reload_requested = true;
m_reload_requested = true;
}
std::pair<int, int> raw_mouse::get_mouse_button(const cfg::string& button)
raw_mouse::mouse_button raw_mouse::get_mouse_button(const cfg::string& button)
{
const std::string value = button.to_string();
#ifdef _WIN32
static const std::unordered_map<int, std::pair<int, int>> btn_pairs
{
{ 0, {}},
{ RI_MOUSE_BUTTON_1_UP, { RI_MOUSE_BUTTON_1_DOWN, RI_MOUSE_BUTTON_1_UP }},
{ RI_MOUSE_BUTTON_2_UP, { RI_MOUSE_BUTTON_2_DOWN, RI_MOUSE_BUTTON_2_UP }},
{ RI_MOUSE_BUTTON_3_UP, { RI_MOUSE_BUTTON_3_DOWN, RI_MOUSE_BUTTON_3_UP }},
{ RI_MOUSE_BUTTON_4_UP, { RI_MOUSE_BUTTON_4_DOWN, RI_MOUSE_BUTTON_4_UP }},
{ RI_MOUSE_BUTTON_5_UP, { RI_MOUSE_BUTTON_5_DOWN, RI_MOUSE_BUTTON_5_UP }},
};
if (const auto it = raw_mouse_button_map.find(value); it != raw_mouse_button_map.cend())
{
return ::at32(btn_pairs, it->second);
@ -134,40 +136,41 @@ void raw_mouse::update_values(const RAWMOUSE& state)
// Update window handle and size
update_window_handle();
if (std::exchange(reload_requested, false))
if (std::exchange(m_reload_requested, false))
{
reload_config();
}
const auto get_button_pressed = [this](u8 button, int button_flags)
if (m_handler->is_for_gui())
{
const auto it = m_buttons.find(button);
if (it == m_buttons.cend()) return;
const auto& [down, up] = it->second;
// Only update the value if either down or up flags are present
if ((button_flags & down))
for (const auto& [up, btn] : btn_pairs)
{
m_handler->Button(m_index, button, true);
m_handler->mouse_press_callback(m_device_name, button, true);
// Only update the value if either down or up flags are present
if ((state.usButtonFlags & btn.down))
{
m_handler->mouse_press_callback(m_device_name, up, true);
}
else if ((state.usButtonFlags & btn.up))
{
m_handler->mouse_press_callback(m_device_name, up, false);
}
}
else if ((button_flags & up))
{
m_handler->Button(m_index, button, false);
m_handler->mouse_press_callback(m_device_name, button, false);
}
};
return;
}
// Get mouse buttons
get_button_pressed(CELL_MOUSE_BUTTON_1, state.usButtonFlags);
get_button_pressed(CELL_MOUSE_BUTTON_2, state.usButtonFlags);
get_button_pressed(CELL_MOUSE_BUTTON_3, state.usButtonFlags);
get_button_pressed(CELL_MOUSE_BUTTON_4, state.usButtonFlags);
get_button_pressed(CELL_MOUSE_BUTTON_5, state.usButtonFlags);
get_button_pressed(CELL_MOUSE_BUTTON_6, state.usButtonFlags);
get_button_pressed(CELL_MOUSE_BUTTON_7, state.usButtonFlags);
get_button_pressed(CELL_MOUSE_BUTTON_8, state.usButtonFlags);
for (const auto& [button, btn] : m_buttons)
{
// Only update the value if either down or up flags are present
if ((state.usButtonFlags & btn.down))
{
m_handler->Button(m_index, button, true);
}
else if ((state.usButtonFlags & btn.up))
{
m_handler->Button(m_index, button, false);
}
}
// Get mouse wheel
if ((state.usButtonFlags & RI_MOUSE_WHEEL))
@ -576,7 +579,7 @@ void raw_mouse_handler::handle_native_event(const MSG& msg)
RAWINPUT raw_input{};
UINT size = sizeof(RAWINPUT);
u32 res = GetRawInputData(reinterpret_cast<HRAWINPUT>(msg.lParam), RID_INPUT, &raw_input, &size, sizeof(RAWINPUTHEADER));
const u32 res = GetRawInputData(reinterpret_cast<HRAWINPUT>(msg.lParam), RID_INPUT, &raw_input, &size, sizeof(RAWINPUTHEADER));
if (res == umax)
{
return;

44
rpcs3/Input/raw_mouse_handler.h
View file

@ -6,22 +6,6 @@
#include "Utilities/mutex.h"
#include "Utilities/Thread.h"
#ifdef _WIN32
#include <windows.h>
#endif
static const std::map<std::string, int> raw_mouse_button_map
{
{ "", 0 },
#ifdef _WIN32
{ "Button 1", RI_MOUSE_BUTTON_1_UP },
{ "Button 2", RI_MOUSE_BUTTON_2_UP },
{ "Button 3", RI_MOUSE_BUTTON_3_UP },
{ "Button 4", RI_MOUSE_BUTTON_4_UP },
{ "Button 5", RI_MOUSE_BUTTON_5_UP },
#endif
};
class raw_mouse_handler;
class raw_mouse
@ -43,11 +27,21 @@ public:
const std::string& device_name() const { return m_device_name; }
u32 index() const { return m_index; }
void set_index(u32 index);
void request_reload() { reload_requested = true; }
void request_reload() { m_reload_requested = true; }
private:
struct mouse_button
{
int down = 0;
int up = 0;
};
#ifdef _WIN32
static const std::unordered_map<int, raw_mouse::mouse_button> btn_pairs;
#endif
void reload_config();
static std::pair<int, int> get_mouse_button(const cfg::string& button);
static mouse_button get_mouse_button(const cfg::string& button);
u32 m_index = 0;
std::string m_device_name;
@ -61,8 +55,8 @@ private:
int m_pos_y{};
float m_mouse_acceleration = 1.0f;
raw_mouse_handler* m_handler{};
std::map<u8, std::pair<int, int>> m_buttons;
bool reload_requested = false;
std::map<u8, mouse_button> m_buttons;
bool m_reload_requested = false;
};
class raw_mouse_handler final : public MouseHandlerBase
@ -74,10 +68,8 @@ public:
void Init(const u32 max_connect) override;
void SetIsForGui(bool value)
{
m_is_for_gui = value;
}
void set_is_for_gui(bool value) { m_is_for_gui = value; }
bool is_for_gui() const { return m_is_for_gui; }
const std::map<void*, raw_mouse>& get_mice() const { return m_raw_mice; };
@ -86,11 +78,11 @@ public:
m_mouse_press_callback = std::move(cb);
}
void mouse_press_callback(const std::string& device_name, s32 cell_code, bool pressed)
void mouse_press_callback(const std::string& device_name, s32 button_code, bool pressed)
{
if (m_mouse_press_callback)
{
m_mouse_press_callback(device_name, cell_code, pressed);
m_mouse_press_callback(device_name, button_code, pressed);
}
}

16
rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp
View file

@ -389,14 +389,14 @@ void emulated_pad_settings_dialog::add_tabs(QTabWidget* tabs)
{
std::string raw_mouse_settings;
const auto& raw_cfg = *ensure(::at32(g_cfg_raw_mouse.players, player));
fmt::append(raw_mouse_settings, "1: %s\n", raw_cfg.mouse_button_1.to_string());
fmt::append(raw_mouse_settings, "2: %s\n", raw_cfg.mouse_button_2.to_string());
fmt::append(raw_mouse_settings, "3: %s\n", raw_cfg.mouse_button_3.to_string());
fmt::append(raw_mouse_settings, "4: %s\n", raw_cfg.mouse_button_4.to_string());
fmt::append(raw_mouse_settings, "5: %s\n", raw_cfg.mouse_button_5.to_string());
fmt::append(raw_mouse_settings, "6: %s\n", raw_cfg.mouse_button_6.to_string());
fmt::append(raw_mouse_settings, "7: %s\n", raw_cfg.mouse_button_7.to_string());
fmt::append(raw_mouse_settings, "8: %s", raw_cfg.mouse_button_8.to_string());
fmt::append(raw_mouse_settings, "1: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_1.to_string()));
fmt::append(raw_mouse_settings, "2: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_2.to_string()));
fmt::append(raw_mouse_settings, "3: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_3.to_string()));
fmt::append(raw_mouse_settings, "4: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_4.to_string()));
fmt::append(raw_mouse_settings, "5: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_5.to_string()));
fmt::append(raw_mouse_settings, "6: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_6.to_string()));
fmt::append(raw_mouse_settings, "7: %s\n", raw_mouse_config::get_button_name(raw_cfg.mouse_button_7.to_string()));
fmt::append(raw_mouse_settings, "8: %s", raw_mouse_config::get_button_name(raw_cfg.mouse_button_8.to_string()));
QGroupBox* gb_legend_raw = new QGroupBox(tr("Current Raw Mouse Config"), this);
QVBoxLayout* gb_legend_raw_layout = new QVBoxLayout(this);

24
rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp
View file

@ -68,11 +68,11 @@ raw_mouse_settings_dialog::raw_mouse_settings_dialog(QWidget* parent)
constexpr u32 max_devices = 16;
g_raw_mouse_handler = std::make_unique<raw_mouse_handler>();
g_raw_mouse_handler->SetIsForGui(true);
g_raw_mouse_handler->set_is_for_gui(true);
g_raw_mouse_handler->Init(std::max(max_devices, ::size32(g_cfg_raw_mouse.players)));
g_raw_mouse_handler->set_mouse_press_callback([this](const std::string& device_name, s32 cell_code, bool pressed)
g_raw_mouse_handler->set_mouse_press_callback([this](const std::string& device_name, s32 button_code, bool pressed)
{
mouse_press(device_name, cell_code, pressed);
mouse_press(device_name, button_code, pressed);
});
m_buttons = new QButtonGroup(this);
@ -91,7 +91,7 @@ raw_mouse_settings_dialog::raw_mouse_settings_dialog(QWidget* parent)
if (const int button_id = m_buttons->id(button); button_id >= 0)
{
auto& config = ::at32(g_cfg_raw_mouse.players, m_tab_widget->currentIndex());
const std::string name = config->get_button_by_index(button_id % button_count).to_string();
const std::string name = raw_mouse_config::get_button_name(config->get_button_by_index(button_id % button_count).to_string());
button->setText(name.empty() ? QStringLiteral("-") : QString::fromStdString(name));
}
}
@ -255,7 +255,7 @@ void raw_mouse_settings_dialog::add_tabs(QTabWidget* tabs)
insert_button(static_cast<int>(player * button_count + i), pb);
const std::string saved_btn = config->get_button(cell_code);
const std::string saved_btn = raw_mouse_config::get_button_name(config->get_button(cell_code).to_string());
pb->setText(saved_btn.empty() ? QStringLiteral("-") : QString::fromStdString(saved_btn));
@ -330,8 +330,8 @@ void raw_mouse_settings_dialog::reset_config()
if (!pb)
continue;
const QString text = QString::fromStdString(config->get_button(cell_code).def);
pb->setText(text.isEmpty() ? QStringLiteral("-") : text);
const std::string text = raw_mouse_config::get_button_name(config->get_button(cell_code).def);
pb->setText(text.empty() ? QStringLiteral("-") : QString::fromStdString(text));
}
if (QComboBox* combo = ::at32(m_device_combos, player))
@ -346,7 +346,7 @@ void raw_mouse_settings_dialog::reset_config()
}
}
void raw_mouse_settings_dialog::mouse_press(const std::string& device_name, s32 cell_code, bool pressed)
void raw_mouse_settings_dialog::mouse_press(const std::string& device_name, s32 button_code, bool pressed)
{
if (m_button_id < 0 || pressed) // Let's only react to mouse releases
{
@ -361,12 +361,14 @@ void raw_mouse_settings_dialog::mouse_press(const std::string& device_name, s32
return;
}
auto& config = ::at32(g_cfg_raw_mouse.players, m_tab_widget->currentIndex());
config->get_button_by_index(m_button_id % button_count).from_string(mouse_button_id(cell_code));
const std::string button_name = raw_mouse_config::get_button_name(button_code);
auto& config = ::at32(g_cfg_raw_mouse.players, player);
config->get_button_by_index(m_button_id % button_count).from_string(button_name);
if (auto button = m_buttons->button(m_button_id))
{
button->setText(localized_emu::translated_mouse_button(cell_code));
button->setText(QString::fromStdString(button_name));
}
reactivate_buttons();

2
rpcs3/rpcs3qt/raw_mouse_settings_dialog.h
View file

@ -30,7 +30,7 @@ private:
void on_enumeration();
void reset_config();
void on_button_click(int id);
void mouse_press(const std::string& device_name, s32 cell_code, bool pressed);
void mouse_press(const std::string& device_name, s32 button_code, bool pressed);
void handle_device_change(const std::string& device_name);
bool is_device_active(const std::string& device_name);
std::string get_current_device_name(int player);