Merge lp:~apinheiro/unity/a11y-emit-children-changed into lp:unity

[Alejandro Piñeiro]

Some comments:

It doesn't emit that signal for all the accessibility object, specifically:

  * NuxViewAccessible
  * NuxLayoutAccessible

But this is because nux::View and nux::Layout lacks signals reporting that a child was added.

Anyway, this branch emit "children-changed" for the most important object, the root, and I found that no manual request of the object was required (so no accessible objects are missing).

So I suggest to close the bug related once this branch gets merged, and managed those objects in a different bug.

[Rodrigo Moya (rodrigo-moya)]

review: Approve

=== modified file 'src/unity-launcher-accessible.cpp'
--- src/unity-launcher-accessible.cpp	2011-03-09 09:44:28 +0000
+++ src/unity-launcher-accessible.cpp	2011-03-14 12:04:17 +0000
@@ -31,6 +31,7 @@
 #include <glib/gi18n.h>
 
 #include "unity-launcher-accessible.h"
+#include "unity-launcher-icon-accessible.h"
 
 #include "unitya11y.h"
 #include "Launcher.h"
@@ -58,6 +59,10 @@
 
 /* private */
 static void on_selection_change_cb (UnityLauncherAccessible *launcher_accessible);
+static void on_icon_added_cb       (LauncherIcon *icon, UnityLauncherAccessible *self);
+static void on_icon_removed_cb     (LauncherIcon *icon, UnityLauncherAccessible *self);
+static void on_order_change_cb     (UnityLauncherAccessible *self);
+static void update_children_index  (UnityLauncherAccessible *self);
 
 
 G_DEFINE_TYPE_WITH_CODE (UnityLauncherAccessible, unity_launcher_accessible,  NUX_TYPE_VIEW_ACCESSIBLE,
@@ -70,6 +75,9 @@
 struct _UnityLauncherAccessiblePrivate
 {
   sigc::connection on_selection_change_connection;
+  sigc::connection on_icon_added_connection;
+  sigc::connection on_icon_removed_connection;
+  sigc::connection on_order_changed_connection;
 };
 
 
@@ -104,6 +112,9 @@
   UnityLauncherAccessible *self = UNITY_LAUNCHER_ACCESSIBLE (object);
 
   self->priv->on_selection_change_connection.disconnect ();
+  self->priv->on_icon_added_connection.disconnect ();
+  self->priv->on_icon_removed_connection.disconnect ();
+  self->priv->on_order_changed_connection.disconnect ();
 
   G_OBJECT_CLASS (unity_launcher_accessible_parent_class)->finalize (object);
 }
@@ -131,6 +142,7 @@
   Launcher *launcher = NULL;
   nux::Object *nux_object = NULL;
   UnityLauncherAccessible *self = NULL;
+  LauncherModel *model = NULL;
 
   ATK_OBJECT_CLASS (unity_launcher_accessible_parent_class)->initialize (accessible, data);
 
@@ -143,6 +155,20 @@
 
   self->priv->on_selection_change_connection  =
     launcher->selection_change.connect (sigc::bind (sigc::ptr_fun (on_selection_change_cb), self));
+
+  model = launcher->GetModel ();
+
+  if (model)
+    {
+      self->priv->on_icon_added_connection =
+        model->icon_added.connect (sigc::bind (sigc::ptr_fun (on_icon_added_cb), self));
+
+      self->priv->on_icon_removed_connection =
+        model->icon_removed.connect (sigc::bind (sigc::ptr_fun (on_icon_removed_cb), self));
+
+      self->priv->on_order_changed_connection =
+        model->order_changed.connect (sigc::bind (sigc::ptr_fun (on_order_change_cb), self));
+    }
 }
 
 static gint
@@ -315,3 +341,100 @@
   g_signal_emit_by_name (ATK_OBJECT (launcher_accessible), "selection-changed");
 }
 
+
+static void
+on_icon_added_cb (LauncherIcon *icon,
+                  UnityLauncherAccessible *self)
+{
+  AtkObject *icon_accessible = NULL;
+  nux::Object *nux_object = NULL;
+  gint index = 0;
+
+  g_return_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (self));
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (self));
+  if (nux_object == NULL) /* state is defunct */
+    return;
+
+  icon_accessible = unity_a11y_get_accessible (icon);
+
+  update_children_index (self);
+
+  index = atk_object_get_index_in_parent (icon_accessible);
+
+  g_debug ("[a11y] icon (%p, %s) added on container (%p,%s) at index %i",
+           icon_accessible, atk_object_get_name (icon_accessible),
+           self, atk_object_get_name ( ATK_OBJECT (self)),
+           index);
+
+  g_signal_emit_by_name (self, "children-changed::add",
+                         index, icon_accessible, NULL);
+}
+
+static void
+on_icon_removed_cb (LauncherIcon *icon,
+                    UnityLauncherAccessible *self)
+{
+  AtkObject *icon_accessible = NULL;
+  nux::Object *nux_object = NULL;
+  gint index = 0;
+
+  g_return_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (self));
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (self));
+  if (nux_object == NULL) /* state is defunct */
+    return;
+
+  icon_accessible = unity_a11y_get_accessible (icon);
+
+  index = atk_object_get_index_in_parent (icon_accessible);
+
+  g_debug ("[a11y] icon (%p, %s) removed on container (%p,%s) at index %i",
+           icon_accessible, atk_object_get_name (icon_accessible),
+           self, atk_object_get_name (ATK_OBJECT (self)),
+           index);
+
+  g_signal_emit_by_name (self, "children-changed::remove",
+                         index, icon_accessible, NULL);
+
+  update_children_index (self);
+}
+
+static void
+update_children_index  (UnityLauncherAccessible *self)
+{
+  gint index = 0;
+  nux::Object *nux_object = NULL;
+  Launcher *launcher = NULL;
+  LauncherModel *launcher_model = NULL;
+  LauncherModel::iterator it;
+  nux::Object *child = NULL;
+  AtkObject *child_accessible = NULL;
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (self));
+  if (!nux_object) /* state is defunct */
+    return;
+
+  launcher = dynamic_cast<Launcher *>(nux_object);
+  launcher_model = launcher->GetModel ();
+
+  if (launcher_model == NULL)
+    return;
+
+  for (it = launcher_model->begin (); it != launcher_model->end (); it++)
+    {
+      child =  dynamic_cast<nux::Object *>(*it);
+      child_accessible = unity_a11y_get_accessible (child);
+
+      unity_launcher_icon_accessible_set_index (UNITY_LAUNCHER_ICON_ACCESSIBLE (child_accessible),
+                                                index++);
+    }
+}
+
+static void
+on_order_change_cb (UnityLauncherAccessible *self)
+{
+  g_return_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (self));
+
+  update_children_index (self);
+}

