Merge lp:~apinheiro/unity/a11y-review-places into lp:unity

[Alejandro Piñeiro]

This branch provides the base support for the Dash.

Some explanation:
  * Dash is using Focusable class to manage the focus
  * But it is not used on the Launcher
  * So I needed to use both, and being care to not create
  * In the same way, places still requires the low level focus management, as the top level window (a base window) still requires to get the key input focus
  * But the places focus management based on Focusable can start to be applied before receive the key input focus.
  * So in order to have a proper order (base window focus, then places contain focus), I don't emit the focus change based on Focusable until the top level base window became active.

So, with this branch:
  * Launcher is still working
  * Pressing Alt+F2 you get the notification of places window being focused, and search bar entry being focused.

NOTE: with the alt+f2 thing, we get a extra notification or orca. I will try to fix it while Rodrigo reviews the branch

[Rodrigo Moya (rodrigo-moya)]

Run command dialog and places window seem to work ok with orca, but none of the buttons in the places window seem to be accessible at all (I guess that's intended though, as this branch doesn't seem to include stuff to do that). Also, the extents of both windows seem to be wrong when selecting them in accerciser.

I'll keep doing some more tests and doing the code review

[Alejandro Piñeiro (apinheiro)]

> Run command dialog and places window seem to work ok with orca, but none of
> the buttons in the places window seem to be accessible at all (I guess that's
> intended though, as this branch doesn't seem to include stuff to do that).

Yes, it is a known issue. The intention of the branch is provide the base, focusing on the run command dialog, as a full a11y support for the dash is out of scope taking into account the current deadlines.

> Also, the extents of both windows seem to be wrong when selecting them in
> accerciser.

The work to provide accurate extents values is also postponed, mainly because it is blocked by this nux bug:

https://bugs.launchpad.net/nux/+bug/703062

(In the same way, launcher icon would require an ad-hoc compute, as they are not a nux::View subclass)

[Rodrigo Moya (rodrigo-moya)]

Ok, approving then, so merge as soon as you fix the extra notification thing (or keep that for another branch, as you wish)

review: Approve

=== modified file 'src/PlacesSearchBar.h'
--- src/PlacesSearchBar.h	2011-03-23 21:11:00 +0000
+++ src/PlacesSearchBar.h	2011-03-28 12:38:26 +0000
@@ -60,6 +60,11 @@
   sigc::signal<void, const char *> search_changed;
   sigc::signal<void> activated;
 
+  nux::TextEntry* GetTextEntry ()
+  {
+    return _pango_entry;
+  }
+
 protected:
   // Introspectable methods
   const gchar * GetName ();

=== modified file 'src/nux-area-accessible.cpp'
--- src/nux-area-accessible.cpp	2011-03-24 17:09:19 +0000
+++ src/nux-area-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -37,39 +37,76 @@
 static void nux_area_accessible_init       (NuxAreaAccessible *area_accessible);
 
 /* AtkObject.h */
-static void       nux_area_accessible_initialize     (AtkObject *accessible,
-                                                      gpointer   data);
-static AtkObject *nux_area_accessible_get_parent     (AtkObject *obj);
-static AtkStateSet* nux_area_accessible_ref_state_set (AtkObject *obj);
+static void         nux_area_accessible_initialize     (AtkObject *accessible,
+                                                        gpointer   data);
+static AtkObject *  nux_area_accessible_get_parent     (AtkObject *obj);
+static AtkStateSet* nux_area_accessible_ref_state_set  (AtkObject *obj);
 
 /* AtkComponent.h */
-static void atk_component_interface_init     (AtkComponentIface *iface);
-static void nux_area_accessible_get_extents  (AtkComponent *component,
-                                              gint         *x,
-                                              gint         *y,
-                                              gint         *width,
-                                              gint         *height,
-                                              AtkCoordType  coord_type);
-
-
-
-G_DEFINE_TYPE_WITH_CODE (NuxAreaAccessible, nux_area_accessible,  NUX_TYPE_OBJECT_ACCESSIBLE,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
+static void         atk_component_interface_init             (AtkComponentIface *iface);
+static void         nux_area_accessible_get_extents          (AtkComponent *component,
+                                                              gint         *x,
+                                                              gint         *y,
+                                                              gint         *width,
+                                                              gint         *height,
+                                                              AtkCoordType  coord_type);
+static gboolean     nux_area_accessible_grab_focus           (AtkComponent *component);
+static guint        nux_area_accessible_add_focus_handler    (AtkComponent *component,
+                                                              AtkFocusHandler handler);
+static void         nux_area_accessible_remove_focus_handler (AtkComponent *component,
+                                                              guint handler_id);
+static void         nux_area_accessible_focus_handler        (AtkObject *accessible,
+                                                              gboolean focus_in);
+/* private */
+static void on_focus_changed_cb               (nux::Area *area,
+                                               AtkObject *accessible);
+static void on_parent_window_activate_cb      (AtkObject *parent_window,
+                                               NuxAreaAccessible *self);
+static AtkObject   * search_for_parent_window (AtkObject *object);
+
+
+G_DEFINE_TYPE_WITH_CODE (NuxAreaAccessible,
+                         nux_area_accessible,
+                         NUX_TYPE_OBJECT_ACCESSIBLE,
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
+                                                atk_component_interface_init))
+
+#define NUX_AREA_ACCESSIBLE_GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_AREA_ACCESSIBLE,        \
+                                NuxAreaAccessiblePrivate))
+
+struct _NuxAreaAccessiblePrivate
+{
+  /* Cached values (used to avoid extra notifications) */
+  gboolean focused;
+
+  /* Top level parent window, it is not required to be the direct
+     parent */
+  AtkObject *parent_window;
+};
+
 
 static void
 nux_area_accessible_class_init (NuxAreaAccessibleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = nux_area_accessible_initialize;
   atk_class->get_parent = nux_area_accessible_get_parent;
   atk_class->ref_state_set = nux_area_accessible_ref_state_set;
+
+  g_type_class_add_private (gobject_class, sizeof (NuxAreaAccessiblePrivate));
 }
 
 static void
 nux_area_accessible_init (NuxAreaAccessible *area_accessible)
 {
+  NuxAreaAccessiblePrivate *priv =
+    NUX_AREA_ACCESSIBLE_GET_PRIVATE (area_accessible);
+
+  area_accessible->priv = priv;
 }
 
 AtkObject*
@@ -91,9 +128,21 @@
 nux_area_accessible_initialize (AtkObject *accessible,
                                 gpointer data)
 {
+  nux::Object *nux_object = NULL;
+  nux::Area *area = NULL;
+
   ATK_OBJECT_CLASS (nux_area_accessible_parent_class)->initialize (accessible, data);
 
   accessible->role = ATK_ROLE_UNKNOWN;
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (accessible));
+  area = dynamic_cast<nux::Area *>(nux_object);
+
+  /* focus support based on Focusable, used on the Dash */
+  area->FocusChanged.connect (sigc::bind (sigc::ptr_fun (on_focus_changed_cb), accessible));
+
+  atk_component_add_focus_handler (ATK_COMPONENT (accessible),
+                                   nux_area_accessible_focus_handler);
 }
 
 static AtkObject *
