Accessibility Linux: Fix caps lock state
Currently in QSpiApplicationAdaptor::eventFilter, the ATSPI_MODIFIER_SHIFTLOCK flag (actually capslock modifier) only set when the capslock key is kept pressed, not when the capslock modifier is enabled. Orca however really needs to know the capslock modifier state, to be able to properly determine whether to enable/disable capslock when the user presses double-capslock. Task-number: QTBUG-84225 Change-Id: I98ab8b7261c5560ebad49410b1358b2279080ec8 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit 6802065da8706f1fc298a56b9f66ab8a815400d3)
This commit is contained in:
parent
a268e8c4f7
commit
4a6a0e13ea
@ -48,6 +48,8 @@
|
||||
#include "deviceeventcontroller_adaptor.h"
|
||||
#include "atspi/atspi-constants.h"
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
|
||||
//#define KEYBOARD_DEBUG
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
@ -62,7 +64,7 @@ QT_BEGIN_NAMESPACE
|
||||
*/
|
||||
|
||||
QSpiApplicationAdaptor::QSpiApplicationAdaptor(const QDBusConnection &connection, QObject *parent)
|
||||
: QObject(parent), dbusConnection(connection), inCapsLock(false)
|
||||
: QObject(parent), dbusConnection(connection)
|
||||
{
|
||||
}
|
||||
|
||||
@ -143,13 +145,9 @@ bool QSpiApplicationAdaptor::eventFilter(QObject *target, QEvent *event)
|
||||
de.text = QStringLiteral("Escape");
|
||||
else if (keyEvent->key() == Qt::Key_Space)
|
||||
de.text = QStringLiteral("space");
|
||||
else if (keyEvent->key() == Qt::Key_CapsLock) {
|
||||
else if (keyEvent->key() == Qt::Key_CapsLock)
|
||||
de.text = QStringLiteral("Caps_Lock");
|
||||
if (event->type() == QEvent::KeyPress)
|
||||
inCapsLock = true;
|
||||
else
|
||||
inCapsLock = false;
|
||||
} else if (keyEvent->key() == Qt::Key_NumLock)
|
||||
else if (keyEvent->key() == Qt::Key_NumLock)
|
||||
de.text = QStringLiteral("Num_Lock");
|
||||
else if (keyEvent->key() == Qt::Key_Insert)
|
||||
de.text = QStringLiteral("Insert");
|
||||
@ -161,9 +159,10 @@ bool QSpiApplicationAdaptor::eventFilter(QObject *target, QEvent *event)
|
||||
de.isText = !de.text.isEmpty();
|
||||
|
||||
de.modifiers = 0;
|
||||
if (!inCapsLock && keyEvent->modifiers() & Qt::ShiftModifier)
|
||||
if ((keyEvent->modifiers() & Qt::ShiftModifier) && (keyEvent->key() != Qt::Key_Shift))
|
||||
de.modifiers |= 1 << ATSPI_MODIFIER_SHIFT;
|
||||
if (inCapsLock && (keyEvent->key() != Qt::Key_CapsLock))
|
||||
// TODO rather introduce Qt::CapslockModifier into KeyboardModifier
|
||||
if (keyEvent->nativeModifiers() & XCB_MOD_MASK_LOCK )
|
||||
de.modifiers |= 1 << ATSPI_MODIFIER_SHIFTLOCK;
|
||||
if ((keyEvent->modifiers() & Qt::ControlModifier) && (keyEvent->key() != Qt::Key_Control))
|
||||
de.modifiers |= 1 << ATSPI_MODIFIER_CONTROL;
|
||||
|
@ -90,7 +90,6 @@ private:
|
||||
|
||||
QQueue<QPair<QPointer<QObject>, QKeyEvent*> > keyEvents;
|
||||
QDBusConnection dbusConnection;
|
||||
bool inCapsLock;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
Loading…
x
Reference in New Issue
Block a user