=== modified file 'src/unity-launcher-icon-accessible.cpp'
--- src/unity-launcher-icon-accessible.cpp	2011-03-09 09:44:28 +0000
+++ src/unity-launcher-icon-accessible.cpp	2011-03-14 12:04:17 +0000
@@ -46,6 +46,7 @@
 static AtkStateSet*  unity_launcher_icon_accessible_ref_state_set (AtkObject *obj);
 static const gchar * unity_launcher_icon_accessible_get_name      (AtkObject *obj);
 static AtkObject *   unity_launcher_icon_accessible_get_parent    (AtkObject *obj);
+static gint          unity_launcher_icon_accessible_get_index_in_parent (AtkObject *obj);
 
 /* AtkComponent.h */
 static void     atk_component_interface_init                        (AtkComponentIface *iface);
@@ -79,6 +80,7 @@
   /* Cached values (used to avoid extra notifications) */
   gboolean selected;
   gboolean parent_focused;
+  gboolean index_in_parent;
 
   guint on_parent_selection_change_id;
   guint on_parent_focus_event_id;
@@ -97,6 +99,7 @@
   atk_class->get_name = unity_launcher_icon_accessible_get_name;
   atk_class->ref_state_set = unity_launcher_icon_accessible_ref_state_set;
   atk_class->get_parent = unity_launcher_icon_accessible_get_parent;
+  atk_class->get_index_in_parent = unity_launcher_icon_accessible_get_index_in_parent;
 
   g_type_class_add_private (gobject_class, sizeof (UnityLauncherIconAccessiblePrivate));
 }
@@ -281,6 +284,10 @@
   gboolean found = FALSE;
 
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (self));
+
+  if (nux_object == NULL) /* state is defunct */
+    return;
+
   icon = dynamic_cast<LauncherIcon *>(nux_object);
   launcher = icon->GetLauncher ();
 
@@ -412,3 +419,21 @@
 
   atk_object_notify_state_change (accessible, ATK_STATE_FOCUSED, focus_in);
 }
+
+/* Public */
+static gint
+unity_launcher_icon_accessible_get_index_in_parent (AtkObject *obj)
+{
+  g_return_val_if_fail (UNITY_IS_LAUNCHER_ICON_ACCESSIBLE (obj), -1);
+
+  return UNITY_LAUNCHER_ICON_ACCESSIBLE (obj)->priv->index_in_parent;
+}
+
+void
+unity_launcher_icon_accessible_set_index (UnityLauncherIconAccessible *self,
+                                          gint index)
+{
+  g_return_if_fail (UNITY_IS_LAUNCHER_ICON_ACCESSIBLE (self));
+
+  self->priv->index_in_parent = index;
+}

=== modified file 'src/unity-launcher-icon-accessible.h'
--- src/unity-launcher-icon-accessible.h	2011-02-27 00:17:03 +0000
+++ src/unity-launcher-icon-accessible.h	2011-03-14 12:04:17 +0000
@@ -52,6 +52,9 @@
 GType      unity_launcher_icon_accessible_get_type (void);
 AtkObject *unity_launcher_icon_accessible_new      (nux::Object *object);
 
+void       unity_launcher_icon_accessible_set_index (UnityLauncherIconAccessible *self,
+                                                     gint index);
+
 G_END_DECLS
 
 #endif /* __UNITY_LAUNCHER_ICON_ACCESSIBLE_H__ */

=== modified file 'src/unity-root-accessible.cpp'
--- src/unity-root-accessible.cpp	2011-02-27 16:16:02 +0000
+++ src/unity-root-accessible.cpp	2011-03-14 12:04:17 +0000
@@ -175,6 +175,7 @@
                                   nux::BaseWindow *window)
 {
   AtkObject *window_accessible = NULL;
+  gint index = 0;
 
   g_return_if_fail (UNITY_IS_ROOT_ACCESSIBLE (self));
 
@@ -183,4 +184,9 @@
 
   self->priv->window_list =
     g_slist_append (self->priv->window_list, window_accessible);
+
+  index = g_slist_index (self->priv->window_list, window_accessible);
+
+  g_signal_emit_by_name (self, "children-changed::add",
+                         index, window_accessible, NULL);
 }