Emulation/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-06-23 14:33:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12850 from jordan-woyak/device-sorting

Browse source 
ControllerInterface: Adjust sort priorities to ensure default keyboard-mouse device is first.
This commit is contained in:
Admiral H. Curtiss 2024-06-15 21:12:08 +02:00 committed by GitHub
parent 56fd9c177c 42e73547eb
commit ed4a09fa56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/InputCommon/ControllerInterface/CoreDevice.h
View file

@ -4,6 +4,7 @@
#pragma once
#include <chrono>
#include <limits>
#include <memory>
#include <mutex>
#include <optional>
@ -147,6 +148,7 @@ public:
// A higher priority means it will be one of the first ones (smaller index), making it more
// likely to be index 0, which is automatically set as the default device when there isn't one.
// Every platform should have at least one device with priority >= 0.
static constexpr int DEFAULT_DEVICE_SORT_PRIORITY = std::numeric_limits<int>::max();
virtual int GetSortPriority() const { return 0; }
const std::vector<Input*>& Inputs() const { return m_inputs; }

2
Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
View file

@ -281,7 +281,7 @@ std::string KeyboardMouse::GetSource() const
// Give this device a higher priority to make sure it shows first
int KeyboardMouse::GetSortPriority() const
{
return 5;
return DEFAULT_DEVICE_SORT_PRIORITY;
}
bool KeyboardMouse::IsVirtualDevice() const

1
Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
View file

@ -69,6 +69,7 @@ public:
std::string GetName() const override;
std::string GetSource() const override;
int GetSortPriority() const override;
private:
void MainThreadInitialization(void* view);

5
Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
View file

@ -289,6 +289,11 @@ std::string KeyboardAndMouse::GetSource() const
return Quartz::GetSourceName();
}
int KeyboardAndMouse::GetSortPriority() const
{
return DEFAULT_DEVICE_SORT_PRIORITY;
}
ControlState KeyboardAndMouse::Cursor::GetState() const
{
return std::max(0.0, ControlState(m_axis) / (m_positive ? 1.0 : -1.0));

5
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
View file

@ -421,6 +421,11 @@ std::string KeyboardMouse::GetSource() const
return std::string(SOURCE_NAME);
}
int KeyboardMouse::GetSortPriority() const
{
return DEFAULT_DEVICE_SORT_PRIORITY;
}
KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard)
: m_display(display), m_keyboard(keyboard), m_keycode(keycode)
{

1
Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
View file

@ -120,6 +120,7 @@ public:
std::string GetName() const override;
std::string GetSource() const override;
int GetSortPriority() const override;
private:
Window m_window;