80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

qt: Map F13/F14/F15 using Apple equivalency again for Apple keyboards on Linux

Browse Source
This commit is contained in:
RichardG867
2023-04-08 19:39:11 -03:00
parent b16b454bf1
commit 218f70baac
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/evdev_keyboard.cpp
View File

@@ -18,14 +18,14 @@
#include <QtDebug> #include <QtDebug>
static std::unordered_map<uint32_t, uint16_t> evdev_keycodes = { static std::unordered_map<uint32_t, uint16_t> evdev_keycodes = {
{99, 0x54}, /* SYSRQ */ {184, 0x46}, /* F14 => Scroll Lock (for Apple keyboards) */
{86, 0x56}, /* 102ND */ {86, 0x56}, /* 102ND */
{87, 0x57}, /* F11 */ {87, 0x57}, /* F11 */
{88, 0x58}, /* F12 */ {88, 0x58}, /* F12 */
{117, 0x59}, /* KPEQUAL */ {117, 0x59}, /* KPEQUAL */
{183, 0x5d}, /* F13 */ {186, 0x5d}, /* F16 => F13 */
{184, 0x5e}, /* F14 */ {187, 0x5e}, /* F17 => F14 */
{185, 0x5f}, /* F15 */ {188, 0x5f}, /* F18 => F15 */
/* Japanese keys. */ /* Japanese keys. */
{95, 0x5c}, /* KPJPCOMMA */ {95, 0x5c}, /* KPJPCOMMA */
@@ -47,9 +47,11 @@ static std::unordered_map<uint32_t, uint16_t> evdev_keycodes = {
{97, 0x11d}, /* RIGHTCTRL */ {97, 0x11d}, /* RIGHTCTRL */
{98, 0x135}, /* KPSLASH */ {98, 0x135}, /* KPSLASH */
{99, 0x137}, /* SYSRQ */ {99, 0x137}, /* SYSRQ */
{183, 0x137}, /* F13 => SysRq (for Apple keyboards) */
{100, 0x138}, /* RIGHTALT */ {100, 0x138}, /* RIGHTALT */
{119, 0x145}, /* PAUSE */ {119, 0x145}, /* PAUSE */
{411, 0x145}, /* BREAK */ {411, 0x145}, /* BREAK */
{185, 0x145}, /* F15 => Pause (for Apple keyboards) */
{102, 0x147}, /* HOME */ {102, 0x147}, /* HOME */
{103, 0x148}, /* UP */ {103, 0x148}, /* UP */
{104, 0x149}, /* PAGEUP */ {104, 0x149}, /* PAGEUP */

9
src/qt/xkbcommon_keyboard.cpp
View File

@@ -102,6 +102,7 @@ static std::unordered_map<std::string, uint16_t> xkb_keycodes = {
{"NMLK", 0x45}, {"NMLK", 0x45},
{"SCLK", 0x46}, {"SCLK", 0x46},
{"FK14", 0x46}, /* F14 => Scroll Lock (for Apple keyboards) */
{"KP7", 0x47}, {"KP7", 0x47},
{"KP8", 0x48}, {"KP8", 0x48},
{"KP9", 0x49}, {"KP9", 0x49},
@@ -119,9 +120,9 @@ static std::unordered_map<std::string, uint16_t> xkb_keycodes = {
{"LSGT", 0x56}, {"LSGT", 0x56},
{"FK11", 0x57}, {"FK11", 0x57},
{"FK12", 0x58}, {"FK12", 0x58},
{"FK13", 0x5d}, {"FK16", 0x5d}, /* F16 => F13 */
{"FK14", 0x5e}, {"FK17", 0x5e}, /* F17 => F14 */
{"FK15", 0x5f}, {"FK18", 0x5f}, /* F18 => F15 */
/* Japanese keys. */ /* Japanese keys. */
{"JPCM", 0x5c}, /* Num, */ {"JPCM", 0x5c}, /* Num, */
@@ -146,8 +147,10 @@ static std::unordered_map<std::string, uint16_t> xkb_keycodes = {
{"KPDV", 0x135}, {"KPDV", 0x135},
{"PRSC", 0x137}, {"PRSC", 0x137},
{"SYRQ", 0x137}, {"SYRQ", 0x137},
{"FK13", 0x137}, /* F13 => SysRq (for Apple keyboards) */
{"RALT", 0x138}, {"RALT", 0x138},
{"PAUS", 0x145}, {"PAUS", 0x145},
{"FK15", 0x145}, /* F15 => Pause (for Apple keyboards) */
{"BRK", 0x145}, {"BRK", 0x145},
{"HOME", 0x147}, {"HOME", 0x147},
{"UP", 0x148}, {"UP", 0x148},