[gtk+/quartz-integration: 515/563] Convert GailWindow to GtkWindowAccessible
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 515/563] Convert GailWindow to GtkWindowAccessible
- Date: Sat, 9 Jul 2011 06:49:18 +0000 (UTC)
commit cbb163efff60a1e0fc2632cece147243eeb34f90
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 1 22:10:27 2011 -0400
Convert GailWindow to GtkWindowAccessible
While doing this, drop the get_mdi_zorder implementation
that really should come from the window manager side. Dropping
this saves some 500 lines.
gtk/a11y/Makefile.am | 4 +-
gtk/a11y/gail.c | 3 -
gtk/a11y/gailutil.c | 50 +--
gtk/a11y/gailwindow.c | 940 ----------------------------------------
gtk/a11y/gailwindow.h | 51 ---
gtk/a11y/gtkwindowaccessible.c | 493 +++++++++++++++++++++
gtk/a11y/gtkwindowaccessible.h | 51 +++
gtk/gtkwindow.c | 3 +
tests/a11y/assistant.txt | 447 ++++++++++++++-----
9 files changed, 906 insertions(+), 1136 deletions(-)
---
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index bd3e3da..7007fa6 100644
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -50,7 +50,7 @@ gail_c_sources = \
gtktreeviewaccessible.c \
gailutil.c \
gailwidget.c \
- gailwindow.c
+ gtkwindowaccessible.c
libgailincludedir=$(includedir)/gail-3.0/gail
@@ -101,7 +101,7 @@ gail_private_h_sources = \
gailtoplevel.h \
gtktreeviewaccessible.h \
gailutil.h \
- gailwindow.h
+ gtkwindowaccessible.h
gail_public_h_sources = \
gailwidget.h
diff --git a/gtk/a11y/gail.c b/gtk/a11y/gail.c
index 60d9088..354d814 100644
--- a/gtk/a11y/gail.c
+++ b/gtk/a11y/gail.c
@@ -35,7 +35,6 @@
#include "gailtoplevel.h"
#include "gailutil.h"
#include "gailwidget.h"
-#include "gailwindow.h"
#include "gailfactory.h"
@@ -85,7 +84,6 @@ GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WIDGET, GailWidget, gail_widget, GTK_TYPE_WIDG
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CONTAINER, GailContainer, gail_container, GTK_TYPE_CONTAINER)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_MENU_SHELL, GailMenuShell, gail_menu_shell, GTK_TYPE_MENU_SHELL)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_MENU, GailMenu, gail_menu, GTK_TYPE_MENU)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WINDOW, GailWindow, gail_window, GTK_TYPE_BIN)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_RENDERER_CELL, GailRendererCell, gail_renderer_cell, GTK_TYPE_CELL_RENDERER, gail_renderer_cell_new)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_BOOLEAN_CELL, GailBooleanCell, gail_boolean_cell, GTK_TYPE_CELL_RENDERER_TOGGLE, gail_boolean_cell_new)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_IMAGE_CELL, GailImageCell, gail_image_cell, GTK_TYPE_CELL_RENDERER_PIXBUF, gail_image_cell_new)
@@ -834,7 +832,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CONTAINER, gail_container);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_MENU_BAR, gail_menu_shell);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_MENU, gail_menu);
- GAIL_WIDGET_SET_FACTORY (GTK_TYPE_WINDOW, gail_window);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_TEXT, gail_text_cell);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_TOGGLE, gail_boolean_cell);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_PIXBUF, gail_image_cell);
diff --git a/gtk/a11y/gailutil.c b/gtk/a11y/gailutil.c
index 316efff..d2424dc 100644
--- a/gtk/a11y/gailutil.c
+++ b/gtk/a11y/gailutil.c
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include "gailutil.h"
#include "gailtoplevel.h"
-#include "gailwindow.h"
+#include "gtkwindowaccessible.h"
static void gail_util_class_init (GailUtilClass *klass);
static void gail_util_init (GailUtil *utils);
@@ -147,7 +147,7 @@ gail_util_add_global_event_listener (GSignalEmissionHook listener,
do_window_event_initialization ();
initialized = TRUE;
}
- rc = add_listener (listener, "GailWindow", split_string[1], event_type);
+ rc = add_listener (listener, "GtkWindowAccessible", split_string[1], event_type);
}
else
{
@@ -403,9 +403,9 @@ do_window_event_initialization (void)
AtkObject *root;
/*
- * Ensure that GailWindowClass exists.
+ * Ensure that GtkWindowAccessibleClass exists.
*/
- g_type_class_ref (GAIL_TYPE_WINDOW);
+ g_type_class_ref (GTK_TYPE_WINDOW_ACCESSIBLE);
g_signal_add_emission_hook (g_signal_lookup ("window-state-event", GTK_TYPE_WIDGET),
0, state_event_watcher, NULL, (GDestroyNotify) NULL);
g_signal_add_emission_hook (g_signal_lookup ("configure-event", GTK_TYPE_WIDGET),
@@ -461,15 +461,15 @@ state_event_watcher (GSignalInvocationHint *hint,
atk_obj = gtk_widget_get_accessible (widget);
- if (GAIL_IS_WINDOW (atk_obj))
+ if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
{
parent = atk_object_get_parent (atk_obj);
if (parent == atk_get_root ())
- {
- signal_id = g_signal_lookup (signal_name, GAIL_TYPE_WINDOW);
- g_signal_emit (atk_obj, signal_id, 0);
- }
-
+ {
+ signal_id = g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE);
+ g_signal_emit (atk_obj, signal_id, 0);
+ }
+
return TRUE;
}
else
@@ -485,17 +485,15 @@ window_added (AtkObject *atk_obj,
{
GtkWidget *widget;
- if (!GAIL_IS_WINDOW (child)) return;
+ if (!GTK_IS_WINDOW_ACCESSIBLE (child)) return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
if (!widget)
return;
- g_signal_connect (widget, "focus-in-event",
- (GCallback) window_focus, NULL);
- g_signal_connect (widget, "focus-out-event",
- (GCallback) window_focus, NULL);
- g_signal_emit (child, g_signal_lookup ("create", GAIL_TYPE_WINDOW), 0);
+ g_signal_connect (widget, "focus-in-event", (GCallback) window_focus, NULL);
+ g_signal_connect (widget, "focus-out-event", (GCallback) window_focus, NULL);
+ g_signal_emit (child, g_signal_lookup ("create", GTK_TYPE_WINDOW_ACCESSIBLE), 0);
}
@@ -507,7 +505,7 @@ window_removed (AtkObject *atk_obj,
GtkWidget *widget;
GtkWindow *window;
- if (!GAIL_IS_WINDOW (child)) return;
+ if (!GTK_IS_WINDOW_ACCESSIBLE (child)) return;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
if (!widget)
@@ -526,11 +524,11 @@ window_removed (AtkObject *atk_obj,
atk_obj = gtk_widget_get_accessible (widget);
signal_name = "deactivate";
- g_signal_emit (atk_obj, g_signal_lookup (signal_name, GAIL_TYPE_WINDOW), 0);
+ g_signal_emit (atk_obj, g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE), 0);
}
g_signal_handlers_disconnect_by_func (widget, (gpointer) window_focus, NULL);
- g_signal_emit (child, g_signal_lookup ("destroy", GAIL_TYPE_WINDOW), 0);
+ g_signal_emit (child, g_signal_lookup ("destroy", GTK_TYPE_WINDOW_ACCESSIBLE), 0);
}
static gboolean
@@ -544,7 +542,7 @@ window_focus (GtkWidget *widget,
atk_obj = gtk_widget_get_accessible (widget);
signal_name = (event->in) ? "activate" : "deactivate";
- g_signal_emit (atk_obj, g_signal_lookup (signal_name, GAIL_TYPE_WINDOW), 0);
+ g_signal_emit (atk_obj, g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE), 0);
return FALSE;
}
@@ -593,15 +591,15 @@ configure_event_watcher (GSignalInvocationHint *hint,
}
atk_obj = gtk_widget_get_accessible (widget);
- if (GAIL_IS_WINDOW (atk_obj))
+ if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
{
parent = atk_object_get_parent (atk_obj);
if (parent == atk_get_root ())
- {
- signal_id = g_signal_lookup (signal_name, GAIL_TYPE_WINDOW);
- g_signal_emit (atk_obj, signal_id, 0);
- }
-
+ {
+ signal_id = g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE);
+ g_signal_emit (atk_obj, signal_id, 0);
+ }
+
return TRUE;
}
else
diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c
new file mode 100644
index 0000000..f07d35f
--- /dev/null
+++ b/gtk/a11y/gtkwindowaccessible.c
@@ -0,0 +1,493 @@
+/* GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gtk/gtkx.h>
+
+#include "gtkwindowaccessible.h"
+#include "gailtoplevel.h"
+
+enum {
+ ACTIVATE,
+ CREATE,
+ DEACTIVATE,
+ DESTROY,
+ MAXIMIZE,
+ MINIMIZE,
+ MOVE,
+ RESIZE,
+ RESTORE,
+ LAST_SIGNAL
+};
+
+
+/* atkcomponent.h */
+
+static void gtk_window_accessible_get_extents (AtkComponent *component,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height,
+ AtkCoordType coord_type);
+static void gtk_window_accessible_get_size (AtkComponent *component,
+ gint *width,
+ gint *height);
+
+static guint gtk_window_accessible_signals [LAST_SIGNAL] = { 0, };
+
+static void atk_component_interface_init (AtkComponentIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible, gtk_window_accessible, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
+
+
+static gboolean
+gtk_window_accessible_focus_gtk (GtkWidget *widget,
+ GdkEventFocus *event)
+{
+ AtkObject* obj;
+
+ obj = gtk_widget_get_accessible (widget);
+ atk_object_notify_state_change (obj, ATK_STATE_ACTIVE, event->in);
+
+ return FALSE;
+}
+
+static void
+gtk_window_accessible_notify_gtk (GObject *obj,
+ GParamSpec *pspec)
+{
+ GtkWidget *widget = GTK_WIDGET (obj);
+ AtkObject* atk_obj = gtk_widget_get_accessible (widget);
+
+ if (strcmp (pspec->name, "title") == 0)
+ {
+ g_object_notify (G_OBJECT (atk_obj), "accessible-name");
+ g_signal_emit_by_name (atk_obj, "visible_data_changed");
+ }
+ else
+ GAIL_WIDGET_CLASS (gtk_window_accessible_parent_class)->notify_gtk (obj, pspec);
+}
+
+static gboolean
+window_state_event_cb (GtkWidget *widget,
+ GdkEventWindowState *event)
+{
+ AtkObject* obj;
+
+ obj = gtk_widget_get_accessible (widget);
+ atk_object_notify_state_change (obj, ATK_STATE_ICONIFIED,
+ (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) != 0);
+
+ return FALSE;
+}
+
+static void
+gtk_window_accessible_initialize (AtkObject *obj,
+ gpointer data)
+{
+ GtkWidget *widget = GTK_WIDGET (data);
+
+ /* A GtkWindowAccessible can be created for a GtkHandleBox or a GtkWindow */
+ if (!GTK_IS_WINDOW (widget) && !GTK_IS_HANDLE_BOX (widget))
+ return;
+
+ ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->initialize (obj, data);
+
+ g_signal_connect (data, "window_state_event", G_CALLBACK (window_state_event_cb), NULL);
+ g_object_set_data (G_OBJECT (obj), "atk-component-layer", GINT_TO_POINTER (ATK_LAYER_WINDOW));
+
+ if (GTK_IS_FILE_CHOOSER_DIALOG (widget))
+ obj->role = ATK_ROLE_FILE_CHOOSER;
+ else if (GTK_IS_COLOR_SELECTION_DIALOG (widget))
+ obj->role = ATK_ROLE_COLOR_CHOOSER;
+ else if (GTK_IS_FONT_SELECTION_DIALOG (widget))
+ obj->role = ATK_ROLE_FONT_CHOOSER;
+ else if (GTK_IS_MESSAGE_DIALOG (widget))
+ obj->role = ATK_ROLE_ALERT;
+ else if (GTK_IS_DIALOG (widget))
+ obj->role = ATK_ROLE_DIALOG;
+ else
+ {
+ const gchar *name;
+
+ name = gtk_widget_get_name (widget);
+
+ if (!g_strcmp0 (name, "gtk-tooltip"))
+ obj->role = ATK_ROLE_TOOL_TIP;
+#ifdef GDK_WINDOWING_X11
+ else if (GTK_IS_PLUG (widget))
+ obj->role = ATK_ROLE_PANEL;
+#endif
+ else if (gtk_window_get_window_type (GTK_WINDOW (widget)) == GTK_WINDOW_POPUP)
+ obj->role = ATK_ROLE_WINDOW;
+ else
+ obj->role = ATK_ROLE_FRAME;
+ }
+
+ /* Notify that tooltip is showing */
+ if (obj->role == ATK_ROLE_TOOL_TIP && gtk_widget_get_mapped (widget))
+ atk_object_notify_state_change (obj, ATK_STATE_SHOWING, 1);
+}
+
+static GtkWidget *
+find_label_child (GtkContainer *container)
+{
+ GList *children, *tmp_list;
+ GtkWidget *child;
+
+ children = gtk_container_get_children (container);
+
+ child = NULL;
+ for (tmp_list = children; tmp_list != NULL; tmp_list = tmp_list->next)
+ {
+ if (GTK_IS_LABEL (tmp_list->data))
+ {
+ child = GTK_WIDGET (tmp_list->data);
+ break;
+ }
+ else if (GTK_IS_CONTAINER (tmp_list->data))
+ {
+ child = find_label_child (GTK_CONTAINER (tmp_list->data));
+ if (child)
+ break;
+ }
+ }
+ g_list_free (children);
+ return child;
+}
+
+static const gchar *
+gtk_window_accessible_get_name (AtkObject *accessible)
+{
+ const gchar* name;
+ GtkWidget* widget;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
+ if (widget == NULL)
+ return NULL;
+
+ name = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->get_name (accessible);
+ if (name != NULL)
+ return name;
+
+ if (GTK_IS_WINDOW (widget))
+ {
+ GtkWindow *window = GTK_WINDOW (widget);
+
+ name = gtk_window_get_title (window);
+ if (name == NULL && accessible->role == ATK_ROLE_TOOL_TIP)
+ {
+ GtkWidget *child;
+
+ child = find_label_child (GTK_CONTAINER (window));
+ if (GTK_IS_LABEL (child))
+ name = gtk_label_get_text (GTK_LABEL (child));
+ }
+ }
+ return name;
+}
+
+static gint
+gtk_window_accessible_get_index_in_parent (AtkObject *accessible)
+{
+ GtkWidget* widget;
+ AtkObject* atk_obj;
+ gint index = -1;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
+ if (widget == NULL)
+ return -1;
+
+ index = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->get_index_in_parent (accessible);
+ if (index != -1)
+ return index;
+
+ atk_obj = atk_get_root ();
+
+ if (GTK_IS_WINDOW (widget))
+ {
+ GtkWindow *window = GTK_WINDOW (widget);
+ if (GAIL_IS_TOPLEVEL (atk_obj))
+ {
+ GailToplevel* toplevel = GAIL_TOPLEVEL (atk_obj);
+ index = g_list_index (toplevel->window_list, window);
+ }
+ else
+ {
+ gint i, sibling_count;
+
+ sibling_count = atk_object_get_n_accessible_children (atk_obj);
+ for (i = 0; i < sibling_count && index == -1; ++i)
+ {
+ AtkObject *child = atk_object_ref_accessible_child (atk_obj, i);
+ if (accessible == child)
+ index = i;
+ g_object_unref (G_OBJECT (child));
+ }
+ }
+ }
+ return index;
+}
+
+static AtkRelationSet *
+gtk_window_accessible_ref_relation_set (AtkObject *obj)
+{
+ GtkWidget *widget;
+ AtkRelationSet *relation_set;
+ AtkObject *array[1];
+ AtkRelation* relation;
+ GtkWidget *current_widget;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
+ if (widget == NULL)
+ return NULL;
+
+ relation_set = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->ref_relation_set (obj);
+
+ if (atk_object_get_role (obj) == ATK_ROLE_TOOL_TIP)
+ {
+ relation = atk_relation_set_get_relation_by_type (relation_set, ATK_RELATION_POPUP_FOR);
+ if (relation)
+ atk_relation_set_remove (relation_set, relation);
+
+ if (0) /* FIXME need a way to go from tooltip window to widget */
+ {
+ array[0] = gtk_widget_get_accessible (current_widget);
+ relation = atk_relation_new (array, 1, ATK_RELATION_POPUP_FOR);
+ atk_relation_set_add (relation_set, relation);
+ g_object_unref (relation);
+ }
+ }
+ return relation_set;
+}
+
+static AtkStateSet *
+gtk_window_accessible_ref_state_set (AtkObject *accessible)
+{
+ AtkStateSet *state_set;
+ GtkWidget *widget;
+ GtkWindow *window;
+ GdkWindow *gdk_window;
+ GdkWindowState state;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
+ if (widget == NULL)
+ return NULL;
+
+ state_set = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->ref_state_set (accessible);
+
+ window = GTK_WINDOW (widget);
+
+ if (gtk_window_has_toplevel_focus (window) && gtk_window_is_active (window))
+ atk_state_set_add_state (state_set, ATK_STATE_ACTIVE);
+
+ gdk_window = gtk_widget_get_window (widget);
+ if (window)
+ {
+ state = gdk_window_get_state (gdk_window);
+ if (state & GDK_WINDOW_STATE_ICONIFIED)
+ atk_state_set_add_state (state_set, ATK_STATE_ICONIFIED);
+ }
+ if (gtk_window_get_modal (window))
+ atk_state_set_add_state (state_set, ATK_STATE_MODAL);
+
+ if (gtk_window_get_resizable (window))
+ atk_state_set_add_state (state_set, ATK_STATE_RESIZABLE);
+
+ return state_set;
+}
+
+static void
+gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass)
+{
+ GailWidgetClass *widget_class = (GailWidgetClass*)klass;
+ AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
+
+ widget_class->focus_gtk = gtk_window_accessible_focus_gtk;
+ widget_class->notify_gtk = gtk_window_accessible_notify_gtk;
+
+ class->get_name = gtk_window_accessible_get_name;
+ class->get_index_in_parent = gtk_window_accessible_get_index_in_parent;
+ class->ref_relation_set = gtk_window_accessible_ref_relation_set;
+ class->ref_state_set = gtk_window_accessible_ref_state_set;
+ class->initialize = gtk_window_accessible_initialize;
+
+ gtk_window_accessible_signals [ACTIVATE] =
+ g_signal_new ("activate",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [CREATE] =
+ g_signal_new ("create",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [DEACTIVATE] =
+ g_signal_new ("deactivate",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [DESTROY] =
+ g_signal_new ("destroy",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [MAXIMIZE] =
+ g_signal_new ("maximize",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [MINIMIZE] =
+ g_signal_new ("minimize",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [MOVE] =
+ g_signal_new ("move",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [RESIZE] =
+ g_signal_new ("resize",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ gtk_window_accessible_signals [RESTORE] =
+ g_signal_new ("restore",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+}
+
+static void
+gtk_window_accessible_init (GtkWindowAccessible *accessible)
+{
+}
+
+static void
+gtk_window_accessible_get_extents (AtkComponent *component,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height,
+ AtkCoordType coord_type)
+{
+ GtkWidget *widget;
+ GdkRectangle rect;
+ gint x_toplevel, y_toplevel;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
+ if (widget == NULL)
+ return;
+
+ if (!gtk_widget_is_toplevel (widget))
+ {
+ AtkComponentIface *parent_iface;
+
+ parent_iface = (AtkComponentIface *) g_type_interface_peek_parent (ATK_COMPONENT_GET_IFACE (component));
+ parent_iface->get_extents (component, x, y, width, height, coord_type);
+ return;
+ }
+
+ gdk_window_get_frame_extents (gtk_widget_get_window (widget), &rect);
+
+ *width = rect.width;
+ *height = rect.height;
+ if (!gtk_widget_is_drawable (widget))
+ {
+ *x = G_MININT;
+ *y = G_MININT;
+ return;
+ }
+
+ *x = rect.x;
+ *y = rect.y;
+ if (coord_type == ATK_XY_WINDOW)
+ {
+ gdk_window_get_origin (gtk_widget_get_window (widget),
+ &x_toplevel, &y_toplevel);
+ *x -= x_toplevel;
+ *y -= y_toplevel;
+ }
+}
+
+static void
+gtk_window_accessible_get_size (AtkComponent *component,
+ gint *width,
+ gint *height)
+{
+ GtkWidget *widget;
+ GdkRectangle rect;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
+ if (widget == NULL)
+ return;
+
+ if (!gtk_widget_is_toplevel (widget))
+ {
+ AtkComponentIface *parent_iface;
+
+ parent_iface = (AtkComponentIface *) g_type_interface_peek_parent (ATK_COMPONENT_GET_IFACE (component));
+ parent_iface->get_size (component, width, height);
+ return;
+ }
+
+ gdk_window_get_frame_extents (gtk_widget_get_window (widget), &rect);
+
+ *width = rect.width;
+ *height = rect.height;
+}
+
+static void
+atk_component_interface_init (AtkComponentIface *iface)
+{
+ iface->get_extents = gtk_window_accessible_get_extents;
+ iface->get_size = gtk_window_accessible_get_size;
+}
diff --git a/gtk/a11y/gtkwindowaccessible.h b/gtk/a11y/gtkwindowaccessible.h
new file mode 100644
index 0000000..ee9cb82
--- /dev/null
+++ b/gtk/a11y/gtkwindowaccessible.h
@@ -0,0 +1,51 @@
+/* GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2001 Sun Microsystems Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_WINDOW_ACCESSIBLE_H__
+#define __GTK_WINDOW_ACCESSIBLE_H__
+
+#include "gailcontainer.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_WINDOW_ACCESSIBLE (gtk_window_accessible_get_type ())
+#define GTK_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW_ACCESSIBLE, GtkWindowAccessible))
+#define GTK_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW_ACCESSIBLE, GtkWindowAccessibleClass))
+#define GTK_IS_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW_ACCESSIBLE))
+#define GTK_IS_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW_ACCESSIBLE))
+#define GTK_WINDOW_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW_ACCESSIBLE, GtkWindowAccessibleClass))
+
+typedef struct _GtkWindowAccessible GtkWindowAccessible;
+typedef struct _GtkWindowAccessibleClass GtkWindowAccessibleClass;
+
+struct _GtkWindowAccessible
+{
+ GailContainer parent;
+};
+
+struct _GtkWindowAccessibleClass
+{
+ GailContainerClass parent_class;
+};
+
+GType gtk_window_accessible_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GTK_WINDOW_ACCESSIBLE_H__ */
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 4c65594..3eb3105 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -50,6 +50,7 @@
#include "gtkcontainerprivate.h"
#include "gtkintl.h"
#include "gtktypebuiltins.h"
+#include "a11y/gtkwindowaccessible.h"
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
@@ -1060,6 +1061,8 @@ gtk_window_class_init (GtkWindowClass *klass)
add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_WINDOW_ACCESSIBLE);
}
static void
diff --git a/tests/a11y/assistant.txt b/tests/a11y/assistant.txt
index 0a92cda..5ac9641 100644
--- a/tests/a11y/assistant.txt
+++ b/tests/a11y/assistant.txt
@@ -6,136 +6,355 @@ window1
<AtkComponent>
layer: window
alpha: 1
- button1
- "push button"
- index: 0
- name: Page 1
- state: enabled focusable sensitive showing visible
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- <AtkImage>
- image size: -1 x -1
- image description: (null)
- <AtkAction>
- action 0 name: click
- button2
- "push button"
- index: 1
- name: Page 2
- state: enabled focusable sensitive visible
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- <AtkImage>
- image size: -1 x -1
- image description: (null)
- <AtkAction>
- action 0 name: click
unnamed-GtkBoxAccessible-0
"filler"
- parent: unnamed-GtkBoxAccessible-1
- index: 1
+ parent: window1
+ index: 0
state: enabled horizontal sensitive showing visible
toolkit: gail
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkButtonAccessible-2
- "push button"
+ unnamed-GtkFrameAccessible-1
+ "panel"
parent: unnamed-GtkBoxAccessible-0
index: 0
- name: Close
- state: enabled focusable sensitive
+ state: enabled sensitive showing visible
toolkit: gail
<AtkComponent>
layer: widget
alpha: 1
- <AtkImage>
- image size: 20 x 20
- image description: (null)
- <AtkAction>
- action 0 name: click
- action 0 keybinding: <Alt>c
- unnamed-GtkButtonAccessible-3
- "push button"
+ unnamed-GtkBoxAccessible-2
+ "filler"
+ parent: unnamed-GtkFrameAccessible-1
+ index: 0
+ state: enabled sensitive showing vertical visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ Page 1
+ "label"
+ parent: unnamed-GtkBoxAccessible-2
+ index: 0
+ name: Page 1
+ state: enabled multi-line sensitive
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkText>
+ text: Page 1
+ character count: 6
+ caret offset: 0
+ default attributes: bg-color: <omitted>
+ bg-full-height: 0
+ direction: <omitted>
+ editable: false
+ family-name: <omitted>
+ fg-color: <omitted>
+ indent: 0
+ invisible: false
+ justification: left
+ language: <omitted>
+ left-margin: 0
+ pixels-above-lines: 0
+ pixels-below-lines: 0
+ pixels-inside-wrap: 0
+ right-margin: 0
+ rise: 0
+ scale: 1
+ size: <omitted>
+ stretch: <omitted>
+ strikethrough: false
+ style: <omitted>
+ underline: none
+ variant: <omitted>
+ weight: <omitted>
+ wrap-mode: word
+ Page 1
+ "label"
+ parent: unnamed-GtkBoxAccessible-2
+ index: 1
+ name: Page 1
+ state: enabled multi-line sensitive visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkText>
+ text: Page 1
+ character count: 6
+ caret offset: 0
+ default attributes: bg-color: <omitted>
+ bg-full-height: 0
+ direction: <omitted>
+ editable: false
+ family-name: <omitted>
+ fg-color: <omitted>
+ indent: 0
+ invisible: false
+ justification: left
+ language: <omitted>
+ left-margin: 0
+ pixels-above-lines: 0
+ pixels-below-lines: 0
+ pixels-inside-wrap: 0
+ right-margin: 0
+ rise: 0
+ scale: 1
+ size: <omitted>
+ stretch: <omitted>
+ strikethrough: false
+ style: <omitted>
+ underline: none
+ variant: <omitted>
+ weight: <omitted>
+ wrap-mode: word
+ Page 2
+ "label"
+ parent: unnamed-GtkBoxAccessible-2
+ index: 2
+ name: Page 2
+ state: enabled multi-line sensitive showing visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkText>
+ text: Page 2
+ character count: 6
+ caret offset: 0
+ default attributes: bg-color: <omitted>
+ bg-full-height: 0
+ direction: <omitted>
+ editable: false
+ family-name: <omitted>
+ fg-color: <omitted>
+ indent: 0
+ invisible: false
+ justification: left
+ language: <omitted>
+ left-margin: 0
+ pixels-above-lines: 0
+ pixels-below-lines: 0
+ pixels-inside-wrap: 0
+ right-margin: 0
+ rise: 0
+ scale: 1
+ size: <omitted>
+ stretch: <omitted>
+ strikethrough: false
+ style: <omitted>
+ underline: none
+ variant: <omitted>
+ weight: <omitted>
+ wrap-mode: word
+ Page 2
+ "label"
+ parent: unnamed-GtkBoxAccessible-2
+ index: 3
+ name: Page 2
+ state: enabled multi-line sensitive
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkText>
+ text: Page 2
+ character count: 6
+ caret offset: 0
+ default attributes: bg-color: <omitted>
+ bg-full-height: 0
+ direction: <omitted>
+ editable: false
+ family-name: <omitted>
+ fg-color: <omitted>
+ indent: 0
+ invisible: false
+ justification: left
+ language: <omitted>
+ left-margin: 0
+ pixels-above-lines: 0
+ pixels-below-lines: 0
+ pixels-inside-wrap: 0
+ right-margin: 0
+ rise: 0
+ scale: 1
+ size: <omitted>
+ stretch: <omitted>
+ strikethrough: false
+ style: <omitted>
+ underline: none
+ variant: <omitted>
+ weight: <omitted>
+ wrap-mode: word
+ unnamed-GtkBoxAccessible-3
+ "filler"
parent: unnamed-GtkBoxAccessible-0
index: 1
- name: Cancel
- state: enabled focusable sensitive showing visible
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- <AtkImage>
- image size: 20 x 20
- image description: (null)
- <AtkAction>
- action 0 name: click
- action 0 keybinding: <Alt>c
- unnamed-GtkButtonAccessible-4
- "push button"
- parent: unnamed-GtkBoxAccessible-0
- index: 2
- name: Finish
- state: focusable
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- <AtkImage>
- image size: -1 x -1
- image description: (null)
- <AtkAction>
- action 0 name: click
- action 0 keybinding: <Alt>f
- unnamed-GtkButtonAccessible-5
- "push button"
- parent: unnamed-GtkBoxAccessible-0
- index: 3
- name: Go Back
- state: enabled focusable sensitive
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- <AtkImage>
- image size: -1 x -1
- image description: (null)
- <AtkAction>
- action 0 name: click
- action 0 keybinding: <Alt>b
- unnamed-GtkButtonAccessible-6
- "push button"
- parent: unnamed-GtkBoxAccessible-0
- index: 4
- name: Continue
- state: focusable showing visible
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- <AtkImage>
- image size: 20 x 20
- image description: (null)
- <AtkAction>
- action 0 name: click
- action 0 keybinding: <Alt>o
- unnamed-GtkButtonAccessible-7
- "push button"
- parent: unnamed-GtkBoxAccessible-0
- index: 5
- name: Apply
- state: enabled focusable sensitive
+ state: enabled sensitive showing vertical visible
toolkit: gail
<AtkComponent>
layer: widget
alpha: 1
- <AtkImage>
- image size: 20 x 20
- image description: (null)
- <AtkAction>
- action 0 name: click
- action 0 keybinding: <Alt>a
+ unnamed-GtkNotebookAccessible-4
+ "page tab list"
+ parent: unnamed-GtkBoxAccessible-3
+ index: 0
+ state: enabled sensitive showing visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkSelection>
+ selected children: unnamed-GtkNotebookPageAccessible-5
+ unnamed-GtkNotebookPageAccessible-5
+ "page tab"
+ parent: unnamed-GtkNotebookAccessible-4
+ index: 0
+ state: enabled selectable selected showing visible
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ button1
+ "push button"
+ index: 0
+ name: Button 1
+ state: enabled focusable sensitive showing visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: -1 x -1
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ unnamed-GtkNotebookPageAccessible-6
+ "page tab"
+ parent: unnamed-GtkNotebookAccessible-4
+ index: 1
+ state: enabled selectable visible
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ button2
+ "push button"
+ index: 1
+ name: Button 2
+ state: enabled focusable sensitive visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: -1 x -1
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ unnamed-GtkBoxAccessible-7
+ "filler"
+ parent: unnamed-GtkBoxAccessible-3
+ index: 1
+ state: enabled horizontal sensitive showing visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ unnamed-GtkButtonAccessible-8
+ "push button"
+ parent: unnamed-GtkBoxAccessible-7
+ index: 0
+ name: Close
+ state: enabled focusable sensitive
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: 20 x 20
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ action 0 keybinding: <Alt>c
+ unnamed-GtkButtonAccessible-9
+ "push button"
+ parent: unnamed-GtkBoxAccessible-7
+ index: 1
+ name: Cancel
+ state: enabled focusable sensitive showing visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: 20 x 20
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ action 0 keybinding: <Alt>c
+ unnamed-GtkButtonAccessible-10
+ "push button"
+ parent: unnamed-GtkBoxAccessible-7
+ index: 2
+ name: Finish
+ state: focusable
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: -1 x -1
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ action 0 keybinding: <Alt>f
+ unnamed-GtkButtonAccessible-11
+ "push button"
+ parent: unnamed-GtkBoxAccessible-7
+ index: 3
+ name: Go Back
+ state: enabled focusable sensitive
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: -1 x -1
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ action 0 keybinding: <Alt>b
+ unnamed-GtkButtonAccessible-12
+ "push button"
+ parent: unnamed-GtkBoxAccessible-7
+ index: 4
+ name: Continue
+ state: focusable showing visible
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: 20 x 20
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ action 0 keybinding: <Alt>o
+ unnamed-GtkButtonAccessible-13
+ "push button"
+ parent: unnamed-GtkBoxAccessible-7
+ index: 5
+ name: Apply
+ state: enabled focusable sensitive
+ toolkit: gail
+ <AtkComponent>
+ layer: widget
+ alpha: 1
+ <AtkImage>
+ image size: 20 x 20
+ image description: (null)
+ <AtkAction>
+ action 0 name: click
+ action 0 keybinding: <Alt>a
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
