AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass autorepeat info to input context key filtering with XCB

Browse Source 
Change-Id: Ifbb658dde6689543f48ed8fb82109ea07bcf8bd7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Pekka Vuorela 2012-04-03 17:01:12 +03:00 committed by Qt by Nokia
parent eb04862920
commit 7adef58fd9
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/platforms/xcb/qxcbkeyboard.cpp
View File

@ -1073,14 +1073,6 @@ void QXcbKeyboard::handleKeyEvent(QWindow *window, QEvent::Type type, xcb_keycod
int count = chars.count(); int count = chars.count();
QString string = translateKeySym(sym, state, qtcode, modifiers, chars, count); QString string = translateKeySym(sym, state, qtcode, modifiers, chars, count);
if (inputContext) {
QKeyEvent event(type, qtcode, modifiers, string);
event.setTimestamp(time);
bool retval = inputContext->filterEvent(&event);
if (retval)
return;
}
bool isAutoRepeat = false; bool isAutoRepeat = false;
if (type == QEvent::KeyPress) { if (type == QEvent::KeyPress) {
@ -1099,13 +1091,28 @@ void QXcbKeyboard::handleKeyEvent(QWindow *window, QEvent::Type type, xcb_keycod
m_autorepeat_code = isAutoRepeat ? code : 0; m_autorepeat_code = isAutoRepeat ? code : 0;
} }
QWindowSystemInterface::handleExtendedKeyEvent(window, time, type, qtcode, modifiers, bool filtered = false;
code, 0, state, string.left(count), isAutoRepeat); if (inputContext) {
QKeyEvent event(type, qtcode, modifiers, string, isAutoRepeat);
event.setTimestamp(time);
filtered = inputContext->filterEvent(&event);
}
if (!filtered)
QWindowSystemInterface::handleExtendedKeyEvent(window, time, type, qtcode, modifiers,
code, 0, state, string.left(count), isAutoRepeat);
if (isAutoRepeat && type == QEvent::KeyRelease) { if (isAutoRepeat && type == QEvent::KeyRelease) {
// since we removed it from the event queue using checkEvent we need to send the key press here // since we removed it from the event queue using checkEvent we need to send the key press here
QWindowSystemInterface::handleExtendedKeyEvent(window, time, QEvent::KeyPress, qtcode, modifiers, filtered = false;
code, 0, state, string.left(count), isAutoRepeat); if (inputContext) {
QKeyEvent event(QEvent::KeyPress, qtcode, modifiers, string, isAutoRepeat);
event.setTimestamp(time);
filtered = inputContext->filterEvent(&event);
}
if (!filtered)
QWindowSystemInterface::handleExtendedKeyEvent(window, time, QEvent::KeyPress, qtcode, modifiers,
code, 0, state, string.left(count), isAutoRepeat);
} }
} }