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

a11y atspi: Implement TableCell methods Get{Column,Row}HeaderCells

Browse Source 
The AT-SPI TableCell interface's GetColumnHeaderCells
and GetRowHeaderCells methods were not documented in
the XML specification until recently, but are actively used,
e.g. also by the Orca screen reader since commit
ac2c4470ff
("Prefer table cell interface for getting row and column headers").

5145d3899d only implemented
the TableCell methods that were contained in the XML spec
by then.

Handle these two methods as well, and add an explicit
warning for the case an unknown method is called.

Related at-spi2-core commit adding the two missing methods to the
AT-SPI TableCell XML spec:
963e991973
("TableCell.xml: Add Get{Column,Row}HeaderCells methods")

Fixes: QTBUG-113110
Change-Id: Ic218cdd021bbc347907762035730e6ae7d387300
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Michael Weghorn 2023-04-24 17:38:38 +03:00 committed by Volker Hilsheimer
parent 644bd3367c
commit 86ea40b478
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/accessible/linux/atspiadaptor.cpp
View File

@ -469,6 +469,14 @@ QString AtSpiAdaptor::introspect(const QString &path) const
" <arg direction=\"out\" name=\"row_extents\" type=\"i\" />\n"
" <arg direction=\"out\" name=\"col_extents\" type=\"i\" />\n"
" </method>\n"
" <method name=\"GetColumnHeaderCells\">\n"
" <arg direction=\"out\" type=\"a(so)\"/>\n"
" <annotation value=\"QSpiObjectReferenceArray\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetRowHeaderCells\">\n"
" <arg direction=\"out\" type=\"a(so)\"/>\n"
" <annotation value=\"QSpiObjectReferenceArray\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" </interface>\n"
);
@ -2770,7 +2778,17 @@ bool AtSpiAdaptor::tableCellInterface(QAccessibleInterface *interface, const QSt
return false;
}
if (function == "GetColumnSpan"_L1) {
if (function == "GetColumnHeaderCells"_L1) {
QSpiObjectReferenceArray headerCells;
const auto headerCellInterfaces = cellInterface->columnHeaderCells();
headerCells.reserve(headerCellInterfaces.size());
for (QAccessibleInterface *cell : headerCellInterfaces) {
const QString childPath = pathForInterface(cell);
const QSpiObjectReference ref(connection, QDBusObjectPath(childPath));
headerCells << ref;
}
connection.send(message.createReply(QVariant::fromValue(headerCells)));
} else if (function == "GetColumnSpan"_L1) {
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(cellInterface->columnExtent())))));
} else if (function == "GetPosition"_L1) {
@ -2778,6 +2796,16 @@ bool AtSpiAdaptor::tableCellInterface(QAccessibleInterface *interface, const QSt
const int column = cellInterface->columnIndex();
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(QPoint(row, column))))));
} else if (function == "GetRowHeaderCells"_L1) {
QSpiObjectReferenceArray headerCells;
const auto headerCellInterfaces = cellInterface->rowHeaderCells();
headerCells.reserve(headerCellInterfaces.size());
for (QAccessibleInterface *cell : headerCellInterfaces) {
const QString childPath = pathForInterface(cell);
const QSpiObjectReference ref(connection, QDBusObjectPath(childPath));
headerCells << ref;
}
connection.send(message.createReply(QVariant::fromValue(headerCells)));
} else if (function == "GetRowSpan"_L1) {
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(cellInterface->rowExtent())))));
@ -2791,6 +2819,9 @@ bool AtSpiAdaptor::tableCellInterface(QAccessibleInterface *interface, const QSt
if (table && table->tableInterface())
ref = QSpiObjectReference(connection, QDBusObjectPath(pathForInterface(table)));
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(QVariant::fromValue(ref)))));
} else {
qCWarning(lcAccessibilityAtspi) << "AtSpiAdaptor::tableCellInterface does not implement" << function << message.path();
return false;
}
return true;