Merge lp:~apinheiro/unity/a11y-switcher into lp:unity

[Alejandro Piñeiro]

[Alejandro Piñeiro (apinheiro)]

BTW, this branch is already being tested by the users, as it is included on this branch:

https://launchpad.net/~apinheiro/+archive/unity-extra-a11y

I already received some positive feedback from ubuntu-accessibility mailing list

[Alex Launi (alexlauni)]

Again, sorry for the large delay. This looks great.

review: Approve

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~apinheiro/unity/a11y-improve-window-event-emission into lp:unity.

=== modified file 'plugins/unityshell/src/nux-area-accessible.cpp'
--- plugins/unityshell/src/nux-area-accessible.cpp	2011-11-07 22:37:27 +0000
+++ plugins/unityshell/src/nux-area-accessible.cpp	2011-11-07 22:37:27 +0000
@@ -177,9 +177,10 @@
   atk_component_add_focus_handler(ATK_COMPONENT(accessible),
                                   nux_area_accessible_focus_handler);
 
-  /* NOTE: we can't search for the parent window on initilization, or
-     we could enter on a infinite loop, as this is called on the
-     initalization */
+  /* NOTE: we can't search for the parent window on initilization as a
+     general rule, or we could enter on a infinite loop. At area this
+     is done on the focus event. On the Switcher this is done on their
+     initialize itself */
 }
 
 static AtkObject*

=== modified file 'plugins/unityshell/src/nux-area-accessible.h'
--- plugins/unityshell/src/nux-area-accessible.h	2011-08-01 17:53:14 +0000
+++ plugins/unityshell/src/nux-area-accessible.h	2011-11-07 22:37:27 +0000
@@ -49,7 +49,10 @@
   NuxObjectAccessibleClass parent_class;
 
   /*
-   * Virtual method to check if there is any pending state change notification
+   * Usually objects shouldn emit events like focus or selection
+   * changes until the toplevel window is active. This method is
+   * called when the toplevel window became active. Redefine it if you
+   * need to check any pending state change notification.
    */
   gboolean(*check_pending_notification)(NuxAreaAccessible* self);
 

=== modified file 'plugins/unityshell/src/nux-view-accessible.cpp'
--- plugins/unityshell/src/nux-view-accessible.cpp	2011-11-07 22:37:27 +0000
+++ plugins/unityshell/src/nux-view-accessible.cpp	2011-11-07 22:37:27 +0000
@@ -45,13 +45,13 @@
 static gint         nux_view_accessible_get_n_children(AtkObject* obj);
 static AtkObject*   nux_view_accessible_ref_child(AtkObject* obj,
                                                   gint i);
+static AtkStateSet* nux_view_accessible_ref_state_set(AtkObject* obj);
+static gint         nux_view_accessible_get_n_children(AtkObject* obj);
+static AtkObject*   nux_view_accessible_ref_child(AtkObject* obj,
+                                                  gint i);
 /* NuxAreaAccessible */
 static gboolean      nux_view_accessible_check_pending_notification(NuxAreaAccessible* self);
 
