diff options
Diffstat (limited to 'atk-adaptor')
-rw-r--r-- | atk-adaptor/adaptors/socket-adaptor.c | 2 | ||||
-rw-r--r-- | atk-adaptor/introspection.c | 104 | ||||
-rw-r--r-- | atk-adaptor/introspection.h | 2 |
3 files changed, 72 insertions, 36 deletions
diff --git a/atk-adaptor/adaptors/socket-adaptor.c b/atk-adaptor/adaptors/socket-adaptor.c index 0f7c1b3a..57fe3f78 100644 --- a/atk-adaptor/adaptors/socket-adaptor.c +++ b/atk-adaptor/adaptors/socket-adaptor.c @@ -225,6 +225,6 @@ spi_initialize_socket (DRoutePath * path) { droute_path_add_interface (path, ATSPI_DBUS_INTERFACE_SOCKET, - NULL, /* spi_org_a11y_atspi_Socket, */ + spi_org_a11y_atspi_Socket, methods, NULL); }; diff --git a/atk-adaptor/introspection.c b/atk-adaptor/introspection.c index e017449d..cad7a93d 100644 --- a/atk-adaptor/introspection.c +++ b/atk-adaptor/introspection.c @@ -25,6 +25,8 @@ const char *spi_org_a11y_atspi_Accessible = "" " <property access=\"read\" name=\"Locale\" type=\"s\" />" "" +" <property access=\"read\" name=\"AccessibleId\" type=\"s\" />" +"" " <method name=\"GetChildAtIndex\">" " <arg direction=\"in\" name=\"index\" type=\"i\" />" " <arg direction=\"out\" type=\"(so)\" />" @@ -72,6 +74,10 @@ const char *spi_org_a11y_atspi_Accessible = " " " </method>" "" +" <method name=\"GetInterfaces\">" +" <arg direction=\"out\" type=\"as\" />" +" </method>" +"" "</interface>" ""; @@ -121,7 +127,7 @@ const char *spi_org_a11y_atspi_Application = " <property access=\"read\" name=\"Version\" type=\"s\" />" "" " <property access=\"read\" name=\"AtspiVersion\" type=\"s\" />" -" <property access=\"read\" name=\"Id\" type=\"i\" />" +" <property access=\"readwrite\" name=\"Id\" type=\"i\" />" "" " <method name=\"GetLocale\">" " <arg direction=\"in\" name=\"lctype\" type=\"u\" />" @@ -143,7 +149,7 @@ const char *spi_org_a11y_atspi_Collection = "<interface name=\"org.a11y.atspi.Collection\" version=\"0.1.7\">" "" " <method name=\"GetMatches\">" -" <arg direction=\"in\" name=\"rule\" type=\"(auuasuauusub)\" />" +" <arg direction=\"in\" name=\"rule\" type=\"(aiia{ss}iaiiasib)\" />" " " " <arg direction=\"in\" name=\"sortby\" type=\"u\" />" " <arg direction=\"in\" name=\"count\" type=\"i\" />" @@ -155,7 +161,7 @@ const char *spi_org_a11y_atspi_Collection = " <method name=\"GetMatchesTo\">" " <arg direction=\"in\" name=\"current_object\" type=\"o\" />" " " -" <arg direction=\"in\" name=\"rule\" type=\"(auuasuauusub)\" />" +" <arg direction=\"in\" name=\"rule\" type=\"(aiia{ss}iaiiasib)\" />" " " " <arg direction=\"in\" name=\"sortby\" type=\"u\" />" " <arg direction=\"in\" name=\"tree\" type=\"u\" />" @@ -169,7 +175,7 @@ const char *spi_org_a11y_atspi_Collection = " <method name=\"GetMatchesFrom\">" " <arg direction=\"in\" name=\"current_object\" type=\"o\" />" " " -" <arg direction=\"in\" name=\"rule\" type=\"(auuasuauusub)\" />" +" <arg direction=\"in\" name=\"rule\" type=\"(aiia{ss}iaiiasib)\" />" " " " <arg direction=\"in\" name=\"sortby\" type=\"u\" />" " <arg direction=\"in\" name=\"tree\" type=\"u\" />" @@ -261,13 +267,15 @@ const char *spi_org_a11y_atspi_Component = " </method>" "" " <method name=\"ScrollTo\">" -" <arg direction=\"in\" name=\"type\" type=\"u\"/>" +" <arg direction=\"in\" name=\"type\" type=\"u\" />" +" <arg direction=\"out\" type=\"b\" />" " </method>" "" " <method name=\"ScrollToPoint\">" -" <arg direction=\"in\" name=\"type\" type=\"u\"/>" -" <arg direction=\"in\" name=\"x\" type=\"i\"/>" -" <arg direction=\"in\" name=\"y\" type=\"i\"/>" +" <arg direction=\"in\" name=\"type\" type=\"u\" />" +" <arg direction=\"in\" name=\"x\" type=\"i\" />" +" <arg direction=\"in\" name=\"y\" type=\"i\" />" +" <arg direction=\"out\" type=\"b\" />" " </method>" "" "</interface>" @@ -290,7 +298,7 @@ const char *spi_org_a11y_atspi_Document = " </method>" "" " <method name=\"GetAttributes\">" -" <arg direction=\"out\" type=\"{ss}\" />" +" <arg direction=\"out\" type=\"a{ss}\" />" " " " </method>" "" @@ -554,11 +562,15 @@ const char *spi_org_a11y_atspi_TableCell = "" " <property access=\"read\" name=\"ColumnSpan\" type=\"i\" />" "" -" <property access=\"read\" name=\"Position\" type=\"(ii)\" />" +" <property access=\"read\" name=\"Position\" type=\"(ii)\">" +" " +" </property>" "" " <property access=\"read\" name=\"RowSpan\" type=\"i\" />" "" -" <property access=\"read\" name=\"Table\" type=\"(so)\" />" +" <property access=\"read\" name=\"Table\" type=\"(so)\">" +" " +" </property>" "" " <method name=\"GetRowColumnSpan\">" " <arg direction=\"out\" type=\"b\" />" @@ -722,20 +734,23 @@ const char *spi_org_a11y_atspi_Text = "" " <method name=\"GetDefaultAttributeSet\">" " <arg direction=\"out\" type=\"a{ss}\" />" +" " " </method>" "" " <method name=\"ScrollSubstringTo\">" " <arg direction=\"in\" name=\"startOffset\" type=\"i\" />" " <arg direction=\"in\" name=\"endOffset\" type=\"i\" />" -" <arg direction=\"in\" name=\"type\" type=\"u\"/>" +" <arg direction=\"in\" name=\"type\" type=\"u\" />" +" <arg direction=\"out\" type=\"b\" />" " </method>" "" " <method name=\"ScrollSubstringToPoint\">" " <arg direction=\"in\" name=\"startOffset\" type=\"i\" />" " <arg direction=\"in\" name=\"endOffset\" type=\"i\" />" -" <arg direction=\"in\" name=\"type\" type=\"u\"/>" -" <arg direction=\"in\" name=\"x\" type=\"i\"/>" -" <arg direction=\"in\" name=\"y\" type=\"i\"/>" +" <arg direction=\"in\" name=\"type\" type=\"u\" />" +" <arg direction=\"in\" name=\"x\" type=\"i\" />" +" <arg direction=\"in\" name=\"y\" type=\"i\" />" +" <arg direction=\"out\" type=\"b\" />" " </method>" "" "</interface>" @@ -781,16 +796,39 @@ const char *spi_org_a11y_atspi_EditableText = "</interface>" ""; +const char *spi_org_a11y_atspi_Socket = +"<interface name=\"org.a11y.atspi.Socket\" version=\"0.1.7\">" +"" +" <method name=\"Embed\">" +" <arg direction=\"in\" name=\"plug\" type=\"(so)\" />" +" " +" <arg direction=\"out\" name=\"socket\" type=\"(so)\" />" +" " +" </method>" +"" +" <method name=\"Unembed\">" +" <arg direction=\"in\" name=\"plug\" type=\"(so)\" />" +" " +" </method>" +"" +" <signal name=\"Available\">" +" <arg name=\"socket\" type=\"(so)\" />" +" " +" </signal>" +"" +"</interface>" +""; + const char *spi_org_a11y_atspi_Cache = "<interface name=\"org.a11y.atspi.Cache\" version=\"0.1.7\">" "" " <method name=\"GetItems\">" -" <arg direction=\"out\" name=\"nodes\" type=\"a((so)(so)iiassusau)\" />" +" <arg direction=\"out\" name=\"nodes\" type=\"a((so)(so)(so)iiassusau)\" />" " " " </method>" "" " <signal name=\"AddAccessible\">" -" <arg name=\"nodeAdded\" type=\"((so)(so)iiassusau)\" />" +" <arg name=\"nodeAdded\" type=\"((so)(so)(so)iiassusau)\" />" " " " </signal>" "" @@ -830,18 +868,18 @@ const char *spi_org_a11y_atspi_Registry = " </method>" "" " <method name=\"GetRegisteredEvents\">" -" <arg direction=\"out\" name=\"events\" type=\"a(ss)\">" -" </arg>" +" <arg direction=\"out\" name=\"events\" type=\"a(ss)\" />" +" " " </method>" "" " <signal name=\"EventListenerRegistered\">" -" <arg direction=\"out\" name=\"bus\" type=\"s\" />" -" <arg direction=\"out\" name=\"path\" type=\"s\" />" +" <arg name=\"bus\" type=\"s\" />" +" <arg name=\"path\" type=\"s\" />" " </signal>" "" " <signal name=\"EventListenerDeregistered\">" -" <arg direction=\"out\" name=\"bus\" type=\"s\" />" -" <arg direction=\"out\" name=\"path\" type=\"s\" />" +" <arg name=\"bus\" type=\"s\" />" +" <arg name=\"path\" type=\"s\" />" " </signal>" "</interface>" ""; @@ -851,24 +889,20 @@ const char *spi_org_a11y_atspi_DeviceEventController = "" " <method name=\"RegisterKeystrokeListener\">" " <arg direction=\"in\" name=\"listener\" type=\"o\" />" -" <arg direction=\"in\" name=\"keys\" type=\"a(iisi)\">" -" " -" </arg>" +" <arg direction=\"in\" name=\"keys\" type=\"a(iisi)\" />" +" " " <arg direction=\"in\" name=\"mask\" type=\"u\" />" -" <arg direction=\"in\" name=\"type\" type=\"au\">" -" " -" </arg>" -" <arg direction=\"in\" name=\"mode\" type=\"(bbb)\">" -" " -" </arg>" +" <arg direction=\"in\" name=\"type\" type=\"au\" />" +" " +" <arg direction=\"in\" name=\"mode\" type=\"(bbb)\" />" +" " " <arg direction=\"out\" type=\"b\" />" " </method>" "" " <method name=\"DeregisterKeystrokeListener\">" " <arg direction=\"in\" name=\"listener\" type=\"o\" />" -" <arg direction=\"in\" name=\"keys\" type=\"a(iisi)\">" -" " -" </arg>" +" <arg direction=\"in\" name=\"keys\" type=\"a(iisi)\" />" +" " " <arg direction=\"in\" name=\"mask\" type=\"u\" />" " <arg direction=\"in\" name=\"type\" type=\"u\" />" " </method>" diff --git a/atk-adaptor/introspection.h b/atk-adaptor/introspection.h index 2210483f..c8caa9ef 100644 --- a/atk-adaptor/introspection.h +++ b/atk-adaptor/introspection.h @@ -41,6 +41,8 @@ extern const char *spi_org_a11y_atspi_Text; extern const char *spi_org_a11y_atspi_EditableText; +extern const char *spi_org_a11y_atspi_Socket; + extern const char *spi_org_a11y_atspi_Cache; extern const char *spi_org_a11y_atspi_Value; |