Changeset View
Changeset View
Standalone View
Standalone View
src/platforms/xcb/kkeyserver.cpp
Show First 20 Lines • Show All 763 Lines • ▼ Show 20 Line(s) | 760 | if (keyQt & Qt::KeypadModifier) { | |||
---|---|---|---|---|---|
764 | } | 764 | } | ||
765 | } else { | 765 | } else { | ||
766 | if (symQt < 0x1000) { | 766 | if (symQt < 0x1000) { | ||
767 | *keySym = QChar(symQt).toUpper().unicode(); | 767 | *keySym = QChar(symQt).toUpper().unicode(); | ||
768 | return true; | 768 | return true; | ||
769 | } | 769 | } | ||
770 | } | 770 | } | ||
771 | 771 | | |||
772 | for (uint i = 0; i < sizeof(g_rgQtToSymX) / sizeof(TransKey); i++) { | 772 | for (const TransKey &tk : g_rgQtToSymX) { | ||
773 | if (g_rgQtToSymX[i].keySymQt == symQt) { | 773 | if (tk.keySymQt == symQt) { | ||
774 | if ((keyQt & Qt::KeypadModifier) && !is_keypad_key(g_rgQtToSymX[i].keySymX)) | 774 | if ((keyQt & Qt::KeypadModifier) && !is_keypad_key(tk.keySymX)) | ||
775 | continue; | 775 | continue; | ||
776 | *keySym = g_rgQtToSymX[i].keySymX; | 776 | *keySym = tk.keySymX; | ||
777 | return true; | 777 | return true; | ||
778 | } | 778 | } | ||
779 | } | 779 | } | ||
780 | 780 | | |||
781 | *keySym = 0; | 781 | *keySym = 0; | ||
782 | if (symQt != Qt::Key_Shift && symQt != Qt::Key_Control && symQt != Qt::Key_Alt && | 782 | if (symQt != Qt::Key_Shift && symQt != Qt::Key_Control && symQt != Qt::Key_Alt && | ||
783 | symQt != Qt::Key_Meta && symQt != Qt::Key_Direction_L && symQt != Qt::Key_Direction_R) { | 783 | symQt != Qt::Key_Meta && symQt != Qt::Key_Direction_L && symQt != Qt::Key_Direction_R) { | ||
784 | // qCDebug(LOG_KKEYSERVER_X11) << "Sym::initQt( " << QString::number(keyQt,16) << " ): failed to convert key."; | 784 | // qCDebug(LOG_KKEYSERVER_X11) << "Sym::initQt( " << QString::number(keyQt,16) << " ): failed to convert key."; | ||
Show All 18 Lines | 798 | else if (keySym < 0x1000) { | |||
803 | } | 803 | } | ||
804 | } | 804 | } | ||
805 | 805 | | |||
806 | else if (keySym < 0x3000) { | 806 | else if (keySym < 0x3000) { | ||
807 | *keyQt = keySym; | 807 | *keyQt = keySym; | ||
808 | } | 808 | } | ||
809 | 809 | | |||
810 | else { | 810 | else { | ||
811 | for (uint i = 0; i < sizeof(g_rgQtToSymX) / sizeof(TransKey); i++) | 811 | for (const TransKey &tk : g_rgQtToSymX) { | ||
812 | if (g_rgQtToSymX[i].keySymX == keySym) { | 812 | if (tk.keySymX == keySym) { | ||
813 | *keyQt = g_rgQtToSymX[i].keySymQt; | 813 | *keyQt = tk.keySymQt; | ||
814 | break; | 814 | break; | ||
815 | } | 815 | } | ||
816 | } | 816 | } | ||
817 | } | ||||
817 | 818 | | |||
818 | if (*keyQt == Qt::Key_unknown) { | 819 | if (*keyQt == Qt::Key_unknown) { | ||
819 | return false; | 820 | return false; | ||
820 | } | 821 | } | ||
821 | 822 | | |||
822 | if (modXToQt(modX, &keyModQt)) { | 823 | if (modXToQt(modX, &keyModQt)) { | ||
823 | *keyQt |= keyModQt; | 824 | *keyQt |= keyModQt; | ||
824 | if (is_keypad_key(keySym)) { | 825 | if (is_keypad_key(keySym)) { | ||
▲ Show 20 Lines • Show All 161 Lines • Show Last 20 Lines |