-static AtkStateSet* nux_view_accessible_ref_state_set(AtkObject* obj);
-static gint         nux_view_accessible_get_n_children(AtkObject* obj);
-static AtkObject*   nux_view_accessible_ref_child(AtkObject* obj,
-                                                  gint i);
 /* private methods */
 static void on_layout_changed_cb(nux::View* view,
                                  nux::Layout* layout,

=== modified file 'plugins/unityshell/src/unity-launcher-accessible.cpp'
--- plugins/unityshell/src/unity-launcher-accessible.cpp	2011-11-07 22:37:27 +0000
+++ plugins/unityshell/src/unity-launcher-accessible.cpp	2011-11-07 22:37:27 +0000
@@ -36,7 +36,6 @@
 #include "unitya11y.h"
 #include "Launcher.h"
 #include "LauncherModel.h"
-#include "QuicklistView.h"
 
 using unity::launcher::Launcher;
 using unity::launcher::LauncherIcon;
@@ -211,6 +210,7 @@
   LauncherModel::iterator it;
   nux::Object* child = NULL;
   AtkObject* child_accessible = NULL;
+  AtkObject* parent = NULL;
 
   g_return_val_if_fail(UNITY_IS_LAUNCHER_ACCESSIBLE(obj), NULL);
   num = atk_object_get_n_accessible_children(obj);
@@ -230,6 +230,10 @@
   child = dynamic_cast<nux::Object*>(*it);
   child_accessible = unity_a11y_get_accessible(child);
 
+  parent = atk_object_get_parent(child_accessible);
+  if (parent != obj)
+    atk_object_set_parent(child_accessible, obj);
+
   g_object_ref(child_accessible);
 
   return child_accessible;

=== modified file 'plugins/unityshell/src/unity-launcher-icon-accessible.cpp'
--- plugins/unityshell/src/unity-launcher-icon-accessible.cpp	2011-11-07 22:37:27 +0000
+++ plugins/unityshell/src/unity-launcher-icon-accessible.cpp	2011-11-07 22:37:27 +0000
@@ -26,6 +26,19 @@
  * nux::LauncherIcon, exposing the common elements on each basic individual
  * element (position, extents, etc)
  *
+ * Implementation notes: on previous implementations we implemented
+ * _get_parent using the LauncherIcon method GetLauncher. But this is
+ * not the case in all the situations. When the user is interacting
+ * with the Switcher, we consider that the parent of that LauncherIcon
+ * is the Switcher.
+ *
+ * The parent is set with atk_object_set_parent as usual.
+ *
+ * As this object is used both on UnityLauncherAccessible and
+ * UnitySwitcherAccessible, we have removed as much as possible any
+ * reference to the Launcher, LauncherModel, SwitcherView or
+ * SwitcherModel.
+ *
  */
 
 #include "unity-launcher-icon-accessible.h"
@@ -49,7 +62,7 @@
                                                                gpointer   data);
 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 AtkObject*    unity_launcher_icon_accessible_get_parent(AtkObject* obj);
 static gint          unity_launcher_icon_accessible_get_index_in_parent(AtkObject* obj);
 
 /* AtkComponent.h */
@@ -86,6 +99,7 @@
   gboolean parent_focused;
   gboolean index_in_parent;
 
+  guint on_parent_change_id;
   guint on_parent_selection_change_id;
   guint on_parent_focus_event_id;
 };
@@ -102,7 +116,7 @@
   atk_class->initialize = unity_launcher_icon_accessible_initialize;
   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_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));
@@ -125,7 +139,7 @@
 
   parent = atk_object_get_parent(ATK_OBJECT(object));
 
-  if (UNITY_IS_LAUNCHER_ACCESSIBLE(parent))
+  if (parent != NULL)
   {
     if (self->priv->on_parent_selection_change_id != 0)
       g_signal_handler_disconnect(parent, self->priv->on_parent_selection_change_id);
@@ -134,6 +148,9 @@
       g_signal_handler_disconnect(parent, self->priv->on_parent_focus_event_id);
   }
 
+  if (self->priv->on_parent_change_id != 0)
+    g_signal_handler_disconnect(object, self->priv->on_parent_change_id);
+
   G_OBJECT_CLASS(unity_launcher_icon_accessible_parent_class)->dispose(object);
 }
 
@@ -154,41 +171,56 @@
 
 /* AtkObject.h */
 static void