@@ -110,7 +159,7 @@
 
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (obj));
 
-  if (nux_object == NULL) /* actor is defunct */
+  if (nux_object == NULL) /* defunct */
     return NULL;
 
   area = dynamic_cast<nux::Area *>(nux_object);
@@ -156,7 +205,7 @@
 
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (obj));
 
-  if (nux_object == NULL) /* actor is defunct */
+  if (nux_object == NULL) /* defunct */
     return state_set;
 
   area = dynamic_cast<nux::Area *>(nux_object);
@@ -175,6 +224,12 @@
         atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
     }
 
+  if (area->CanFocus ())
+    atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
+
+  if (area->GetFocused ())
+    atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
+
   return state_set;
 }
 
@@ -184,9 +239,13 @@
 {
   g_return_if_fail (iface != NULL);
 
+  /* placement */
   iface->get_extents    = nux_area_accessible_get_extents;
 
-  /* Focus management is done on NuxViewAccessible */
+  /* focus management based on Focusable */
+  iface->grab_focus           = nux_area_accessible_grab_focus;
+  iface->add_focus_handler    = nux_area_accessible_add_focus_handler;
+  iface->remove_focus_handler = nux_area_accessible_remove_focus_handler;
 }
 
 static void
@@ -207,7 +266,7 @@
 
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (component));
 
-  if (nux_object == NULL) /* actor is defunct */
+  if (nux_object == NULL) /* defunct */
     return;
 
   area = dynamic_cast<nux::Area *>(nux_object);
@@ -234,3 +293,181 @@
 
   return;
 }
+
+static gboolean
+nux_area_accessible_grab_focus (AtkComponent *component)
+{
+  nux::Object *nux_object = NULL;
+  nux::Area *area = NULL;
+
+  g_return_val_if_fail (NUX_IS_AREA_ACCESSIBLE (component), FALSE);
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (component));
+  if (nux_object == NULL) /* defunct */
+    return FALSE;
+
+  area = dynamic_cast<nux::Area *>(nux_object);
+
+  area->SetFocused (TRUE);
+
+  /* FIXME: SetFocused doesn't return if the force was succesful or
+     not, we suppose that this is the case like in cally and gail */
+
+  return TRUE;
+}
+
+/*
+ * comment C&P from cally-actor:
+ *
+ * "These methods are basically taken from gail, as I don't see any
+ * reason to modify it. It makes me wonder why it is really required
+ * to be implemented in the toolkit"
+ */
+
+static guint
+nux_area_accessible_add_focus_handler (AtkComponent *component,
+                                       AtkFocusHandler handler)
+{
+  GSignalMatchType match_type;
+  gulong ret;
+  guint signal_id;
+
+  g_return_val_if_fail (NUX_IS_AREA_ACCESSIBLE (component), 0);
+
+  match_type = (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC);
+  signal_id = g_signal_lookup ("focus-event", ATK_TYPE_OBJECT);
+
+  ret = g_signal_handler_find (component, match_type, signal_id, 0, NULL,
+                               (gpointer) handler, NULL);
+  if (!ret)
+    {
+      return g_signal_connect_closure_by_id (component,
+                                             signal_id, 0,
+                                             g_cclosure_new (G_CALLBACK (handler), NULL,
+                                                             (GClosureNotify) NULL),
+                                             FALSE);
+    }
+  else
+    return 0;
+}
+
+static void
+nux_area_accessible_remove_focus_handler (AtkComponent *component,
+                                          guint handler_id)
+{
+  g_return_if_fail (NUX_IS_AREA_ACCESSIBLE (component));
+
+  g_signal_handler_disconnect (component, handler_id);
+}
+
+static void
+nux_area_accessible_focus_handler (AtkObject *accessible,
+                                   gboolean focus_in)
+{
+  g_return_if_fail (NUX_IS_AREA_ACCESSIBLE (accessible));
+
+  g_debug ("[a11y][area] focus_handler (%p:%s:%i)",
+           accessible, atk_object_get_name (accessible), focus_in);
+
+  atk_object_notify_state_change (accessible, ATK_STATE_FOCUSED, focus_in);
+}
+
+/* private */
+static gboolean
+check_parent_window_active (NuxAreaAccessible *self)
+{
+  gboolean active = FALSE;
+  AtkStateSet *state_set = NULL;
+
+  if (self->priv->parent_window == NULL)
+    {
+      self->priv->parent_window = search_for_parent_window (ATK_OBJECT (self));
+
+      g_signal_connect (self->priv->parent_window,
+                        "activate",
+                        G_CALLBACK (on_parent_window_activate_cb),
+                        self);
+    }
+
+  state_set = atk_object_ref_state_set (ATK_OBJECT (self->priv->parent_window));
+
+  active = atk_state_set_contains_state (state_set, ATK_STATE_ACTIVE);
+
+  g_debug ("[a11y][area] check_parent_window_active %i", active);
+
+  g_object_unref (state_set);
+
+  return active;
+}
+
+static void
+check_focus_change (nux::Area *area,
+                    AtkObject *accessible)
+{
+  gboolean focus_in = FALSE;
+  NuxAreaAccessible *self = NULL;
+  gboolean is_parent_window_active = FALSE;
+
+  g_return_if_fail (NUX_IS_AREA_ACCESSIBLE (accessible));
+
+  self = NUX_AREA_ACCESSIBLE (accessible);
+
+  if (area->GetFocused ())
+    focus_in = TRUE;
+
+  is_parent_window_active = check_parent_window_active (self);
+
+  /* We don't emit focus_in=TRUE events until the top level window is
+     active*/
+  if ((focus_in) && (!is_parent_window_active))
+    return;
+
+  if (self->priv->focused != focus_in)
+    {
+      self->priv->focused = focus_in;
+
+      g_debug ("[a11y][area] on_focus_change_cb (actual focus change) : (%p:%s:%i)",
+               accessible, atk_object_get_name (accessible), focus_in);
+
+      g_signal_emit_by_name (accessible, "focus_event", focus_in);
+      atk_focus_tracker_notify (accessible);
+    }
+}
+
+static void
+on_focus_changed_cb (nux::Area *area,
+                     AtkObject *accessible)
+{
+  check_focus_change (area, accessible);
+}
+
+static AtkObject *
+search_for_parent_window (AtkObject *object)
+{
+  AtkObject *parent = NULL;
+
+  for (parent = atk_object_get_parent (object);
+       (parent != NULL) && (atk_object_get_role (parent) != ATK_ROLE_WINDOW);
+       parent = atk_object_get_parent (parent));
+
+  if (parent == NULL)
+    g_debug ("[a11y][area] search_for_parent NO PARENT WINDOW");
+
+  return parent;
+}
+
+static void
+on_parent_window_activate_cb (AtkObject *parent_window,
+                              NuxAreaAccessible *self)
+{
+  nux::Object *nux_object = NULL;
+  nux::Area *area = NULL;
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (self));
+  if (nux_object == NULL) /* defunct */
+    return;
+
+  area = dynamic_cast<nux::Area *>(nux_object);
+
+  check_focus_change (area, ATK_OBJECT (self));
+}

