From: Artur Świgoń Date: Fri, 7 Feb 2020 13:01:49 +0000 (+0100) Subject: Merge tag 'upstream/2.34.0' into tizen X-Git-Tag: submit/tizen/20200213.221652^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fat-spi2-core.git;a=commitdiff_plain;h=5016c77a44ff9bb5ce595a32429319d189839063 Merge tag 'upstream/2.34.0' into tizen Change-Id: I480c8e572f5fe7d3d7d2d6f1f0aa2a76f009c9a8 --- 5016c77a44ff9bb5ce595a32429319d189839063 diff --cc atspi/atspi-accessible.h index 9e209e3,13e4962..a1fe314 --- a/atspi/atspi-accessible.h +++ b/atspi/atspi-accessible.h @@@ -5,12 -5,12 +5,12 @@@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@@ -99,9 -64,11 +99,11 @@@ typedef struct _AtspiAccessibleClass At struct _AtspiAccessibleClass { AtspiObjectClass parent_class; + + void (*region_changed) (AtspiAccessible *accessible, gint current_offset, gint last_offset); }; -GType atspi_accessible_get_type (void); +GType atspi_accessible_get_type (void); AtspiAccessible * _atspi_accessible_new (AtspiApplication *app, const gchar *path); diff --cc atspi/atspi-component.h index a97e83f,4e8f0ad..a812251 --- a/atspi/atspi-component.h +++ b/atspi/atspi-component.h @@@ -4,12 -4,12 +4,12 @@@ * * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. - * + * * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --cc atspi/atspi-constants.h index 67c42bf,8657ead..848ec8e --- a/atspi/atspi-constants.h +++ b/atspi/atspi-constants.h @@@ -1388,28 -1383,8 +1396,28 @@@ typedef enum * * One higher than the highest valid value of #AtspiRole. */ - #define ATSPI_ROLE_COUNT (125+1) + #define ATSPI_ROLE_COUNT (127+1) +/** + * AtspiMoveOutedType: The type of signal that occurs when an object outted the screen. + * @ATSPI_MOVE_OUTED_TOP_LEFT: Object has outted top or left of the screen. + * @ATSPI_MOVE_OUTED_BOTTOM_RIGHT: Object has outted bottom or right of the screen. + **/ + +typedef enum { + ATSPI_MOVE_OUTED_NULL, + ATSPI_MOVE_OUTED_TOP_LEFT, + ATSPI_MOVE_OUTED_BOTTOM_RIGHT, + ATSPI_MOVE_OUTED_LAST_DEFINDED +} AtspiMoveOutedType; + +/** + * ATSPI_MOVE_OUTED_COUNT: + * + * One higher than the highest valid value of #AtspiScreenOuttedType. + **/ +#define ATSPI_MOVE_OUTED_COUNT (3+1) + typedef enum { ATSPI_CACHE_NONE = 0, diff --cc atspi/atspi-misc-private.h index 44b4dc6,f0b5adb..fb40277 --- a/atspi/atspi-misc-private.h +++ b/atspi/atspi-misc-private.h @@@ -5,12 -5,12 +5,12 @@@ * Copyright 2002 Ximian, Inc. * 2002 Sun Microsystems Inc. * Copyright 2010, 2011 Novell, Inc. - * + * * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --cc bus/at-spi-bus-launcher.c index 91bdd48,b4f49b8..afd4edb --- a/bus/at-spi-bus-launcher.c +++ b/bus/at-spi-bus-launcher.c @@@ -379,13 -321,12 +382,14 @@@ ensure_a11y_bus_daemon (A11yBusLaunche app->state = A11Y_BUS_STATE_READING_ADDRESS; app->a11y_bus_pid = pid; - g_debug ("Launched a11y bus, child is %ld", (long) pid); + LOGD("Launched a11y bus, child is %ld", (long) pid); if (!unix_read_all_fd_to_string (app->pipefd[0], addr_buf, sizeof (addr_buf))) { - app->a11y_launch_error_message = g_strdup_printf ("Failed to read address: %s", strerror (errno)); + char buf[4096] = { 0 }; + strerror_r (errno, buf, sizeof(buf)); + app->a11y_launch_error_message = g_strdup_printf ("Failed to read address: %s", buf); kill (app->a11y_bus_pid, SIGTERM); + app->a11y_bus_pid = -1; goto error; } close (app->pipefd[0]); @@@ -1227,26 -824,8 +1191,20 @@@ main (int argc gboolean screen_reader_set = FALSE; gint i; - if (already_running ()) - { - LOGD("atspi bus launcher is already running"); - return 0; - } - _global_app = g_slice_new0 (A11yBusLauncher); _global_app->loop = g_main_loop_new (NULL, FALSE); + _global_app->client_watcher_id = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); + + _global_app->screen_reader.name = "screen-reader"; + _global_app->screen_reader.app_control_operation = APP_CONTROL_OPERATION_SCREEN_READ; + _global_app->screen_reader.vconf_key[0] = VCONFKEY_SETAPPL_ACCESSIBILITY_TTS; + _global_app->screen_reader.number_of_keys = 1; + + _global_app->universal_switch.name = "universal-switch"; + _global_app->universal_switch.app_control_operation = APP_CONTROL_OPERATION_UNIVERSAL_SWITCH; + _global_app->universal_switch.vconf_key[0] = VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_CONFIGURATION_SERVICE; + _global_app->universal_switch.vconf_key[1] = VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE; + _global_app->universal_switch.number_of_keys = 2; for (i = 1; i < argc; i++) { diff --cc meson.build index 777f821,0a2f75e..8fed991 --- a/meson.build +++ b/meson.build @@@ -54,11 -52,16 +54,17 @@@ libdbus_dep = dependency('dbus-1', vers glib_dep = dependency('glib-2.0', version: glib_req_version) gobject_dep = dependency('gobject-2.0', version: gobject_req_version) gio_dep = dependency('gio-2.0', version: gio_req_version) +app_svc_dep = dependency('appsvc', version: app_svc_req_version) - dl_dep = cc.find_library('dl', required: false) + if cc.has_function('dlopen') + dl_dep = [] + elif cc.has_function('dlopen', args: '-ldl') + dl_dep = cc.find_library('dl') + else + error('Could not find a library with the dlopen function') + endif x11_deps = [] - x11_option = get_option('enable-x11') + x11_option = get_option('x11') if x11_option != 'no' x11_dep = dependency('x11', required: false) diff --cc packaging/at-spi2-core.spec index c2db81e,0000000..6316fb2 mode 100644,000000..100644 --- a/packaging/at-spi2-core.spec +++ b/packaging/at-spi2-core.spec @@@ -1,129 -1,0 +1,129 @@@ +%bcond_with x + +Name: at-spi2-core - Version: 2.31.1 ++Version: 2.34.0 +Release: 0 +Summary: Assistive Technology Service Provider Interface - D-Bus based implementation +License: LGPL-2.0+ +Group: System/Libraries +Url: http://www.gnome.org/ +Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.31/%{name}-%{version}.tar.xz +Source1001: %{name}.manifest +Requires: dbus +BuildRequires: python-devel +BuildRequires: python-xml +BuildRequires: intltool +BuildRequires: dbus-devel +BuildRequires: glib2-devel +BuildRequires: gettext +BuildRequires: gtk-doc +%if %{with x} +BuildRequires: libX11-devel +BuildRequires: libXtst-devel +BuildRequires: libXi-devel +%endif +BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(appsvc) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(aul) +BuildRequires: gobject-introspection +BuildRequires: meson +BuildRequires: app-svc-devel + +%description +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +This package contains the AT-SPI registry daemon. It provides a +mechanism for all assistive technologies to discover and interact +with applications running on the desktop. + +%package -n libatspi0 +Summary: An Accessibility ToolKit -- Library +Group: System/Libraries + +%description -n libatspi0 +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +%package -n typelib-1_0-Atspi-2_0 +Summary: An Accessibility ToolKit -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-Atspi-2_0 +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +This package provides the GObject Introspection bindings for the +libatspi library. + +%package devel +Summary: Include Files and Libraries mandatory for Development +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: libatspi0 = %{version} +Requires: typelib-1_0-Atspi-2_0 = %{version} + +%description devel +This package contains all necessary include files and libraries needed +to develop applications that require these. + +%prep +%setup -q +cp %{SOURCE1001} . + +%build +meson --prefix /usr --libdir %{_libdir} build -Dwith-dbus-daemondir=%{_bindir} -Ddbus_daemon=/usr/bin/dbus-daemon \ +%if !%{with x} + -Denable-x11=no \ +%else + -Denable-x11=yes \ +%endif + -Denable-static=no + +ninja -C build all + +%install +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f + +export DESTDIR=%{buildroot} +ninja -C build install + +%find_lang %{name} + +%clean +rm -fr %{buildroot} + +%post -n libatspi0 -p /sbin/ldconfig + +%postun -n libatspi0 -p /sbin/ldconfig + +%files -f %{name}.lang +%manifest %{name}.manifest +%defattr(-,root,root) +%{_bindir}/at_spi2_tool + +%doc AUTHORS README +%license COPYING +%{_libexecdir}/at-spi-bus-launcher +%{_libexecdir}/at-spi2-registryd +%{_datadir}/defaults/at-spi2/accessibility.conf +%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop +%{_datadir}/dbus-1/accessibility-services/org.a11y.atspi.Registry.service +%{_datadir}/dbus-1/services/org.a11y.Bus.service +%{_prefix}/lib/systemd/user/at-spi-dbus-bus.service +%files -n libatspi0 +%manifest %{name}.manifest +%defattr(-, root, root) +%{_libdir}/libatspi.so.0* + +%files -n typelib-1_0-Atspi-2_0 +%manifest %{name}.manifest +%defattr(-, root, root) + +%files devel +%manifest %{name}.manifest +%defattr(-, root, root) +%{_includedir}/at-spi-2.0 +%{_libdir}/libatspi.so +%{_libdir}/pkgconfig/atspi-2.pc