+on_parent_change_cb(gchar* property,
+                    GValue* value,
+                    gpointer data)
+{
+  AtkObject* parent = NULL;
+  UnityLauncherIconAccessible* self = NULL;
+  AtkStateSet* state_set = NULL;
+
+  g_return_if_fail(UNITY_IS_LAUNCHER_ICON_ACCESSIBLE(data));
+
+  self = UNITY_LAUNCHER_ICON_ACCESSIBLE(data);
+  parent = atk_object_get_parent(ATK_OBJECT(data));
+
+  if (parent == NULL)
+    return;
+
+  self->priv->on_parent_selection_change_id =
+    g_signal_connect(parent, "selection-changed",
+                     G_CALLBACK(on_parent_selection_change_cb), self);
+
+  self->priv->on_parent_focus_event_id =
+    g_signal_connect(parent, "focus-event",
+                     G_CALLBACK(on_parent_focus_event_cb), self);
+
+  state_set = atk_object_ref_state_set(parent);
+  if (atk_state_set_contains_state(state_set, ATK_STATE_FOCUSED))
+  {
+    self->priv->parent_focused = TRUE;
+  }
+  g_object_unref(state_set);
+}
+
+static void
 unity_launcher_icon_accessible_initialize(AtkObject* accessible,
                                           gpointer data)
 {
-  LauncherIcon* icon = NULL;
-  Launcher* launcher = NULL;
-  UnityLauncherAccessible* launcher_accessible = NULL;
   UnityLauncherIconAccessible* self = NULL;
-  nux::Object* nux_object = NULL;
 
   ATK_OBJECT_CLASS(unity_launcher_icon_accessible_parent_class)->initialize(accessible, data);
   self = UNITY_LAUNCHER_ICON_ACCESSIBLE(accessible);
 
   accessible->role = ATK_ROLE_PUSH_BUTTON;
 
-  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(accessible));
-  icon = dynamic_cast<LauncherIcon*>(nux_object);
-  launcher = icon->GetLauncher();
-
-  if (launcher == NULL)
-    return;
-
-  /* NOTE: we could also get the launcher_accessible by just calling
-     atk_object_get_parent */
-  launcher_accessible = UNITY_LAUNCHER_ACCESSIBLE(unity_a11y_get_accessible(launcher));
-
-  self->priv->on_parent_selection_change_id =
-    g_signal_connect(launcher_accessible, "selection-changed",
-                     G_CALLBACK(on_parent_selection_change_cb), self);
-
-  self->priv->on_parent_focus_event_id =
-    g_signal_connect(launcher_accessible, "focus-event",
-                     G_CALLBACK(on_parent_focus_event_cb), self);
-
   atk_component_add_focus_handler(ATK_COMPONENT(accessible),
                                   unity_launcher_icon_accessible_focus_handler);
+
+  /* we could do that by redefining ->set_parent */
+  self->priv->on_parent_change_id =
+    g_signal_connect(accessible, "notify::accessible-parent",
+                     G_CALLBACK(on_parent_change_cb), self);
 }
 
 
@@ -256,31 +288,6 @@
   return state_set;
 }
 