=== modified file 'src/nux-area-accessible.h'
--- src/nux-area-accessible.h	2011-02-17 12:57:17 +0000
+++ src/nux-area-accessible.h	2011-03-28 12:38:26 +0000
@@ -34,10 +34,14 @@
 
 typedef struct _NuxAreaAccessible        NuxAreaAccessible;
 typedef struct _NuxAreaAccessibleClass   NuxAreaAccessibleClass;
+typedef struct _NuxAreaAccessiblePrivate NuxAreaAccessiblePrivate;
 
 struct _NuxAreaAccessible
 {
   NuxObjectAccessible parent;
+
+  /*< private >*/
+  NuxAreaAccessiblePrivate *priv;
 };
 
 struct _NuxAreaAccessibleClass

=== modified file 'src/nux-base-window-accessible.cpp'
--- src/nux-base-window-accessible.cpp	2011-03-09 09:44:28 +0000
+++ src/nux-base-window-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -34,6 +34,14 @@
 #include "Nux/Area.h"
 #include "Nux/Layout.h"
 
+enum {
+  ACTIVATE,
+  DEACTIVATE,
+  LAST_SIGNAL
+};
+
+static guint signals [LAST_SIGNAL] = { 0, };
+
 /* GObject */
 static void nux_base_window_accessible_class_init (NuxBaseWindowAccessibleClass *klass);
 static void nux_base_window_accessible_init       (NuxBaseWindowAccessible *base_window_accessible);
@@ -42,23 +50,85 @@
 static void       nux_base_window_accessible_initialize     (AtkObject *accessible,
                                                              gpointer   data);
 static AtkObject *nux_base_window_accessible_get_parent     (AtkObject *obj);
+static AtkStateSet *nux_base_window_accessible_ref_state_set (AtkObject *obj);
 
+/* private */
+static void       on_focus_event_cb                         (AtkObject *object,
+                                                             gboolean in,
+                                                             gpointer data);
 
 G_DEFINE_TYPE (NuxBaseWindowAccessible, nux_base_window_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
 
+struct _NuxBaseWindowAccessiblePrivate
+{
+  /* Cached values (used to avoid extra notifications) */
+  gboolean active;
+};
+
+#define NUX_BASE_WINDOW_ACCESSIBLE_GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_BASE_WINDOW_ACCESSIBLE, \
+                                NuxBaseWindowAccessiblePrivate))
+
 static void
 nux_base_window_accessible_class_init (NuxBaseWindowAccessibleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   atk_class->initialize = nux_base_window_accessible_initialize;
   atk_class->get_parent = nux_base_window_accessible_get_parent;
+  atk_class->ref_state_set = nux_base_window_accessible_ref_state_set;
+
+  g_type_class_add_private (gobject_class, sizeof (NuxBaseWindowAccessiblePrivate));
+
+  /**
+   * BaseWindow::activate:
+   * @nux_object: the object which received the signal
+   *
+   * The ::activate signal is emitted when the window receives the key
+   * focus from the underlying window system.
+   *
+   * Toolkit implementation note: it is used when anyone adds a global
+   * event listener to "window:activate"
+   */
+  signals [ACTIVATE] =
+    g_signal_new ("activate",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0, /* default signal handler */
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * BaseWindow::deactivate:
+   * @nux_object: the object which received the signal
+   *
+   * The ::deactivate signal is emitted when the window loses key
+   * focus from the underlying window system.
+   *
+   * Toolkit implementation note: it is used when anyone adds a global
+   * event listener to "window:deactivate"
+   */
+  signals [DEACTIVATE] =
+    g_signal_new ("deactivate",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0, /* default signal handler */
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
 }
 
 static void
 nux_base_window_accessible_init (NuxBaseWindowAccessible *base_window_accessible)
 {
+  NuxBaseWindowAccessiblePrivate *priv =
+    NUX_BASE_WINDOW_ACCESSIBLE_GET_PRIVATE (base_window_accessible);
+
+  base_window_accessible->priv = priv;
 }
 
 AtkObject*
@@ -72,8 +142,6 @@
 
   atk_object_initialize (accessible, object);
 
-  atk_object_set_name (accessible, "BaseWindow");
-
   return accessible;
 }
 
@@ -85,6 +153,9 @@
   ATK_OBJECT_CLASS (nux_base_window_accessible_parent_class)->initialize (accessible, data);
 
   accessible->role = ATK_ROLE_WINDOW;
+
+  g_signal_connect (accessible, "focus-event",
+                    G_CALLBACK (on_focus_event_cb), NULL);
 }
 
 static AtkObject*
@@ -92,3 +163,64 @@
 {
   return atk_get_root ();
 }
