qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtbase/src/platformsupport/linuxaccessibility/atspiadaptor.cpp

2487 lines
120 KiB
C++
Raw Normal View History

Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
/****************************************************************************
**
Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
2015-01-28 08:44:43 +00:00
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
**
** This file is part of the QtGui module of the Qt Toolkit.
**
Update license headers and add new license files - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2014-08-21 13:51:22 +00:00
** $QT_BEGIN_LICENSE:LGPL21$
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-19 12:28:29 +00:00
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
2015-01-28 08:44:43 +00:00
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-19 12:28:29 +00:00
**
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
** GNU Lesser General Public License Usage
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-19 12:28:29 +00:00
** Alternatively, this file may be used under the terms of the GNU Lesser
Update license headers and add new license files - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2014-08-21 13:51:22 +00:00
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
Change copyrights from Nokia to Digia Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-19 12:28:29 +00:00
**
Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
2015-01-28 08:44:43 +00:00
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "atspiadaptor_p.h"
#include <QtGui/qwindow.h>
Accessibility doesn't need QApp from QWidgets. Change-Id: I440179bfa95d6aa73c8b69b09431e4dc9fae5436 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-17 09:29:26 +00:00
#include <QtGui/qguiapplication.h>
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
#include <qdbusmessage.h>
#include <qdbusreply.h>
#include <qclipboard.h>
#include <qdebug.h>
Compile with -no-feature-accessibility Task-number: QTBUG-38045 Change-Id: Id436b70aa6161bdf2428ca0a605212b278c71849 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-07-02 12:10:30 +00:00
#ifndef QT_NO_ACCESSIBILITY
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
#include "socket_interface.h"
#include "constant_mappings_p.h"
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
#include "../accessibility/qaccessiblebridgeutils_p.h"
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
#include "application_p.h"
/*!
\class AtSpiAdaptor
Mark plugin class docs as internal. Change-Id: I2eb0a6ce4108774377df1296de4152715b65de6e Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2012-09-05 14:23:23 +00:00
\internal
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
\brief AtSpiAdaptor is the main class to forward between QAccessibleInterface and AT-SPI DBus
AtSpiAdaptor implements the functions specified in all at-spi interfaces.
Doc: Fix spelling errors Change-Id: Ibae8d10183f6b15a16b1499daa2df8802dbb014e Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
2012-08-16 08:46:42 +00:00
It sends notifications coming from Qt via dbus and listens to incoming dbus requests.
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
*/
QT_BEGIN_NAMESPACE
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
static bool isDebugging = false;
#define qAtspiDebug if (!::isDebugging); else qDebug
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
AtSpiAdaptor::AtSpiAdaptor(DBusConnection *connection, QObject *parent)
Accessibility Linux: Make dbus registration async Change-Id: I74043be04f4ee17089353304fdc007a7f22cdea0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-12-13 17:12:40 +00:00
: QDBusVirtualObject(parent), m_dbus(connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
, sendFocus(0)
, sendObject(0)
, sendObject_active_descendant_changed(0)
, sendObject_attributes_changed(0)
, sendObject_bounds_changed(0)
, sendObject_children_changed(0)
// , sendObject_children_changed_add(0)
// , sendObject_children_changed_remove(0)
, sendObject_column_deleted(0)
, sendObject_column_inserted(0)
, sendObject_column_reordered(0)
, sendObject_link_selected(0)
, sendObject_model_changed(0)
, sendObject_property_change(0)
, sendObject_property_change_accessible_description(0)
, sendObject_property_change_accessible_name(0)
, sendObject_property_change_accessible_parent(0)
, sendObject_property_change_accessible_role(0)
, sendObject_property_change_accessible_table_caption(0)
, sendObject_property_change_accessible_table_column_description(0)
, sendObject_property_change_accessible_table_column_header(0)
, sendObject_property_change_accessible_table_row_description(0)
, sendObject_property_change_accessible_table_row_header(0)
, sendObject_property_change_accessible_table_summary(0)
, sendObject_property_change_accessible_value(0)
, sendObject_row_deleted(0)
, sendObject_row_inserted(0)
, sendObject_row_reordered(0)
, sendObject_selection_changed(0)
Add missing bit in initialization. Change-Id: I1de8dcd8714f1700ac03d7c1e8536f10a031cef9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-12-13 19:30:48 +00:00
, sendObject_state_changed(0)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
, sendObject_text_attributes_changed(0)
, sendObject_text_bounds_changed(0)
, sendObject_text_caret_moved(0)
, sendObject_text_changed(0)
// , sendObject_text_changed_delete(0)
// , sendObject_text_changed_insert(0)
, sendObject_text_selection_changed(0)
, sendObject_value_changed(0)
, sendObject_visible_data_changed(0)
, sendWindow(0)
, sendWindow_activate(0)
, sendWindow_close(0)
, sendWindow_create(0)
, sendWindow_deactivate(0)
// , sendWindow_desktop_create(0)
// , sendWindow_desktop_destroy(0)
, sendWindow_lower(0)
, sendWindow_maximize(0)
, sendWindow_minimize(0)
, sendWindow_move(0)
, sendWindow_raise(0)
, sendWindow_reparent(0)
, sendWindow_resize(0)
, sendWindow_restore(0)
, sendWindow_restyle(0)
, sendWindow_shade(0)
, sendWindow_unshade(0)
{
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
::isDebugging = qEnvironmentVariableIsSet("QT_DEBUG_ACCESSIBILITY");
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
m_applicationAdaptor = new QSpiApplicationAdaptor(m_dbus->connection(), this);
connect(m_applicationAdaptor, SIGNAL(windowActivated(QObject*,bool)), this, SLOT(windowActivated(QObject*,bool)));
Accessibility Linux: Make dbus registration async Change-Id: I74043be04f4ee17089353304fdc007a7f22cdea0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-12-13 17:12:40 +00:00
updateEventListeners();
bool success = m_dbus->connection().connect(QLatin1String("org.a11y.atspi.Registry"), QLatin1String("/org/a11y/atspi/registry"),
QLatin1String("org.a11y.atspi.Registry"), QLatin1String("EventListenerRegistered"), this,
SLOT(eventListenerRegistered(QString,QString)));
success = success && m_dbus->connection().connect(QLatin1String("org.a11y.atspi.Registry"), QLatin1String("/org/a11y/atspi/registry"),
QLatin1String("org.a11y.atspi.Registry"), QLatin1String("EventListenerDeregistered"), this,
SLOT(eventListenerDeregistered(QString,QString)));
#ifdef QT_ATSPI_DEBUG
qAtspiDebug() << "Registered event listener change listener: " << success;
#endif
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
AtSpiAdaptor::~AtSpiAdaptor()
{
}
/*!
Provide DBus introspection.
*/
QString AtSpiAdaptor::introspect(const QString &path) const
{
static const QLatin1String accessibleIntrospection(
" <interface name=\"org.a11y.atspi.Accessible\">\n"
" <property access=\"read\" type=\"s\" name=\"Name\"/>\n"
" <property access=\"read\" type=\"s\" name=\"Description\"/>\n"
" <property access=\"read\" type=\"(so)\" name=\"Parent\">\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n"
" </property>\n"
" <property access=\"read\" type=\"i\" name=\"ChildCount\"/>\n"
" <method name=\"GetChildAtIndex\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"(so)\"/>\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetChildren\">\n"
" <arg direction=\"out\" type=\"a(so)\"/>\n"
" <annotation value=\"QSpiObjectReferenceArray\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetIndexInParent\">\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetRelationSet\">\n"
" <arg direction=\"out\" type=\"a(ua(so))\"/>\n"
" <annotation value=\"QSpiRelationArray\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetRole\">\n"
" <arg direction=\"out\" type=\"u\"/>\n"
" </method>\n"
" <method name=\"GetRoleName\">\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetLocalizedRoleName\">\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetState\">\n"
" <arg direction=\"out\" type=\"au\"/>\n"
" <annotation value=\"QSpiUIntList\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetAttributes\">\n"
" <arg direction=\"out\" type=\"a{ss}\"/>\n"
" <annotation value=\"QSpiAttributeSet\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetApplication\">\n"
" <arg direction=\"out\" type=\"(so)\"/>\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" </interface>\n"
);
static const QLatin1String actionIntrospection(
" <interface name=\"org.a11y.atspi.Action\">\n"
" <property access=\"read\" type=\"i\" name=\"NActions\"/>\n"
" <method name=\"GetDescription\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetName\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetKeyBinding\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetActions\">\n"
" <arg direction=\"out\" type=\"a(sss)\" name=\"index\"/>\n"
" <annotation value=\"QSpiActionArray\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"DoAction\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" </interface>\n"
);
static const QLatin1String applicationIntrospection(
" <interface name=\"org.a11y.atspi.Application\">\n"
" <property access=\"read\" type=\"s\" name=\"ToolkitName\"/>\n"
" <property access=\"read\" type=\"s\" name=\"Version\"/>\n"
" <property access=\"readwrite\" type=\"i\" name=\"Id\"/>\n"
" <method name=\"GetLocale\">\n"
" <arg direction=\"in\" type=\"u\" name=\"lctype\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetApplicationBusAddress\">\n"
" <arg direction=\"out\" type=\"s\" name=\"address\"/>\n"
" </method>\n"
" </interface>\n"
);
static const QLatin1String componentIntrospection(
" <interface name=\"org.a11y.atspi.Component\">\n"
" <method name=\"Contains\">\n"
" <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coord_type\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"GetAccessibleAtPoint\">\n"
" <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coord_type\"/>\n"
" <arg direction=\"out\" type=\"(so)\"/>\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetExtents\">\n"
" <arg direction=\"in\" type=\"u\" name=\"coord_type\"/>\n"
" <arg direction=\"out\" type=\"(iiii)\"/>\n"
" <annotation value=\"QSpiRect\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetPosition\">\n"
" <arg direction=\"in\" type=\"u\" name=\"coord_type\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"y\"/>\n"
" </method>\n"
" <method name=\"GetSize\">\n"
" <arg direction=\"out\" type=\"i\" name=\"width\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"height\"/>\n"
" </method>\n"
" <method name=\"GetLayer\">\n"
" <arg direction=\"out\" type=\"u\"/>\n"
" </method>\n"
" <method name=\"GetMDIZOrder\">\n"
" <arg direction=\"out\" type=\"n\"/>\n"
" </method>\n"
" <method name=\"GrabFocus\">\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"GetAlpha\">\n"
" <arg direction=\"out\" type=\"d\"/>\n"
" </method>\n"
" <method name=\"SetExtents\">\n"
" <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"width\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"height\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coord_type\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"SetPosition\">\n"
" <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coord_type\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"SetSize\">\n"
" <arg direction=\"in\" type=\"i\" name=\"width\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"height\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" </interface>\n"
);
static const QLatin1String editableTextIntrospection(
" <interface name=\"org.a11y.atspi.EditableText\">\n"
" <method name=\"SetTextContents\">\n"
" <arg direction=\"in\" type=\"s\" name=\"newContents\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"InsertText\">\n"
" <arg direction=\"in\" type=\"i\" name=\"position\"/>\n"
" <arg direction=\"in\" type=\"s\" name=\"text\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"length\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"CopyText\">\n"
" <arg direction=\"in\" type=\"i\" name=\"startPos\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"endPos\"/>\n"
" </method>\n"
" <method name=\"CutText\">\n"
" <arg direction=\"in\" type=\"i\" name=\"startPos\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"endPos\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"DeleteText\">\n"
" <arg direction=\"in\" type=\"i\" name=\"startPos\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"endPos\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"PasteText\">\n"
" <arg direction=\"in\" type=\"i\" name=\"position\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" </interface>\n"
);
static const QLatin1String tableIntrospection(
" <interface name=\"org.a11y.atspi.Table\">\n"
" <property access=\"read\" type=\"i\" name=\"NRows\"/>\n"
" <property access=\"read\" type=\"i\" name=\"NColumns\"/>\n"
" <property access=\"read\" type=\"(so)\" name=\"Caption\">\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n"
" </property>\n"
" <property access=\"read\" type=\"(so)\" name=\"Summary\">\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName\"/>\n"
" </property>\n"
" <property access=\"read\" type=\"i\" name=\"NSelectedRows\"/>\n"
" <property access=\"read\" type=\"i\" name=\"NSelectedColumns\"/>\n"
" <method name=\"GetAccessibleAt\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"(so)\"/>\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetIndexAt\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetRowAtIndex\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetColumnAtIndex\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetRowDescription\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetColumnDescription\">\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"GetRowExtentAt\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetColumnExtentAt\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetRowHeader\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"out\" type=\"(so)\"/>\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetColumnHeader\">\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"(so)\"/>\n"
" <annotation value=\"QSpiObjectReference\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetSelectedRows\">\n"
" <arg direction=\"out\" type=\"ai\"/>\n"
" <annotation value=\"QSpiIntList\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetSelectedColumns\">\n"
" <arg direction=\"out\" type=\"ai\"/>\n"
" <annotation value=\"QSpiIntList\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"IsRowSelected\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"IsColumnSelected\">\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"IsSelected\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"AddRowSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"AddColumnSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"RemoveRowSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"RemoveColumnSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"column\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"GetRowColumnExtentsAtIndex\">\n"
" <arg direction=\"in\" type=\"i\" name=\"index\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"row\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"col\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"row_extents\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"col_extents\"/>\n"
" <arg direction=\"out\" type=\"b\" name=\"is_selected\"/>\n"
" </method>\n"
" </interface>\n"
);
static const QLatin1String textIntrospection(
" <interface name=\"org.a11y.atspi.Text\">\n"
" <property access=\"read\" type=\"i\" name=\"CharacterCount\"/>\n"
" <property access=\"read\" type=\"i\" name=\"CaretOffset\"/>\n"
" <method name=\"GetText\">\n"
" <arg direction=\"in\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"endOffset\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" </method>\n"
" <method name=\"SetCaretOffset\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"GetTextBeforeOffset\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"type\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"endOffset\"/>\n"
" </method>\n"
" <method name=\"GetTextAtOffset\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"type\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"endOffset\"/>\n"
" </method>\n"
" <method name=\"GetTextAfterOffset\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"type\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"endOffset\"/>\n"
" </method>\n"
" <method name=\"GetCharacterAtOffset\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetAttributeValue\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"in\" type=\"s\" name=\"attributeName\"/>\n"
" <arg direction=\"out\" type=\"s\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"endOffset\"/>\n"
" <arg direction=\"out\" type=\"b\" name=\"defined\"/>\n"
" </method>\n"
" <method name=\"GetAttributes\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"out\" type=\"a{ss}\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"endOffset\"/>\n"
" <annotation value=\"QSpiAttributeSet\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetDefaultAttributes\">\n"
" <arg direction=\"out\" type=\"a{ss}\"/>\n"
" <annotation value=\"QSpiAttributeSet\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetCharacterExtents\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"width\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"height\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coordType\"/>\n"
" </method>\n"
" <method name=\"GetOffsetAtPoint\">\n"
" <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coordType\"/>\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" </method>\n"
" <method name=\"GetNSelections\">\n"
" <arg direction=\"out\" type=\"i\"/>\n"
" <method name=\"GetSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"selectionNum\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"endOffset\"/>\n"
" </method>\n"
" <method name=\"AddSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"endOffset\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"RemoveSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"selectionNum\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"SetSelection\">\n"
" <arg direction=\"in\" type=\"i\" name=\"selectionNum\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"endOffset\"/>\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"GetRangeExtents\">\n"
" <arg direction=\"in\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"endOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"width\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"height\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coordType\"/>\n"
" </method>\n"
" <method name=\"GetBoundedRanges\">\n"
" <arg direction=\"in\" type=\"i\" name=\"x\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"y\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"width\"/>\n"
" <arg direction=\"in\" type=\"i\" name=\"height\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"coordType\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"xClipType\"/>\n"
" <arg direction=\"in\" type=\"u\" name=\"yClipType\"/>\n"
" <arg direction=\"out\" type=\"a(iisv)\"/>\n"
" <annotation value=\"QSpiRangeList\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetAttributeRun\">\n"
" <arg direction=\"in\" type=\"i\" name=\"offset\"/>\n"
" <arg direction=\"in\" type=\"b\" name=\"includeDefaults\"/>\n"
" <arg direction=\"out\" type=\"a{ss}\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"startOffset\"/>\n"
" <arg direction=\"out\" type=\"i\" name=\"endOffset\"/>\n"
" <annotation value=\"QSpiAttributeSet\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" <method name=\"GetDefaultAttributeSet\">\n"
" <arg direction=\"out\" type=\"a{ss}\"/>\n"
" <annotation value=\"QSpiAttributeSet\" name=\"org.qtproject.QtDBus.QtTypeName.Out0\"/>\n"
" </method>\n"
" </interface>\n"
);
static const QLatin1String valueIntrospection(
" <interface name=\"org.a11y.atspi.Value\">\n"
" <property access=\"read\" type=\"d\" name=\"MinimumValue\"/>\n"
" <property access=\"read\" type=\"d\" name=\"MaximumValue\"/>\n"
" <property access=\"read\" type=\"d\" name=\"MinimumIncrement\"/>\n"
" <property access=\"readwrite\" type=\"d\" name=\"CurrentValue\"/>\n"
" <method name=\"SetCurrentValue\">\n"
" <arg direction=\"in\" type=\"d\" name=\"value\"/>\n"
" </method>\n"
" </interface>\n"
);
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * interface = interfaceFromPath(path);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (!interface) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING Qt AtSpiAdaptor: Could not find accessible on path: " << path;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return QString();
}
QStringList interfaces = accessibleInterfaces(interface);
QString xml;
xml.append(accessibleIntrospection);
if (interfaces.contains(QLatin1String(ATSPI_DBUS_INTERFACE_COMPONENT)))
xml.append(componentIntrospection);
if (interfaces.contains(QLatin1String(ATSPI_DBUS_INTERFACE_TEXT)))
xml.append(textIntrospection);
if (interfaces.contains(QLatin1String(ATSPI_DBUS_INTERFACE_EDITABLE_TEXT)))
xml.append(editableTextIntrospection);
if (interfaces.contains(QLatin1String(ATSPI_DBUS_INTERFACE_ACTION)))
xml.append(actionIntrospection);
if (interfaces.contains(QLatin1String(ATSPI_DBUS_INTERFACE_TABLE)))
xml.append(tableIntrospection);
if (interfaces.contains(QLatin1String(ATSPI_DBUS_INTERFACE_VALUE)))
xml.append(valueIntrospection);
if (path == QLatin1String(QSPI_OBJECT_PATH_ROOT))
xml.append(applicationIntrospection);
return xml;
}
void AtSpiAdaptor::setBitFlag(const QString &flag)
{
Q_ASSERT(flag.size());
// assume we don't get nonsense - look at first letter only
switch (flag.at(0).toLower().toLatin1()) {
case 'o': {
if (flag.size() <= 8) { // Object::
sendObject = 1;
} else { // Object:Foo:Bar
QString right = flag.mid(7);
if (false) {
} else if (right.startsWith(QLatin1String("ActiveDescendantChanged"))) {
sendObject_active_descendant_changed = 1;
} else if (right.startsWith(QLatin1String("AttributesChanged"))) {
sendObject_attributes_changed = 1;
} else if (right.startsWith(QLatin1String("BoundsChanged"))) {
sendObject_bounds_changed = 1;
} else if (right.startsWith(QLatin1String("ChildrenChanged"))) {
sendObject_children_changed = 1;
} else if (right.startsWith(QLatin1String("ColumnDeleted"))) {
sendObject_column_deleted = 1;
} else if (right.startsWith(QLatin1String("ColumnInserted"))) {
sendObject_column_inserted = 1;
} else if (right.startsWith(QLatin1String("ColumnReordered"))) {
sendObject_column_reordered = 1;
} else if (right.startsWith(QLatin1String("LinkSelected"))) {
sendObject_link_selected = 1;
} else if (right.startsWith(QLatin1String("ModelChanged"))) {
sendObject_model_changed = 1;
} else if (right.startsWith(QLatin1String("PropertyChange"))) {
if (right == QLatin1String("PropertyChange:AccessibleDescription")) {
sendObject_property_change_accessible_description = 1;
} else if (right == QLatin1String("PropertyChange:AccessibleName")) {
sendObject_property_change_accessible_name = 1;
} else if (right == QLatin1String("PropertyChange:AccessibleParent")) {
sendObject_property_change_accessible_parent = 1;
} else if (right == QLatin1String("PropertyChange:AccessibleRole")) {
sendObject_property_change_accessible_role = 1;
} else if (right == QLatin1String("PropertyChange:TableCaption")) {
sendObject_property_change_accessible_table_caption = 1;
} else if (right == QLatin1String("PropertyChange:TableColumnDescription")) {
sendObject_property_change_accessible_table_column_description = 1;
} else if (right == QLatin1String("PropertyChange:TableColumnHeader")) {
sendObject_property_change_accessible_table_column_header = 1;
} else if (right == QLatin1String("PropertyChange:TableRowDescription")) {
sendObject_property_change_accessible_table_row_description = 1;
} else if (right == QLatin1String("PropertyChange:TableRowHeader")) {
sendObject_property_change_accessible_table_row_header = 1;
} else if (right == QLatin1String("PropertyChange:TableSummary")) {
sendObject_property_change_accessible_table_summary = 1;
} else if (right == QLatin1String("PropertyChange:AccessibleValue")) {
sendObject_property_change_accessible_value = 1;
} else {
sendObject_property_change = 1;
}
} else if (right.startsWith(QLatin1String("RowDeleted"))) {
sendObject_row_deleted = 1;
} else if (right.startsWith(QLatin1String("RowInserted"))) {
sendObject_row_inserted = 1;
} else if (right.startsWith(QLatin1String("RowReordered"))) {
sendObject_row_reordered = 1;
} else if (right.startsWith(QLatin1String("SelectionChanged"))) {
sendObject_selection_changed = 1;
} else if (right.startsWith(QLatin1String("StateChanged"))) {
sendObject_state_changed = 1;
} else if (right.startsWith(QLatin1String("TextAttributesChanged"))) {
sendObject_text_attributes_changed = 1;
} else if (right.startsWith(QLatin1String("TextBoundsChanged"))) {
sendObject_text_bounds_changed = 1;
} else if (right.startsWith(QLatin1String("TextCaretMoved"))) {
sendObject_text_caret_moved = 1;
} else if (right.startsWith(QLatin1String("TextChanged"))) {
sendObject_text_changed = 1;
} else if (right.startsWith(QLatin1String("TextSelectionChanged"))) {
sendObject_text_selection_changed = 1;
} else if (right.startsWith(QLatin1String("ValueChanged"))) {
sendObject_value_changed = 1;
Add workaround for typo in libatspi VisualdataChanged Change-Id: I6375d77fac4e743a372f18b3e3d63c128ce51271 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-10-01 10:02:44 +00:00
} else if (right.startsWith(QLatin1String("VisibleDataChanged"))
|| right.startsWith(QLatin1String("VisibledataChanged"))) { // typo in libatspi
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
sendObject_visible_data_changed = 1;
} else {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING: subscription string not handled:" << flag;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
}
break;
}
case 'w': { // window
if (flag.size() <= 8) {
sendWindow = 1;
} else { // object:Foo:Bar
QString right = flag.mid(7);
if (false) {
} else if (right.startsWith(QLatin1String("Activate"))) {
sendWindow_activate = 1;
} else if (right.startsWith(QLatin1String("Close"))) {
sendWindow_close= 1;
} else if (right.startsWith(QLatin1String("Create"))) {
sendWindow_create = 1;
} else if (right.startsWith(QLatin1String("Deactivate"))) {
sendWindow_deactivate = 1;
} else if (right.startsWith(QLatin1String("Lower"))) {
sendWindow_lower = 1;
} else if (right.startsWith(QLatin1String("Maximize"))) {
sendWindow_maximize = 1;
} else if (right.startsWith(QLatin1String("Minimize"))) {
sendWindow_minimize = 1;
} else if (right.startsWith(QLatin1String("Move"))) {
sendWindow_move = 1;
} else if (right.startsWith(QLatin1String("Raise"))) {
sendWindow_raise = 1;
} else if (right.startsWith(QLatin1String("Reparent"))) {
sendWindow_reparent = 1;
} else if (right.startsWith(QLatin1String("Resize"))) {
sendWindow_resize = 1;
} else if (right.startsWith(QLatin1String("Restore"))) {
sendWindow_restore = 1;
} else if (right.startsWith(QLatin1String("Restyle"))) {
sendWindow_restyle = 1;
} else if (right.startsWith(QLatin1String("Shade"))) {
sendWindow_shade = 1;
} else if (right.startsWith(QLatin1String("Unshade"))) {
sendWindow_unshade = 1;
} else if (right.startsWith(QLatin1String("DesktopCreate"))) {
// ignore this one
} else if (right.startsWith(QLatin1String("DesktopDestroy"))) {
// ignore this one
} else {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING: subscription string not handled:" << flag;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
}
break;
}
case 'f': {
sendFocus = 1;
break;
}
case 'd': { // document is not implemented
break;
}
case 't': { // terminal is not implemented
break;
}
case 'm': { // mouse* is handled in a different way by the gnome atspi stack
break;
}
default:
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING: subscription string not handled:" << flag;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
}
/*!
Checks via dbus which events should be sent.
*/
void AtSpiAdaptor::updateEventListeners()
{
QDBusMessage m = QDBusMessage::createMethodCall(QLatin1String("org.a11y.atspi.Registry"),
QLatin1String("/org/a11y/atspi/registry"),
QLatin1String("org.a11y.atspi.Registry"), QLatin1String("GetRegisteredEvents"));
QDBusReply<QSpiEventListenerArray> listenersReply = m_dbus->connection().call(m);
if (listenersReply.isValid()) {
const QSpiEventListenerArray evList = listenersReply.value();
Q_FOREACH (const QSpiEventListener &ev, evList) {
setBitFlag(ev.eventName);
}
m_applicationAdaptor->sendEvents(!evList.isEmpty());
} else {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "Could not query active accessibility event listeners.";
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
}
void AtSpiAdaptor::eventListenerDeregistered(const QString &/*bus*/, const QString &/*path*/)
{
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
// qAtspiDebug() << "AtSpiAdaptor::eventListenerDeregistered: " << bus << path;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
updateEventListeners();
}
void AtSpiAdaptor::eventListenerRegistered(const QString &/*bus*/, const QString &/*path*/)
{
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
// qAtspiDebug() << "AtSpiAdaptor::eventListenerRegistered: " << bus << path;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
updateEventListeners();
}
/*!
This slot needs to get called when a \a window has be activated or deactivated (become focused).
When \a active is true, the window just received focus, otherwise it lost the focus.
*/
void AtSpiAdaptor::windowActivated(QObject* window, bool active)
{
if (!(sendWindow || sendWindow_activate))
return;
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(window);
Accessibility: Fix crash when updating in dtor This happens for example when running several tests. Widgets in destructor should be treated as invalid since their window pointer and other properties are no longer valid. When deleting a window containing only a table view there would be a table model reset update comming from the window being destroyed. Change-Id: Ia387c814333ce373fe132b189fc180787e36cdd5 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-18 14:59:17 +00:00
Q_ASSERT(iface);
Q_ASSERT(!active || iface->isValid());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
Accessibility: Fix crash when updating in dtor This happens for example when running several tests. Widgets in destructor should be treated as invalid since their window pointer and other properties are no longer valid. When deleting a window containing only a table view there would be a table model reset update comming from the window being destroyed. Change-Id: Ia387c814333ce373fe132b189fc180787e36cdd5 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-18 14:59:17 +00:00
QString windowTitle;
// in dtor it may be invalid
if (iface->isValid())
windowTitle = iface->text(QAccessible::Name);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QDBusVariant data;
data.setVariant(windowTitle);
QVariantList args = packDBusSignalArguments(QString(), 0, 0, QVariant::fromValue(data));
QString status = active ? QLatin1String("Activate") : QLatin1String("Deactivate");
QString path = pathForObject(window);
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_WINDOW), status, args);
QVariantList stateArgs = packDBusSignalArguments(QLatin1String("active"), active ? 1 : 0, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("StateChanged"), stateArgs);
}
QVariantList AtSpiAdaptor::packDBusSignalArguments(const QString &type, int data1, int data2, const QVariant &variantData) const
{
QVariantList arguments;
arguments << type << data1 << data2 << variantData
<< QVariant::fromValue(QSpiObjectReference(m_dbus->connection(), QDBusObjectPath(QSPI_OBJECT_PATH_ROOT)));
return arguments;
}
QVariant AtSpiAdaptor::variantForPath(const QString &path) const
{
QDBusVariant data;
data.setVariant(QVariant::fromValue(QSpiObjectReference(m_dbus->connection(), QDBusObjectPath(path))));
return QVariant::fromValue(data);
}
bool AtSpiAdaptor::sendDBusSignal(const QString &path, const QString &interface, const QString &signalName, const QVariantList &arguments) const
{
QDBusMessage message = QDBusMessage::createSignal(path, interface, signalName);
message.setArguments(arguments);
return m_dbus->connection().send(message);
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface *AtSpiAdaptor::interfaceFromPath(const QString& dbusPath) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (dbusPath == QLatin1String(QSPI_OBJECT_PATH_ROOT))
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
return QAccessible::queryAccessibleInterface(qApp);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QStringList parts = dbusPath.split(QLatin1Char('/'));
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
if (parts.size() != 6) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "invalid path: " << dbusPath;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
return 0;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
QString objectString = parts.at(5);
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessible::Id id = objectString.toUInt();
// The id is always in the range [INT_MAX+1, UINT_MAX]
if ((int)id >= 0)
qWarning() << "No accessible object found for id: " << id;
return QAccessible::accessibleInterface(id);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
void AtSpiAdaptor::notifyStateChange(QAccessibleInterface *interface, const QString &state, int value)
Implemented AtSpiAdaptor::notifyStateChange Adding a new private method to simplify notifying that the state has changed as it is something that is frequently done in AtSpiAdaptor::notify Change-Id: Idf21715b5d20212adb301ae9bca05f1edfc19946 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-10-26 13:23:58 +00:00
{
QString path = pathForInterface(interface);
QVariantList stateArgs = packDBusSignalArguments(state, value, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("StateChanged"), stateArgs);
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
/*!
This function gets called when Qt notifies about accessibility updates.
*/
void AtSpiAdaptor::notify(QAccessibleEvent *event)
{
switch (event->type()) {
case QAccessible::ObjectCreated:
if (sendObject || sendObject_children_changed)
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
notifyAboutCreation(event->accessibleInterface());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
break;
case QAccessible::ObjectShow: {
if (sendObject || sendObject_state_changed) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
notifyStateChange(event->accessibleInterface(), QLatin1String("showing"), 1);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
break;
}
case QAccessible::ObjectHide: {
if (sendObject || sendObject_state_changed) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
notifyStateChange(event->accessibleInterface(), QLatin1String("showing"), 0);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
break;
}
case QAccessible::ObjectDestroyed: {
if (sendObject || sendObject_state_changed)
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
notifyAboutDestruction(event->accessibleInterface());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
break;
}
Accessibility Linux: send children changed notifications The badly named ObjectReorder actually stands for any of this object's children may have changed. This event is used in webengine and should trigger the ATs to drop their caches (eg when loading a new website). Change-Id: I44080f8d43c1161285d9ace4891fe18531f16e09 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
2014-07-19 08:02:23 +00:00
case QAccessible::ObjectReorder: {
if (sendObject || sendObject_children_changed)
childrenChanged(event->accessibleInterface());
break;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
case QAccessible::NameChanged: {
if (sendObject || sendObject_property_change || sendObject_property_change_accessible_name) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QString path = pathForInterface(event->accessibleInterface());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QVariantList args = packDBusSignalArguments(QLatin1String("accessible-name"), 0, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("PropertyChange"), args);
}
break;
}
case QAccessible::DescriptionChanged: {
if (sendObject || sendObject_property_change || sendObject_property_change_accessible_description) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QString path = pathForInterface(event->accessibleInterface());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QVariantList args = packDBusSignalArguments(QLatin1String("accessible-description"), 0, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("PropertyChange"), args);
}
break;
}
case QAccessible::Focus: {
if (sendFocus || sendObject || sendObject_state_changed)
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
sendFocusChanged(event->accessibleInterface());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
break;
}
case QAccessible::TextInserted:
case QAccessible::TextRemoved:
case QAccessible::TextUpdated: {
if (sendObject || sendObject_text_changed) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * iface = event->accessibleInterface();
Accessibility Linux: Prevent access to invalid interfaces Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-12-11 19:31:00 +00:00
if (!iface || !iface->textInterface()) {
qAtspiDebug() << "Received text event for invalid interface.";
return;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QString path = pathForInterface(iface);
int changePosition = 0;
int cursorPosition = 0;
QString textRemoved;
QString textInserted;
if (event->type() == QAccessible::TextInserted) {
QAccessibleTextInsertEvent *textEvent = static_cast<QAccessibleTextInsertEvent*>(event);
textInserted = textEvent->textInserted();
changePosition = textEvent->changePosition();
cursorPosition = textEvent->cursorPosition();
} else if (event->type() == QAccessible::TextRemoved) {
QAccessibleTextRemoveEvent *textEvent = static_cast<QAccessibleTextRemoveEvent*>(event);
textRemoved = textEvent->textRemoved();
changePosition = textEvent->changePosition();
cursorPosition = textEvent->cursorPosition();
} else if (event->type() == QAccessible::TextInserted) {
QAccessibleTextUpdateEvent *textEvent = static_cast<QAccessibleTextUpdateEvent*>(event);
textInserted = textEvent->textInserted();
textRemoved = textEvent->textRemoved();
changePosition = textEvent->changePosition();
cursorPosition = textEvent->cursorPosition();
}
QDBusVariant data;
if (!textRemoved.isEmpty()) {
data.setVariant(QVariant::fromValue(textRemoved));
QVariantList args = packDBusSignalArguments(QLatin1String("delete"), changePosition, textRemoved.length(), QVariant::fromValue(data));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("TextChanged"), args);
}
if (!textInserted.isEmpty()) {
data.setVariant(QVariant::fromValue(textInserted));
QVariantList args = packDBusSignalArguments(QLatin1String("insert"), changePosition, textInserted.length(), QVariant::fromValue(data));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("TextChanged"), args);
}
// send a cursor update
Q_UNUSED(cursorPosition)
// QDBusVariant cursorData;
// cursorData.setVariant(QVariant::fromValue(cursorPosition));
// QVariantList args = packDBusSignalArguments(QString(), cursorPosition, 0, QVariant::fromValue(cursorData));
// sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
// QLatin1String("TextCaretMoved"), args);
}
break;
}
case QAccessible::TextCaretMoved: {
if (sendObject || sendObject_text_caret_moved) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * iface = event->accessibleInterface();
Accessibility Linux: Prevent access to invalid interfaces Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-12-11 19:31:00 +00:00
if (!iface || !iface->textInterface()) {
qWarning() << "Sending TextCaretMoved from object that does not implement text interface: " << iface;
Be more careful about asserting in accessibility. It is possible to call the accessibility update for any widget, even if it doesn't implement the right interfaces. While that is bad, warning about it is better than asserting. Change-Id: I23c0c783083f73fb816d75b2c9b78efd603edcb6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-18 14:24:37 +00:00
return;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QString path = pathForInterface(iface);
QDBusVariant cursorData;
int pos = iface->textInterface()->cursorPosition();
cursorData.setVariant(QVariant::fromValue(pos));
QVariantList args = packDBusSignalArguments(QString(), pos, 0, QVariant::fromValue(cursorData));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("TextCaretMoved"), args);
}
break;
}
case QAccessible::TextSelectionChanged: {
if (sendObject || sendObject_text_selection_changed) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * iface = event->accessibleInterface();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QString path = pathForInterface(iface);
QVariantList args = packDBusSignalArguments(QString(), 0, 0, QVariant::fromValue(QDBusVariant(QVariant(QString()))));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("TextSelectionChanged"), args);
}
break;
}
case QAccessible::ValueChanged: {
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
if (sendObject || sendObject_value_changed || sendObject_property_change_accessible_value) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * iface = event->accessibleInterface();
Accessibility: Update ComboBox text on arrow keys Use ValueChanged to notify of changes in the ComboBox. On Linux we need to update name and then send selection-changed for Orca. Task-number: QTBUG-36814 Change-Id: Icdd34adddeac532476a6dd910d1e8bd33bcd590b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-05-07 14:06:22 +00:00
if (!iface) {
qWarning() << "ValueChanged event from invalid accessible.";
Accessibility Linux: Prevent access to invalid interfaces Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-12-11 19:31:00 +00:00
return;
}
Accessibility: Update ComboBox text on arrow keys Use ValueChanged to notify of changes in the ComboBox. On Linux we need to update name and then send selection-changed for Orca. Task-number: QTBUG-36814 Change-Id: Icdd34adddeac532476a6dd910d1e8bd33bcd590b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-05-07 14:06:22 +00:00
if (iface->valueInterface()) {
QString path = pathForInterface(iface);
QVariantList args = packDBusSignalArguments(QLatin1String("accessible-value"), 0, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("PropertyChange"), args);
} else if (iface->role() == QAccessible::ComboBox) {
// Combo Box with AT-SPI likes to be special
// It requires a name-change to update caches and then selection-changed
QString path = pathForInterface(iface);
QVariantList args1 = packDBusSignalArguments(QLatin1String("accessible-name"), 0, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("PropertyChange"), args1);
QVariantList args2 = packDBusSignalArguments(QString(), 0, 0, QVariant::fromValue(QDBusVariant(QVariant(0))));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("SelectionChanged"), args2);
} else {
qWarning() << "ValueChanged event and no ValueInterface or ComboBox: " << iface;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
break;
}
Accessibility: Fix selection change notifications on Linux The selection update is not implemented on other platforms (if needed at all). Task-number: QTBUG-39440 Change-Id: I8eb8c4eb1c23ba2d246bc95f1c77dc9da9e22495 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2014-07-01 13:39:32 +00:00
case QAccessible::SelectionAdd:
case QAccessible::SelectionRemove:
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
case QAccessible::Selection: {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * iface = event->accessibleInterface();
Accessibility Linux: Prevent access to invalid interfaces Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-12-11 19:31:00 +00:00
if (!iface) {
qWarning() << "Selection event from invalid accessible.";
return;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QString path = pathForInterface(iface);
int selected = iface->state().selected ? 1 : 0;
QVariantList stateArgs = packDBusSignalArguments(QLatin1String("selected"), selected, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("StateChanged"), stateArgs);
break;
}
case QAccessible::StateChanged: {
if (sendObject || sendObject_state_changed || sendWindow || sendWindow_activate) {
QAccessible::State stateChange = static_cast<QAccessibleStateChangeEvent*>(event)->changedStates();
if (stateChange.checked) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * iface = event->accessibleInterface();
Accessibility Linux: Prevent access to invalid interfaces Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-12-11 19:31:00 +00:00
if (!iface) {
qWarning() << "StateChanged event from invalid accessible.";
return;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
int checked = iface->state().checked;
Implemented AtSpiAdaptor::notifyStateChange Adding a new private method to simplify notifying that the state has changed as it is something that is frequently done in AtSpiAdaptor::notify Change-Id: Idf21715b5d20212adb301ae9bca05f1edfc19946 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-10-26 13:23:58 +00:00
notifyStateChange(iface, QLatin1String("checked"), checked);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
} else if (stateChange.active) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * iface = event->accessibleInterface();
Accessibility Linux: Prevent access to invalid interfaces Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-12-11 19:31:00 +00:00
if (!iface || !(iface->role() == QAccessible::Window && (sendWindow || sendWindow_activate)))
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return;
Cleanup local var usage Change-Id: I24c8bc1eef444e3ef4823d5d092089e4f308585b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2014-06-19 13:36:32 +00:00
int isActive = iface->state().active;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QString windowTitle = iface->text(QAccessible::Name);
QDBusVariant data;
data.setVariant(windowTitle);
QVariantList args = packDBusSignalArguments(QString(), 0, 0, QVariant::fromValue(data));
Cleanup local var usage Change-Id: I24c8bc1eef444e3ef4823d5d092089e4f308585b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2014-06-19 13:36:32 +00:00
QString status = isActive ? QLatin1String("Activate") : QLatin1String("Deactivate");
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QString path = pathForInterface(iface);
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_WINDOW), status, args);
Implemented AtSpiAdaptor::notifyStateChange Adding a new private method to simplify notifying that the state has changed as it is something that is frequently done in AtSpiAdaptor::notify Change-Id: Idf21715b5d20212adb301ae9bca05f1edfc19946 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-10-26 13:23:58 +00:00
notifyStateChange(iface, QLatin1String("active"), isActive);
Handle disabled state change Modified AtSpiAdaptor::notify to handle enabling and disabling widgets. Change-Id: I9a23f74d891aaf123d7fc094bdf63e384e1d65fe Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-26 14:56:00 +00:00
} else if (stateChange.disabled) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface *iface = event->accessibleInterface();
Handle disabled state change Modified AtSpiAdaptor::notify to handle enabling and disabling widgets. Change-Id: I9a23f74d891aaf123d7fc094bdf63e384e1d65fe Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-26 14:56:00 +00:00
QAccessible::State state = iface->state();
bool enabled = !state.disabled;
notifyStateChange(iface, QLatin1String("enabled"), enabled);
notifyStateChange(iface, QLatin1String("sensitive"), enabled);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
}
break;
}
Remove debug output that can cause crashes in static builds. Currently static builds ignore the accessibility plugins. The debug output would also potentially crash for other events when they could not create interfaces. Task-number: QTBUG-28707 Change-Id: I5ae20cac89bd7f4a74add2b80834f4e9d4fa438c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-02-20 11:02:17 +00:00
// For now we ignore these events
Accessibility: Ignore TableModelChanges on Linux for now. This part will be improved in Qt 5.1. Currently it just spits out debug messages for unhandled events. Change-Id: I22475317ab54a8223d42536e1cee3f93a969e497 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-01-31 12:48:09 +00:00
case QAccessible::TableModelChanged:
Remove debug output that can cause crashes in static builds. Currently static builds ignore the accessibility plugins. The debug output would also potentially crash for other events when they could not create interfaces. Task-number: QTBUG-28707 Change-Id: I5ae20cac89bd7f4a74add2b80834f4e9d4fa438c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-02-20 11:02:17 +00:00
// For tables, setting manages_descendants should
// indicate to the client that it cannot cache these
// interfaces.
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
case QAccessible::ParentChanged:
case QAccessible::DialogStart:
case QAccessible::DialogEnd:
Remove debug output that can cause crashes in static builds. Currently static builds ignore the accessibility plugins. The debug output would also potentially crash for other events when they could not create interfaces. Task-number: QTBUG-28707 Change-Id: I5ae20cac89bd7f4a74add2b80834f4e9d4fa438c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-02-20 11:02:17 +00:00
case QAccessible::PopupMenuStart:
case QAccessible::PopupMenuEnd:
case QAccessible::SoundPlayed:
case QAccessible::Alert:
case QAccessible::ForegroundChanged:
case QAccessible::MenuStart:
case QAccessible::MenuEnd:
case QAccessible::ContextHelpStart:
case QAccessible::ContextHelpEnd:
case QAccessible::DragDropStart:
case QAccessible::DragDropEnd:
case QAccessible::ScrollingStart:
case QAccessible::ScrollingEnd:
case QAccessible::MenuCommand:
case QAccessible::ActionChanged:
case QAccessible::ActiveDescendantChanged:
case QAccessible::AttributeChanged:
case QAccessible::DocumentContentChanged:
case QAccessible::DocumentLoadComplete:
case QAccessible::DocumentLoadStopped:
case QAccessible::DocumentReload:
case QAccessible::HyperlinkEndIndexChanged:
case QAccessible::HyperlinkNumberOfAnchorsChanged:
case QAccessible::HyperlinkSelectedLinkChanged:
case QAccessible::HypertextLinkActivated:
case QAccessible::HypertextLinkSelected:
case QAccessible::HyperlinkStartIndexChanged:
case QAccessible::HypertextChanged:
case QAccessible::HypertextNLinksChanged:
case QAccessible::ObjectAttributeChanged:
case QAccessible::PageChanged:
case QAccessible::SectionChanged:
case QAccessible::TableCaptionChanged:
case QAccessible::TableColumnDescriptionChanged:
case QAccessible::TableColumnHeaderChanged:
case QAccessible::TableRowDescriptionChanged:
case QAccessible::TableRowHeaderChanged:
case QAccessible::TableSummaryChanged:
case QAccessible::TextAttributeChanged:
case QAccessible::TextColumnChanged:
case QAccessible::VisibleDataChanged:
case QAccessible::SelectionWithin:
case QAccessible::LocationChanged:
case QAccessible::HelpChanged:
case QAccessible::DefaultActionChanged:
case QAccessible::AcceleratorChanged:
case QAccessible::InvalidEvent:
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
break;
}
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
void AtSpiAdaptor::sendFocusChanged(QAccessibleInterface *interface) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
static QString lastFocusPath;
// "remove" old focus
if (!lastFocusPath.isEmpty()) {
QVariantList stateArgs = packDBusSignalArguments(QLatin1String("focused"), 0, 0, variantForPath(lastFocusPath));
sendDBusSignal(lastFocusPath, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("StateChanged"), stateArgs);
}
// send new focus
{
QString path = pathForInterface(interface);
QVariantList stateArgs = packDBusSignalArguments(QLatin1String("focused"), 1, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
QLatin1String("StateChanged"), stateArgs);
QVariantList focusArgs = packDBusSignalArguments(QString(), 0, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_FOCUS),
QLatin1String("Focus"), focusArgs);
lastFocusPath = path;
}
}
Accessibility Linux: send children changed notifications The badly named ObjectReorder actually stands for any of this object's children may have changed. This event is used in webengine and should trigger the ATs to drop their caches (eg when loading a new website). Change-Id: I44080f8d43c1161285d9ace4891fe18531f16e09 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
2014-07-19 08:02:23 +00:00
void AtSpiAdaptor::childrenChanged(QAccessibleInterface *interface) const
{
QString parentPath = pathForInterface(interface);
int childCount = interface->childCount();
for (int i = 0; i < interface->childCount(); ++i) {
QString childPath = pathForInterface(interface->child(i));
QVariantList args = packDBusSignalArguments(QLatin1String("add"), childCount, 0, childPath);
sendDBusSignal(parentPath, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT), QLatin1String("ChildrenChanged"), args);
}
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
void AtSpiAdaptor::notifyAboutCreation(QAccessibleInterface *interface) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
// // say hello to d-bus
// cache->emitAddAccessible(accessible->getCacheItem());
// notify about the new child of our parent
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * parent = interface->parent();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (!parent) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "AtSpiAdaptor::notifyAboutCreation: Could not find parent for " << interface->object();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return;
}
QString path = pathForInterface(interface);
int childCount = parent->childCount();
QString parentPath = pathForInterface(parent);
QVariantList args = packDBusSignalArguments(QLatin1String("add"), childCount, 0, variantForPath(path));
sendDBusSignal(parentPath, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT), QLatin1String("ChildrenChanged"), args);
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
void AtSpiAdaptor::notifyAboutDestruction(QAccessibleInterface *interface) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
Check if the interface pointer is valid to avoid a potential crash. Change-Id: I7e6634b799e551786d6cbc85e2d526b7874ada3d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-02-06 09:23:24 +00:00
if (!interface || !interface->isValid())
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * parent = interface->parent();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (!parent) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "AtSpiAdaptor::notifyAboutDestruction: Could not find parent for " << interface->object();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return;
}
QString path = pathForInterface(interface);
// this is in the destructor. we have no clue which child we used to be.
// FIXME
int childIndex = -1;
// if (child) {
// childIndex = child;
// } else {
// childIndex = parent->indexOfChild(interface);
// }
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QString parentPath = pathForInterface(parent);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QVariantList args = packDBusSignalArguments(QLatin1String("remove"), childIndex, 0, variantForPath(path));
sendDBusSignal(parentPath, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT), QLatin1String("ChildrenChanged"), args);
}
/*!
Handle incoming DBus message.
This function dispatches the dbus message to the right interface handler.
*/
bool AtSpiAdaptor::handleMessage(const QDBusMessage &message, const QDBusConnection &connection)
{
// get accessible interface
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * accessible = interfaceFromPath(message.path());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (!accessible) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING Qt AtSpiAdaptor: Could not find accessible on path: " << message.path();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
Do not handle invalid accessibles in atspi bridge. Change-Id: I13a7dd1e190c5d3a5bb8be0ee66c2f18d0d3a1b5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-01 12:09:50 +00:00
if (!accessible->isValid()) {
qWarning() << "WARNING Qt AtSpiAdaptor: Accessible invalid: " << accessible << message.path();
return false;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QString interface = message.interface();
QString function = message.member();
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
// qAtspiDebug() << "AtSpiAdaptor::handleMessage: " << interface << function;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (function == QLatin1String("Introspect")) {
//introspect(message.path());
return false;
}
// handle properties like regular functions
if (interface == QLatin1String("org.freedesktop.DBus.Properties")) {
interface = message.arguments().at(0).toString();
// Get/Set + Name
function = message.member() + message.arguments().at(1).toString();
}
// switch interface to call
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_ACCESSIBLE))
return accessibleInterface(accessible, function, message, connection);
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_APPLICATION))
return applicationInterface(accessible, function, message, connection);
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_COMPONENT))
return componentInterface(accessible, function, message, connection);
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_ACTION))
return actionInterface(accessible, function, message, connection);
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_TEXT))
return textInterface(accessible, function, message, connection);
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_EDITABLE_TEXT))
return editableTextInterface(accessible, function, message, connection);
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_VALUE))
return valueInterface(accessible, function, message, connection);
if (interface == QLatin1String(ATSPI_DBUS_INTERFACE_TABLE))
return tableInterface(accessible, function, message, connection);
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "AtSpiAdaptor::handleMessage with unknown interface: " << message.path() << interface << function;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
// Application
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::applicationInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (message.path() != QLatin1String(ATSPI_DBUS_PATH_ROOT)) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING Qt AtSpiAdaptor: Could not find application interface for: " << message.path() << interface;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
if (function == QLatin1String("SetId")) {
Q_ASSERT(message.signature() == QLatin1String("ssv"));
QVariant value = qvariant_cast<QDBusVariant>(message.arguments().at(2)).variant();
m_applicationId = value.toInt();
return true;
}
if (function == QLatin1String("GetId")) {
Q_ASSERT(message.signature() == QLatin1String("ss"));
QDBusMessage reply = message.createReply(QVariant::fromValue(QDBusVariant(m_applicationId)));
return connection.send(reply);
}
if (function == QLatin1String("GetToolkitName")) {
Q_ASSERT(message.signature() == QLatin1String("ss"));
QDBusMessage reply = message.createReply(QVariant::fromValue(QDBusVariant(QLatin1String("Qt"))));
return connection.send(reply);
}
Use QLatin1String in AtSpiAdaptor::applicationInterface Using QLatin1String in string constants which were not using it. Change-Id: I3aa4b7104cf3d1765874e0ee9a6fd23aadd8d671 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-10-15 12:10:56 +00:00
if (function == QLatin1String("GetVersion")) {
Q_ASSERT(message.signature() == QLatin1String("ss"));
Accessibility: Implement GetVersion and GetLocale in app adaptor. Change-Id: I73a49b22add9e268907025dd0bf7ec76e7fd0c0b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-09-28 18:18:22 +00:00
QDBusMessage reply = message.createReply(QVariant::fromValue(QDBusVariant(QLatin1String(qVersion()))));
return connection.send(reply);
}
Use QLatin1String in AtSpiAdaptor::applicationInterface Using QLatin1String in string constants which were not using it. Change-Id: I3aa4b7104cf3d1765874e0ee9a6fd23aadd8d671 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-10-15 12:10:56 +00:00
if (function == QLatin1String("GetLocale")) {
Q_ASSERT(message.signature() == QLatin1String("u"));
Accessibility: Implement GetVersion and GetLocale in app adaptor. Change-Id: I73a49b22add9e268907025dd0bf7ec76e7fd0c0b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-09-28 18:18:22 +00:00
QDBusMessage reply = message.createReply(QVariant::fromValue(QLocale().name()));
return connection.send(reply);
}
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "AtSpiAdaptor::applicationInterface " << message.path() << interface << function;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
/*!
Register this application as accessible on the accessibility DBus.
*/
void AtSpiAdaptor::registerApplication()
{
OrgA11yAtspiSocketInterface *registry;
registry = new OrgA11yAtspiSocketInterface(QLatin1String(QSPI_REGISTRY_NAME),
QLatin1String(QSPI_OBJECT_PATH_ROOT), m_dbus->connection());
QDBusPendingReply<QSpiObjectReference> reply;
QSpiObjectReference ref = QSpiObjectReference(m_dbus->connection(), QDBusObjectPath(QSPI_OBJECT_PATH_ROOT));
reply = registry->Embed(ref);
reply.waitForFinished(); // TODO: make this async
if (reply.isValid ()) {
const QSpiObjectReference &socket = reply.value();
accessibilityRegistry = QSpiObjectReference(socket);
} else {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "Error in contacting registry: "
<< reply.error().name()
<< reply.error().message();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
delete registry;
}
// Accessible
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::accessibleInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (function == QLatin1String("GetRole")) {
sendReply(connection, message, (uint) getRole(interface));
} else if (function == QLatin1String("GetName")) {
sendReply(connection, message, QVariant::fromValue(QDBusVariant(interface->text(QAccessible::Name))));
} else if (function == QLatin1String("GetRoleName")) {
sendReply(connection, message, qSpiRoleMapping[interface->role()].name());
} else if (function == QLatin1String("GetLocalizedRoleName")) {
sendReply(connection, message, QVariant::fromValue(qSpiRoleMapping[interface->role()].localizedName()));
} else if (function == QLatin1String("GetChildCount")) {
sendReply(connection, message, QVariant::fromValue(QDBusVariant(interface->childCount())));
} else if (function == QLatin1String("GetIndexInParent")) {
int childIndex = -1;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * parent = interface->parent();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (parent) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
childIndex = parent->indexOfChild(interface);
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
if (childIndex < 0) {
qAtspiDebug() << "GetIndexInParent get invalid index: " << childIndex << interface;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
sendReply(connection, message, childIndex);
} else if (function == QLatin1String("GetParent")) {
QString path;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * parent = interface->parent();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (!parent) {
path = QLatin1String(ATSPI_DBUS_PATH_NULL);
} else if (parent->role() == QAccessible::Application) {
path = QLatin1String(ATSPI_DBUS_PATH_ROOT);
} else {
path = pathForInterface(parent);
}
// Parent is a property, so it needs to be wrapped inside an extra variant.
sendReply(connection, message, QVariant::fromValue(
QDBusVariant(QVariant::fromValue(QSpiObjectReference(connection, QDBusObjectPath(path))))));
} else if (function == QLatin1String("GetChildAtIndex")) {
int index = message.arguments().first().toInt();
if (index < 0) {
sendReply(connection, message, QVariant::fromValue(
QSpiObjectReference(connection, QDBusObjectPath(ATSPI_DBUS_PATH_NULL))));
} else {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * childInterface = interface->child(index);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
sendReply(connection, message, QVariant::fromValue(
QSpiObjectReference(connection, QDBusObjectPath(pathForInterface(childInterface)))));
}
} else if (function == QLatin1String("GetInterfaces")) {
sendReply(connection, message, accessibleInterfaces(interface));
} else if (function == QLatin1String("GetDescription")) {
sendReply(connection, message, QVariant::fromValue(QDBusVariant(interface->text(QAccessible::Description))));
} else if (function == QLatin1String("GetState")) {
quint64 spiState = spiStatesFromQState(interface->state());
if (interface->tableInterface()) {
setSpiStateBit(&spiState, ATSPI_STATE_MANAGES_DESCENDANTS);
}
QAccessible::Role role = interface->role();
if (role == QAccessible::TreeItem ||
role == QAccessible::ListItem) {
/* Transient means libatspi2 will not cache items.
This is important because when adding/removing an item
the cache becomes outdated and we don't change the paths of
items in lists/trees/tables. */
setSpiStateBit(&spiState, ATSPI_STATE_TRANSIENT);
}
sendReply(connection, message,
QVariant::fromValue(spiStateSetFromSpiStates(spiState)));
} else if (function == QLatin1String("GetAttributes")) {
sendReply(connection, message, QVariant::fromValue(QSpiAttributeSet()));
} else if (function == QLatin1String("GetRelationSet")) {
sendReply(connection, message, QVariant::fromValue(relationSet(interface, connection)));
} else if (function == QLatin1String("GetApplication")) {
sendReply(connection, message, QVariant::fromValue(
QSpiObjectReference(connection, QDBusObjectPath(QSPI_OBJECT_PATH_ROOT))));
} else if (function == QLatin1String("GetChildren")) {
QSpiObjectReferenceArray children;
Use QList::reserve(), reduces reallocations Change-Id: I9f218bdd65a97ad9c867b695f3ba27ab64a54d2a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2015-06-23 15:18:12 +00:00
const int numChildren = interface->childCount();
children.reserve(numChildren);
for (int i = 0; i < numChildren; ++i) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QString childPath = pathForInterface(interface->child(i));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QSpiObjectReference ref(connection, QDBusObjectPath(childPath));
children << ref;
}
connection.send(message.createReply(QVariant::fromValue(children)));
} else {
Fix function names in warning messages. Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-09-28 18:06:51 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::accessibleInterface does not implement " << function << message.path();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
return true;
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
AtspiRole AtSpiAdaptor::getRole(QAccessibleInterface *interface) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if ((interface->role() == QAccessible::EditableText) && interface->state().passwordEdit)
return ATSPI_ROLE_PASSWORD_TEXT;
return qSpiRoleMapping[interface->role()].spiRole();
}
//#define ACCESSIBLE_CREATION_DEBUG
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QStringList AtSpiAdaptor::accessibleInterfaces(QAccessibleInterface *interface) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
QStringList ifaces;
#ifdef ACCESSIBLE_CREATION_DEBUG
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "AtSpiAdaptor::accessibleInterfaces create: " << interface->object();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
#endif
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_ACCESSIBLE);
if ( (!interface->rect().isEmpty()) ||
(interface->object() && interface->object()->isWidgetType()) ||
(interface->role() == QAccessible::ListItem) ||
(interface->role() == QAccessible::Cell) ||
(interface->role() == QAccessible::TreeItem) ||
(interface->role() == QAccessible::Row) ||
(interface->object() && interface->object()->inherits("QSGItem"))
) {
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_COMPONENT);
}
#ifdef ACCESSIBLE_CREATION_DEBUG
else {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << " IS NOT a component";
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
#endif
Accessibility: For app claim support for app iface. Change-Id: Idb7f5971d61885f18d827f6bff3994df7a3860e5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-09-28 18:15:02 +00:00
if (interface->role() == QAccessible::Application)
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_APPLICATION);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
if (interface->actionInterface() || interface->valueInterface())
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_ACTION);
if (interface->textInterface())
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_TEXT);
if (interface->editableTextInterface())
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
if (interface->valueInterface())
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_VALUE);
if (interface->tableInterface())
ifaces << QLatin1String(ATSPI_DBUS_INTERFACE_TABLE);
return ifaces;
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QSpiRelationArray AtSpiAdaptor::relationSet(QAccessibleInterface *interface, const QDBusConnection &connection) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
typedef QPair<QAccessibleInterface*, QAccessible::Relation> RelationPair;
QVector<RelationPair> relationInterfaces;
relationInterfaces = interface->relations();
QSpiRelationArray relations;
Q_FOREACH (const RelationPair &pair, relationInterfaces) {
// FIXME: this loop seems a bit strange... "related" always have one item when we check.
//And why is it a list, when it always have one item? And it seems to assume that the QAccessible::Relation enum maps directly to AtSpi
platformsupport/linuxaccessibility: fix uses of inefficient QLists These types are larger than a void*, so holding them in QLists is needlessly inefficient. Worse, the code could come to depend on the fragile property of (inefficient) QLists that references to elements therein never are invalidated. Fix by marking them movable, and holding in a QVector instead. Change-Id: I3d5cf78c1597bd1b743ed3692aaa5e2e750a85f9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-07-05 20:43:08 +00:00
QSpiObjectReferenceArray related;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QDBusObjectPath path = QDBusObjectPath(pathForInterface(pair.first));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
related.append(QSpiObjectReference(connection, path));
if (!related.isEmpty())
relations.append(QSpiRelationArrayEntry(qAccessibleRelationToAtSpiRelation(pair.second), related));
}
return relations;
}
void AtSpiAdaptor::sendReply(const QDBusConnection &connection, const QDBusMessage &message, const QVariant &argument) const
{
QDBusMessage reply = message.createReply(argument);
connection.send(reply);
}
QString AtSpiAdaptor::pathForObject(QObject *object) const
{
Q_ASSERT(object);
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
if (inheritsQAction(object)) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "AtSpiAdaptor::pathForObject: warning: creating path with QAction as object.";
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(object);
return pathForInterface(iface);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QString AtSpiAdaptor::pathForInterface(QAccessibleInterface *interface) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (!interface || !interface->isValid())
return QLatin1String(ATSPI_DBUS_PATH_NULL);
if (interface->role() == QAccessible::Application)
return QLatin1String(QSPI_OBJECT_PATH_ROOT);
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessible::Id id = QAccessible::uniqueId(interface);
Q_ASSERT((int)id < 0);
return QLatin1String(QSPI_OBJECT_PATH_PREFIX) + QString::number(id);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
bool AtSpiAdaptor::inheritsQAction(QObject *object)
{
const QMetaObject *mo = object->metaObject();
while (mo) {
const QLatin1String cn(mo->className());
if (cn == QLatin1String("QAction"))
return true;
mo = mo->superClass();
}
return false;
}
// Component
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
static QAccessibleInterface * getWindow(QAccessibleInterface * interface)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (interface->role() == QAccessible::Window)
return interface;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * parent = interface->parent();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
while (parent && parent->role() != QAccessible::Window)
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
parent = parent->parent();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return parent;
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
static QRect getRelativeRect(QAccessibleInterface *interface)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * window;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QRect wr, cr;
cr = interface->rect();
window = getWindow(interface);
if (window) {
wr = window->rect();
cr.setX(cr.x() - wr.x());
cr.setY(cr.x() - wr.y());
}
return cr;
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::componentInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (function == QLatin1String("Contains")) {
bool ret = false;
int x = message.arguments().at(0).toInt();
int y = message.arguments().at(1).toInt();
uint coordType = message.arguments().at(2).toUInt();
if (coordType == ATSPI_COORD_TYPE_SCREEN)
ret = interface->rect().contains(x, y);
else
ret = getRelativeRect(interface).contains(x, y);
sendReply(connection, message, ret);
} else if (function == QLatin1String("GetAccessibleAtPoint")) {
int x = message.arguments().at(0).toInt();
int y = message.arguments().at(1).toInt();
uint coordType = message.arguments().at(2).toUInt();
Q_UNUSED (coordType) // FIXME
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * childInterface(interface->childAt(x, y));
QAccessibleInterface * iface = 0;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
while (childInterface) {
iface = childInterface;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
childInterface = iface->childAt(x, y);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
if (iface) {
QString path = pathForInterface(iface);
sendReply(connection, message, QVariant::fromValue(
QSpiObjectReference(connection, QDBusObjectPath(path))));
} else {
sendReply(connection, message, QVariant::fromValue(
QSpiObjectReference(connection, QDBusObjectPath(ATSPI_DBUS_PATH_NULL))));
}
} else if (function == QLatin1String("GetAlpha")) {
sendReply(connection, message, (double) 1.0);
} else if (function == QLatin1String("GetExtents")) {
uint coordType = message.arguments().at(0).toUInt();
sendReply(connection, message, QVariant::fromValue(getExtents(interface, coordType)));
} else if (function == QLatin1String("GetLayer")) {
sendReply(connection, message, QVariant::fromValue((uint)1));
} else if (function == QLatin1String("GetMDIZOrder")) {
sendReply(connection, message, QVariant::fromValue((short)0));
} else if (function == QLatin1String("GetPosition")) {
uint coordType = message.arguments().at(0).toUInt();
QRect rect;
if (coordType == ATSPI_COORD_TYPE_SCREEN)
rect = interface->rect();
else
rect = getRelativeRect(interface);
QVariantList pos;
pos << rect.x() << rect.y();
connection.send(message.createReply(pos));
} else if (function == QLatin1String("GetSize")) {
QRect rect = interface->rect();
QVariantList size;
size << rect.width() << rect.height();
connection.send(message.createReply(size));
} else if (function == QLatin1String("GrabFocus")) {
Accessibility Linux: Implement set focus action This is used by Orca for geometric navigation (aka flat review) to move the focus around. It is also generally sensible to be able to programatically move the focus around. This way of moving the focus is redundant with the action interface's focus action. Task-number: QTBUG-40048 Change-Id: I1b61ea843f6bfc3dc00007772e0e5102555ca752 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:15:21 +00:00
QAccessibleActionInterface *actionIface = interface->actionInterface();
if (actionIface && actionIface->actionNames().contains(QAccessibleActionInterface::setFocusAction())) {
actionIface->doAction(QAccessibleActionInterface::setFocusAction());
sendReply(connection, message, true);
} else {
sendReply(connection, message, false);
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
} else if (function == QLatin1String("SetExtents")) {
// int x = message.arguments().at(0).toInt();
// int y = message.arguments().at(1).toInt();
// int width = message.arguments().at(2).toInt();
// int height = message.arguments().at(3).toInt();
// uint coordinateType = message.arguments().at(4).toUInt();
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "SetExtents is not implemented.";
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
sendReply(connection, message, false);
} else if (function == QLatin1String("SetPosition")) {
// int x = message.arguments().at(0).toInt();
// int y = message.arguments().at(1).toInt();
// uint coordinateType = message.arguments().at(2).toUInt();
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "SetPosition is not implemented.";
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
sendReply(connection, message, false);
} else if (function == QLatin1String("SetSize")) {
// int width = message.arguments().at(0).toInt();
// int height = message.arguments().at(1).toInt();
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "SetSize is not implemented.";
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
sendReply(connection, message, false);
} else {
Fix function names in warning messages. Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-09-28 18:06:51 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::componentInterface does not implement " << function << message.path();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
return true;
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QRect AtSpiAdaptor::getExtents(QAccessibleInterface *interface, uint coordType)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
return (coordType == ATSPI_COORD_TYPE_SCREEN) ? interface->rect() : getRelativeRect(interface);
}
// Action interface
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::actionInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (function == QLatin1String("GetNActions")) {
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
int count = QAccessibleBridgeUtils::effectiveActionNames(interface).count();
sendReply(connection, message, QVariant::fromValue(QDBusVariant(QVariant::fromValue(count))));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
} else if (function == QLatin1String("DoAction")) {
int index = message.arguments().at(0).toInt();
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
if (index < 0 || index >= actionNames.count())
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
const QString actionName = actionNames.at(index);
bool success = QAccessibleBridgeUtils::performEffectiveAction(interface, actionName);
sendReply(connection, message, success);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
} else if (function == QLatin1String("GetActions")) {
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
sendReply(connection, message, QVariant::fromValue(getActions(interface)));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
} else if (function == QLatin1String("GetName")) {
int index = message.arguments().at(0).toInt();
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
if (index < 0 || index >= actionNames.count())
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
sendReply(connection, message, actionNames.at(index));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
} else if (function == QLatin1String("GetDescription")) {
int index = message.arguments().at(0).toInt();
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
if (index < 0 || index >= actionNames.count())
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
QString description;
if (QAccessibleActionInterface *actionIface = interface->actionInterface())
description = actionIface->localizedActionDescription(actionNames.at(index));
else
description = qAccessibleLocalizedActionDescription(actionNames.at(index));
sendReply(connection, message, description);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
} else if (function == QLatin1String("GetKeyBinding")) {
int index = message.arguments().at(0).toInt();
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
if (index < 0 || index >= actionNames.count())
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
QStringList keyBindings;
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
if (QAccessibleActionInterface *actionIface = interface->actionInterface())
keyBindings = actionIface->keyBindingsForAction(actionNames.at(index));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (keyBindings.isEmpty()) {
QString acc = interface->text(QAccessible::Accelerator);
if (!acc.isEmpty())
keyBindings.append(acc);
}
if (keyBindings.length() > 0)
Use QStringList::join(QChar) overload where applicable [QtWidgets] This is an automated change performing the following replacements: join\("(.)"\) -> join('\1') join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1')) join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1')) Change-Id: Ia30048e0c40967dc86a4e4ad26ac02ab67519096 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-05-18 18:00:23 +00:00
sendReply(connection, message, keyBindings.join(QLatin1Char(';')));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
else
sendReply(connection, message, QString());
} else {
Fix function names in warning messages. Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-09-28 18:06:51 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::actionInterface does not implement " << function << message.path();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
return true;
}
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
QSpiActionArray AtSpiAdaptor::getActions(QAccessibleInterface *interface) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
QAccessibleActionInterface *actionInterface = interface->actionInterface();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QSpiActionArray actions;
Use QList::reserve(), reduces reallocations Change-Id: I9f218bdd65a97ad9c867b695f3ba27ab64a54d2a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2015-06-23 15:18:12 +00:00
const QStringList actionNames = QAccessibleBridgeUtils::effectiveActionNames(interface);
actions.reserve(actionNames.size());
Q_FOREACH (const QString &actionName, actionNames) {
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QSpiAction action;
QStringList keyBindings;
Accessibility Linux: Fix atspi getActions to return action name [ChangeLog][Accessibility] On Linux action names were returned as empty strings in AT-SPI getActions, now returns the proper names. Change-Id: I75a469a0b8a5789cd54ce1b489ed5012654bb265 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-01-03 07:53:57 +00:00
action.name = actionName;
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
if (actionInterface) {
action.description = actionInterface->localizedActionDescription(actionName);
keyBindings = actionInterface->keyBindingsForAction(actionName);
} else {
action.description = qAccessibleLocalizedActionDescription(actionName);
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (keyBindings.length() > 0)
Accessibility Linux: add action interfaces for value Change-Id: I454493fc6e9e93f44d15986ca843c3244f97cbe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-06-20 12:05:09 +00:00
action.keyBinding = keyBindings[0];
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
else
action.keyBinding = QString();
actions << action;
}
return actions;
}
// Text interface
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::textInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (!interface->textInterface())
return false;
// properties
if (function == QLatin1String("GetCaretOffset")) {
sendReply(connection, message, QVariant::fromValue(QDBusVariant(QVariant::fromValue(interface->textInterface()->cursorPosition()))));
} else if (function == QLatin1String("GetCharacterCount")) {
sendReply(connection, message, QVariant::fromValue(QDBusVariant(QVariant::fromValue(interface->textInterface()->characterCount()))));
// functions
} else if (function == QLatin1String("AddSelection")) {
int startOffset = message.arguments().at(0).toInt();
int endOffset = message.arguments().at(1).toInt();
int lastSelection = interface->textInterface()->selectionCount();
interface->textInterface()->setSelection(lastSelection, startOffset, endOffset);
sendReply(connection, message, (interface->textInterface()->selectionCount() > lastSelection));
} else if (function == QLatin1String("GetAttributeRun")) {
int offset = message.arguments().at(0).toInt();
bool includeDefaults = message.arguments().at(1).toBool();
Q_UNUSED(includeDefaults)
connection.send(message.createReply(getAttributes(interface, offset, includeDefaults)));
} else if (function == QLatin1String("GetAttributeValue")) {
int offset = message.arguments().at(0).toInt();
QString attributeName = message.arguments().at(1).toString();
connection.send(message.createReply(getAttributeValue(interface, offset, attributeName)));
} else if (function == QLatin1String("GetAttributes")) {
int offset = message.arguments().at(0).toInt();
connection.send(message.createReply(getAttributes(interface, offset, true)));
} else if (function == QLatin1String("GetBoundedRanges")) {
int x = message.arguments().at(0).toInt();
int y = message.arguments().at(1).toInt();
int width = message.arguments().at(2).toInt();
int height = message.arguments().at(3).toInt();
uint coordType = message.arguments().at(4).toUInt();
uint xClipType = message.arguments().at(5).toUInt();
uint yClipType = message.arguments().at(6).toUInt();
Q_UNUSED(x) Q_UNUSED (y) Q_UNUSED(width)
Q_UNUSED(height) Q_UNUSED(coordType)
Q_UNUSED(xClipType) Q_UNUSED(yClipType)
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug("Not implemented: QSpiAdaptor::GetBoundedRanges");
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
sendReply(connection, message, QVariant::fromValue(QSpiTextRangeList()));
} else if (function == QLatin1String("GetCharacterAtOffset")) {
int offset = message.arguments().at(0).toInt();
int start;
int end;
Make QTextCursor accessibility boundary finder available This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-05 13:37:37 +00:00
QString result = interface->textInterface()->textAtOffset(offset, QAccessible::CharBoundary, &start, &end);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
sendReply(connection, message, (int) *(qPrintable (result)));
} else if (function == QLatin1String("GetCharacterExtents")) {
int offset = message.arguments().at(0).toInt();
int coordType = message.arguments().at(1).toUInt();
connection.send(message.createReply(getCharacterExtents(interface, offset, coordType)));
} else if (function == QLatin1String("GetDefaultAttributeSet") || function == QLatin1String("GetDefaultAttributes")) {
// GetDefaultAttributes is deprecated in favour of GetDefaultAttributeSet.
// Empty set seems reasonable. There is no default attribute set.
sendReply(connection, message, QVariant::fromValue(QSpiAttributeSet()));
} else if (function == QLatin1String("GetNSelections")) {
sendReply(connection, message, interface->textInterface()->selectionCount());
} else if (function == QLatin1String("GetOffsetAtPoint")) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << message.signature();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
Q_ASSERT(!message.signature().isEmpty());
QPoint point(message.arguments().at(0).toInt(), message.arguments().at(1).toInt());
uint coordType = message.arguments().at(2).toUInt();
if (coordType == ATSPI_COORD_TYPE_WINDOW) {
QWindow *win = interface->window();
point -= QPoint(win->x(), win->y());
}
int offset = interface->textInterface()->offsetAtPoint(point);
sendReply(connection, message, offset);
} else if (function == QLatin1String("GetRangeExtents")) {
int startOffset = message.arguments().at(0).toInt();
int endOffset = message.arguments().at(1).toInt();
uint coordType = message.arguments().at(2).toUInt();
connection.send(message.createReply(getRangeExtents(interface, startOffset, endOffset, coordType)));
} else if (function == QLatin1String("GetSelection")) {
int selectionNum = message.arguments().at(0).toInt();
int start, end;
interface->textInterface()->selection(selectionNum, &start, &end);
if (start < 0)
start = end = interface->textInterface()->cursorPosition();
QVariantList sel;
sel << start << end;
connection.send(message.createReply(sel));
} else if (function == QLatin1String("GetText")) {
int startOffset = message.arguments().at(0).toInt();
int endOffset = message.arguments().at(1).toInt();
if (endOffset == -1) // AT-SPI uses -1 to signal all characters
endOffset = interface->textInterface()->characterCount();
sendReply(connection, message, interface->textInterface()->text(startOffset, endOffset));
} else if (function == QLatin1String("GetTextAfterOffset")) {
int offset = message.arguments().at(0).toInt();
int type = message.arguments().at(1).toUInt();
int startOffset, endOffset;
QString text = interface->textInterface()->textAfterOffset(offset, qAccessibleBoundaryType(type), &startOffset, &endOffset);
QVariantList ret;
ret << text << startOffset << endOffset;
connection.send(message.createReply(ret));
} else if (function == QLatin1String("GetTextAtOffset")) {
int offset = message.arguments().at(0).toInt();
int type = message.arguments().at(1).toUInt();
int startOffset, endOffset;
QString text = interface->textInterface()->textAtOffset(offset, qAccessibleBoundaryType(type), &startOffset, &endOffset);
QVariantList ret;
ret << text << startOffset << endOffset;
connection.send(message.createReply(ret));
} else if (function == QLatin1String("GetTextBeforeOffset")) {
int offset = message.arguments().at(0).toInt();
int type = message.arguments().at(1).toUInt();
int startOffset, endOffset;
QString text = interface->textInterface()->textBeforeOffset(offset, qAccessibleBoundaryType(type), &startOffset, &endOffset);
QVariantList ret;
ret << text << startOffset << endOffset;
connection.send(message.createReply(ret));
} else if (function == QLatin1String("RemoveSelection")) {
int selectionNum = message.arguments().at(0).toInt();
interface->textInterface()->removeSelection(selectionNum);
sendReply(connection, message, true);
} else if (function == QLatin1String("SetCaretOffset")) {
int offset = message.arguments().at(0).toInt();
interface->textInterface()->setCursorPosition(offset);
sendReply(connection, message, true);
} else if (function == QLatin1String("SetSelection")) {
int selectionNum = message.arguments().at(0).toInt();
int startOffset = message.arguments().at(1).toInt();
int endOffset = message.arguments().at(2).toInt();
interface->textInterface()->setSelection(selectionNum, startOffset, endOffset);
sendReply(connection, message, true);
} else {
Fix function names in warning messages. Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-09-28 18:06:51 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::textInterface does not implement " << function << message.path();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
return true;
}
Make QTextCursor accessibility boundary finder available This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-05 13:37:37 +00:00
QAccessible::TextBoundaryType AtSpiAdaptor::qAccessibleBoundaryType(int atspiTextBoundaryType) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
switch (atspiTextBoundaryType) {
case ATSPI_TEXT_BOUNDARY_CHAR:
Make QTextCursor accessibility boundary finder available This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-05 13:37:37 +00:00
return QAccessible::CharBoundary;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
case ATSPI_TEXT_BOUNDARY_WORD_START:
case ATSPI_TEXT_BOUNDARY_WORD_END:
Make QTextCursor accessibility boundary finder available This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-05 13:37:37 +00:00
return QAccessible::WordBoundary;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
case ATSPI_TEXT_BOUNDARY_SENTENCE_START:
case ATSPI_TEXT_BOUNDARY_SENTENCE_END:
Make QTextCursor accessibility boundary finder available This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-05 13:37:37 +00:00
return QAccessible::SentenceBoundary;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
case ATSPI_TEXT_BOUNDARY_LINE_START:
case ATSPI_TEXT_BOUNDARY_LINE_END:
Make QTextCursor accessibility boundary finder available This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-05 13:37:37 +00:00
return QAccessible::LineBoundary;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
Q_ASSERT_X(0, "", "Requested invalid boundary type.");
Make QTextCursor accessibility boundary finder available This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-03-05 13:37:37 +00:00
return QAccessible::CharBoundary;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
namespace
{
struct AtSpiAttribute {
QString name;
QString value;
AtSpiAttribute(const QString &aName, const QString &aValue) : name(aName), value(aValue) {}
bool isNull() const { return name.isNull() || value.isNull(); }
};
QString atspiColor(const QString &ia2Color)
{
// "rgb(%u,%u,%u)" -> "%u,%u,%u"
return ia2Color.mid(4, ia2Color.length() - (4+1));
}
QString atspiSize(const QString &ia2Size)
{
// "%fpt" -> "%f"
return ia2Size.left(ia2Size.length() - 2);
}
AtSpiAttribute atspiTextAttribute(const QString &ia2Name, const QString &ia2Value)
{
QString name = ia2Name;
QString value = ia2Value;
// IAccessible2: http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2/textattributes
// ATK attribute names: https://git.gnome.org/browse/orca/tree/src/orca/text_attribute_names.py
// ATK attribute values: https://developer.gnome.org/atk/unstable/AtkText.html#AtkTextAttribute
// https://bugzilla.gnome.org/show_bug.cgi?id=744553 "ATK docs provide no guidance for allowed values of some text attributes"
// specifically for "weight", "invalid", "language" and value range for colors
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (ia2Name == QLatin1String("background-color")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("bg-color");
value = atspiColor(value);
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("font-family")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("family-name");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("color")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("fg-color");
value = atspiColor(value);
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("text-align")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("justification");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (value == QLatin1String("justify")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
value = QStringLiteral("fill");
} else {
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (value != QLatin1String("left") &&
value != QLatin1String("right") &&
value != QLatin1String("center")
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
) {
value = QString();
qAtspiDebug() << "Unknown text-align attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
}
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("font-size")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("size");
value = atspiSize(value);
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("font-style")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("style");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (value != QLatin1String("normal") &&
value != QLatin1String("italic") &&
value != QLatin1String("oblique")
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
) {
value = QString();
qAtspiDebug() << "Unknown font-style attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("text-underline-type")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("underline");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (value != QLatin1String("none") &&
value != QLatin1String("single") &&
value != QLatin1String("double")
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
) {
value = QString();
qAtspiDebug() << "Unknown text-underline-type attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("font-weight")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("weight");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (value == QLatin1String("normal"))
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
// Orca seems to accept all IAccessible2 values except for "normal"
// (on which it produces traceback and fails to read any following text attributes),
// but that is the default value, so omit it anyway
value = QString();
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("text-position")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("vertical-align");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (value != QLatin1String("baseline") &&
value != QLatin1String("super") &&
value != QLatin1String("sub")
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
) {
value = QString();
qAtspiDebug() << "Unknown text-position attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("writing-mode")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
name = QStringLiteral("direction");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
if (value == QLatin1String("lr"))
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
value = QStringLiteral("ltr");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
else if (value == QLatin1String("rl"))
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
value = QStringLiteral("rtl");
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
else if (value == QLatin1String("tb")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
// IAccessible2 docs refer to XSL, which specifies "tb" is shorthand for "tb-rl"; so at least give a hint about the horizontal direction (ATK does not support vertical direction in this attribute (yet))
value = QStringLiteral("rtl");
qAtspiDebug() << "writing-mode attribute value \"tb\" translated only w.r.t. horizontal direction; vertical direction ignored";
} else {
value = QString();
qAtspiDebug() << "Unknown writing-mode attribute value \"" << value << "\" cannot be translated to AT-SPI.";
}
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("language")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
// OK - ATK has no docs on the format of the value, IAccessible2 has reasonable format - leave it at that now
Don't use QStringLiteral in comparisons For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-01-19 08:49:37 +00:00
} else if (ia2Name == QLatin1String("invalid")) {
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
// OK - ATK docs are vague but suggest they support the same range of values as IAccessible2
} else {
// attribute we know nothing about
name = QString();
value = QString();
}
return AtSpiAttribute(name, value);
}
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
// FIXME all attribute methods below should share code
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QVariantList AtSpiAdaptor::getAttributes(QAccessibleInterface *interface, int offset, bool includeDefaults) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
Q_UNUSED(includeDefaults);
QSpiAttributeSet set;
int startOffset;
int endOffset;
QString joined = interface->textInterface()->attributes(offset, &startOffset, &endOffset);
QStringList attributes = joined.split (QLatin1Char(';'), QString::SkipEmptyParts, Qt::CaseSensitive);
foreach (const QString &attr, attributes) {
QStringList items;
items = attr.split(QLatin1Char(':'), QString::SkipEmptyParts, Qt::CaseSensitive);
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
AtSpiAttribute attribute = atspiTextAttribute(items[0], items[1]);
if (!attribute.isNull())
set[attribute.name] = attribute.value;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
QVariantList list;
list << QVariant::fromValue(set) << startOffset << endOffset;
return list;
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QVariantList AtSpiAdaptor::getAttributeValue(QAccessibleInterface *interface, int offset, const QString &attributeName) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
QString mapped;
QString joined;
QStringList attributes;
QSpiAttributeSet map;
int startOffset;
int endOffset;
bool defined;
joined = interface->textInterface()->attributes(offset, &startOffset, &endOffset);
attributes = joined.split (QLatin1Char(';'), QString::SkipEmptyParts, Qt::CaseSensitive);
foreach (const QString& attr, attributes) {
QStringList items;
items = attr.split(QLatin1Char(':'), QString::SkipEmptyParts, Qt::CaseSensitive);
Accessibility Linux: Fix text attributes Orca expects text attributes with different names (and sometimes also different values) than IAccessible2 ones (which Qt uses). So adapt the names and values accordingly. [ChangeLog][Accessibility] We now report text attributes correctly on Linux, so ORCA+F now works properly in QTextEdit and other text controls. Change-Id: I55ead0e87e7e298f4fae14a197716f86494334b0 Task-number: QTBUG-44479 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2015-02-15 22:04:51 +00:00
AtSpiAttribute attribute = atspiTextAttribute(items[0], items[1]);
if (!attribute.isNull())
map[attribute.name] = attribute.value;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
mapped = map[attributeName];
defined = mapped.isEmpty();
QVariantList list;
list << mapped << startOffset << endOffset << defined;
return list;
}
Accessibility Linux: Fix methods returning rects as iiii for AT-SPI According to the spec rects get returned with iiii but we were directly serializing QRect resulting in (iiii) as signature. This would trip up Orca when trying to use flat review in text edits. Task-number: QTBUG-39702 Change-Id: I8d6769688586e678d27cc4341de5176a91f057fc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-06-17 17:10:43 +00:00
QList<QVariant> AtSpiAdaptor::getCharacterExtents(QAccessibleInterface *interface, int offset, uint coordType) const
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
QRect rect = interface->textInterface()->characterRect(offset);
if (coordType == ATSPI_COORD_TYPE_WINDOW)
rect = translateRectToWindowCoordinates(interface, rect);
Accessibility Linux: Fix methods returning rects as iiii for AT-SPI According to the spec rects get returned with iiii but we were directly serializing QRect resulting in (iiii) as signature. This would trip up Orca when trying to use flat review in text edits. Task-number: QTBUG-39702 Change-Id: I8d6769688586e678d27cc4341de5176a91f057fc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-06-17 17:10:43 +00:00
return QList<QVariant>() << rect.x() << rect.y() << rect.width() << rect.height();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
Accessibility Linux: Fix methods returning rects as iiii for AT-SPI According to the spec rects get returned with iiii but we were directly serializing QRect resulting in (iiii) as signature. This would trip up Orca when trying to use flat review in text edits. Task-number: QTBUG-39702 Change-Id: I8d6769688586e678d27cc4341de5176a91f057fc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-06-17 17:10:43 +00:00
QList<QVariant> AtSpiAdaptor::getRangeExtents(QAccessibleInterface *interface,
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
int startOffset, int endOffset, uint coordType) const
{
if (endOffset == -1)
endOffset = interface->textInterface()->characterCount();
QAccessibleTextInterface *textInterface = interface->textInterface();
if (endOffset <= startOffset || !textInterface)
Accessibility Linux: Fix methods returning rects as iiii for AT-SPI According to the spec rects get returned with iiii but we were directly serializing QRect resulting in (iiii) as signature. This would trip up Orca when trying to use flat review in text edits. Task-number: QTBUG-39702 Change-Id: I8d6769688586e678d27cc4341de5176a91f057fc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-06-17 17:10:43 +00:00
return QList<QVariant>() << -1 << -1 << 0 << 0;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QRect rect = textInterface->characterRect(startOffset);
for (int i=startOffset + 1; i <= endOffset; i++)
rect = rect | textInterface->characterRect(i);
// relative to window
if (coordType == ATSPI_COORD_TYPE_WINDOW)
rect = translateRectToWindowCoordinates(interface, rect);
Accessibility Linux: Fix methods returning rects as iiii for AT-SPI According to the spec rects get returned with iiii but we were directly serializing QRect resulting in (iiii) as signature. This would trip up Orca when trying to use flat review in text edits. Task-number: QTBUG-39702 Change-Id: I8d6769688586e678d27cc4341de5176a91f057fc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-06-17 17:10:43 +00:00
return QList<QVariant>() << rect.x() << rect.y() << rect.width() << rect.height();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QRect AtSpiAdaptor::translateRectToWindowCoordinates(QAccessibleInterface *interface, const QRect &rect)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * window = getWindow(interface);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (window)
return rect.translated(-window->rect().x(), -window->rect().y());
return rect;
}
// Editable Text interface
static QString textForRange(QAccessibleInterface *accessible, int startOffset, int endOffset)
{
if (QAccessibleTextInterface *textIface = accessible->textInterface()) {
if (endOffset == -1)
endOffset = textIface->characterCount();
return textIface->text(startOffset, endOffset);
}
QString txt = accessible->text(QAccessible::Value);
if (endOffset == -1)
endOffset = txt.length();
return txt.mid(startOffset, endOffset - startOffset);
}
static void replaceTextFallback(QAccessibleInterface *accessible, long startOffset, long endOffset, const QString &txt)
{
QString t = textForRange(accessible, 0, -1);
if (endOffset == -1)
endOffset = t.length();
if (endOffset - startOffset == 0)
t.insert(startOffset, txt);
else
t.replace(startOffset, endOffset - startOffset, txt);
accessible->setText(QAccessible::Value, t);
}
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::editableTextInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (function == QLatin1String("CopyText")) {
#ifndef QT_NO_CLIPBOARD
int startOffset = message.arguments().at(0).toInt();
int endOffset = message.arguments().at(1).toInt();
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
const QString t = textForRange(interface, startOffset, endOffset);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QGuiApplication::clipboard()->setText(t);
#endif
connection.send(message.createReply(true));
} else if (function == QLatin1String("CutText")) {
#ifndef QT_NO_CLIPBOARD
int startOffset = message.arguments().at(0).toInt();
int endOffset = message.arguments().at(1).toInt();
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
const QString t = textForRange(interface, startOffset, endOffset);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (QAccessibleEditableTextInterface *editableTextIface = interface->editableTextInterface())
editableTextIface->deleteText(startOffset, endOffset);
else
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
replaceTextFallback(interface, startOffset, endOffset, QString());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QGuiApplication::clipboard()->setText(t);
#endif
connection.send(message.createReply(true));
} else if (function == QLatin1String("DeleteText")) {
int startOffset = message.arguments().at(0).toInt();
int endOffset = message.arguments().at(1).toInt();
if (QAccessibleEditableTextInterface *editableTextIface = interface->editableTextInterface())
editableTextIface->deleteText(startOffset, endOffset);
else
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
replaceTextFallback(interface, startOffset, endOffset, QString());
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
connection.send(message.createReply(true));
} else if (function == QLatin1String("InsertText")) {
int position = message.arguments().at(0).toInt();
QString text = message.arguments().at(1).toString();
int length = message.arguments().at(2).toInt();
text.resize(length);
if (QAccessibleEditableTextInterface *editableTextIface = interface->editableTextInterface())
editableTextIface->insertText(position, text);
else
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
replaceTextFallback(interface, position, position, text);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
connection.send(message.createReply(true));
} else if (function == QLatin1String("PasteText")) {
#ifndef QT_NO_CLIPBOARD
int position = message.arguments().at(0).toInt();
const QString txt = QGuiApplication::clipboard()->text();
if (QAccessibleEditableTextInterface *editableTextIface = interface->editableTextInterface())
editableTextIface->insertText(position, txt);
else
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
replaceTextFallback(interface, position, position, txt);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
#endif
connection.send(message.createReply(true));
} else if (function == QLatin1String("SetTextContents")) {
QString newContents = message.arguments().at(0).toString();
Accessibility Linux: Fix crashes when accessing invalid functions There is no way to prevent ATs from calling random functions on DBus. While these functions shouldn't exist when we don't advertise the interface, they should just fail gracefully. Task-number: QTBUG-40044 Change-Id: Ia29b49b16feabc0beb80007456e53497f230c7d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:09:18 +00:00
if (QAccessibleEditableTextInterface *editableTextIface = interface->editableTextInterface())
editableTextIface->replaceText(0, interface->textInterface()->characterCount(), newContents);
else
replaceTextFallback(interface, 0, -1, newContents);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
connection.send(message.createReply(true));
} else if (function == QLatin1String("")) {
connection.send(message.createReply());
} else {
Fix function names in warning messages. Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-09-28 18:06:51 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::editableTextInterface does not implement " << function << message.path();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
return true;
}
// Value interface
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::valueInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
Accessibility Linux: Fix crashes when accessing invalid functions There is no way to prevent ATs from calling random functions on DBus. While these functions shouldn't exist when we don't advertise the interface, they should just fail gracefully. Task-number: QTBUG-40044 Change-Id: Ia29b49b16feabc0beb80007456e53497f230c7d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:09:18 +00:00
QAccessibleValueInterface *valueIface = interface->valueInterface();
if (!valueIface)
return false;
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
if (function == QLatin1String("SetCurrentValue")) {
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QDBusVariant v = message.arguments().at(2).value<QDBusVariant>();
double value = v.variant().toDouble();
//Temporary fix
//See https://bugzilla.gnome.org/show_bug.cgi?id=652596
Accessibility Linux: Fix crashes when accessing invalid functions There is no way to prevent ATs from calling random functions on DBus. While these functions shouldn't exist when we don't advertise the interface, they should just fail gracefully. Task-number: QTBUG-40044 Change-Id: Ia29b49b16feabc0beb80007456e53497f230c7d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:09:18 +00:00
valueIface->setCurrentValue(value);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
connection.send(message.createReply()); // FIXME is the reply needed?
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
} else {
QVariant value;
if (function == QLatin1String("GetCurrentValue"))
Accessibility Linux: Fix crashes when accessing invalid functions There is no way to prevent ATs from calling random functions on DBus. While these functions shouldn't exist when we don't advertise the interface, they should just fail gracefully. Task-number: QTBUG-40044 Change-Id: Ia29b49b16feabc0beb80007456e53497f230c7d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:09:18 +00:00
value = valueIface->currentValue();
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
else if (function == QLatin1String("GetMaximumValue"))
Accessibility Linux: Fix crashes when accessing invalid functions There is no way to prevent ATs from calling random functions on DBus. While these functions shouldn't exist when we don't advertise the interface, they should just fail gracefully. Task-number: QTBUG-40044 Change-Id: Ia29b49b16feabc0beb80007456e53497f230c7d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:09:18 +00:00
value = valueIface->maximumValue();
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
else if (function == QLatin1String("GetMinimumIncrement"))
Accessibility Linux: Fix crashes when accessing invalid functions There is no way to prevent ATs from calling random functions on DBus. While these functions shouldn't exist when we don't advertise the interface, they should just fail gracefully. Task-number: QTBUG-40044 Change-Id: Ia29b49b16feabc0beb80007456e53497f230c7d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:09:18 +00:00
value = valueIface->minimumStepSize();
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
else if (function == QLatin1String("GetMinimumValue"))
Accessibility Linux: Fix crashes when accessing invalid functions There is no way to prevent ATs from calling random functions on DBus. While these functions shouldn't exist when we don't advertise the interface, they should just fail gracefully. Task-number: QTBUG-40044 Change-Id: Ia29b49b16feabc0beb80007456e53497f230c7d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-07-03 14:09:18 +00:00
value = valueIface->minimumValue();
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
else {
qAtspiDebug() << "WARNING: AtSpiAdaptor::valueInterface does not implement " << function << message.path();
return false;
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
}
Fix GCC warning about parentheses in QtPlatformSupport atspiadaptor.cpp:2140:12: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=parentheses] Change-Id: Ib21308f9c1b3bf813fed803228d8adbcc3ce7e9f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-12-22 03:39:46 +00:00
if (!value.canConvert(QVariant::Double)) {
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
qAtspiDebug() << "AtSpiAdaptor::valueInterface: Could not convert to double: " << function;
Fix GCC warning about parentheses in QtPlatformSupport atspiadaptor.cpp:2140:12: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=parentheses] Change-Id: Ib21308f9c1b3bf813fed803228d8adbcc3ce7e9f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-12-22 03:39:46 +00:00
}
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
// explicitly convert to dbus-variant containing one double since atspi expects that
// everything else might fail to convert back on the other end
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
connection.send(message.createReply(
Accessible: Improve value interface The stepSize property was missing in Qt 4 and is a sensible addition to the value interface. Change-Id: I7571800d50ee7e4194c09c4db40300809a1ce45a Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-11-03 18:21:12 +00:00
QVariant::fromValue(QDBusVariant(QVariant::fromValue(value.toDouble())))));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
return true;
}
// Table interface
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString &function, const QDBusMessage &message, const QDBusConnection &connection)
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
{
if (!(interface->tableInterface() || interface->tableCellInterface())) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING Qt AtSpiAdaptor: Could not find table interface for: " << message.path() << interface;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
if (0) {
// properties
} else if (function == QLatin1String("GetCaption")) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * captionInterface= interface->tableInterface()->caption();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (captionInterface) {
QSpiObjectReference ref = QSpiObjectReference(connection, QDBusObjectPath(pathForInterface(captionInterface)));
sendReply(connection, message, QVariant::fromValue(ref));
} else {
sendReply(connection, message, QVariant::fromValue(
QSpiObjectReference(connection, QDBusObjectPath(ATSPI_DBUS_PATH_NULL))));
}
} else if (function == QLatin1String("GetNColumns")) {
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(interface->tableInterface()->columnCount())))));
} else if (function == QLatin1String("GetNRows")) {
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(interface->tableInterface()->rowCount())))));
} else if (function == QLatin1String("GetNSelectedColumns")) {
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(interface->tableInterface()->selectedColumnCount())))));
} else if (function == QLatin1String("GetNSelectedRows")) {
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(
QVariant::fromValue(interface->tableInterface()->selectedRowCount())))));
} else if (function == QLatin1String("GetSummary")) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * summary = interface->tableInterface() ? interface->tableInterface()->summary() : 0;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QSpiObjectReference ref(connection, QDBusObjectPath(pathForInterface(summary)));
connection.send(message.createReply(QVariant::fromValue(QDBusVariant(QVariant::fromValue(ref)))));
} else if (function == QLatin1String("GetAccessibleAt")) {
int row = message.arguments().at(0).toInt();
int column = message.arguments().at(1).toInt();
Accessibility: rather than assert, just warn. Screen readers do random things with the dbus interface, we should be careful when handling what they send. Change-Id: Ie8fc515c8d399dae9b5e892a135b54a1820d09e2 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-22 16:37:21 +00:00
if ((row < 0) ||
(column < 0) ||
(row >= interface->tableInterface()->rowCount()) ||
(column >= interface->tableInterface()->columnCount())) {
Libraries: Fix single-character string literals. Use character literals where applicable. Change-Id: I8e198774c2247c1cc1d852a41b59b301199b7878 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2015-10-13 07:26:59 +00:00
qAtspiDebug() << "WARNING: invalid index for tableInterface GetAccessibleAt (" << row << ", " << column << ')';
Accessibility: rather than assert, just warn. Screen readers do random things with the dbus interface, we should be careful when handling what they send. Change-Id: Ie8fc515c8d399dae9b5e892a135b54a1820d09e2 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-22 16:37:21 +00:00
return false;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
QSpiObjectReference ref;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * cell(interface->tableInterface()->cellAt(row, column));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (cell) {
ref = QSpiObjectReference(connection, QDBusObjectPath(pathForInterface(cell)));
} else {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING: no cell interface returned for " << interface->object() << row << column;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
ref = QSpiObjectReference();
}
connection.send(message.createReply(QVariant::fromValue(ref)));
} else if (function == QLatin1String("GetIndexAt")) {
int row = message.arguments().at(0).toInt();
int column = message.arguments().at(1).toInt();
QAccessibleInterface *cell = interface->tableInterface()->cellAt(row, column);
if (!cell) {
Libraries: Fix single-character string literals. Use character literals where applicable. Change-Id: I8e198774c2247c1cc1d852a41b59b301199b7878 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2015-10-13 07:26:59 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::GetIndexAt(" << row << ',' << column << ") did not find a cell. " << interface;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
int index = interface->indexOfChild(cell);
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "QSpiAdaptor::GetIndexAt row:" << row << " col:" << column << " logical index:" << index;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
Q_ASSERT(index > 0);
connection.send(message.createReply(index));
} else if ((function == QLatin1String("GetColumnAtIndex")) || (function == QLatin1String("GetRowAtIndex"))) {
int index = message.arguments().at(0).toInt();
int ret = -1;
if (index >= 0) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * cell = interface->child(index);
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (cell) {
if (function == QLatin1String("GetColumnAtIndex")) {
if (cell->role() == QAccessible::ColumnHeader) {
ret = index;
} else if (cell->role() == QAccessible::RowHeader) {
ret = -1;
} else {
if (!cell->tableCellInterface()) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::" << function << " No table cell interface: " << cell;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
ret = cell->tableCellInterface()->columnIndex();
}
} else {
if (cell->role() == QAccessible::ColumnHeader) {
ret = -1;
} else if (cell->role() == QAccessible::RowHeader) {
ret = index % interface->tableInterface()->columnCount();
} else {
if (!cell->tableCellInterface()) {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::" << function << " No table cell interface: " << cell;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
ret = cell->tableCellInterface()->rowIndex();
}
}
} else {
Make accessibility debug output optional. On linux with the new plugin debug output was a bit too generous. Instead use environment var: If QT_DEBUG_ACCESSIBILITY is set, give the full a11y output. Change-Id: I1c9e2078e38799f91468cfc2d9ddcaa36ba4fa03 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-09-28 16:04:37 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::" << function << " No cell at index: " << index << interface;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
}
connection.send(message.createReply(ret));
} else if (function == QLatin1String("GetColumnDescription")) {
int column = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->columnDescription(column)));
} else if (function == QLatin1String("GetRowDescription")) {
int row = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->rowDescription(row)));
} else if (function == QLatin1String("GetRowColumnExtentsAtIndex")) {
int index = message.arguments().at(0).toInt();
bool success = false;
Fix potential division by zero Since it's possible to call the function on an empty model, return failure in that case. Change-Id: I0a0eabe917da3e6294bdd616a85579f6dc894ec8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-08-17 14:51:27 +00:00
int row = -1;
int col = -1;
int rowExtents = -1;
int colExtents = -1;
bool isSelected = false;
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
int cols = interface->tableInterface()->columnCount();
Fix potential division by zero Since it's possible to call the function on an empty model, return failure in that case. Change-Id: I0a0eabe917da3e6294bdd616a85579f6dc894ec8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-08-17 14:51:27 +00:00
if (cols > 0) {
row = index / cols;
col = index % cols;
QAccessibleTableCellInterface *cell = interface->tableInterface()->cellAt(row, col)->tableCellInterface();
if (cell) {
Remove rowColumnExtents from QAccessibleTableCellInterface The API is broken and available in individual functions. Don't make it more complicated than necessary to implement the interfaces for new widgets. Change-Id: Ie408c369ef05b2b8e7ac666b25153d090fcf3aae Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-08-12 14:34:44 +00:00
row = cell->rowIndex();
col = cell->columnIndex();
rowExtents = cell->rowExtent();
colExtents = cell->columnExtent();
isSelected = cell->isSelected();
Fix potential division by zero Since it's possible to call the function on an empty model, return failure in that case. Change-Id: I0a0eabe917da3e6294bdd616a85579f6dc894ec8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-08-17 14:51:27 +00:00
success = true;
}
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
QVariantList list;
list << success << row << col << rowExtents << colExtents << isSelected;
connection.send(message.createReply(list));
} else if (function == QLatin1String("GetColumnExtentAt")) {
int row = message.arguments().at(0).toInt();
int column = message.arguments().at(1).toInt();
connection.send(message.createReply(interface->tableInterface()->cellAt(row, column)->tableCellInterface()->columnExtent()));
} else if (function == QLatin1String("GetRowExtentAt")) {
int row = message.arguments().at(0).toInt();
int column = message.arguments().at(1).toInt();
connection.send(message.createReply(interface->tableInterface()->cellAt(row, column)->tableCellInterface()->rowExtent()));
} else if (function == QLatin1String("GetColumnHeader")) {
int column = message.arguments().at(0).toInt();
QSpiObjectReference ref;
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
QAccessibleInterface * cell(interface->tableInterface()->cellAt(0, column));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
if (cell && cell->tableCellInterface()) {
QList<QAccessibleInterface*> header = cell->tableCellInterface()->columnHeaderCells();
if (header.size() > 0) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
ref = QSpiObjectReference(connection, QDBusObjectPath(pathForInterface(header.takeAt(0))));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
}
connection.send(message.createReply(QVariant::fromValue(ref)));
} else if (function == QLatin1String("GetRowHeader")) {
int row = message.arguments().at(0).toInt();
QSpiObjectReference ref;
QAccessibleTableCellInterface *cell = interface->tableInterface()->cellAt(row, 0)->tableCellInterface();
if (cell) {
QList<QAccessibleInterface*> header = cell->rowHeaderCells();
if (header.size() > 0) {
Cache QAccessibleInterfaces. Since there already is a one-to-one relationship between QObject and QAccessibleInterface it makes little sense to create and destroy the interfaces on each call to queryAccessibleInterface. Add a cache and keep created interfaces around for the lifetime of the corresponding QObject. This changes the memory management rules: accessible interfaces must no longer be deleted. If you get an QAccessibleIntrface pointer that pointer will stay valid as long as the corresponding QObject is not deleted. This also re-enables accessibility for Mac. We limit the range of the IDs so that they are useable for Windows directly. That means we can get rid of the event cache there. This is based on: Iebf2f374916fc70a9dd29e95f45a6444b85f6cee Change-Id: I9fe6531812c0dbc5b41101ac05830a6dd75e13a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-03 16:18:40 +00:00
ref = QSpiObjectReference(connection, QDBusObjectPath(pathForInterface(header.takeAt(0))));
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
}
}
connection.send(message.createReply(QVariant::fromValue(ref)));
} else if (function == QLatin1String("GetSelectedColumns")) {
connection.send(message.createReply(QVariant::fromValue(interface->tableInterface()->selectedColumns())));
} else if (function == QLatin1String("GetSelectedRows")) {
connection.send(message.createReply(QVariant::fromValue(interface->tableInterface()->selectedRows())));
} else if (function == QLatin1String("IsColumnSelected")) {
int column = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->isColumnSelected(column)));
} else if (function == QLatin1String("IsRowSelected")) {
int row = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->isRowSelected(row)));
} else if (function == QLatin1String("IsSelected")) {
int row = message.arguments().at(0).toInt();
int column = message.arguments().at(1).toInt();
QAccessibleTableCellInterface* cell = interface->tableInterface()->cellAt(row, column)->tableCellInterface();
connection.send(message.createReply(cell->isSelected()));
} else if (function == QLatin1String("AddColumnSelection")) {
int column = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->selectColumn(column)));
} else if (function == QLatin1String("AddRowSelection")) {
int row = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->selectRow(row)));
} else if (function == QLatin1String("RemoveColumnSelection")) {
int column = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->unselectColumn(column)));
} else if (function == QLatin1String("RemoveRowSelection")) {
int row = message.arguments().at(0).toInt();
connection.send(message.createReply(interface->tableInterface()->unselectRow(row)));
} else {
Fix function names in warning messages. Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-09-28 18:06:51 +00:00
qAtspiDebug() << "WARNING: AtSpiAdaptor::tableInterface does not implement " << function << message.path();
Add Linux Accessibility Bridge This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-05-10 21:52:05 +00:00
return false;
}
return true;
}
QT_END_NAMESPACE
Compile with -no-feature-accessibility Task-number: QTBUG-38045 Change-Id: Id436b70aa6161bdf2428ca0a605212b278c71849 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2014-07-02 12:10:30 +00:00
#endif //QT_NO_ACCESSIBILITY