mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-31 18:32:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7272 from Techjar/xkb-mouse-button-fix

Browse Source 
InputCommon/XInput2: Increase mouse buttons to 32
This commit is contained in:
Pierre Bourdon 2018-08-27 14:52:37 +02:00 committed by GitHub
commit b2b72bd3ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,13 +12,15 @@
#include "InputCommon/ControllerInterface/Xlib/XInput2.h" #include "InputCommon/ControllerInterface/Xlib/XInput2.h"
#include "Common/StringUtil.h"
// This is an input plugin using the XInput 2.0 extension to the X11 protocol, // This is an input plugin using the XInput 2.0 extension to the X11 protocol,
// loosely based on the old XLib plugin. (Has nothing to do with the XInput // loosely based on the old XLib plugin. (Has nothing to do with the XInput
// API on Windows.) // API on Windows.)
// This plugin creates one KeyboardMouse object for each master pointer/ // This plugin creates one KeyboardMouse object for each master pointer/
// keyboard pair. Each KeyboardMouse object exports four types of controls: // keyboard pair. Each KeyboardMouse object exports four types of controls:
// * Mouse button controls: hardcoded at five of them, but could be made to // * Mouse button controls: hardcoded at 32 of them, but could be made to
// support infinitely many mouse buttons in theory; XInput2 has no limit. // support infinitely many mouse buttons in theory; XInput2 has no limit.
// * Mouse cursor controls: one for each cardinal direction. Calculated by // * Mouse cursor controls: one for each cardinal direction. Calculated by
// comparing the absolute position of the mouse pointer on screen to the // comparing the absolute position of the mouse pointer on screen to the
@ -173,7 +175,7 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar
} }
// Mouse Buttons // Mouse Buttons
for (int i = 0; i < 5; i++) for (int i = 0; i < 32; i++)
AddInput(new Button(i, &m_state.buttons)); AddInput(new Button(i, &m_state.buttons));
// Mouse Cursor, X-/+ and Y-/+ // Mouse Cursor, X-/+ and Y-/+
@ -338,8 +340,7 @@ ControlState KeyboardMouse::Key::GetState() const
KeyboardMouse::Button::Button(unsigned int index, unsigned int* buttons) KeyboardMouse::Button::Button(unsigned int index, unsigned int* buttons)
: m_buttons(buttons), m_index(index) : m_buttons(buttons), m_index(index)
{ {
// this will be a problem if we remove the hardcoded five-button limit name = StringFromFormat("Click %d", m_index + 1);
name = std::string("Click ") + (char)('1' + m_index);
} }
ControlState KeyboardMouse::Button::GetState() const ControlState KeyboardMouse::Button::GetState() const