diff options
| author | iwubcode <iwubcode@users.noreply.github.com> | 2020-04-20 23:16:07 -0500 |
|---|---|---|
| committer | iwubcode <iwubcode@users.noreply.github.com> | 2021-03-17 20:58:33 -0500 |
| commit | db4b4e40cb5c9d00940cdb76478b632804cdf244 (patch) | |
| tree | ed9ba12bcc60ec1a34a72ada599853115b6c91d8 /Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | |
| parent | 679d51c2898b99c24ad904e891781a147b2f6667 (diff) | |
InputCommon / DolphinQt / Core: Add a "RelativeMouse" input which provides the raw delta mouse input
Co-authored-by: Jordan Woyak <jordan.woyak@gmail.com>
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index a60edc3282..996673becb 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -197,6 +197,11 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar // Mouse Axis, X-/+ and Y-/+ for (int i = 0; i != 4; ++i) AddInput(new Axis(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.axis.y : &m_state.axis.x)); + + // Relative Mouse, X-/+ and Y-/+ + for (int i = 0; i != 4; ++i) + AddInput(new RelativeMouse(!!(i & 2), !!(i & 1), + (i & 2) ? &m_state.relative_mouse.y : &m_state.relative_mouse.x)); } KeyboardMouse::~KeyboardMouse() @@ -302,6 +307,9 @@ void KeyboardMouse::UpdateInput() XFreeEventData(m_display, &event.xcookie); } + m_state.relative_mouse.x = delta_x; + m_state.relative_mouse.y = delta_y; + // apply axis smoothing m_state.axis.x *= MOUSE_AXIS_SMOOTHING; m_state.axis.x += delta_x; @@ -391,8 +399,20 @@ KeyboardMouse::Axis::Axis(u8 index, bool positive, const float* axis) name = fmt::format("Axis {}{}", static_cast<char>('X' + m_index), (m_positive ? '+' : '-')); } +KeyboardMouse::RelativeMouse::RelativeMouse(u8 index, bool positive, const float* axis) + : m_axis(axis), m_index(index), m_positive(positive) +{ + name = + fmt::format("RelativeMouse {}{}", static_cast<char>('X' + m_index), (m_positive ? '+' : '-')); +} + ControlState KeyboardMouse::Axis::GetState() const { return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); } + +ControlState KeyboardMouse::RelativeMouse::GetState() const +{ + return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); +} } // namespace ciface::XInput2 |