From 7565fcaab04855fc2cb197c86f41b6e39409ae88 Mon Sep 17 00:00:00 2001 From: Philippe Normand Date: Wed, 2 Feb 2011 11:29:33 +0100 Subject: [PATCH] a11y: cally-text get_character_extents implementation See http://bugzilla.clutter-project.org/show_bug.cgi?id=1733 --- clutter/cally/cally-text.c | 79 ++++++++++++++++++++- tests/accessibility/cally-atktext-example.c | 13 +++- 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/clutter/cally/cally-text.c b/clutter/cally/cally-text.c index 523a12b6d..8e861d6a6 100644 --- a/clutter/cally/cally-text.c +++ b/clutter/cally/cally-text.c @@ -134,6 +134,13 @@ static AtkAttributeSet* cally_text_get_run_attributes (AtkText *text, gint *start_offset, gint *end_offset); static AtkAttributeSet* cally_text_get_default_attributes (AtkText *text); +static void cally_text_get_character_extents (AtkText *text, + gint offset, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coords); static void _cally_text_get_selection_bounds (ClutterText *clutter_text, gint *start_offset, gint *end_offset); @@ -398,7 +405,7 @@ cally_text_text_interface_init (AtkTextIface *iface) iface->set_selection = cally_text_set_selection; iface->get_run_attributes = cally_text_get_run_attributes; iface->get_default_attributes = cally_text_get_default_attributes; -/* iface->get_character_extents = */ + iface->get_character_extents = cally_text_get_character_extents; /* iface->get_offset_at_point = */ } @@ -779,6 +786,76 @@ cally_text_get_default_attributes (AtkText *text) return at_set; } +static void cally_text_get_character_extents (AtkText *text, + gint offset, + gint *xp, + gint *yp, + gint *widthp, + gint *heightp, + AtkCoordType coords) +{ + ClutterActor *actor = NULL; + ClutterText *clutter_text = NULL; + gint x = 0, y = 0, width = 0, height = 0; + gint index, x_window, y_window, x_toplevel, y_toplevel; + gint x_layout, y_layout; + PangoLayout *layout; + PangoRectangle extents; + const gchar *text_value; + ClutterVertex verts[4]; + + actor = CALLY_GET_CLUTTER_ACTOR (text); + if (actor == NULL) /* State is defunct */ + goto done; + + clutter_text = CLUTTER_TEXT (actor); + + text_value = clutter_text_get_text (clutter_text); + index = g_utf8_offset_to_pointer (text_value, offset) - text_value; + + layout = clutter_text_get_layout (clutter_text); + pango_layout_index_to_pos (layout, index, &extents); + + /* handle RTL text layout */ + if (extents.width < 0) + { + extents.x += extents.width; + extents.width = -extents.width; + } + + clutter_actor_get_abs_allocation_vertices (actor, verts); + x_window = verts[0].x; + y_window = verts[0].y; + + clutter_text_get_layout_offsets (clutter_text, &x_layout, &y_layout); + + x = (extents.x / PANGO_SCALE) + x_layout + x_window; + y = (extents.y / PANGO_SCALE) + y_layout + y_window; + width = extents.width / PANGO_SCALE; + height = extents.height / PANGO_SCALE; + + if (coords == ATK_XY_SCREEN) + { + _cally_actor_get_top_level_origin (actor, &x_toplevel, &y_toplevel); + x += x_toplevel; + y += y_toplevel; + } + +done: + if (widthp) + *widthp = width; + + if (heightp) + *heightp = height; + + if (xp) + *xp = x; + + if (yp) + *yp = y; +} + + /******** Auxiliar private methods ******/ /* ClutterText only maintains the current cursor position and a extra selection diff --git a/tests/accessibility/cally-atktext-example.c b/tests/accessibility/cally-atktext-example.c index da7d6a347..6181b71f5 100644 --- a/tests/accessibility/cally-atktext-example.c +++ b/tests/accessibility/cally-atktext-example.c @@ -49,6 +49,7 @@ test_atk_text (ClutterActor *actor) AtkAttributeSet *at_set = NULL; GSList *attrs; gchar *buf; + gint x, y, width, height; object = atk_gobject_accessible_for_object (G_OBJECT (actor)); cally_text = ATK_TEXT (object); @@ -124,6 +125,16 @@ test_atk_text (ClutterActor *actor) attrs = g_slist_next (attrs); } + atk_text_get_character_extents (cally_text, 0, &x, &y, &width, &height, + ATK_XY_WINDOW); + g_print ("atk_text_get_character_extents (0, window): x=%i y=%i width=%i height=%i\n", + x, y, width, height); + + atk_text_get_character_extents (cally_text, 0, &x, &y, &width, &height, + ATK_XY_SCREEN); + g_print ("atk_text_get_character_extents (0, screen): x=%i y=%i width=%i height=%i\n", + x, y, width, height); + } static void @@ -192,7 +203,7 @@ make_ui (ClutterActor *stage) text_editable_actor = clutter_text_new_full ("Sans Bold 32px", "consectetur adipisicing elit", &color_text); - clutter_actor_set_position (text_editable_actor, 0, 100); + clutter_actor_set_position (text_editable_actor, 20, 100); clutter_text_set_editable (CLUTTER_TEXT (text_editable_actor), TRUE); clutter_text_set_selectable (CLUTTER_TEXT (text_editable_actor), TRUE); clutter_text_set_selection_color (CLUTTER_TEXT (text_editable_actor),