+
+static AtkStateSet*
+nux_base_window_accessible_ref_state_set (AtkObject *obj)
+{
+  AtkStateSet *state_set = NULL;
+  NuxBaseWindowAccessible *self = NULL;
+  nux::Object *nux_object = NULL;
+
+  g_return_val_if_fail (NUX_IS_BASE_WINDOW_ACCESSIBLE (obj), NULL);
+
+  state_set = ATK_OBJECT_CLASS (nux_base_window_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;
+
+  self = NUX_BASE_WINDOW_ACCESSIBLE (obj);
+
+  atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
+
+  if (self->priv->active)
+    {
+      atk_state_set_add_state (state_set, ATK_STATE_ACTIVE);
+      atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
+    }
+
+  return state_set;
+}
+
+/* private */
+static void
+on_focus_event_cb (AtkObject *object,
+                   gboolean focus_in,
+                   gpointer data)
+{
+  NuxBaseWindowAccessible *self = NULL;
+
+  /* On the base window, we suppose that the window is active if it
+     has the focus*/
+  self = NUX_BASE_WINDOW_ACCESSIBLE (object);
+
+  if (self->priv->active != focus_in)
+    {
+      gint signal_id;
+
+      self->priv->active = focus_in;
+
+      atk_object_notify_state_change (ATK_OBJECT (self),
+                                      ATK_STATE_ACTIVE, focus_in);
+
+      if (focus_in)
+        signal_id = ACTIVATE;
+      else
+        signal_id = DEACTIVATE;
+
+      g_debug ("[a11y][bwindow] on_focus_event activate events (%p:%s:%i)",
+               object, atk_object_get_name (object), focus_in);
+
+      g_signal_emit (self, signals [signal_id], 0);
+    }
+}

=== modified file 'src/nux-base-window-accessible.h'
--- src/nux-base-window-accessible.h	2011-02-17 12:57:17 +0000
+++ src/nux-base-window-accessible.h	2011-03-28 12:38:26 +0000
@@ -37,10 +37,14 @@
 
 typedef struct _NuxBaseWindowAccessible        NuxBaseWindowAccessible;
 typedef struct _NuxBaseWindowAccessibleClass   NuxBaseWindowAccessibleClass;
+typedef struct _NuxBaseWindowAccessiblePrivate NuxBaseWindowAccessiblePrivate;
 
 struct _NuxBaseWindowAccessible
 {
   NuxViewAccessible parent;
+
+  /*< private >*/
+  NuxBaseWindowAccessiblePrivate *priv;
 };
 
 struct _NuxBaseWindowAccessibleClass

=== modified file 'src/nux-view-accessible.cpp'
--- src/nux-view-accessible.cpp	2011-03-21 00:30:48 +0000
+++ src/nux-view-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -31,6 +31,7 @@
 #include "unitya11y.h"
 
 #include "Nux/Layout.h"
+#include "Nux/Area.h"
 
 /* GObject */
 static void nux_view_accessible_class_init (NuxViewAccessibleClass *klass);
@@ -44,34 +45,34 @@
 static gint         nux_view_accessible_get_n_children      (AtkObject *obj);
 static AtkObject*   nux_view_accessible_ref_child           (AtkObject *obj,
                                                              gint i);
-
-/* AtkComponent.h */
-static void     atk_component_interface_init             (AtkComponentIface *iface);
-static gboolean nux_view_accessible_grab_focus           (AtkComponent *component);
-static guint    nux_view_accessible_add_focus_handler    (AtkComponent *component,
-                                                          AtkFocusHandler handler);
-static void     nux_view_accessible_remove_focus_handler (AtkComponent *component,
-                                                          guint handler_id);
-
 /* private methods */
-static void on_start_focus_cb                 (AtkObject *accessible);
-static void on_end_focus_cb                   (AtkObject *accessible);
-static void nux_view_accessible_focus_handler (AtkObject *accessible,
-                                               gboolean focus_in);
-static void on_layout_changed_cb              (nux::View *view,
-                                               nux::Layout *layout,
-                                               AtkObject *accessible,
-                                               gboolean is_add);
-
-G_DEFINE_TYPE_WITH_CODE (NuxViewAccessible,
-                         nux_view_accessible,
-                         NUX_TYPE_AREA_ACCESSIBLE,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
-                                                atk_component_interface_init))
+static void on_layout_changed_cb (nux::View *view,
+                                  nux::Layout *layout,
+                                  AtkObject *accessible,
+                                  gboolean is_add);
+static void on_start_focus_cb    (AtkObject *accessible);
+static void on_end_focus_cb      (AtkObject *accessible);
+
+
+G_DEFINE_TYPE (NuxViewAccessible,
+               nux_view_accessible,
+               NUX_TYPE_AREA_ACCESSIBLE)
+
+#define NUX_VIEW_ACCESSIBLE_GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NUX_TYPE_VIEW_ACCESSIBLE,        \
+                                NuxViewAccessiblePrivate))
+
+struct _NuxViewAccessiblePrivate
+{
+  /* Cached values (used to avoid extra notifications) */
+  gboolean focused;
+};
+
 
 static void
 nux_view_accessible_class_init (NuxViewAccessibleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
@@ -79,11 +80,17 @@
   atk_class->ref_state_set = nux_view_accessible_ref_state_set;
   atk_class->ref_child = nux_view_accessible_ref_child;
   atk_class->get_n_children = nux_view_accessible_get_n_children;
+
+  g_type_class_add_private (gobject_class, sizeof (NuxViewAccessiblePrivate));
 }
 
 static void
 nux_view_accessible_init (NuxViewAccessible *view_accessible)
 {
+  NuxViewAccessiblePrivate *priv =
+    NUX_VIEW_ACCESSIBLE_GET_PRIVATE (view_accessible);
+
+  view_accessible->priv = priv;
 }
 
 AtkObject*
@@ -115,16 +122,17 @@
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (accessible));
   view = dynamic_cast<nux::View *>(nux_object);
 
-  view->OnStartFocus.connect (sigc::bind (sigc::ptr_fun (on_start_focus_cb), accessible));
-  view->OnEndFocus.connect (sigc::bind (sigc::ptr_fun (on_end_focus_cb), accessible));
-
   view->LayoutAdded.connect (sigc::bind (sigc::ptr_fun (on_layout_changed_cb),
                                          accessible, TRUE));
   view->LayoutRemoved.connect (sigc::bind (sigc::ptr_fun (on_layout_changed_cb),
                                            accessible, FALSE));
 
-  atk_component_add_focus_handler (ATK_COMPONENT (accessible),
-                                   nux_view_accessible_focus_handler);
+  /* Some extra focus things as Focusable is not used on Launcher and
+     some BaseWindow */
+  view->OnStartFocus.connect (sigc::bind (sigc::ptr_fun (on_start_focus_cb),
+                                          accessible));
+  view->OnEndFocus.connect (sigc::bind (sigc::ptr_fun (on_end_focus_cb),
+                                        accessible));
 }
 
 static AtkStateSet*
@@ -140,15 +148,13 @@
 
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (obj));
 
-  if (nux_object == NULL) /* actor is defunct */
+  if (nux_object == NULL) /* defunct */
     return state_set;
 
   view = dynamic_cast<nux::View *>(nux_object);
 
-  /* FIXME: Waiting for the full keyboard navigation support, for the
-     moment any nux object is focusable*/
-  atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
-
+  /* required for some basic object as the BaseWindow containing the
+     Launcher */
   if (view->HasKeyboardFocus ())
     atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
 
@@ -210,24 +216,6 @@
 }
 
 static void
-on_start_focus_cb (AtkObject *accessible)
-{
-  g_debug ("[a11y] on start_focus_cb: (%p:%s)", accessible, atk_object_get_name (accessible));
-
-  g_signal_emit_by_name (accessible, "focus_event", TRUE);
-  atk_focus_tracker_notify (accessible);
-}
-
-static void
-on_end_focus_cb (AtkObject *accessible)
-{
-  g_debug ("[a11y] on end_focus_cb: (%p:%s)", accessible, atk_object_get_name (accessible));
-
-  g_signal_emit_by_name (accessible, "focus_event", FALSE);
-  atk_focus_tracker_notify (accessible);
-}
-
-static void
 on_layout_changed_cb (nux::View *view,
                       nux::Layout *layout,
                       AtkObject *accessible,
@@ -254,91 +242,33 @@
   g_signal_emit_by_name (accessible, signal_name, 0, atk_child, NULL);
 }
 
-/* AtkComponent.h */
 static void
