The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 08:49:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon/Xinput: Cleaned up a bit

Browse Source
This commit is contained in:
TheConfuZzledDude 2022-12-23 22:35:09 +00:00
parent c3018fdc3b
commit 27d596b89c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
View File

@ -101,6 +101,7 @@ void PopulateDevices(void* const hwnd)
XIScrollClassInfo* scroll_event = XIScrollClassInfo* scroll_event =
reinterpret_cast<XIScrollClassInfo*>(current_master->classes[j]); reinterpret_cast<XIScrollClassInfo*>(current_master->classes[j]);
scroll_increment = scroll_event->increment; scroll_increment = scroll_event->increment;
break;
} }
} }
// Since current_master is a master pointer, its attachment must // Since current_master is a master pointer, its attachment must
@ -215,19 +216,21 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar
for (int i = 0; i != 4; ++i) for (int i = 0; i != 4; ++i)
AddInput(new Cursor(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.cursor.y : &m_state.cursor.x)); AddInput(new Cursor(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.cursor.y : &m_state.cursor.x));
// Mouse Axis, X-/+ and Y-/+ // Mouse Axis, X-/+, Y-/+ and Z-/+
for (int i = 0; i != 6; ++i) AddInput(new Axis(0, false, &m_state.axis.x));
AddInput(new Axis(i / 2, !!(i & 1), AddInput(new Axis(0, true, &m_state.axis.x));
(i & 4) ? &m_state.axis.z : AddInput(new Axis(1, false, &m_state.axis.y));
(i & 2) ? &m_state.axis.y : AddInput(new Axis(1, true, &m_state.axis.y));
&m_state.axis.x)); AddInput(new Axis(2, false, &m_state.axis.z));
AddInput(new Axis(2, true, &m_state.axis.z));
// Relative Mouse, X-/+ and Y-/+ // Relative Mouse, X-/+, Y-/+ and Z-/+
for (int i = 0; i != 4; ++i) AddInput(new RelativeMouse(0, false, &m_state.relative_mouse.x));
AddInput(new RelativeMouse(i / 2, !!(i & 1), AddInput(new RelativeMouse(0, true, &m_state.relative_mouse.x));
(i & 4) ? &m_state.relative_mouse.z : AddInput(new RelativeMouse(1, false, &m_state.relative_mouse.y));
(i & 2) ? &m_state.relative_mouse.y : AddInput(new RelativeMouse(1, true, &m_state.relative_mouse.y));
&m_state.relative_mouse.x)); AddInput(new RelativeMouse(2, false, &m_state.relative_mouse.z));
AddInput(new RelativeMouse(2, true, &m_state.relative_mouse.z));
} }
KeyboardMouse::~KeyboardMouse() KeyboardMouse::~KeyboardMouse()