yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xkb: fix testing if on keypad

Browse source 
XKB_KEY_KP_9 is 0xffb9 while XKB_KEY_KP_Equal is 0xffbd and XKB_KEY_F1
is 0xffbe. So XKB_KEY_KP_Equal, instead of XKB_KEY_KP_9, has the maximum
keysym for keypad keys.
This commit is contained in:
Yifan Zhu 2024-03-10 17:31:04 -07:00
parent 609833e880
commit 681752ada1
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
autotests/test_xkb.cpp
View file

@ -457,6 +457,28 @@ static const TransKey g_rgQtToSymX[] = {
{XKB_KEY_KP_7, Qt::Key_7, Qt::KeypadModifier},
{XKB_KEY_KP_8, Qt::Key_8, Qt::KeypadModifier},
{XKB_KEY_KP_9, Qt::Key_9, Qt::KeypadModifier},
{XKB_KEY_KP_Space, Qt::Key_Space, Qt::KeypadModifier},
{XKB_KEY_KP_Tab, Qt::Key_Tab, Qt::KeypadModifier},
{XKB_KEY_KP_Enter, Qt::Key_Enter, Qt::KeypadModifier},
{XKB_KEY_KP_Home, Qt::Key_Home, Qt::KeypadModifier},
{XKB_KEY_KP_Left, Qt::Key_Left, Qt::KeypadModifier},
{XKB_KEY_KP_Up, Qt::Key_Up, Qt::KeypadModifier},
{XKB_KEY_KP_Right, Qt::Key_Right, Qt::KeypadModifier},
{XKB_KEY_KP_Down, Qt::Key_Down, Qt::KeypadModifier},
{XKB_KEY_KP_Prior, Qt::Key_PageUp, Qt::KeypadModifier},
{XKB_KEY_KP_Next, Qt::Key_PageDown, Qt::KeypadModifier},
{XKB_KEY_KP_End, Qt::Key_End, Qt::KeypadModifier},
{XKB_KEY_KP_Begin, Qt::Key_Clear, Qt::KeypadModifier},
{XKB_KEY_KP_Insert, Qt::Key_Insert, Qt::KeypadModifier},
{XKB_KEY_KP_Delete, Qt::Key_Delete, Qt::KeypadModifier},
{XKB_KEY_KP_Equal, Qt::Key_Equal, Qt::KeypadModifier},
{XKB_KEY_KP_Multiply, Qt::Key_Asterisk, Qt::KeypadModifier},
{XKB_KEY_KP_Add, Qt::Key_Plus, Qt::KeypadModifier},
{XKB_KEY_KP_Separator, Qt::Key_Comma, Qt::KeypadModifier},
{XKB_KEY_KP_Subtract, Qt::Key_Minus, Qt::KeypadModifier},
{XKB_KEY_KP_Decimal, Qt::Key_Period, Qt::KeypadModifier},
{XKB_KEY_KP_Divide, Qt::Key_Slash, Qt::KeypadModifier},
};
void XkbTest::testToQtKey_data()

4
src/xkb.cpp
View file

@ -433,7 +433,7 @@ void Xkb::updateModifiers()
if (xkb_state_mod_index_is_active(m_state, m_metaModifier, XKB_STATE_MODS_EFFECTIVE) == 1) {
mods |= Qt::MetaModifier;
}
if (m_keysym >= XKB_KEY_KP_Space && m_keysym <= XKB_KEY_KP_9) {
if (m_keysym >= XKB_KEY_KP_Space && m_keysym <= XKB_KEY_KP_Equal) {
mods |= Qt::KeypadModifier;
}
m_modifiers = mods;
@ -534,7 +534,7 @@ Qt::KeyboardModifiers Xkb::modifiersRelevantForGlobalShortcuts(uint32_t scanCode
if (xkb_state_mod_index_is_active(m_state, m_metaModifier, XKB_STATE_MODS_EFFECTIVE) == 1) {
mods |= Qt::MetaModifier;
}
if (m_keysym >= XKB_KEY_KP_Space && m_keysym <= XKB_KEY_KP_9) {
if (m_keysym >= XKB_KEY_KP_Space && m_keysym <= XKB_KEY_KP_Equal) {
mods |= Qt::KeypadModifier;
}