Merge branch 'bidi-revenge' into 'main'

Reimplement pango_layout_move_cursor_visually

Closes #587, #585, and #157

See merge request GNOME/pango!389

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/test-layout.c b/tests/test-layout.c
index f35d839e..e533618d 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -194,15 +194,22 @@ dump_directions (PangoLayout *layout, GString *string)
 static void
 dump_cursor_positions (PangoLayout *layout, GString *string)
 {
+  const char *text;
   int index, trailing;
 
+  text = pango_layout_get_text (layout);
+
   index = 0;
   trailing = 0;
 
   while (index < G_MAXINT)
     {
       g_string_append_printf (string, "%d(%d) ", index, trailing);
-      pango_layout_move_cursor_visually (layout, TRUE, index, trailing, 1, &index, &trailing);
+
+      while (trailing--)
+        index = g_utf8_next_char (text + index) - text;
+
+      pango_layout_move_cursor_visually (layout, TRUE, index, 0, 1, &index, &trailing);
     }
 
   g_string_append (string, "\n");