-static AtkObject*
-unity_launcher_icon_accessible_get_parent(AtkObject* obj)
-{
-  nux::Object* nux_object = NULL;
-  LauncherIcon* icon = NULL;
-  Launcher* launcher = NULL;
-
-  g_return_val_if_fail(UNITY_IS_LAUNCHER_ICON_ACCESSIBLE(obj), NULL);
-
-  if (obj->accessible_parent)
-    return obj->accessible_parent;
-
-  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(obj));
-
-  if (nux_object == NULL) /* defunct */
-    return NULL;
-
-  icon = dynamic_cast<LauncherIcon*>(nux_object);
-  launcher = icon->GetLauncher();
-
-  g_return_val_if_fail(dynamic_cast<Launcher*>(launcher), NULL);
-
-  return unity_a11y_get_accessible(launcher);
-}
-
 /* private methods */
 
 /*
@@ -290,27 +297,15 @@
 static void
 check_selected(UnityLauncherIconAccessible* self)
 {
-  LauncherIcon* icon = NULL;
-  LauncherIcon* selected_icon = NULL;
-  Launcher* launcher = NULL;
-  nux::Object* nux_object = NULL;
+  AtkObject* parent = NULL;
   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();
-
-  if (launcher == NULL)
-    return;
-
-  selected_icon = launcher->GetSelectedMenuIcon();
-
-  if (icon == selected_icon)
-    found = TRUE;
+  parent = atk_object_get_parent(ATK_OBJECT(self));
+  if  (parent == NULL)
+    return;
+
+  found = atk_selection_is_child_selected(ATK_SELECTION(parent),
+                                          self->priv->index_in_parent);
 
   if ((found) && (self->priv->parent_focused == FALSE))
     return;
@@ -326,6 +321,7 @@
     atk_object_notify_state_change(ATK_OBJECT(self),
                                    ATK_STATE_ACTIVE,
                                    found);
+
     g_signal_emit_by_name(self, "focus-event", self->priv->selected, &return_val);
     atk_focus_tracker_notify(ATK_OBJECT(self));
   }
@@ -335,7 +331,6 @@
 on_parent_selection_change_cb(AtkSelection* selection,
                               gpointer data)
 {
-  g_return_if_fail(UNITY_IS_LAUNCHER_ACCESSIBLE(selection));
   g_return_if_fail(UNITY_IS_LAUNCHER_ICON_ACCESSIBLE(data));
 
   check_selected(UNITY_LAUNCHER_ICON_ACCESSIBLE(data));

=== modified file 'plugins/unityshell/src/unity-root-accessible.cpp'
--- plugins/unityshell/src/unity-root-accessible.cpp	2011-11-07 22:37:27 +0000
+++ plugins/unityshell/src/unity-root-accessible.cpp	2011-11-07 22:37:27 +0000
@@ -258,6 +258,9 @@
   window_accessible =
     unity_a11y_get_accessible(window);
 
+  /* FIXME: temporal */
+  atk_object_set_name (window_accessible, window->GetWindowName().GetTCharPtr());
+
   if (g_slist_find(self->priv->window_list, window_accessible))
     return;
 
@@ -293,6 +296,8 @@
   window_accessible =
     unity_a11y_get_accessible(window);
 
+  return;
+  
   if (!g_slist_find(self->priv->window_list, window_accessible))
     return;
 