-atk_component_interface_init (AtkComponentIface *iface)
-{
-  g_return_if_fail (iface != NULL);
-
-  /* focus management */
-  iface->grab_focus           = nux_view_accessible_grab_focus;
-  iface->add_focus_handler    = nux_view_accessible_add_focus_handler;
-  iface->remove_focus_handler = nux_view_accessible_remove_focus_handler;
-}
-
-static gboolean
-nux_view_accessible_grab_focus (AtkComponent *component)
-{
-  nux::Object *nux_object = NULL;
-  nux::View *view = NULL;
-
-  g_return_val_if_fail (NUX_IS_VIEW_ACCESSIBLE (component), FALSE);
-
-  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (component));
-  if (nux_object == NULL) /* actor is defunct */
-    return FALSE;
-
-  view = dynamic_cast<nux::View *>(nux_object);
-
-  view->ForceStartFocus (0, 0);
-
-  /* FIXME: ForceStartFocus doesn't return if the force was succesful
-     or not, we suppose that this is the case like in cally and gail */
-  return TRUE;
-}
-
-/*
- * comment C&P from cally-actor:
- *
- * "These methods are basically taken from gail, as I don't see any
- * reason to modify it. It makes me wonder why it is really required
- * to be implemented in the toolkit"
- */
-
-static guint
-nux_view_accessible_add_focus_handler (AtkComponent *component,
-                                       AtkFocusHandler handler)
-{
-  GSignalMatchType match_type;
-  gulong ret;
-  guint signal_id;
-
-  g_return_val_if_fail (NUX_IS_VIEW_ACCESSIBLE (component), 0);
-
-  match_type = (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC);
-  signal_id = g_signal_lookup ("focus-event", ATK_TYPE_OBJECT);
-
-  ret = g_signal_handler_find (component, match_type, signal_id, 0, NULL,
-                               (gpointer) handler, NULL);
-  if (!ret)
+check_focus (NuxViewAccessible *self,
+             gboolean focus_in)
+{
+  if (self->priv->focused != focus_in)
     {
-      return g_signal_connect_closure_by_id (component,
-                                             signal_id, 0,
-                                             g_cclosure_new (G_CALLBACK (handler), NULL,
-                                                             (GClosureNotify) NULL),
-                                             FALSE);
+      self->priv->focused = focus_in;
+
+      g_signal_emit_by_name (self, "focus-event", focus_in);
+      atk_focus_tracker_notify (ATK_OBJECT (self));
     }
-  else
-    return 0;
-}
-
-static void
-nux_view_accessible_remove_focus_handler (AtkComponent *component,
-                                          guint handler_id)
-{
-  g_return_if_fail (NUX_IS_VIEW_ACCESSIBLE (component));
-
-  g_signal_handler_disconnect (component, handler_id);
-}
-
-static void
-nux_view_accessible_focus_handler (AtkObject *accessible,
-                                   gboolean focus_in)
-{
-  g_return_if_fail (NUX_IS_VIEW_ACCESSIBLE (accessible));
-
-  g_debug ("[a11y] view_focus_handler (%p:%s:%i)",
-           accessible, atk_object_get_name (accessible), focus_in);
-
-  atk_object_notify_state_change (accessible, ATK_STATE_FOCUSED, focus_in);
+}
+
+static void
+on_start_focus_cb (AtkObject *accessible)
+{
+  g_debug ("[a11y][view] on_start_focus_cb: (%p:%s)", accessible,
+           atk_object_get_name (accessible));
+
+  check_focus (NUX_VIEW_ACCESSIBLE (accessible), TRUE);
+}
+
+static void
+on_end_focus_cb (AtkObject *accessible)
+{
+  g_debug ("[a11y][view] on_end_focus_cb: (%p:%s)",
+           accessible, atk_object_get_name (accessible));
+
+  check_focus (NUX_VIEW_ACCESSIBLE (accessible), FALSE);
 }

=== modified file 'src/nux-view-accessible.h'
--- src/nux-view-accessible.h	2011-02-17 12:57:17 +0000
+++ src/nux-view-accessible.h	2011-03-28 12:38:26 +0000
@@ -37,10 +37,14 @@
 
 typedef struct _NuxViewAccessible        NuxViewAccessible;
 typedef struct _NuxViewAccessibleClass   NuxViewAccessibleClass;
+typedef struct _NuxViewAccessiblePrivate NuxViewAccessiblePrivate;
 
 struct _NuxViewAccessible
 {
   NuxAreaAccessible parent;
+
+  /*< private >*/
+  NuxViewAccessiblePrivate *priv;
 };
 
 struct _NuxViewAccessibleClass

=== modified file 'src/unity-launcher-accessible.cpp'
--- src/unity-launcher-accessible.cpp	2011-03-14 11:45:11 +0000
+++ src/unity-launcher-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -48,6 +48,7 @@
 static gint       unity_launcher_accessible_get_n_children (AtkObject *obj);
 static AtkObject *unity_launcher_accessible_ref_child      (AtkObject *obj,
                                                             gint i);
+static AtkStateSet *unity_launcher_accessible_ref_state_set  (AtkObject *obj);
 
 /* AtkSelection */
 static void       atk_selection_interface_init                  (AtkSelectionIface *iface);
@@ -64,7 +65,6 @@
 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,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
 
@@ -78,6 +78,8 @@
   sigc::connection on_icon_added_connection;
   sigc::connection on_icon_removed_connection;
   sigc::connection on_order_changed_connection;
+
+  gboolean focused;
 };
 
 
@@ -93,6 +95,7 @@
   atk_class->get_n_children = unity_launcher_accessible_get_n_children;
   atk_class->ref_child = unity_launcher_accessible_ref_child;
   atk_class->initialize = unity_launcher_accessible_initialize;
+  atk_class->ref_state_set = unity_launcher_accessible_ref_state_set;
 
   g_type_class_add_private (gobject_class, sizeof (UnityLauncherAccessiblePrivate));
 }
@@ -215,7 +218,6 @@
     return 0;
 
   launcher = dynamic_cast<Launcher *>(nux_object);
-  g_debug ("[Launcher] ref_child Launcher = %p", launcher);
 
   launcher_model = launcher->GetModel ();
 
@@ -225,11 +227,42 @@
   child = dynamic_cast<nux::Object *>(*it);
   child_accessible = unity_a11y_get_accessible (child);
 
+  g_debug ("[a11y][launcher] ref_child (%p:%s)",
+           child_accessible, atk_object_get_name (child_accessible));
+
   g_object_ref (child_accessible);
 
   return child_accessible;
 }
 
+static AtkStateSet*
+unity_launcher_accessible_ref_state_set (AtkObject *obj)
+{
+  AtkStateSet *state_set = NULL;
+  nux::Object *nux_object = NULL;
+  UnityLauncherAccessible *self = NULL;
+
+  g_return_val_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (obj), NULL);
+
+  state_set =
+    ATK_OBJECT_CLASS (unity_launcher_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;
+
+  self = UNITY_LAUNCHER_ACCESSIBLE (obj);
+
+  /* The Launcher is always focusable */
+  atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
+
+  if (self->priv->focused)
+    atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
+
+  return state_set;
+}
+
 /* AtkSelection */
 static void
 atk_selection_interface_init (AtkSelectionIface *iface)
@@ -336,7 +369,7 @@
 /* private */
 static void on_selection_change_cb (UnityLauncherAccessible *launcher_accessible)
 {
-  g_debug ("[LAUNCHER]: selection changed");
+  g_debug ("[a11y][launcher] selection changed");
 
   g_signal_emit_by_name (ATK_OBJECT (launcher_accessible), "selection-changed");
 }
@@ -362,7 +395,7 @@
 
   index = atk_object_get_index_in_parent (icon_accessible);
 
