[gtk/ebassi/new-a11y: 65/71] a11y: Allow storing list of references in GtkAccessibleValue
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ebassi/new-a11y: 65/71] a11y: Allow storing list of references in GtkAccessibleValue
- Date: Wed, 22 Jul 2020 12:27:14 +0000 (UTC)
commit 27abe80084df569b93dcc64d2876d1becb60a823
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Jul 22 13:07:36 2020 +0100
a11y: Allow storing list of references in GtkAccessibleValue
It's one of the fundamental accessible value types in ARIA.
gtk/gtkaccessiblevalue.c | 157 ++++++++++++++++++++++++++++++++++++++--
gtk/gtkaccessiblevalueprivate.h | 6 +-
2 files changed, 157 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkaccessiblevalue.c b/gtk/gtkaccessiblevalue.c
index 4ccd8a837d..835ae89cc2 100644
--- a/gtk/gtkaccessiblevalue.c
+++ b/gtk/gtkaccessiblevalue.c
@@ -462,6 +462,121 @@ gtk_reference_accessible_value_get (const GtkAccessibleValue *value)
return self->ref;
}
+typedef struct {
+ GtkAccessibleValue parent;
+
+ GList *refs;
+} GtkReferenceListAccessibleValue;
+
+static void
+remove_weak_ref_from_list (gpointer data,
+ GObject *old_reference)
+{
+ GtkReferenceListAccessibleValue *self = data;
+
+ GList *item = g_list_find (self->refs, old_reference);
+
+ if (item != NULL)
+ self->refs = g_list_remove_link (self->refs, item);
+
+ g_list_free (item);
+}
+
+static void
+gtk_reference_list_accessible_value_finalize (GtkAccessibleValue *value)
+{
+ GtkReferenceListAccessibleValue *self = (GtkReferenceListAccessibleValue *) value;
+
+ for (GList *l = self->refs; l != NULL; l = l->next)
+ g_object_weak_unref (G_OBJECT (l->data), remove_weak_ref_from_list, self);
+
+ g_list_free (self->refs);
+}
+
+static gboolean
+gtk_reference_list_accessible_value_equal (const GtkAccessibleValue *value_a,
+ const GtkAccessibleValue *value_b)
+{
+ const GtkReferenceListAccessibleValue *self_a = (GtkReferenceListAccessibleValue *) value_a;
+ const GtkReferenceListAccessibleValue *self_b = (GtkReferenceListAccessibleValue *) value_b;
+
+ if (g_list_length (self_a->refs) != g_list_length (self_b->refs))
+ return FALSE;
+
+ for (GList *l = self_a->refs; l != NULL; l = l->next)
+ {
+ if (g_list_find (self_b->refs, l->data) == NULL)
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static void
+gtk_reference_list_accessible_value_print (const GtkAccessibleValue *value,
+ GString *buffer)
+{
+ const GtkReferenceListAccessibleValue *self = (GtkReferenceListAccessibleValue *) value;
+
+ if (self->refs == NULL)
+ {
+ g_string_append (buffer, "<null>");
+ return;
+ }
+
+ for (GList *l = self->refs; l != NULL; l = l->next)
+ {
+ g_string_append_printf (buffer, "%s<%p>",
+ G_OBJECT_TYPE_NAME (l->data),
+ l->data);
+ }
+}
+
+static const GtkAccessibleValueClass GTK_REFERENCE_LIST_ACCESSIBLE_VALUE = {
+ .type = GTK_ACCESSIBLE_VALUE_TYPE_REFERENCE_LIST,
+ .type_name = "GtkReferenceListAccessibleValue",
+ .instance_size = sizeof (GtkReferenceListAccessibleValue),
+ .finalize = gtk_reference_list_accessible_value_finalize,
+ .equal = gtk_reference_list_accessible_value_equal,
+ .print = gtk_reference_list_accessible_value_print,
+};
+
+/*< private >
+ * gtk_reference_list_accessible_value_new:
+ * @value: (element-type GtkAccessible) (transfer full): a list of accessible objects
+ *
+ * Creates a new #GtkAccessible that stores a list of references to #GtkAccessible objects.
+ *
+ * Returns: (transfer full): the newly created #GtkAccessible
+ */
+GtkAccessibleValue *
+gtk_reference_list_accessible_value_new (GList *value)
+{
+ GtkAccessibleValue *res = gtk_accessible_value_alloc (>K_REFERENCE_LIST_ACCESSIBLE_VALUE);
+
+ GtkReferenceListAccessibleValue *self = (GtkReferenceListAccessibleValue *) res;
+
+ self->refs = value;
+ if (self->refs != NULL)
+ {
+ for (GList *l = self->refs; l != NULL; l = l->next)
+ g_object_weak_ref (l->data, remove_weak_ref_from_list, self);
+ }
+
+ return res;
+}
+
+GList *
+gtk_reference_list_accessible_value_get (const GtkAccessibleValue *value)
+{
+ GtkReferenceListAccessibleValue *self = (GtkReferenceListAccessibleValue *) value;
+
+ g_return_val_if_fail (value != NULL, 0);
+ g_return_val_if_fail (value->value_class == >K_REFERENCE_LIST_ACCESSIBLE_VALUE, 0);
+
+ return self->refs;
+}
+
/* }}} */
/* {{{ Collection API */
@@ -490,6 +605,9 @@ typedef enum {
/* reference */
GTK_ACCESSIBLE_COLLECT_REFERENCE,
+ /* references list */
+ GTK_ACCESSIBLE_COLLECT_REFERENCE_LIST,
+
/* allows collecting GTK_ACCESSIBLE_VALUE_UNDEFINED; implied
* by GTK_ACCESSIBLE_COLLECT_TRISTATE
*/
@@ -765,7 +883,8 @@ typedef GtkAccessibleValue * (* GtkAccessibleValueTristateCtor) (int value);
typedef GtkAccessibleValue * (* GtkAccessibleValueEnumCtor) (int value);
typedef GtkAccessibleValue * (* GtkAccessibleValueNumberCtor) (double value);
typedef GtkAccessibleValue * (* GtkAccessibleValueStringCtor) (const char *value);
-typedef GtkAccessibleValue * (* GtkAccessibleValueRefCtor) (gpointer value);
+typedef GtkAccessibleValue * (* GtkAccessibleValueRefCtor) (GtkAccessible *value);
+typedef GtkAccessibleValue * (* GtkAccessibleValueRefListCtor) (GList *value);
/*< private >
* gtk_accessible_value_get_default_for_state:
@@ -917,8 +1036,8 @@ gtk_accessible_value_collect_valist (const GtkAccessibleCollect *cstate,
case GTK_ACCESSIBLE_COLLECT_REFERENCE:
{
- GtkAccessibleValueStringCtor ctor =
- (GtkAccessibleValueStringCtor) cstate->ctor;
+ GtkAccessibleValueRefCtor ctor =
+ (GtkAccessibleValueRefCtor) cstate->ctor;
gpointer value = va_arg (*args, gpointer);
@@ -929,6 +1048,20 @@ gtk_accessible_value_collect_valist (const GtkAccessibleCollect *cstate,
}
break;
+ case GTK_ACCESSIBLE_COLLECT_REFERENCE_LIST:
+ {
+ GtkAccessibleValueRefListCtor ctor =
+ (GtkAccessibleValueRefListCtor) cstate->ctor;
+
+ GList *value = va_arg (*args, gpointer);
+
+ if (ctor == NULL)
+ res = gtk_reference_list_accessible_value_new (value);
+ else
+ res = (* ctor) (value);
+ }
+ break;
+
case GTK_ACCESSIBLE_COLLECT_UNDEFINED:
case GTK_ACCESSIBLE_COLLECT_INVALID:
default:
@@ -1051,8 +1184,8 @@ gtk_accessible_value_collect_value (const GtkAccessibleCollect *cstate,
case GTK_ACCESSIBLE_COLLECT_REFERENCE:
{
- GtkAccessibleValueStringCtor ctor =
- (GtkAccessibleValueStringCtor) cstate->ctor;
+ GtkAccessibleValueRefCtor ctor =
+ (GtkAccessibleValueRefCtor) cstate->ctor;
gpointer value = g_value_get_object (value_);
@@ -1063,6 +1196,20 @@ gtk_accessible_value_collect_value (const GtkAccessibleCollect *cstate,
}
break;
+ case GTK_ACCESSIBLE_COLLECT_REFERENCE_LIST:
+ {
+ GtkAccessibleValueRefListCtor ctor =
+ (GtkAccessibleValueRefListCtor) cstate->ctor;
+
+ GList *value = g_value_get_pointer (value_);
+
+ if (ctor == NULL)
+ res = gtk_reference_list_accessible_value_new (value);
+ else
+ res = (* ctor) (value);
+ }
+ break;
+
case GTK_ACCESSIBLE_COLLECT_UNDEFINED:
case GTK_ACCESSIBLE_COLLECT_INVALID:
default:
diff --git a/gtk/gtkaccessiblevalueprivate.h b/gtk/gtkaccessiblevalueprivate.h
index 30648d1fb0..9405c872ef 100644
--- a/gtk/gtkaccessiblevalueprivate.h
+++ b/gtk/gtkaccessiblevalueprivate.h
@@ -42,7 +42,8 @@ typedef enum {
GTK_ACCESSIBLE_VALUE_TYPE_INTEGER,
GTK_ACCESSIBLE_VALUE_TYPE_NUMBER,
GTK_ACCESSIBLE_VALUE_TYPE_STRING,
- GTK_ACCESSIBLE_VALUE_TYPE_REFERENCE
+ GTK_ACCESSIBLE_VALUE_TYPE_REFERENCE,
+ GTK_ACCESSIBLE_VALUE_TYPE_REFERENCE_LIST
} GtkAccessibleValueType;
struct _GtkAccessibleValue
@@ -130,6 +131,9 @@ const char * gtk_string_accessible_value_get (const G
GtkAccessibleValue * gtk_reference_accessible_value_new (GtkAccessible *value);
GtkAccessible * gtk_reference_accessible_value_get (const GtkAccessibleValue *value);
+GtkAccessibleValue * gtk_reference_list_accessible_value_new (GList *value);
+GList * gtk_reference_list_accessible_value_get (const GtkAccessibleValue *value);
+
/* Token values */
GtkAccessibleValue * gtk_invalid_accessible_value_new (GtkAccessibleInvalidState value);
GtkAccessibleInvalidState gtk_invalid_accessible_value_get (const GtkAccessibleValue *value);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]