=== added file 'plugins/unityshell/src/unity-switcher-accessible.cpp'
--- plugins/unityshell/src/unity-switcher-accessible.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/unity-switcher-accessible.cpp	2011-11-07 22:37:27 +0000
@@ -0,0 +1,417 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alejandro Piñeiro Iglesias <[e-mail]>
+ */
+
+/**
+ * SECTION:unity-switcher-accessible
+ * @Title: UnitySwitcherAccessible
+ * @short_description: Implementation of the ATK interfaces for #SwitcherView
+ * @see_also: SwitcherView
+ *
+ * #UnitySwitcherAccessible implements the required ATK interfaces for
+ * #SwitcherView, ie: exposing the different AbstractLauncherIcon on the
+ * #model as child of the object.
+ *
+ */
+
+#include <glib/gi18n.h>
+
+#include "unity-switcher-accessible.h"
+#include "unity-launcher-icon-accessible.h"
+
+#include "unitya11y.h"
+#include "SwitcherView.h"
+#include "SwitcherModel.h"
+
+using namespace unity::switcher;
+using namespace unity::launcher;
+
+/* GObject */
+static void unity_switcher_accessible_class_init(UnitySwitcherAccessibleClass* klass);
+static void unity_switcher_accessible_init(UnitySwitcherAccessible* self);
+static void unity_switcher_accessible_finalize(GObject* object);
+
+/* AtkObject.h */
+static void       unity_switcher_accessible_initialize(AtkObject* accessible,
+                                                       gpointer   data);
+static gint       unity_switcher_accessible_get_n_children(AtkObject* obj);
+static AtkObject* unity_switcher_accessible_ref_child(AtkObject* obj,
+                                                      gint i);
+static AtkStateSet* unity_switcher_accessible_ref_state_set(AtkObject* obj);
+
+/* AtkSelection */
+static void       atk_selection_interface_init(AtkSelectionIface* iface);
+static AtkObject* unity_switcher_accessible_ref_selection(AtkSelection* selection,
+                                                          gint i);
+static gint       unity_switcher_accessible_get_selection_count(AtkSelection* selection);
+static gboolean   unity_switcher_accessible_is_child_selected(AtkSelection* selection,
+                                                              gint i);
+/* NuxAreaAccessible */
+static gboolean   unity_switcher_accessible_check_pending_notification(NuxAreaAccessible* self);
+
+/* private */
+static void       on_selection_changed_cb(AbstractLauncherIcon* icon,
+                                          UnitySwitcherAccessible* switcher_accessible);
+static void       create_children(UnitySwitcherAccessible* self);
+
+
+G_DEFINE_TYPE_WITH_CODE(UnitySwitcherAccessible, unity_switcher_accessible,  NUX_TYPE_VIEW_ACCESSIBLE,
+                        G_IMPLEMENT_INTERFACE(ATK_TYPE_SELECTION, atk_selection_interface_init))
+
+#define UNITY_SWITCHER_ACCESSIBLE_GET_PRIVATE(obj)                      \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_SWITCHER_ACCESSIBLE,  \
+                                UnitySwitcherAccessiblePrivate))
+
+struct _UnitySwitcherAccessiblePrivate
+{
+  /* We maintain the children. Although the LauncherIcon are shared
+   * between the Switcher and Launcher, in order to keep a hierarchy
+   * coherence, we create a different accessible object  */
+  GSList* children;
+
+  sigc::connection on_selection_changed_connection;
+};
+
+
+static void
+unity_switcher_accessible_class_init(UnitySwitcherAccessibleClass* klass)
+{
+  GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
+  AtkObjectClass* atk_class = ATK_OBJECT_CLASS(klass);
+  NuxAreaAccessibleClass* area_class = NUX_AREA_ACCESSIBLE_CLASS(klass);
+
+  gobject_class->finalize = unity_switcher_accessible_finalize;
+
+  /* AtkObject */
+  atk_class->get_n_children = unity_switcher_accessible_get_n_children;
+  atk_class->ref_child = unity_switcher_accessible_ref_child;
+  atk_class->initialize = unity_switcher_accessible_initialize;
+  atk_class->ref_state_set = unity_switcher_accessible_ref_state_set;
+
+  /* NuxAreaAccessible */
+  area_class->check_pending_notification = unity_switcher_accessible_check_pending_notification;
+
+  g_type_class_add_private(gobject_class, sizeof(UnitySwitcherAccessiblePrivate));
+}
+
+static void
+unity_switcher_accessible_init(UnitySwitcherAccessible* self)
+{
+  UnitySwitcherAccessiblePrivate* priv =
+    UNITY_SWITCHER_ACCESSIBLE_GET_PRIVATE(self);
+
+  self->priv = priv;
+  self->priv->children = NULL;
+}
+
+static void
+unity_switcher_accessible_finalize(GObject* object)
+{
+  UnitySwitcherAccessible* self = UNITY_SWITCHER_ACCESSIBLE(object);
+
+  self->priv->on_selection_changed_connection.disconnect();
+
+  if (self->priv->children)
+  {
+    g_slist_free_full(self->priv->children, g_object_unref);
+    self->priv->children = NULL;
+  }
+
+  G_OBJECT_CLASS(unity_switcher_accessible_parent_class)->finalize(object);
+}
+
+AtkObject*
+unity_switcher_accessible_new(nux::Object* object)
+{
+  AtkObject* accessible = NULL;
+
+  g_return_val_if_fail(dynamic_cast<SwitcherView*>(object), NULL);
+
+  accessible = ATK_OBJECT(g_object_new(UNITY_TYPE_SWITCHER_ACCESSIBLE, NULL));
+
+  atk_object_initialize(accessible, object);
+  atk_object_set_name(accessible, _("Switcher"));
+
+  return accessible;
+}
+
+/* AtkObject.h */
+static void
+unity_switcher_accessible_initialize(AtkObject* accessible,
+                                     gpointer data)
+{
+  SwitcherView* switcher = NULL;
+  nux::Object* nux_object = NULL;
+  UnitySwitcherAccessible* self = NULL;
+  SwitcherModel::Ptr model;
+
+  ATK_OBJECT_CLASS(unity_switcher_accessible_parent_class)->initialize(accessible, data);
+
+  atk_object_set_role(accessible, ATK_ROLE_TOOL_BAR);
+
+  self = UNITY_SWITCHER_ACCESSIBLE(accessible);
+  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(accessible));
+  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  if (switcher == NULL)
+    return;
+
+  model = switcher->GetModel();
+
+  if (model)
+  {
+    self->priv->on_selection_changed_connection  =
+      model->selection_changed.connect(sigc::bind(sigc::ptr_fun(on_selection_changed_cb),
+                                                  self));
+
+    create_children(self);
+  }
+
+  /* To force being connected to the window::activate signal */
+  nux_area_accessible_parent_window_active(NUX_AREA_ACCESSIBLE(self));
+}
+
+static gint
+unity_switcher_accessible_get_n_children(AtkObject* obj)
+{
+  nux::Object* object = NULL;
+  UnitySwitcherAccessible* self = NULL;
+
+  g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(obj), 0);
+  self = UNITY_SWITCHER_ACCESSIBLE(obj);
+
+  object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(obj));
+  if (!object) /* state is defunct */
+    return 0;
+
+  return g_slist_length(self->priv->children);
+}
+
+static AtkObject*
+unity_switcher_accessible_ref_child(AtkObject* obj,
+                                    gint i)
+{
+  gint num = 0;
+  nux::Object* nux_object = NULL;
+  AtkObject* child_accessible = NULL;
+  UnitySwitcherAccessible* self = NULL;
+
+  g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(obj), NULL);
+  num = atk_object_get_n_accessible_children(obj);
+  g_return_val_if_fail((i < num) && (i >= 0), NULL);
+  self = UNITY_SWITCHER_ACCESSIBLE(obj);
+
+  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(obj));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  child_accessible = ATK_OBJECT(g_slist_nth_data(self->priv->children, i));
+
+  g_object_ref(child_accessible);
+
+  return child_accessible;
+}
+
+static AtkStateSet*
+unity_switcher_accessible_ref_state_set(AtkObject* obj)
+{
+  AtkStateSet* state_set = NULL;
+  nux::Object* nux_object = NULL;
+
+  g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(obj), NULL);
+
+  state_set =
+    ATK_OBJECT_CLASS(unity_switcher_accessible_parent_class)->ref_state_set(obj);
+
+  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(obj));
+
+  if (nux_object == NULL) /* defunct */
+    return state_set;
+
+  /* The Switcher is always focusable */
+  atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE);
+
+  /* The Switcher is always focused. Looking SwitcherController code,
+   * SwitcherView is only created to be presented to the user */
+  atk_state_set_add_state(state_set, ATK_STATE_FOCUSED);
+
+  return state_set;
+}
+
+/* AtkSelection */
+static void
+atk_selection_interface_init(AtkSelectionIface* iface)
+{
+  iface->ref_selection = unity_switcher_accessible_ref_selection;
+  iface->get_selection_count = unity_switcher_accessible_get_selection_count;
+  iface->is_child_selected = unity_switcher_accessible_is_child_selected;
+
+  /* NOTE: for the moment we don't provide the implementation for the
+     "interactable" methods, it is, the methods that allow to change
+     the selected icon. The Switcher doesn't provide that API, and
+     right now  we are focusing on a normal user input.*/
+  /* iface->add_selection = unity_switcher_accessible_add_selection; */
+  /* iface->clear_selection = unity_switcher_accessible_clear_selection; */
+  /* iface->remove_selection = unity_switcher_accessible_remove_selection; */
+
+  /* This method will never be implemented, as select all the switcher
+     icons makes no sense */
+  /* iface->select_all = unity_switcher_accessible_select_all_selection; */
+}
+
+static AtkObject*
+unity_switcher_accessible_ref_selection(AtkSelection* selection,
+                                        gint i)
+{
+  SwitcherView* switcher = NULL;
+  SwitcherModel::Ptr switcher_model;
+  nux::Object* nux_object = NULL;
+  gint selected_index = 0;
+  AtkObject* accessible_selected = NULL;
+  UnitySwitcherAccessible* self = NULL;
+
+  g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(selection), 0);
+  /* there can be only just item selected */
+  g_return_val_if_fail(i == 0, NULL);
+  self = UNITY_SWITCHER_ACCESSIBLE(selection);
+
+  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(selection));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  switcher = dynamic_cast<SwitcherView*>(nux_object);
+
+  switcher_model = switcher->GetModel();
+  selected_index = switcher_model->SelectionIndex();
+
+  accessible_selected = ATK_OBJECT(g_slist_nth_data(self->priv->children,
+                                                    selected_index));
+
+  if (accessible_selected != NULL)
+    g_object_ref(accessible_selected);
+
+  return accessible_selected;
+}
+
+static gint
+unity_switcher_accessible_get_selection_count(AtkSelection* selection)
+{
+  SwitcherView* switcher = NULL;
+  SwitcherModel::Ptr switcher_model;
+  AbstractLauncherIcon* selected_icon = NULL;
+  nux::Object* nux_object = NULL;
+
+  g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(selection), 0);
+
+  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(selection));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher_model = switcher->GetModel();
+
+  selected_icon = switcher_model->Selection();
+
+  if (selected_icon == 0)
+    return 0;
+  else
+    return 1;
+}
+
+static gboolean
+unity_switcher_accessible_is_child_selected(AtkSelection* selection,
+                                            gint i)
+{
+  SwitcherView* switcher = NULL;
+  SwitcherModel::Ptr switcher_model;
+  SwitcherModel::iterator it;
+  nux::Object* nux_object = NULL;
+  gint selected_index = 0;
+
+  g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(selection), FALSE);
+
+  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(selection));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher_model = switcher->GetModel();
+  selected_index = switcher_model->SelectionIndex();
+
+  if (selected_index == i)
+    return TRUE;
+  else
+    return FALSE;
+}
+
+/* NuxAreaAccessible */
+static gboolean
+unity_switcher_accessible_check_pending_notification(NuxAreaAccessible* self)
+{
+  g_return_val_if_fail(UNITY_IS_SWITCHER_ACCESSIBLE(self), FALSE);
+
+  /* Overriding the method: the switcher doesn't get the key focus of
+   * focus (Focusable) */
+  /* From SwitcherController: it shows that the switcher only exists
+   * to be shown to the user, so if the parent window gets actived, we
+   * assume that the switcher will be automatically focused
+   */
+  atk_object_notify_state_change(ATK_OBJECT(self), ATK_STATE_FOCUSED, TRUE);
+  g_signal_emit_by_name(self, "focus-event", TRUE, NULL);
+
+  return TRUE;
+}
+
+/* private */
+static void
+on_selection_changed_cb(AbstractLauncherIcon* icon,
+                        UnitySwitcherAccessible* switcher_accessible)
+{
+  g_signal_emit_by_name(ATK_OBJECT(switcher_accessible), "selection-changed");
+}
+
+static void
+create_children(UnitySwitcherAccessible* self)
+{
+  gint index = 0;
+  nux::Object* nux_object = NULL;
+  SwitcherView* switcher = NULL;
+  SwitcherModel::Ptr switcher_model;
+  SwitcherModel::iterator it;
+  LauncherIcon* child = NULL;
+  AtkObject* child_accessible = NULL;
+
+  nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(self));
+  if (!nux_object) /* state is defunct */
+    return;
+
+  switcher = dynamic_cast<SwitcherView*>(nux_object);
+  switcher_model = switcher->GetModel();
+
+  if (switcher_model == NULL)
+    return;
+
+  for (it = switcher_model->begin(); it != switcher_model->end(); it++)
+  {
+    child =  dynamic_cast<LauncherIcon*>(*it);
+    child_accessible = unity_launcher_icon_accessible_new(child);
+    atk_object_set_parent(child_accessible, ATK_OBJECT(self));
+    self->priv->children = g_slist_append(self->priv->children,
+                                          child_accessible);
+    unity_launcher_icon_accessible_set_index(UNITY_LAUNCHER_ICON_ACCESSIBLE(child_accessible),
+                                             index++);
+  }
+}