-  g_debug ("[a11y] icon (%p, %s) added on container (%p,%s) at index %i",
+  g_debug ("[a11y][launcher] 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);
@@ -389,7 +422,7 @@
 
   index = atk_object_get_index_in_parent (icon_accessible);
 
-  g_debug ("[a11y] icon (%p, %s) removed on container (%p,%s) at index %i",
+  g_debug ("[a11y][launcher] 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);

=== modified file 'src/unity-launcher-icon-accessible.cpp'
--- src/unity-launcher-icon-accessible.cpp	2011-03-24 17:09:19 +0000
+++ src/unity-launcher-icon-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -185,11 +185,6 @@
 
   atk_component_add_focus_handler (ATK_COMPONENT (accessible),
                                    unity_launcher_icon_accessible_focus_handler);
-
-  /* Check the cached selected state and notify the first selection.
-   * Ie: it is required to ensure a first notification
-   */
-  check_selected (UNITY_LAUNCHER_ICON_ACCESSIBLE (accessible));
 }
 
 
@@ -231,7 +226,7 @@
 
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (obj));
 
-  if (nux_object == NULL) /* actor is defunct */
+  if (nux_object == NULL) /* defunct */
     return state_set;
 
   /* by default */
@@ -271,7 +266,7 @@
 
   nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (obj));
 
-  if (nux_object == NULL) /* actor is defunct */
+  if (nux_object == NULL) /* defunct */
     return NULL;
 
   icon = dynamic_cast<LauncherIcon *>(nux_object);
@@ -305,7 +300,7 @@
   icon = dynamic_cast<LauncherIcon *>(nux_object);
   launcher = icon->GetLauncher ();
 
-  if ((launcher == NULL) || (self->priv->parent_focused == FALSE))
+  if (launcher == NULL)
     return;
 
   selected_icon = launcher->GetSelectedMenuIcon ();
@@ -313,6 +308,9 @@
   if (icon == selected_icon)
     found = TRUE;
 
+  if ((found) && (self->priv->parent_focused == FALSE))
+    return;
+
   if (found != self->priv->selected)
     {
       gboolean return_val = FALSE;
@@ -325,11 +323,11 @@
                                       ATK_STATE_ACTIVE,
                                       found);
 
-      g_signal_emit_by_name (self, "focus_event", found, &return_val);
+      g_signal_emit_by_name (self, "focus-event", self->priv->selected, &return_val);
       atk_focus_tracker_notify (ATK_OBJECT (self));
 
-      g_debug ("[LAUNCHER-ICON]: selected state changed (%p:%i:%s)",
-               self, found, atk_object_get_name (ATK_OBJECT (self)));
+      g_debug ("[a11y][launcher-icon] selected state changed (%p:%i:%s)",
+               self, self->priv->selected, atk_object_get_name (ATK_OBJECT (self)));
     }
 }
 
@@ -428,7 +426,7 @@
 {
   g_return_if_fail (UNITY_IS_LAUNCHER_ICON_ACCESSIBLE (accessible));
 
-  g_debug ("[a11y] launcher_icon_focus_handler (%p:%s:%i)",
+  g_debug ("[a11y][launcher-icon] focus_handler (%p:%s:%i)",
            accessible, atk_object_get_name (accessible), focus_in);
 
   atk_object_notify_state_change (accessible, ATK_STATE_FOCUSED, focus_in);

=== added file 'src/unity-places-view-accessible.cpp'
--- src/unity-places-view-accessible.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-places-view-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -0,0 +1,112 @@
+/*
+ * 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-places_view-accessible
+ * @Title: UnityPlacesViewAccessible
+ * @short_description: Implementation of the ATK interfaces for #PlacesView
+ * @see_also: PlacesView
+ *
+ * #UnityPlacesViewAccessible implements the required ATK interfaces for
+ * #PlacesView, ie: exposing the different PlacesViewIcon on the model as
+ * #child of the object.
+ *
+ */
+
+#include <glib/gi18n.h>
+
+#include "unity-places-view-accessible.h"
+
+#include "unitya11y.h"
+#include "PlacesView.h"
+
+/* GObject */
+static void unity_places_view_accessible_class_init (UnityPlacesViewAccessibleClass *klass);
+static void unity_places_view_accessible_init       (UnityPlacesViewAccessible *self);
+static void unity_places_view_accessible_finalize   (GObject *object);
+
+/* AtkObject.h */
+static void       unity_places_view_accessible_initialize     (AtkObject *accessible,
+                                                               gpointer   data);
+
+G_DEFINE_TYPE (UnityPlacesViewAccessible, unity_places_view_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
+
+#define UNITY_PLACES_VIEW_ACCESSIBLE_GET_PRIVATE(obj)                      \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_PLACES_VIEW_ACCESSIBLE,  \
+                                UnityPlacesViewAccessiblePrivate))
+
+struct _UnityPlacesViewAccessiblePrivate
+{
+  
+};
+
+
+static void
+unity_places_view_accessible_class_init (UnityPlacesViewAccessibleClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = unity_places_view_accessible_finalize;
+
+  /* AtkObject */
+  atk_class->initialize = unity_places_view_accessible_initialize;
+
+  g_type_class_add_private (gobject_class, sizeof (UnityPlacesViewAccessiblePrivate));
+}
+
+static void
+unity_places_view_accessible_init (UnityPlacesViewAccessible *self)
+{
+  UnityPlacesViewAccessiblePrivate *priv =
+    UNITY_PLACES_VIEW_ACCESSIBLE_GET_PRIVATE (self);
+
+  self->priv = priv;
+}
+
+static void
+unity_places_view_accessible_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (unity_places_view_accessible_parent_class)->finalize (object);
+}
+
+AtkObject*
+unity_places_view_accessible_new (nux::Object *object)
+{
+  AtkObject *accessible = NULL;
+
+  g_return_val_if_fail (dynamic_cast<PlacesView *>(object), NULL);
+
+  accessible = ATK_OBJECT (g_object_new (UNITY_TYPE_PLACES_VIEW_ACCESSIBLE, NULL));
+
+  atk_object_initialize (accessible, object);
+  atk_object_set_name (accessible, _("Places"));
+
+  return accessible;
+}
+
+/* AtkObject.h */
+static void
+unity_places_view_accessible_initialize (AtkObject *accessible,
+                                      gpointer data)
+{
+  ATK_OBJECT_CLASS (unity_places_view_accessible_parent_class)->initialize (accessible, data);
+
+  accessible->role = ATK_ROLE_PANEL;
+}
+

=== added file 'src/unity-places-view-accessible.h'
--- src/unity-places-view-accessible.h	1970-01-01 00:00:00 +0000
+++ src/unity-places-view-accessible.h	2011-03-28 12:38:26 +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_PLACES_VIEW_ACCESSIBLE_H
+#define UNITY_PLACES_VIEW_ACCESSIBLE_H
+
+#include <atk/atk.h>
+
+#include "nux-view-accessible.h"
+
+G_BEGIN_DECLS
+
+#define UNITY_TYPE_PLACES_VIEW_ACCESSIBLE            (unity_places_view_accessible_get_type ())
+#define UNITY_PLACES_VIEW_ACCESSIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_TYPE_PLACES_VIEW_ACCESSIBLE, UnityPlacesViewAccessible))
+#define UNITY_PLACES_VIEW_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_TYPE_PLACES_VIEW_ACCESSIBLE, UnityPlacesViewAccessibleClass))
+#define UNITY_IS_PLACES_VIEW_ACCESSIBLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_TYPE_PLACES_VIEW_ACCESSIBLE))
+#define UNITY_IS_PLACES_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_TYPE_PLACES_VIEW_ACCESSIBLE))
+#define UNITY_PLACES_VIEW_ACCESSIBLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_TYPE_PLACES_VIEW_ACCESSIBLE, UnityPlacesViewAccessibleClass))
+
+typedef struct _UnityPlacesViewAccessible          UnityPlacesViewAccessible;
+typedef struct _UnityPlacesViewAccessibleClass     UnityPlacesViewAccessibleClass;
+typedef struct _UnityPlacesViewAccessiblePrivate   UnityPlacesViewAccessiblePrivate;
+
+struct _UnityPlacesViewAccessible
+{
+  NuxViewAccessible parent;
+
+  /*< private >*/
+  UnityPlacesViewAccessiblePrivate *priv;
+};
+
+struct _UnityPlacesViewAccessibleClass
+{
+  NuxViewAccessibleClass parent_class;
+};
+
+GType      unity_places_view_accessible_get_type (void);
+AtkObject *unity_places_view_accessible_new      (nux::Object *object);
+
+G_END_DECLS
+
+#endif /* __UNITY_PLACES_VIEW_ACCESSIBLE_H__ */

