From 0c7238e572a7f8c2a6bea3cd87d31be0069eea6c Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Tue, 16 Nov 2021 21:35:41 +0000 Subject: [PATCH] Add F13-F24 as assignable hotkeys --- src/blackinput/linux/keyboardlinux.cpp | 12 ++++++++++++ src/blackinput/macos/keyboardmacos.mm | 12 ++++++++++++ src/blackinput/win/keyboardwindows.cpp | 12 ++++++++++++ src/blackmisc/input/keyboardkey.cpp | 12 ++++++++++++ src/blackmisc/input/keyboardkeylist.cpp | 12 ++++++++++++ src/blackmisc/input/keycodes.h | 12 ++++++++++++ 6 files changed, 72 insertions(+) diff --git a/src/blackinput/linux/keyboardlinux.cpp b/src/blackinput/linux/keyboardlinux.cpp index ab887e07f..921f635f0 100644 --- a/src/blackinput/linux/keyboardlinux.cpp +++ b/src/blackinput/linux/keyboardlinux.cpp @@ -101,6 +101,18 @@ namespace BlackInput { XK_F10, Key_Function10 }, { XK_F11, Key_Function11 }, { XK_F12, Key_Function12 }, + { XK_F13, Key_Function13 }, + { XK_F14, Key_Function14 }, + { XK_F15, Key_Function15 }, + { XK_F16, Key_Function16 }, + { XK_F17, Key_Function17 }, + { XK_F18, Key_Function18 }, + { XK_F19, Key_Function19 }, + { XK_F20, Key_Function20 }, + { XK_F21, Key_Function21 }, + { XK_F22, Key_Function22 }, + { XK_F23, Key_Function23 }, + { XK_F24, Key_Function24 }, /** fixme Missing ones CKeyboardKey(Key_NumpadEqual), diff --git a/src/blackinput/macos/keyboardmacos.mm b/src/blackinput/macos/keyboardmacos.mm index f814799bd..4eadd0992 100644 --- a/src/blackinput/macos/keyboardmacos.mm +++ b/src/blackinput/macos/keyboardmacos.mm @@ -106,6 +106,18 @@ namespace BlackInput { kHIDUsage_KeyboardF10, Key_Function10 }, { kHIDUsage_KeyboardF11, Key_Function11 }, { kHIDUsage_KeyboardF12, Key_Function12 }, + { kHIDUsage_KeyboardF13, Key_Function13 }, + { kHIDUsage_KeyboardF14, Key_Function14 }, + { kHIDUsage_KeyboardF15, Key_Function15 }, + { kHIDUsage_KeyboardF16, Key_Function16 }, + { kHIDUsage_KeyboardF17, Key_Function17 }, + { kHIDUsage_KeyboardF18, Key_Function18 }, + { kHIDUsage_KeyboardF19, Key_Function19 }, + { kHIDUsage_KeyboardF20, Key_Function20 }, + { kHIDUsage_KeyboardF21, Key_Function21 }, + { kHIDUsage_KeyboardF22, Key_Function22 }, + { kHIDUsage_KeyboardF23, Key_Function23 }, + { kHIDUsage_KeyboardF24, Key_Function24 }, /** fixme Missing ones CKeyboardKey(Key_NumpadEqual), diff --git a/src/blackinput/win/keyboardwindows.cpp b/src/blackinput/win/keyboardwindows.cpp index 5e52c63fd..0d37d679b 100644 --- a/src/blackinput/win/keyboardwindows.cpp +++ b/src/blackinput/win/keyboardwindows.cpp @@ -112,6 +112,18 @@ namespace BlackInput { VK_F10, Key_Function10 }, { VK_F11, Key_Function11 }, { VK_F12, Key_Function12 }, + { VK_F13, Key_Function13 }, + { VK_F14, Key_Function14 }, + { VK_F15, Key_Function15 }, + { VK_F16, Key_Function16 }, + { VK_F17, Key_Function17 }, + { VK_F18, Key_Function18 }, + { VK_F19, Key_Function19 }, + { VK_F20, Key_Function20 }, + { VK_F21, Key_Function21 }, + { VK_F22, Key_Function22 }, + { VK_F23, Key_Function23 }, + { VK_F24, Key_Function24 }, }; return hash; } diff --git a/src/blackmisc/input/keyboardkey.cpp b/src/blackmisc/input/keyboardkey.cpp index 7ef9e9ca7..fb68a6854 100644 --- a/src/blackmisc/input/keyboardkey.cpp +++ b/src/blackmisc/input/keyboardkey.cpp @@ -104,6 +104,18 @@ namespace BlackMisc::Input case Key_Function10: return QStringLiteral("F10"); case Key_Function11: return QStringLiteral("F11"); case Key_Function12: return QStringLiteral("F12"); + case Key_Function13: return QStringLiteral("F13"); + case Key_Function14: return QStringLiteral("F14"); + case Key_Function15: return QStringLiteral("F15"); + case Key_Function16: return QStringLiteral("F16"); + case Key_Function17: return QStringLiteral("F17"); + case Key_Function18: return QStringLiteral("F18"); + case Key_Function19: return QStringLiteral("F19"); + case Key_Function20: return QStringLiteral("F20"); + case Key_Function21: return QStringLiteral("F21"); + case Key_Function22: return QStringLiteral("F22"); + case Key_Function23: return QStringLiteral("F23"); + case Key_Function24: return QStringLiteral("F24"); default: return QChar::fromLatin1(static_cast(m_keyCode)); } } diff --git a/src/blackmisc/input/keyboardkeylist.cpp b/src/blackmisc/input/keyboardkeylist.cpp index d8270b6cb..06ad26a64 100644 --- a/src/blackmisc/input/keyboardkeylist.cpp +++ b/src/blackmisc/input/keyboardkeylist.cpp @@ -128,6 +128,18 @@ namespace BlackMisc::Input CKeyboardKey(Key_Function10), CKeyboardKey(Key_Function11), CKeyboardKey(Key_Function12), + CKeyboardKey(Key_Function13), + CKeyboardKey(Key_Function14), + CKeyboardKey(Key_Function15), + CKeyboardKey(Key_Function16), + CKeyboardKey(Key_Function17), + CKeyboardKey(Key_Function18), + CKeyboardKey(Key_Function19), + CKeyboardKey(Key_Function20), + CKeyboardKey(Key_Function21), + CKeyboardKey(Key_Function22), + CKeyboardKey(Key_Function23), + CKeyboardKey(Key_Function24), }; return allKeys; diff --git a/src/blackmisc/input/keycodes.h b/src/blackmisc/input/keycodes.h index 1d0e38dc6..3ece0db11 100644 --- a/src/blackmisc/input/keycodes.h +++ b/src/blackmisc/input/keycodes.h @@ -120,6 +120,18 @@ namespace BlackMisc::Input Key_Function10, Key_Function11, Key_Function12, + Key_Function13, + Key_Function14, + Key_Function15, + Key_Function16, + Key_Function17, + Key_Function18, + Key_Function19, + Key_Function20, + Key_Function21, + Key_Function22, + Key_Function23, + Key_Function24, }; } // namespace