[gtk+] Convert GailStatusbar to GtkStatusbarAccessible
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Convert GailStatusbar to GtkStatusbarAccessible
- Date: Tue, 5 Jul 2011 20:35:43 +0000 (UTC)
commit ff5eb4adfe1fff68afbd8388396bc49f9fe9a4db
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 1 00:47:41 2011 -0400
Convert GailStatusbar to GtkStatusbarAccessible
And drop the AtkText implementation at the same time.
Update test results to match.
gtk/a11y/Makefile.am | 4 +-
gtk/a11y/gail.c | 3 -
gtk/a11y/gailstatusbar.c | 650 -------------------------------------
gtk/a11y/gailstatusbar.h | 54 ---
gtk/a11y/gtkstatusbaraccessible.c | 150 +++++++++
gtk/a11y/gtkstatusbaraccessible.h | 52 +++
gtk/gtkstatusbar.c | 3 +
tests/a11y/statusbar.txt | 90 +-----
8 files changed, 208 insertions(+), 798 deletions(-)
---
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 4db9a34..60f967e 100644
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -40,7 +40,7 @@ gail_c_sources = \
gtkscrolledwindowaccessible.c \
gtkspinbuttonaccessible.c \
gailsubmenuitem.c \
- gailstatusbar.c \
+ gtkstatusbaraccessible.c \
gailtextcell.c \
gailtextutil.c \
gtktextviewaccessible.c \
@@ -91,7 +91,7 @@ gail_private_h_sources = \
gtkscrolledwindowaccessible.h \
gtkspinbuttonaccessible.h \
gailsubmenuitem.h \
- gailstatusbar.h \
+ gtkstatusbaraccessible.h \
gailtextcell.h \
gailtextutil.h \
gtktextviewaccessible.h \
diff --git a/gtk/a11y/gail.c b/gtk/a11y/gail.c
index 0acfa93..3aa11de 100644
--- a/gtk/a11y/gail.c
+++ b/gtk/a11y/gail.c
@@ -36,7 +36,6 @@
#include "gailmenuitem.h"
#include "gailradiomenuitem.h"
#include "gailrenderercell.h"
-#include "gailstatusbar.h"
#include "gailtextcell.h"
#include "gailtoplevel.h"
#include "gailutil.h"
@@ -94,7 +93,6 @@ GAIL_IMPLEMENT_FACTORY_WITH_FUNC (GAIL_TYPE_MENU_ITEM, GailMenuItem, gail_menu_i
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 (GAIL_TYPE_STATUSBAR, GailStatusbar, gail_statusbar, GTK_TYPE_STATUSBAR)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC (GAIL_TYPE_CHECK_MENU_ITEM, GailCheckMenuItem, gail_check_menu_item, gail_check_menu_item_new)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC (GAIL_TYPE_RADIO_MENU_ITEM, GailRadioMenuItem, gail_radio_menu_item, gail_radio_menu_item_new)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_EXPANDER, GailExpander, gail_expander, GTK_TYPE_EXPANDER)
@@ -849,7 +847,6 @@ gail_accessibility_module_init (void)
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_STATUSBAR, gail_statusbar);
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/gtkstatusbaraccessible.c b/gtk/a11y/gtkstatusbaraccessible.c
new file mode 100644
index 0000000..a2edef9
--- /dev/null
+++ b/gtk/a11y/gtkstatusbaraccessible.c
@@ -0,0 +1,150 @@
+/* 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/gtk.h>
+#include "gtkstatusbaraccessible.h"
+
+
+G_DEFINE_TYPE (GtkStatusbarAccessible, gtk_statusbar_accessible, GAIL_TYPE_CONTAINER)
+
+static void
+text_changed (GtkStatusbar *statusbar,
+ guint context_id,
+ const gchar *text,
+ AtkObject *obj)
+{
+ if (!obj->name)
+ g_object_notify (G_OBJECT (obj), "accessible-name");
+ g_signal_emit_by_name (obj, "visible-data-changed");
+}
+
+static void
+gtk_statusbar_accessible_initialize (AtkObject *obj,
+ gpointer data)
+{
+ GtkWidget *statusbar = data;
+
+ ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->initialize (obj, data);
+
+ g_signal_connect_after (statusbar, "text-pushed",
+ G_CALLBACK (text_changed), obj);
+ g_signal_connect_after (statusbar, "text-popped",
+ G_CALLBACK (text_changed), obj);
+
+ obj->role = ATK_ROLE_STATUSBAR;
+}
+
+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 GtkWidget *
+get_label_from_statusbar (GtkStatusbar *statusbar)
+{
+ GtkWidget *box;
+
+ box = gtk_statusbar_get_message_area (statusbar);
+
+ return find_label_child (GTK_CONTAINER (box));
+}
+
+static const gchar *
+gtk_statusbar_accessible_get_name (AtkObject *obj)
+{
+ const gchar *name;
+ GtkWidget *widget;
+ GtkWidget *label;
+
+ widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
+ if (widget == NULL)
+ return NULL;
+
+ name = ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->get_name (obj);
+ if (name != NULL)
+ return name;
+
+ label = get_label_from_statusbar (GTK_STATUSBAR (widget));
+ if (GTK_IS_LABEL (label))
+ return gtk_label_get_label (GTK_LABEL (label));
+
+ return NULL;
+}
+
+static gint
+gtk_statusbar_accessible_get_n_children (AtkObject *obj)
+{
+ return 0;
+}
+
+static AtkObject*
+gtk_statusbar_accessible_ref_child (AtkObject *obj,
+ gint i)
+{
+ return NULL;
+}
+
+static void
+gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass)
+{
+ AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
+ GailContainerClass *container_class = (GailContainerClass*)klass;
+
+ class->get_name = gtk_statusbar_accessible_get_name;
+ class->get_n_children = gtk_statusbar_accessible_get_n_children;
+ class->ref_child = gtk_statusbar_accessible_ref_child;
+ class->initialize = gtk_statusbar_accessible_initialize;
+ /*
+ * As we report the statusbar as having no children
+ * we are not interested in add and remove signals
+ */
+ container_class->add_gtk = NULL;
+ container_class->remove_gtk = NULL;
+}
+
+static void
+gtk_statusbar_accessible_init (GtkStatusbarAccessible *bar)
+{
+}
diff --git a/gtk/a11y/gtkstatusbaraccessible.h b/gtk/a11y/gtkstatusbaraccessible.h
new file mode 100644
index 0000000..13b478a
--- /dev/null
+++ b/gtk/a11y/gtkstatusbaraccessible.h
@@ -0,0 +1,52 @@
+/* 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 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_STATUSBAR_ACCESSIBLE_H__
+#define __GTK_STATUSBAR_ACCESSIBLE_H__
+
+#include "gailcontainer.h"
+#include "gailtextutil.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_STATUSBAR_ACCESSIBLE (gtk_statusbar_accessible_get_type ())
+#define GTK_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessible))
+#define GTK_STATUSBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessibleClass))
+#define GTK_IS_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE))
+#define GTK_IS_STATUSBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STATUSBAR_ACCESSIBLE))
+#define GTK_STATUSBAR_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessibleClass))
+
+typedef struct _GtkStatusbarAccessible GtkStatusbarAccessible;
+typedef struct _GtkStatusbarAccessibleClass GtkStatusbarAccessibleClass;
+
+struct _GtkStatusbarAccessible
+{
+ GailContainer parent;
+};
+
+struct _GtkStatusbarAccessibleClass
+{
+ GailContainerClass parent_class;
+};
+
+GType gtk_statusbar_accessible_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GTK_STATUSBAR_ACCESSIBLE_H__ */
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 44398b3..3a7df17 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -37,6 +37,7 @@
#include "gtkbuildable.h"
#include "gtkorientable.h"
#include "gtktypebuiltins.h"
+#include "a11y/gtkstatusbaraccessible.h"
/**
* SECTION:gtkstatusbar
@@ -185,6 +186,8 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
GTK_PARAM_READABLE));
g_type_class_add_private (class, sizeof (GtkStatusbarPrivate));
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STATUSBAR_ACCESSIBLE);
}
static void
diff --git a/tests/a11y/statusbar.txt b/tests/a11y/statusbar.txt
index 0075e85..5dfab1d 100644
--- a/tests/a11y/statusbar.txt
+++ b/tests/a11y/statusbar.txt
@@ -7,7 +7,7 @@ window1
layer: window
alpha: 1
statusbar1
- "filler"
+ "statusbar"
parent: window1
index: 0
name:
@@ -16,91 +16,3 @@ window1
<AtkComponent>
layer: widget
alpha: 1
- <AtkText>
- text:
- character count: 0
- caret offset: 0
- default attributes: bg-color: <omitted>
- bg-full-height: 0
- bg-stipple: false
- direction: <omitted>
- editable: false
- family-name: <omitted>
- fg-color: <omitted>
- fg-stipple: false
- 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-GtkFrameAccessible-0
- "panel"
- parent: statusbar1
- index: 0
- state: enabled sensitive showing visible
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- unnamed-GailContainer-1
- "filler"
- parent: unnamed-GtkFrameAccessible-0
- index: 0
- state: enabled horizontal sensitive showing visible
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
-
- "label"
- parent: unnamed-GailContainer-1
- index: 0
- name:
- state: enabled multi-line sensitive showing visible
- toolkit: gail
- <AtkComponent>
- layer: widget
- alpha: 1
- <AtkText>
- text:
- character count: 0
- 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
