mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Process keyboard input events

Browse Source
This commit is contained in:
Ted John
2020-12-13 22:51:50 +00:00
parent 3339089235
commit c8f31dea7f
7 changed files with 70 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/openrct2-ui/input/ShortcutManager.cpp
View File

@@ -16,6 +16,8 @@
using namespace OpenRCT2::Ui;
constexpr uint32_t UsefulModifiers = KMOD_SHIFT | KMOD_CTRL | KMOD_ALT | KMOD_GUI;
static uint32_t ParseModifier(const std::string_view& text)
{
if (String::Equals(text, "CTRL", true))
@@ -232,9 +234,7 @@ std::string ShortcutInput::ToString() const
}
else
{
char buffer[8]{};
utf8_write_codepoint(buffer, Key);
result += buffer;
String::AppendCodepoint(result, std::toupper(Key));
}
break;
}
@@ -285,9 +285,17 @@ bool ShortcutInput::AppendModifier(std::string& s, const std::string_view& text,
bool ShortcutInput::Matches(const InputEvent& e) const
{
auto modifiers = e.Modifiers & UsefulModifiers;
if (e.DeviceKind == InputDeviceKind::Mouse)
{
if (Kind == ShortcutInputKind::Mouse && Key == e.Button)
if (Kind == ShortcutInputKind::Mouse && Modifiers == modifiers && Key == e.Button)
{
return true;
}
}
else if (e.DeviceKind == InputDeviceKind::Keyboard)
{
if (Kind == ShortcutInputKind::Keyboard && Modifiers == modifiers && Key == e.Button)
{
return true;
}
@@ -297,10 +305,20 @@ bool ShortcutInput::Matches(const InputEvent& e) const
std::optional<ShortcutInput> ShortcutInput::FromInputEvent(const InputEvent& e)
{
auto modifiers = e.Modifiers & UsefulModifiers;
if (e.DeviceKind == InputDeviceKind::Mouse)
{
ShortcutInput result;
result.Kind = ShortcutInputKind::Mouse;
result.Modifiers = modifiers;
result.Key = e.Button;
return result;
}
else if (e.DeviceKind == InputDeviceKind::Keyboard)
{
ShortcutInput result;
result.Kind = ShortcutInputKind::Keyboard;
result.Modifiers = modifiers;
result.Key = e.Button;
return result;
}
@@ -342,6 +360,13 @@ bool RegisteredShortcut::IsSuitableInputEvent(const InputEvent& e) const
return false;
}
}
else if (e.DeviceKind == InputDeviceKind::Keyboard)
{
if (e.State == InputEventState::Down)
{
return false;
}
}
return true;
}