=== modified file 'src/unity-root-accessible.cpp'
--- src/unity-root-accessible.cpp	2011-03-21 20:06:16 +0000
+++ src/unity-root-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -23,7 +23,6 @@
  * #UnityRootAccessible is the root object of the accessibility
  * tree-like hierarchy, exposing the application level.
  *
- * Implementation notes: FIXME, RIGHT NOW IS JUST A DUMMY IMPLEMENTATION
  */
 
 #include "unity-root-accessible.h"
@@ -172,14 +171,14 @@
  * temporal. This method should be a internal root method, as part of
  * a basewindow::show callback, as in the case of gail
  */
-void
+AtkObject *
 unity_root_accessible_add_window (UnityRootAccessible *self,
                                   nux::BaseWindow *window)
 {
   AtkObject *window_accessible = NULL;
   gint index = 0;
 
-  g_return_if_fail (UNITY_IS_ROOT_ACCESSIBLE (self));
+  g_return_val_if_fail (UNITY_IS_ROOT_ACCESSIBLE (self), NULL);
 
   window_accessible =
     unity_a11y_get_accessible (window);
@@ -193,6 +192,8 @@
 
   g_signal_emit_by_name (self, "children-changed::add",
                          index, window_accessible, NULL);
+
+  return window_accessible;
 }
 
 /* private */

=== modified file 'src/unity-root-accessible.h'
--- src/unity-root-accessible.h	2011-01-13 01:59:18 +0000
+++ src/unity-root-accessible.h	2011-03-28 12:38:26 +0000
@@ -53,7 +53,8 @@
 GType      unity_root_accessible_get_type (void);
 AtkObject *unity_root_accessible_new      (void);
 
-void       unity_root_accessible_add_window (UnityRootAccessible *self, nux::BaseWindow *window);
+AtkObject *unity_root_accessible_add_window (UnityRootAccessible *self,
+                                             nux::BaseWindow *window);
 
 G_END_DECLS
 

=== added file 'src/unity-search-bar-accessible.cpp'
--- src/unity-search-bar-accessible.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-search-bar-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -0,0 +1,132 @@
+/*
+ * 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-search_bar-accessible
+ * @Title: UnitySearchBarAccessible
+ * @short_description: Implementation of the ATK interfaces for #SearchBar
+ * @see_also: SearchBar
+ *
+ * #UnitySearchBarAccessible implements the required ATK interfaces for
+ * #SearchBar, ie: exposing the different SearchBarIcon on the model as
+ * #child of the object.
+ *
+ */
+
+#include <glib/gi18n.h>
+
+#include "unity-search-bar-accessible.h"
+
+#include "unitya11y.h"
+#include "PlacesSearchBar.h"
+
+/* GObject */
+static void unity_search_bar_accessible_class_init (UnitySearchBarAccessibleClass *klass);
+static void unity_search_bar_accessible_init       (UnitySearchBarAccessible *self);
+static void unity_search_bar_accessible_finalize   (GObject *object);
+
+/* AtkObject.h */
+static void       unity_search_bar_accessible_initialize     (AtkObject *accessible,
+                                                               gpointer   data);
+
+G_DEFINE_TYPE (UnitySearchBarAccessible, unity_search_bar_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
+
+#define UNITY_SEARCH_BAR_ACCESSIBLE_GET_PRIVATE(obj)                      \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_SEARCH_BAR_ACCESSIBLE,  \
+                                UnitySearchBarAccessiblePrivate))
+
+struct _UnitySearchBarAccessiblePrivate
+{
+  
+};
+
+
+static void
+unity_search_bar_accessible_class_init (UnitySearchBarAccessibleClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = unity_search_bar_accessible_finalize;
+
+  /* AtkObject */
+  atk_class->initialize = unity_search_bar_accessible_initialize;
+
+  g_type_class_add_private (gobject_class, sizeof (UnitySearchBarAccessiblePrivate));
+}
+
+static void
+unity_search_bar_accessible_init (UnitySearchBarAccessible *self)
+{
+  UnitySearchBarAccessiblePrivate *priv =
+    UNITY_SEARCH_BAR_ACCESSIBLE_GET_PRIVATE (self);
+
+  self->priv = priv;
+}
+
+static void
+unity_search_bar_accessible_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (unity_search_bar_accessible_parent_class)->finalize (object);
+}
+
+AtkObject*
+unity_search_bar_accessible_new (nux::Object *object)
+{
+  AtkObject *accessible = NULL;
+
+  g_return_val_if_fail (dynamic_cast<PlacesSearchBar *>(object), NULL);
+
+  accessible = ATK_OBJECT (g_object_new (UNITY_TYPE_SEARCH_BAR_ACCESSIBLE, NULL));
+
+  atk_object_initialize (accessible, object);
+  atk_object_set_name (accessible, _("Search Bar"));
+
+  return accessible;
+}
+
+/* AtkObject.h */
+static void
+unity_search_bar_accessible_initialize (AtkObject *accessible,
+                                      gpointer data)
+{
+  nux::Object *nux_object = NULL;
+  PlacesSearchBar *search_bar = NULL;
+  nux::TextEntry *text_entry = NULL;
+
+  ATK_OBJECT_CLASS (unity_search_bar_accessible_parent_class)->initialize (accessible, data);
+
+  accessible->role = ATK_ROLE_PANEL;
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (accessible));
+  search_bar = dynamic_cast<PlacesSearchBar *>(nux_object);
+
+  text_entry = search_bar->GetTextEntry ();
+
+  if (text_entry != NULL)
+    {
+      AtkObject *atk_object = unity_a11y_get_accessible (text_entry);
+
+      /* FIXME: this is the general search bar, but right now it is
+         only supported the Run Command dialog. When a full Places
+         support is finished, this would change */
+
+      atk_object_set_name (atk_object, _("Run Command Search Entry"));
+    }
+}
+

