[egg-list-box] flow-box: Add an accessible implementation
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [egg-list-box] flow-box: Add an accessible implementation
- Date: Fri, 22 Feb 2013 06:29:26 +0000 (UTC)
commit 83d8a147720cb90a15b87fc160b9110e4719539a
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Feb 21 15:57:38 2013 +0100
flow-box: Add an accessible implementation
This is almost a 1-1 copy of EggListBoxAccessible.
Makefile.am | 3 +-
egg-flow-box-accessible.c | 253 +++++++++++++++++++++++++++++++++++++++++++++
egg-flow-box-accessible.h | 55 ++++++++++
egg-flow-box.c | 7 ++
4 files changed, 317 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 245f8d2..282ff54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,8 @@ libegglistbox_la_SOURCES = \
libegglistbox_la_LIBADD = $(LISTBOX_LIBS)
libeggflowbox_la_SOURCES = \
- egg-flow-box.c egg-flow-box.h
+ egg-flow-box.c egg-flow-box.h \
+ egg-flow-box-accessible.c egg-flow-box-accessible.h
libeggflowbox_la_LIBADD = $(LISTBOX_LIBS)
diff --git a/egg-flow-box-accessible.c b/egg-flow-box-accessible.c
new file mode 100644
index 0000000..7b244c3
--- /dev/null
+++ b/egg-flow-box-accessible.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "egg-flow-box.h"
+#include "egg-flow-box-accessible.h"
+
+static void atk_selection_interface_init (AtkSelectionIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (EggFlowBoxAccessible, egg_flow_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
+
+static void
+egg_flow_box_accessible_init (EggFlowBoxAccessible *accessible)
+{
+}
+
+static void
+egg_flow_box_accessible_initialize (AtkObject *obj,
+ gpointer data)
+{
+ ATK_OBJECT_CLASS (egg_flow_box_accessible_parent_class)->initialize (obj, data);
+
+ obj->role = ATK_ROLE_LIST_BOX;
+}
+
+static AtkStateSet*
+egg_flow_box_accessible_ref_state_set (AtkObject *obj)
+{
+ AtkStateSet *state_set;
+ GtkWidget *widget;
+
+ state_set = ATK_OBJECT_CLASS (egg_flow_box_accessible_parent_class)->ref_state_set (obj);
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
+
+ if (widget != NULL)
+ atk_state_set_add_state (state_set, ATK_STATE_MANAGES_DESCENDANTS);
+
+ return state_set;
+}
+
+static void
+egg_flow_box_accessible_class_init (EggFlowBoxAccessibleClass *klass)
+{
+ AtkObjectClass *object_class = ATK_OBJECT_CLASS (klass);
+
+ object_class->initialize = egg_flow_box_accessible_initialize;
+ object_class->ref_state_set = egg_flow_box_accessible_ref_state_set;
+}
+
+static gboolean
+egg_flow_box_accessible_add_selection (AtkSelection *selection,
+ gint idx)
+{
+ GtkWidget *box;
+ GList *children;
+ GtkWidget *child;
+
+ box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+ if (box == NULL)
+ return FALSE;
+
+ children = gtk_container_get_children (GTK_CONTAINER (box));
+ child = g_list_nth_data (children, idx);
+ g_list_free (children);
+ if (child)
+ {
+ egg_flow_box_select_child (EGG_FLOW_BOX (box), child);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static gboolean
+egg_flow_box_accessible_remove_selection (AtkSelection *selection,
+ gint idx)
+{
+ GtkWidget *box;
+ GList *children;
+ GtkWidget *child;
+
+ box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+ if (box == NULL)
+ return FALSE;
+
+ children = gtk_container_get_children (GTK_CONTAINER (box));
+ child = g_list_nth_data (children, idx);
+ g_list_free (children);
+ if (child)
+ {
+ egg_flow_box_unselect_child (EGG_FLOW_BOX (box), child);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static gboolean
+egg_flow_box_accessible_clear_selection (AtkSelection *selection)
+{
+ GtkWidget *box;
+
+ box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+ if (box == NULL)
+ return FALSE;
+
+ egg_flow_box_unselect_all (EGG_FLOW_BOX (box));
+ return TRUE;
+}
+
+static gboolean
+egg_flow_box_accessible_select_all (AtkSelection *selection)
+{
+ GtkWidget *box;
+
+ box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+ if (box == NULL)
+ return FALSE;
+
+ egg_flow_box_select_all (EGG_FLOW_BOX (box));
+ return TRUE;
+}
+
+typedef struct
+{
+ gint idx;
+ GtkWidget *child;
+} FindSelectedData;
+
+static void
+find_selected_child (EggFlowBox *box,
+ GtkWidget *child,
+ gpointer data)
+{
+ FindSelectedData *d = data;
+
+ if (d->idx == 0)
+ {
+ if (d->child == NULL)
+ d->child = child;
+ }
+ else
+ d->idx -= 1;
+}
+
+static AtkObject *
+egg_flow_box_accessible_ref_selection (AtkSelection *selection,
+ gint idx)
+{
+ GtkWidget *box;
+ GtkWidget *widget;
+ AtkObject *accessible;
+ FindSelectedData data;
+
+ box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+ if (box == NULL)
+ return NULL;
+
+ data.idx = idx;
+ data.child = NULL;
+ egg_flow_box_selected_foreach (EGG_FLOW_BOX (box), find_selected_child, &data);
+
+ if (data.child == NULL)
+ return NULL;
+
+ accessible = gtk_widget_get_accessible (data.child);
+ g_object_ref (accessible);
+ return accessible;
+}
+
+static void
+count_selected (EggFlowBox *box,
+ GtkWidget *child,
+ gpointer data)
+{
+ gint *count = data;
+ *count += 1;
+}
+
+static gint
+egg_flow_box_accessible_get_selection_count (AtkSelection *selection)
+{
+ GtkWidget *box;
+ gint count;
+
+ box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+ if (box == NULL)
+ return 0;
+
+ count = 0;
+ egg_flow_box_selected_foreach (EGG_FLOW_BOX (box), count_selected, &count);
+
+ return count;
+}
+
+static gboolean
+egg_flow_box_accessible_is_child_selected (AtkSelection *selection,
+ gint idx)
+{
+ GtkWidget *box;
+ GtkWidget *widget;
+ GList *children;
+ GtkWidget *child;
+
+ box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
+ if (box == NULL)
+ return FALSE;
+
+ children = gtk_container_get_children (GTK_CONTAINER (box));
+ child = g_list_nth_data (children, idx);
+ g_list_free (children);
+ return egg_flow_box_is_child_selected (EGG_FLOW_BOX (box), child);
+}
+
+static void atk_selection_interface_init (AtkSelectionIface *iface)
+{
+ iface->add_selection = egg_flow_box_accessible_add_selection;
+ iface->clear_selection = egg_flow_box_accessible_clear_selection;
+ iface->ref_selection = egg_flow_box_accessible_ref_selection;
+ iface->get_selection_count = egg_flow_box_accessible_get_selection_count;
+ iface->is_child_selected = egg_flow_box_accessible_is_child_selected;
+}
+
+void
+_egg_flow_box_accessible_selection_changed (GtkWidget *box)
+{
+ AtkObject *accessible;
+ accessible = gtk_widget_get_accessible (box);
+ g_signal_emit_by_name (accessible, "selection-changed");
+}
+
+void
+_egg_flow_box_accessible_update_cursor (GtkWidget *box,
+ GtkWidget *child)
+{
+ AtkObject *accessible;
+ AtkObject *descendant;
+ accessible = gtk_widget_get_accessible (box);
+ descendant = child ? gtk_widget_get_accessible (child) : NULL;
+ g_signal_emit_by_name (accessible, "active-descendant-changed", descendant);
+}
diff --git a/egg-flow-box-accessible.h b/egg-flow-box-accessible.h
new file mode 100644
index 0000000..779aee4
--- /dev/null
+++ b/egg-flow-box-accessible.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __EGG_FLOW_BOX_ACCESSIBLE_H__
+#define __EGG_FLOW_BOX_ACCESSIBLE_H__
+
+#include <gtk/gtk-a11y.h>
+
+G_BEGIN_DECLS
+
+#define EGG_TYPE_FLOW_BOX_ACCESSIBLE (egg_flow_box_accessible_get_type ())
+#define EGG_FLOW_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
EGG_TYPE_FLOW_BOX_ACCESSIBLE, EggFlowBoxAccessible))
+#define EGG_FLOW_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
EGG_TYPE_FLOW_BOX_ACCESSIBLE, EggFlowBoxAccessibleClass))
+#define EGG_IS_FLOW_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
EGG_TYPE_FLOW_BOX_ACCESSIBLE))
+#define EGG_IS_FLOW_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
EGG_TYPE_FLOW_BOX_ACCESSIBLE))
+#define EGG_FLOW_BOX_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
EGG_TYPE_FLOW_BOX_ACCESSIBLE, EggFlowBoxAccessibleClass))
+
+typedef struct _EggFlowBoxAccessible EggFlowBoxAccessible;
+typedef struct _EggFlowBoxAccessibleClass EggFlowBoxAccessibleClass;
+typedef struct _EggFlowBoxAccessiblePrivate EggFlowBoxAccessiblePrivate;
+
+struct _EggFlowBoxAccessible
+{
+ GtkContainerAccessible parent;
+
+ EggFlowBoxAccessiblePrivate *priv;
+};
+
+struct _EggFlowBoxAccessibleClass
+{
+ GtkContainerAccessibleClass parent_class;
+};
+
+GType egg_flow_box_accessible_get_type (void);
+
+void _egg_flow_box_accessible_selection_changed (GtkWidget *box);
+void _egg_flow_box_accessible_update_cursor (GtkWidget *box, GtkWidget *child);
+
+G_END_DECLS
+
+#endif /* __EGG_FLOW_BOX_ACCESSIBLE_H__ */
diff --git a/egg-flow-box.c b/egg-flow-box.c
index 1a0dc32..884ab68 100644
--- a/egg-flow-box.c
+++ b/egg-flow-box.c
@@ -42,6 +42,8 @@
#include <gtk/gtk.h>
#include "egg-flow-box.h"
+#include "egg-flow-box-accessible.h"
+
/* This already exists in gtk as _gtk_marshal_VOID__ENUM_INT, inline it here for now
to avoid separate marshallers file */
static void
@@ -2263,6 +2265,8 @@ egg_flow_box_update_cursor (EggFlowBox *box,
priv->cursor_child->area.y + allocation.y,
priv->cursor_child->area.y + allocation.y +
priv->cursor_child->area.height);
}
+
+ _egg_flow_box_accessible_update_cursor (GTK_WIDGET (box), child_info ? child_info->widget : NULL);
}
static void
@@ -3123,6 +3127,7 @@ egg_flow_box_finalize (GObject *obj)
static void
egg_flow_box_real_selected_children_changed (EggFlowBox *box)
{
+ _egg_flow_box_accessible_selection_changed (GTK_WIDGET (box));
}
static void
@@ -3393,6 +3398,8 @@ egg_flow_box_class_init (EggFlowBoxClass *class)
"unselect-all", 0);
g_type_class_add_private (class, sizeof (EggFlowBoxPrivate));
+
+ gtk_widget_class_set_accessible_type (widget_class, EGG_TYPE_FLOW_BOX_ACCESSIBLE);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]