Commit 65e016c183d2072b44151976d3aa9e73ec8cf4e7

Authored by samuel thibault
1 parent 8a820e18

debian/patches/1002-scrollsubstringto: Support scrollsubstringto interface.

debian/changelog
... ... @@ -3,6 +3,8 @@ at-spi2-core (2.14.0-1+hypra1) UNRELEASED; urgency=medium
3 3 * debian/patches/1000-lock-modifiers: Support locking modifiers for
4 4 double-capslock support in Orca.
5 5 * debian/patches/1001-scrollto: Support scrollto interface.
  6 + * debian/patches/1002-scrollsubstringto: Support scrollsubstringto
  7 + interface.
6 8  
7 9 -- Samuel Thibault <sthibault@debian.org> Mon, 19 Nov 2018 16:44:36 +0100
8 10  
... ...
debian/patches/1002-scrollsubstringto 0 → 100644
... ... @@ -0,0 +1,174 @@
  1 +commit 29a11aad565b0ad29acacc943074137b24e6fa22
  2 +Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
  3 +Date: Wed Jun 27 15:14:59 2018 +0200
  4 +
  5 + Add ScrollSubstringTo and ScrollSubstringToPoint text interfaces
  6 +
  7 +#diff --git a/NEWS b/NEWS
  8 +#index 2767e4a..dfbe165 100644
  9 +#--- a/NEWS
  10 +#+++ b/NEWS
  11 +#@@ -1,3 +1,7 @@
  12 +#+What's new in at-spi2-core 2.31.0:
  13 +#+
  14 +#+* Add ScrollSubstringTo and ScrollSubstringToPoint text interfaces.
  15 +#+
  16 +# What's new in at-spi2-core 2.29.1:
  17 +#
  18 +# * Add dbus-broker support to bus launcher.
  19 +diff --git a/atspi/atspi-text.c b/atspi/atspi-text.c
  20 +index 1e887d3..009d07b 100644
  21 +--- a/atspi/atspi-text.c
  22 ++++ b/atspi/atspi-text.c
  23 +@@ -892,6 +892,72 @@ atspi_text_set_selection (AtspiText *obj,
  24 + return retval;
  25 + }
  26 +
  27 ++/**
  28 ++ * atspi_text_scroll_substring_to:
  29 ++ * @obj: a pointer to the #AtspiText object on which to operate.
  30 ++ * @start_offset: a #gint indicating the start of the desired text range.
  31 ++ * @end_offset: a #gint indicating the first character past the desired range.
  32 ++ * @type: a #AtspiScrollType indicating where the object should be placed on the
  33 ++ * screen.
  34 ++ *
  35 ++ * Scrolls whatever container of the #AtspiText text range so it becomes
  36 ++ * visible on the screen.
  37 ++ *
  38 ++ * Returns: #TRUE if successful, #FALSE otherwise.
  39 ++ **/
  40 ++gboolean
  41 ++atspi_text_scroll_substring_to (AtspiText *obj,
  42 ++ gint start_offset,
  43 ++ gint end_offset,
  44 ++ AtspiScrollType type,
  45 ++ GError **error)
  46 ++{
  47 ++ dbus_bool_t retval = FALSE;
  48 ++
  49 ++ g_return_val_if_fail (obj != NULL, FALSE);
  50 ++
  51 ++ _atspi_dbus_call (obj, atspi_interface_text, "ScrollSubstringTo",
  52 ++ error, "iiu=>b",
  53 ++ start_offset, end_offset, type, &retval);
  54 ++
  55 ++ return retval;
  56 ++}
  57 ++
  58 ++/**
  59 ++ * atspi_text_scroll_substring_to_point:
  60 ++ * @obj: a pointer to the #AtspiText object on which to operate.
  61 ++ * @start_offset: a #gint indicating the start of the desired text range.
  62 ++ * @end_offset: a #gint indicating the first character past the desired range.
  63 ++ * @coords: a #AtspiCoordType indicating whether the coordinates are relative to
  64 ++ * the screen, to the window, or to the parent object.
  65 ++ * @x: the x coordinate of the point to reach
  66 ++ * @y: the y coordinate of the point to reach
  67 ++ *
  68 ++ * Scrolls whatever container of the #AtspiText text range so it becomes
  69 ++ * visible on the screen at a given position.
  70 ++ *
  71 ++ * Returns: #TRUE if successful, #FALSE otherwise.
  72 ++ **/
  73 ++gboolean
  74 ++atspi_text_scroll_substring_to_point (AtspiText *obj,
  75 ++ gint start_offset,
  76 ++ gint end_offset,
  77 ++ AtspiCoordType coords,
  78 ++ gint x,
  79 ++ gint y,
  80 ++ GError **error)
  81 ++{
  82 ++ dbus_bool_t retval = FALSE;
  83 ++
  84 ++ g_return_val_if_fail (obj != NULL, FALSE);
  85 ++
  86 ++ _atspi_dbus_call (obj, atspi_interface_text, "ScrollSubstringToPoint",
  87 ++ error, "iiuii=>b",
  88 ++ start_offset, end_offset, coords, x, y, &retval);
  89 ++
  90 ++ return retval;
  91 ++}
  92 ++
  93 + static void
  94 + atspi_text_base_init (AtspiText *klass)
  95 + {
  96 +diff --git a/atspi/atspi-text.h b/atspi/atspi-text.h
  97 +index 8e11eb0..05b99dc 100644
  98 +--- a/atspi/atspi-text.h
  99 ++++ b/atspi/atspi-text.h
  100 +@@ -137,6 +137,10 @@ gboolean atspi_text_remove_selection (AtspiText *obj, gint selection_num, GError
  101 +
  102 + gboolean atspi_text_set_selection (AtspiText *obj, gint selection_num, gint start_offset, gint end_offset, GError **error);
  103 +
  104 ++gboolean atspi_text_scroll_substring_to (AtspiText *obj, gint start_offset, gint end_offset, AtspiScrollType type, GError **error);
  105 ++
  106 ++gboolean atspi_text_scroll_substring_to_point (AtspiText *obj, gint start_offset, gint end_offset, AtspiCoordType coords, gint x, gint y, GError **error);
  107 ++
  108 + G_END_DECLS
  109 +
  110 + #endif /* _ATSPI_TEXT_H_ */
  111 +#diff --git a/doc/libatspi/libatspi-sections.txt b/doc/libatspi/libatspi-sections.txt
  112 +#index 14304ff..adb9130 100644
  113 +#--- a/doc/libatspi/libatspi-sections.txt
  114 +#+++ b/doc/libatspi/libatspi-sections.txt
  115 +#@@ -30,6 +30,8 @@ atspi_text_set_selection
  116 +# atspi_text_get_string_at_offset
  117 +# atspi_text_get_text_attribute_value
  118 +# atspi_text_get_text_attributes
  119 +#+atspi_text_scroll_substring_to
  120 +#+atspi_text_scroll_substring_to_point
  121 +# <SUBSECTION Standard>
  122 +# ATSPI_TEXT
  123 +# ATSPI_IS_TEXT
  124 +#diff --git a/idl/text.didl b/idl/text.didl
  125 +#index 07ce85e..d5ae66c 100644
  126 +#--- a/idl/text.didl
  127 +#+++ b/idl/text.didl
  128 +#@@ -241,6 +241,22 @@ namespace org.freestandards.atspi {
  129 +# method GetAttributeSet reply {
  130 +# Attributes attributes'
  131 +# }
  132 +#+
  133 +#+ /*
  134 +#+ Scroll this text range so it becomes visible on the screen.
  135 +#+ */
  136 +#+ method ScrollSubstringTo {
  137 +#+ ScrollType type;
  138 +#+ }
  139 +#+
  140 +#+ /*
  141 +#+ Scroll this text range so it becomes visible on the screen at a given position.
  142 +#+ */
  143 +#+ method ScrollSubstringToPoint {
  144 +#+ CoordType type;
  145 +#+ int32 x;
  146 +#+ int32 y;
  147 +#+ }
  148 +# }
  149 +#
  150 +# /*
  151 +diff --git a/xml/Text.xml b/xml/Text.xml
  152 +index 320ee5e..313131e 100644
  153 +--- a/xml/Text.xml
  154 ++++ b/xml/Text.xml
  155 +@@ -152,5 +152,19 @@
  156 + <arg direction="out" type="a{ss}"/>
  157 + </method>
  158 +
  159 ++ <method name="ScrollSubstringTo">
  160 ++ <arg direction="in" name="startOffset" type="i"/>
  161 ++ <arg direction="in" name="endOffset" type="i"/>
  162 ++ <arg direction="in" name="type" type="u"/>
  163 ++ </method>
  164 ++
  165 ++ <method name="ScrollSubstringToPoint">
  166 ++ <arg direction="in" name="startOffset" type="i"/>
  167 ++ <arg direction="in" name="endOffset" type="i"/>
  168 ++ <arg direction="in" name="type" type="u"/>
  169 ++ <arg direction="in" name="x" type="i"/>
  170 ++ <arg direction="in" name="y" type="i"/>
  171 ++ </method>
  172 ++
  173 + </interface>
  174 + </node>
... ...
debian/patches/series
1 1 1000-lock-modifiers
2 2 1001-scrollto
  3 +1002-scrollsubstringto
... ...