=== added file 'plugins/unityshell/src/unity-switcher-accessible.h'
--- plugins/unityshell/src/unity-switcher-accessible.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/unity-switcher-accessible.h	2011-11-07 22:37:27 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alejandro Piñeiro Iglesias <[e-mail]>
+ */
+
+#ifndef UNITY_SWITCHER_ACCESSIBLE_H
+#define UNITY_SWITCHER_ACCESSIBLE_H
+
+#include <atk/atk.h>
+
+#include "nux-view-accessible.h"
+
+G_BEGIN_DECLS
+
+#define UNITY_TYPE_SWITCHER_ACCESSIBLE            (unity_switcher_accessible_get_type ())
+#define UNITY_SWITCHER_ACCESSIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_TYPE_SWITCHER_ACCESSIBLE, UnitySwitcherAccessible))
+#define UNITY_SWITCHER_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_TYPE_SWITCHER_ACCESSIBLE, UnitySwitcherAccessibleClass))
+#define UNITY_IS_SWITCHER_ACCESSIBLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_TYPE_SWITCHER_ACCESSIBLE))
+#define UNITY_IS_SWITCHER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_TYPE_SWITCHER_ACCESSIBLE))
+#define UNITY_SWITCHER_ACCESSIBLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_TYPE_SWITCHER_ACCESSIBLE, UnitySwitcherAccessibleClass))
+
+typedef struct _UnitySwitcherAccessible        UnitySwitcherAccessible;
+typedef struct _UnitySwitcherAccessibleClass   UnitySwitcherAccessibleClass;
+typedef struct _UnitySwitcherAccessiblePrivate   UnitySwitcherAccessiblePrivate;
+
+struct _UnitySwitcherAccessible
+{
+  NuxViewAccessible parent;
+
+  /*< private >*/
+  UnitySwitcherAccessiblePrivate* priv;
+};
+
+struct _UnitySwitcherAccessibleClass
+{
+  NuxViewAccessibleClass parent_class;
+};
+
+GType      unity_switcher_accessible_get_type(void);
+AtkObject* unity_switcher_accessible_new(nux::Object* object);
+
+G_END_DECLS
+
+#endif /* __UNITY_SWITCHER_ACCESSIBLE_H__ */

