[gtk+] Drop now unused gail_misc API
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Drop now unused gail_misc API
- Date: Sat, 9 Jul 2011 00:14:23 +0000 (UTC)
commit 64d3314a642cb66f025f264789d73bf8c413e498
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 8 20:12:45 2011 -0400
Drop now unused gail_misc API
gtk/a11y/gailmisc.c | 363 ---------------------------------------------------
gtk/a11y/gailmisc.h | 12 --
2 files changed, 0 insertions(+), 375 deletions(-)
---
diff --git a/gtk/a11y/gailmisc.c b/gtk/a11y/gailmisc.c
index c937ee0..9bee054 100644
--- a/gtk/a11y/gailmisc.c
+++ b/gtk/a11y/gailmisc.c
@@ -155,369 +155,6 @@ gail_misc_get_index_at_point_in_layout (GtkWidget *widget,
return index;
}
-static AtkAttributeSet*
-gail_misc_add_attribute (AtkAttributeSet *attrib_set,
- AtkTextAttribute attr,
- gchar *value)
-{
- AtkAttributeSet *return_set;
- AtkAttribute *at = g_malloc (sizeof (AtkAttribute));
- at->name = g_strdup (atk_text_attribute_get_name (attr));
- at->value = value;
- return_set = g_slist_prepend(attrib_set, at);
- return return_set;
-}
-
-/**
- * gail_misc_layout_get_run_attributes:
- * @attrib_set: The #AtkAttributeSet to add the attribute to
- * @layout: The PangoLayout from which the attributes will be obtained
- * @text: The text
- * @offset: The offset at which the attributes are required
- * @start_offset: The start offset of the current run
- * @end_offset: The end offset of the current run
- *
- * Adds the attributes for the run starting at offset to the specified
- * attribute set.
- *
- * Returns: A pointer to the #AtkAttributeSet.
- **/
-AtkAttributeSet*
-gail_misc_layout_get_run_attributes (AtkAttributeSet *attrib_set,
- PangoLayout *layout,
- const gchar *text,
- gint offset,
- gint *start_offset,
- gint *end_offset)
-{
- PangoAttrIterator *iter;
- PangoAttrList *attr;
- PangoAttrString *pango_string;
- PangoAttrInt *pango_int;
- PangoAttrColor *pango_color;
- PangoAttrLanguage *pango_lang;
- PangoAttrFloat *pango_float;
- gint index, start_index, end_index;
- gboolean is_next = TRUE;
- gchar *value = NULL;
- glong len;
-
- len = g_utf8_strlen (text, -1);
- /* Grab the attributes of the PangoLayout, if any */
- if ((attr = pango_layout_get_attributes (layout)) == NULL)
- {
- *start_offset = 0;
- *end_offset = len;
- return attrib_set;
- }
- iter = pango_attr_list_get_iterator (attr);
- /* Get invariant range offsets */
- /* If offset out of range, set offset in range */
- if (offset > len)
- offset = len;
- else if (offset < 0)
- offset = 0;
-
- index = g_utf8_offset_to_pointer (text, offset) - text;
- pango_attr_iterator_range (iter, &start_index, &end_index);
- while (is_next)
- {
- if (index >= start_index && index < end_index)
- {
- *start_offset = g_utf8_pointer_to_offset (text,
- text + start_index);
- if (end_index == G_MAXINT)
- /* Last iterator */
- end_index = len;
-
- *end_offset = g_utf8_pointer_to_offset (text,
- text + end_index);
- break;
- }
- is_next = pango_attr_iterator_next (iter);
- pango_attr_iterator_range (iter, &start_index, &end_index);
- }
- /* Get attributes */
- if ((pango_string = (PangoAttrString*) pango_attr_iterator_get (iter,
- PANGO_ATTR_FAMILY)) != NULL)
- {
- value = g_strdup_printf("%s", pango_string->value);
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_FAMILY_NAME,
- value);
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_STYLE)) != NULL)
- {
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_STYLE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STYLE, pango_int->value)));
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_WEIGHT)) != NULL)
- {
- value = g_strdup_printf("%i", pango_int->value);
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_WEIGHT,
- value);
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_VARIANT)) != NULL)
- {
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_VARIANT,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_VARIANT, pango_int->value)));
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_STRETCH)) != NULL)
- {
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_STRETCH,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STRETCH, pango_int->value)));
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_SIZE)) != NULL)
- {
- value = g_strdup_printf("%i", pango_int->value / PANGO_SCALE);
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_SIZE,
- value);
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_UNDERLINE)) != NULL)
- {
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_UNDERLINE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_UNDERLINE, pango_int->value)));
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_STRIKETHROUGH)) != NULL)
- {
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_STRIKETHROUGH,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STRIKETHROUGH, pango_int->value)));
- }
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
- PANGO_ATTR_RISE)) != NULL)
- {
- value = g_strdup_printf("%i", pango_int->value);
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_RISE,
- value);
- }
- if ((pango_lang = (PangoAttrLanguage*) pango_attr_iterator_get (iter,
- PANGO_ATTR_LANGUAGE)) != NULL)
- {
- value = g_strdup( pango_language_to_string( pango_lang->value));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_LANGUAGE,
- value);
- }
- if ((pango_float = (PangoAttrFloat*) pango_attr_iterator_get (iter,
- PANGO_ATTR_SCALE)) != NULL)
- {
- value = g_strdup_printf("%g", pango_float->value);
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_SCALE,
- value);
- }
- if ((pango_color = (PangoAttrColor*) pango_attr_iterator_get (iter,
- PANGO_ATTR_FOREGROUND)) != NULL)
- {
- value = g_strdup_printf ("%u,%u,%u",
- pango_color->color.red,
- pango_color->color.green,
- pango_color->color.blue);
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_FG_COLOR,
- value);
- }
- if ((pango_color = (PangoAttrColor*) pango_attr_iterator_get (iter,
- PANGO_ATTR_BACKGROUND)) != NULL)
- {
- value = g_strdup_printf ("%u,%u,%u",
- pango_color->color.red,
- pango_color->color.green,
- pango_color->color.blue);
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_BG_COLOR,
- value);
- }
- pango_attr_iterator_destroy (iter);
- return attrib_set;
-}
-
-/**
- * gail_misc_get_default_attributes:
- * @attrib_set: The #AtkAttributeSet to add the attribute to
- * @layout: The PangoLayout from which the attributes will be obtained
- * @widget: The GtkWidget for which the default attributes are required.
- *
- * Adds the default attributes to the specified attribute set.
- *
- * Returns: A pointer to the #AtkAttributeSet.
- **/
-AtkAttributeSet*
-gail_misc_get_default_attributes (AtkAttributeSet *attrib_set,
- PangoLayout *layout,
- GtkWidget *widget)
-{
- PangoContext *context;
- GtkStyleContext *style_context;
- gint int_value;
- PangoWrapMode mode;
- GdkRGBA color;
- gchar *value;
-
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_DIRECTION,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_DIRECTION,
- gtk_widget_get_direction (widget))));
-
- context = pango_layout_get_context (layout);
- if (context)
- {
- PangoLanguage* language;
- PangoFontDescription* font;
-
- language = pango_context_get_language (context);
- if (language)
- {
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_LANGUAGE,
- g_strdup (pango_language_to_string (language)));
- }
- font = pango_context_get_font_description (context);
- if (font)
- {
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_STYLE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STYLE,
- pango_font_description_get_style (font))));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_VARIANT,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_VARIANT,
- pango_font_description_get_variant (font))));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_STRETCH,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STRETCH,
- pango_font_description_get_stretch (font))));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_FAMILY_NAME,
- g_strdup (pango_font_description_get_family (font)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_WEIGHT,
- g_strdup_printf ("%d",
- pango_font_description_get_weight (font)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_SIZE,
- g_strdup_printf ("%i",
- pango_font_description_get_size (font) / PANGO_SCALE));
- }
- }
- if (pango_layout_get_justify (layout))
- {
- int_value = 3;
- }
- else
- {
- PangoAlignment align;
-
- align = pango_layout_get_alignment (layout);
- if (align == PANGO_ALIGN_LEFT)
- int_value = 0;
- else if (align == PANGO_ALIGN_CENTER)
- int_value = 2;
- else /* if (align == PANGO_ALIGN_RIGHT) */
- int_value = 1;
- }
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_JUSTIFICATION,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_JUSTIFICATION,
- int_value)));
- mode = pango_layout_get_wrap (layout);
- if (mode == PANGO_WRAP_WORD)
- int_value = 2;
- else /* if (mode == PANGO_WRAP_CHAR) */
- int_value = 1;
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_WRAP_MODE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_WRAP_MODE,
- int_value)));
-
- style_context = gtk_widget_get_style_context (widget);
-
- gtk_style_context_get_background_color (style_context, 0, &color);
- value = g_strdup_printf ("%u,%u,%u",
- (guint) ceil (color.red * 65536 - color.red),
- (guint) ceil (color.green * 65536 - color.green),
- (guint) ceil (color.blue * 65536 - color.blue));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_BG_COLOR,
- value);
-
- gtk_style_context_get_color (style_context, 0, &color);
- value = g_strdup_printf ("%u,%u,%u",
- (guint) ceil (color.red * 65536 - color.red),
- (guint) ceil (color.green * 65536 - color.green),
- (guint) ceil (color.blue * 65536 - color.blue));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_FG_COLOR,
- value);
-
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_FG_STIPPLE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_FG_STIPPLE,
- 0)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_BG_STIPPLE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_BG_STIPPLE,
- 0)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_STRIKETHROUGH,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STRIKETHROUGH,
- 0)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_UNDERLINE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_UNDERLINE,
- 0)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_RISE,
- g_strdup_printf ("%i", 0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_SCALE,
- g_strdup_printf ("%g", 1.0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_BG_FULL_HEIGHT,
- g_strdup_printf ("%i", 0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP,
- g_strdup_printf ("%i", 0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_PIXELS_BELOW_LINES,
- g_strdup_printf ("%i", 0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_PIXELS_ABOVE_LINES,
- g_strdup_printf ("%i", 0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_EDITABLE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_EDITABLE,
- 0)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_INVISIBLE,
- g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_INVISIBLE,
- 0)));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_INDENT,
- g_strdup_printf ("%i", 0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_RIGHT_MARGIN,
- g_strdup_printf ("%i", 0));
- attrib_set = gail_misc_add_attribute (attrib_set,
- ATK_TEXT_ATTR_LEFT_MARGIN,
- g_strdup_printf ("%i", 0));
- return attrib_set;
-}
/**
* gail_misc_get_origins:
diff --git a/gtk/a11y/gailmisc.h b/gtk/a11y/gailmisc.h
index 67c60af..d517bba 100644
--- a/gtk/a11y/gailmisc.h
+++ b/gtk/a11y/gailmisc.h
@@ -26,18 +26,6 @@
G_BEGIN_DECLS
-AtkAttributeSet* gail_misc_layout_get_run_attributes
- (AtkAttributeSet *attrib_set,
- PangoLayout *layout,
- const gchar *text,
- gint offset,
- gint *start_offset,
- gint *end_offset);
-
-AtkAttributeSet* gail_misc_get_default_attributes (AtkAttributeSet *attrib_set,
- PangoLayout *layout,
- GtkWidget *widget);
-
void gail_misc_get_extents_from_pango_rectangle
(GtkWidget *widget,
PangoRectangle *char_rect,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]