1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map Shift+Tab to Shift+Backtab in evdevkeyboard

Browse Source 
This mapping has to be done manually, like we do on Windows
for example.

libinput maps through xkbcommon, like xcb, so it is already correct.

Task-number: QTBUG-46845
Change-Id: I61f3f1160e2581aae2ef43cc260f191f6d344fec
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
This commit is contained in:
Laszlo Agocs 2015-06-29 15:17:40 +02:00
parent 26bcc0565f
commit 756266d015
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
View File

@ -379,17 +379,20 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
} }
if (!skip) { if (!skip) {
qCDebug(qLcEvdevKeyMap, "Processing: uni=%04x, qt=%08x, qtmod=%08x", unicode, qtcode & ~modmask, (qtcode & modmask)); // Up until now qtcode contained both the key and modifiers. Split it.
//If NumLockOff and keypad key pressed remap event sent Qt::KeyboardModifiers qtmods = Qt::KeyboardModifiers(qtcode & modmask);
if (!m_locks[1] && qtcode &= ~modmask;
(qtcode & Qt::KeypadModifier) &&
qCDebug(qLcEvdevKeyMap, "Processing: uni=%04x, qt=%08x, qtmod=%08x", unicode, qtcode, int(qtmods));
// If NumLockOff and keypad key pressed remap event sent
if (!m_locks[1] && (qtmods & Qt::KeypadModifier) &&
keycode >= 71 && keycode >= 71 &&
keycode <= 83 && keycode <= 83 &&
keycode != 74 && keycode != 74 &&
keycode != 78) { keycode != 78) {
unicode = 0xffff; unicode = 0xffff;
int oldMask = (qtcode & modmask);
switch (keycode) { switch (keycode) {
case 71: //7 --> Home case 71: //7 --> Home
qtcode = Qt::Key_Home; qtcode = Qt::Key_Home;
@ -425,11 +428,14 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint
qtcode = Qt::Key_Delete; qtcode = Qt::Key_Delete;
break; break;
} }
qtcode ^= oldMask;
} }
// send the result to the server // Map SHIFT + Tab to SHIFT + Backtab, QShortcutMap knows about this translation
processKeyEvent(keycode, unicode, qtcode & ~modmask, Qt::KeyboardModifiers(qtcode & modmask), pressed, autorepeat); if (qtcode == Qt::Key_Tab && (qtmods & Qt::ShiftModifier) == Qt::ShiftModifier)
qtcode = Qt::Key_Backtab;
// Generate the QPA event.
processKeyEvent(keycode, unicode, qtcode, qtmods, pressed, autorepeat);
} }
} }
return result; return result;