=== modified file 'plugins/unityshell/src/unitya11y.cpp'
--- plugins/unityshell/src/unitya11y.cpp	2011-11-07 22:37:27 +0000
+++ plugins/unityshell/src/unitya11y.cpp	2011-11-07 22:37:27 +0000
@@ -41,6 +41,7 @@
 #include "PlacesGroup.h"
 #include "QuicklistView.h"
 #include "QuicklistMenuItem.h"
+#include "SwitcherView.h"
 #include "unity-launcher-accessible.h"
 #include "unity-launcher-icon-accessible.h"
 #include "unity-panel-view-accessible.h"
@@ -52,6 +53,7 @@
 #include "unity-places-group-accessible.h"
 #include "unity-quicklist-accessible.h"
 #include "unity-quicklist-menu-item-accessible.h"
+#include "unity-switcher-accessible.h"
 
 using namespace unity;
 using namespace unity::dash;
@@ -300,6 +302,9 @@
   if (object->Type().IsDerivedFromType(unity::dash::SearchBar::StaticObjectType))
     return unity_search_bar_accessible_new(object);
 
+  if (object->Type().IsDerivedFromType(unity::switcher::SwitcherView::StaticObjectType))
+    return unity_switcher_accessible_new(object);
+
   /* NUX classes  */
   if (object->Type().IsDerivedFromType(nux::TextEntry::StaticObjectType))
     return nux_text_entry_accessible_new(object);