=== added file 'src/unity-search-bar-accessible.h'
--- src/unity-search-bar-accessible.h	1970-01-01 00:00:00 +0000
+++ src/unity-search-bar-accessible.h	2011-03-28 12:38:26 +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_SEARCH_BAR_ACCESSIBLE_H
+#define UNITY_SEARCH_BAR_ACCESSIBLE_H
+
+#include <atk/atk.h>
+
+#include "nux-view-accessible.h"
+
+G_BEGIN_DECLS
+
+#define UNITY_TYPE_SEARCH_BAR_ACCESSIBLE            (unity_search_bar_accessible_get_type ())
+#define UNITY_SEARCH_BAR_ACCESSIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_TYPE_SEARCH_BAR_ACCESSIBLE, UnitySearchBarAccessible))
+#define UNITY_SEARCH_BAR_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_TYPE_SEARCH_BAR_ACCESSIBLE, UnitySearchBarAccessibleClass))
+#define UNITY_IS_SEARCH_BAR_ACCESSIBLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_TYPE_SEARCH_BAR_ACCESSIBLE))
+#define UNITY_IS_SEARCH_BAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_TYPE_SEARCH_BAR_ACCESSIBLE))
+#define UNITY_SEARCH_BAR_ACCESSIBLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_TYPE_SEARCH_BAR_ACCESSIBLE, UnitySearchBarAccessibleClass))
+
+typedef struct _UnitySearchBarAccessible          UnitySearchBarAccessible;
+typedef struct _UnitySearchBarAccessibleClass     UnitySearchBarAccessibleClass;
+typedef struct _UnitySearchBarAccessiblePrivate   UnitySearchBarAccessiblePrivate;
+
+struct _UnitySearchBarAccessible
+{
+  NuxViewAccessible parent;
+
+  /*< private >*/
+  UnitySearchBarAccessiblePrivate *priv;
+};
+
+struct _UnitySearchBarAccessibleClass
+{
+  NuxViewAccessibleClass parent_class;
+};
+
+GType      unity_search_bar_accessible_get_type (void);
+AtkObject *unity_search_bar_accessible_new      (nux::Object *object);
+
+G_END_DECLS
+
+#endif /* __UNITY_SEARCH_BAR_ACCESSIBLE_H__ */

=== modified file 'src/unity-util-accessible.cpp'
--- src/unity-util-accessible.cpp	2011-03-16 18:12:57 +0000
+++ src/unity-util-accessible.cpp	2011-03-28 12:38:26 +0000
@@ -24,6 +24,8 @@
 #include "unity-util-accessible.h"
 #include "unity-root-accessible.h"
 
+#include "nux-base-window-accessible.h"
+
 static void unity_util_accessible_class_init (UnityUtilAccessibleClass	*klass);
 static void unity_util_accessible_init       (UnityUtilAccessible *unity_util_accessible);
 
@@ -144,7 +146,11 @@
 	  listener_idx++;
 	}
       else
-        g_debug ("Signal type %s not supported\n", signal_name);
+        {
+          /* Mainly becase some "window::xxx" methods not implemented
+             on NuxBaseWindowAccessible */
+          g_debug ("Signal type %s not supported\n", signal_name);
+        }
     }
   else
     g_warning ("Invalid object type %s\n", object_type);
@@ -152,6 +158,15 @@
   return rc;
 }
 
+static void
+do_window_event_initialization (void)
+{
+  /*
+   * Ensure that NuxBaseWindowClass exists
+   */
+  g_type_class_unref (g_type_class_ref (NUX_TYPE_BASE_WINDOW_ACCESSIBLE));
+}
+
 static guint
 unity_util_accessible_add_global_event_listener (GSignalEmissionHook listener,
                                                  const gchar*        event_type)
@@ -164,8 +179,16 @@
     {
       if (g_str_equal ("window", split_string[0]))
         {
-	  /* FIXME: need to specifically process window: events (create, destroy,
-	     minimize, maximize, restore, activate, deactivate) */
+          /* Using NuxBaseWindow as the toplevelwindow */
+          static gboolean initialized = FALSE;
+
+          if (initialized == FALSE)
+            {
+              do_window_event_initialization ();
+              initialized = TRUE;
+            }
+
+          rc = add_listener (listener, "NuxBaseWindowAccessible", split_string [1], event_type);
 	}
       else
         {
@@ -421,11 +444,15 @@
 }
 
 /* Public */
-void
+AtkObject *
 unity_util_accessible_add_window (nux::BaseWindow *window)
 {
-  unity_root_accessible_add_window
+  AtkObject *atk_obj = NULL;
+
+  atk_obj = unity_root_accessible_add_window
     (UNITY_ROOT_ACCESSIBLE (unity_util_accessible_get_root ()), window);
+
+  return atk_obj;
 }
 
 void

=== modified file 'src/unity-util-accessible.h'
--- src/unity-util-accessible.h	2011-03-16 18:12:57 +0000
+++ src/unity-util-accessible.h	2011-03-28 12:38:26 +0000
@@ -52,8 +52,8 @@
 
 GType unity_util_accessible_get_type (void);
 
-void  unity_util_accessible_add_window (nux::BaseWindow *window);
-void  unity_util_accessible_set_window_thread (nux::WindowThread *wt);
+AtkObject*  unity_util_accessible_add_window (nux::BaseWindow *window);
+void        unity_util_accessible_set_window_thread (nux::WindowThread *wt);
 
 G_END_DECLS
 

=== modified file 'src/unitya11y.cpp'
--- src/unitya11y.cpp	2011-03-16 18:12:57 +0000
+++ src/unitya11y.cpp	2011-03-28 12:38:26 +0000
@@ -36,10 +36,13 @@
 #include "LauncherIcon.h"
 #include "SimpleLauncherIcon.h"
 #include "PanelView.h"
+#include "PlacesView.h"
 #include "unity-launcher-accessible.h"
 #include "unity-launcher-icon-accessible.h"
 #include "unity-panel-view-accessible.h"
 #include "unity-panel-home-button-accessible.h"
+#include "unity-places-view-accessible.h"
+#include "unity-search-bar-accessible.h"
 
 static GHashTable *accessible_table = NULL;
 /* FIXME: remove accessible objects when not required anymore */
@@ -264,6 +267,12 @@
   if (object->Type().IsDerivedFromType (PanelHomeButton::StaticObjectType))
     return unity_panel_home_button_accessible_new (object);
 
+  if (object->Type().IsDerivedFromType (PlacesView::StaticObjectType))
+    return unity_places_view_accessible_new (object);
+
+  if (object->Type().IsDerivedFromType (PlacesSearchBar::StaticObjectType))
+    return unity_search_bar_accessible_new (object);
+
   /* NUX classes  */
   if (object->Type().IsDerivedFromType (nux::BaseWindow::StaticObjectType))
     return nux_base_window_accessible_new (object);

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-03-24 01:29:39 +0000
+++ src/unityshell.cpp	2011-03-28 12:38:26 +0000
@@ -898,7 +898,13 @@
   /* FIXME: this should not be manual, should be managed with a
      show/hide callback like in GAIL*/
   if (unity_a11y_initialized () == TRUE)
-    unity_util_accessible_add_window (self->placesController->GetWindow ());
+    {
+      AtkObject *atk_obj = NULL;
+
+      atk_obj = unity_util_accessible_add_window (self->placesController->GetWindow ());
+
+      atk_object_set_name (atk_obj, _("Places"));
+    }
 
   self->launcher->SetHideMode (Launcher::LAUNCHER_HIDE_DODGE_WINDOWS);
   self->launcher->SetLaunchAnimation (Launcher::LAUNCH_ANIMATION_PULSE);