callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GailLabel -> GtkLabelAccessible

Browse Source 
A first experimental conversion from the gail namespace to gtkaccessible.
At the same time, use gtk_widget_class_set_accessible_type() to register
the accessible type for GtkLabel.
This commit is contained in:
Matthias Clasen
2011-06-23 01:12:29 -04:00
parent a0790f1000
commit a381fd288c
5 changed files with 188 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/a11y/Makefile.am
View File

@ -23,7 +23,7 @@ gail_c_sources = \
gailframe.c \ gailframe.c \
gailimage.c \ gailimage.c \
gailimagecell.c \ gailimagecell.c \
gaillabel.c \ gtklabelaccessible.c \
gaillinkbutton.c \ gaillinkbutton.c \
gailmisc.c \ gailmisc.c \
gailmenu.c \ gailmenu.c \
@ -78,7 +78,7 @@ gail_private_h_sources = \
gailframe.h \ gailframe.h \
gailimage.h \ gailimage.h \
gailimagecell.h \ gailimagecell.h \
gaillabel.h \ gtklabelaccessible.h \
gaillinkbutton.h \ gaillinkbutton.h \
gailmisc.h \ gailmisc.h \
gailmenu.h \ gailmenu.h \

3
gtk/a11y/gail.c
View File

@ -39,7 +39,6 @@
#include "gailframe.h" #include "gailframe.h"
#include "gailimage.h" #include "gailimage.h"
#include "gailimagecell.h" #include "gailimagecell.h"
#include "gaillabel.h"
#include "gaillinkbutton.h" #include "gaillinkbutton.h"
#include "gailmenu.h" #include "gailmenu.h"
#include "gailmenushell.h" #include "gailmenushell.h"
@ -129,7 +128,6 @@ GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WINDOW, GailWindow, gail_window, GTK_TYPE_BIN)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_RANGE, GailRange, gail_range, GTK_TYPE_RANGE) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_RANGE, GailRange, gail_range, GTK_TYPE_RANGE)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE, GailScale, gail_scale, GTK_TYPE_SCALE) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE, GailScale, gail_scale, GTK_TYPE_SCALE)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE_BUTTON, GailScaleButton, gail_scale_button, GTK_TYPE_SCALE_BUTTON) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE_BUTTON, GailScaleButton, gail_scale_button, GTK_TYPE_SCALE_BUTTON)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_LABEL, GailLabel, gail_label, GTK_TYPE_LABEL)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_STATUSBAR, GailStatusbar, gail_statusbar, GTK_TYPE_STATUSBAR) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_STATUSBAR, GailStatusbar, gail_statusbar, GTK_TYPE_STATUSBAR)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_NOTEBOOK, GailNotebook, gail_notebook, GTK_TYPE_NOTEBOOK) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_NOTEBOOK, GailNotebook, gail_notebook, GTK_TYPE_NOTEBOOK)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CALENDAR, GailCalendar, gail_calendar, GTK_TYPE_CALENDAR) GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CALENDAR, GailCalendar, gail_calendar, GTK_TYPE_CALENDAR)
@ -907,7 +905,6 @@ gail_accessibility_module_init (void)
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_RANGE, gail_range); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_RANGE, gail_range);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE, gail_scale); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE, gail_scale);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE_BUTTON, gail_scale_button); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE_BUTTON, gail_scale_button);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_LABEL, gail_label);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_STATUSBAR, gail_statusbar); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_STATUSBAR, gail_statusbar);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_NOTEBOOK, gail_notebook); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_NOTEBOOK, gail_notebook);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CALENDAR, gail_calendar); GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CALENDAR, gail_calendar);

320
gtk/a11y/gaillabel.c → gtk/a11y/gtklabelaccessible.c
View File

@ -22,146 +22,145 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gaillabel.h" #include "gtklabelaccessible.h"
#include "gailwindow.h" #include "gailwindow.h"
#include <libgail-util/gailmisc.h> #include <libgail-util/gailmisc.h>
static void gail_label_class_init (GailLabelClass *klass); static void gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass);
static void gail_label_init (GailLabel *label); static void gtk_label_accessible_init (GtkLabelAccessible *label);
static void gail_label_real_initialize (AtkObject *obj, static void gtk_label_accessible_real_initialize (AtkObject *obj,
gpointer data); gpointer data);
static void gail_label_real_notify_gtk (GObject *obj, static void gtk_label_accessible_real_notify_gtk (GObject *obj,
GParamSpec *pspec); GParamSpec *pspec);
static void gail_label_map_gtk (GtkWidget *widget, static void gtk_label_accessible_map_gtk (GtkWidget *widget,
gpointer data); gpointer data);
static void gail_label_init_text_util (GailLabel *gail_label, static void gtk_label_accessible_init_text_util (GtkLabelAccessible *gail_label,
GtkWidget *widget); GtkWidget *widget);
static void gail_label_finalize (GObject *object); static void gtk_label_accessible_finalize (GObject *object);
static void atk_text_interface_init (AtkTextIface *iface); static void atk_text_interface_init (AtkTextIface *iface);
/* atkobject.h */ /* atkobject.h */
static const gchar* gail_label_get_name (AtkObject *accessible); static const gchar* gtk_label_accessible_get_name (AtkObject *accessible);
static AtkStateSet* gail_label_ref_state_set (AtkObject *accessible); static AtkStateSet* gtk_label_accessible_ref_state_set (AtkObject *accessible);
static AtkRelationSet* gail_label_ref_relation_set (AtkObject *accessible); static AtkRelationSet* gtk_label_accessible_ref_relation_set (AtkObject *accessible);
/* atktext.h */ /* atktext.h */
static gchar* gail_label_get_text (AtkText *text, static gchar* gtk_label_accessible_get_text (AtkText *text,
gint start_pos, gint start_pos,
gint end_pos); gint end_pos);
static gunichar gail_label_get_character_at_offset(AtkText *text, static gunichar gtk_label_accessible_get_character_at_offset(AtkText *text,
gint offset); gint offset);
static gchar* gail_label_get_text_before_offset(AtkText *text, static gchar* gtk_label_accessible_get_text_before_offset(AtkText *text,
gint offset, gint offset,
AtkTextBoundary boundary_type, AtkTextBoundary boundary_type,
gint *start_offset, gint *start_offset,
gint *end_offset); gint *end_offset);
static gchar* gail_label_get_text_at_offset (AtkText *text, static gchar* gtk_label_accessible_get_text_at_offset (AtkText *text,
gint offset, gint offset,
AtkTextBoundary boundary_type, AtkTextBoundary boundary_type,
gint *start_offset, gint *start_offset,
gint *end_offset); gint *end_offset);
static gchar* gail_label_get_text_after_offset (AtkText *text, static gchar* gtk_label_accessible_get_text_after_offset (AtkText *text,
gint offset, gint offset,
AtkTextBoundary boundary_type, AtkTextBoundary boundary_type,
gint *start_offset, gint *start_offset,
gint *end_offset); gint *end_offset);
static gint gail_label_get_character_count (AtkText *text); static gint gtk_label_accessible_get_character_count (AtkText *text);
static gint gail_label_get_caret_offset (AtkText *text); static gint gtk_label_accessible_get_caret_offset (AtkText *text);
static gboolean gail_label_set_caret_offset (AtkText *text, static gboolean gtk_label_accessible_set_caret_offset (AtkText *text,
gint offset); gint offset);
static gint gail_label_get_n_selections (AtkText *text); static gint gtk_label_accessible_get_n_selections (AtkText *text);
static gchar* gail_label_get_selection (AtkText *text, static gchar* gtk_label_accessible_get_selection (AtkText *text,
gint selection_num, gint selection_num,
gint *start_offset, gint *start_offset,
gint *end_offset); gint *end_offset);
static gboolean gail_label_add_selection (AtkText *text, static gboolean gtk_label_accessible_add_selection (AtkText *text,
gint start_offset, gint start_offset,
gint end_offset); gint end_offset);
static gboolean gail_label_remove_selection (AtkText *text, static gboolean gtk_label_accessible_remove_selection (AtkText *text,
gint selection_num); gint selection_num);
static gboolean gail_label_set_selection (AtkText *text, static gboolean gtk_label_accessible_set_selection (AtkText *text,
gint selection_num, gint selection_num,
gint start_offset, gint start_offset,
gint end_offset); gint end_offset);
static void gail_label_get_character_extents (AtkText *text, static void gtk_label_accessible_get_character_extents (AtkText *text,
gint offset, gint offset,
gint *x, gint *x,
gint *y, gint *y,
gint *width, gint *width,
gint *height, gint *height,
AtkCoordType coords); AtkCoordType coords);
static gint gail_label_get_offset_at_point (AtkText *text, static gint gtk_label_accessible_get_offset_at_point (AtkText *text,
gint x, gint x,
gint y, gint y,
AtkCoordType coords); AtkCoordType coords);
static AtkAttributeSet* gail_label_get_run_attributes static AtkAttributeSet* gtk_label_accessible_get_run_attributes
(AtkText *text, (AtkText *text,
gint offset, gint offset,
gint *start_offset, gint *start_offset,
gint *end_offset); gint *end_offset);
static AtkAttributeSet* gail_label_get_default_attributes static AtkAttributeSet* gtk_label_accessible_get_default_attributes
(AtkText *text); (AtkText *text);
G_DEFINE_TYPE_WITH_CODE (GailLabel, gail_label, GAIL_TYPE_WIDGET, G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, gtk_label_accessible, GAIL_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void static void
gail_label_class_init (GailLabelClass *klass) gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GailWidgetClass *widget_class; GailWidgetClass *widget_class;
gobject_class->finalize = gail_label_finalize; gobject_class->finalize = gtk_label_accessible_finalize;
widget_class = (GailWidgetClass*)klass; widget_class = (GailWidgetClass*)klass;
widget_class->notify_gtk = gail_label_real_notify_gtk; widget_class->notify_gtk = gtk_label_accessible_real_notify_gtk;
class->get_name = gail_label_get_name; class->get_name = gtk_label_accessible_get_name;
class->ref_state_set = gail_label_ref_state_set; class->ref_state_set = gtk_label_accessible_ref_state_set;
class->ref_relation_set = gail_label_ref_relation_set; class->ref_relation_set = gtk_label_accessible_ref_relation_set;
class->initialize = gail_label_real_initialize; class->initialize = gtk_label_accessible_real_initialize;
} }
static void static void
gail_label_init (GailLabel *label) gtk_label_accessible_init (GtkLabelAccessible *label)
{ {
} }
static void static void
gail_label_real_initialize (AtkObject *obj, gtk_label_accessible_real_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
GtkWidget *widget; GtkWidget *widget;
GailLabel *gail_label; GtkLabelAccessible *accessible;
ATK_OBJECT_CLASS (gail_label_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->initialize (obj, data);
gail_label = GAIL_LABEL (obj); accessible = GTK_LABEL_ACCESSIBLE (obj);
gail_label->window_create_handler = 0; accessible->window_create_handler = 0;
gail_label->has_top_level = FALSE; accessible->has_top_level = FALSE;
gail_label->cursor_position = 0; accessible->cursor_position = 0;
gail_label->selection_bound = 0; accessible->selection_bound = 0;
gail_label->textutil = NULL; accessible->textutil = NULL;
gail_label->label_length = 0; accessible->label_length = 0;
widget = GTK_WIDGET (data); widget = GTK_WIDGET (data);
if (gtk_widget_get_mapped (widget)) if (gtk_widget_get_mapped (widget))
gail_label_init_text_util (gail_label, widget); gtk_label_accessible_init_text_util (accessible, widget);
else else
g_signal_connect (widget, g_signal_connect (widget, "map",
"map", G_CALLBACK (gtk_label_accessible_map_gtk),
G_CALLBACK (gail_label_map_gtk), accessible);
gail_label);
/* /*
* Check whether ancestor of GtkLabel is a GtkButton and if so * Check whether ancestor of GtkLabel is a GtkButton and if so
* set accessible parent for GailLabel * set accessible parent for GtkLabelAccessible
*/ */
while (widget != NULL) while (widget != NULL)
{ {
@ -180,40 +179,40 @@ gail_label_real_initialize (AtkObject *obj,
} }
static void static void
gail_label_map_gtk (GtkWidget *widget, gtk_label_accessible_map_gtk (GtkWidget *widget,
gpointer data) gpointer data)
{ {
GailLabel *gail_label; GtkLabelAccessible *accessible;
gail_label = GAIL_LABEL (data); accessible = GTK_LABEL_ACCESSIBLE (data);
gail_label_init_text_util (gail_label, widget); gtk_label_accessible_init_text_util (accessible, widget);
} }
static void static void
gail_label_init_text_util (GailLabel *gail_label, gtk_label_accessible_init_text_util (GtkLabelAccessible *accessible,
GtkWidget *widget) GtkWidget *widget)
{ {
GtkLabel *label; GtkLabel *label;
const gchar *label_text; const gchar *label_text;
if (gail_label->textutil == NULL) if (accessible->textutil == NULL)
gail_label->textutil = gail_text_util_new (); accessible->textutil = gail_text_util_new ();
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
label_text = gtk_label_get_text (label); label_text = gtk_label_get_text (label);
gail_text_util_text_setup (gail_label->textutil, label_text); gail_text_util_text_setup (accessible->textutil, label_text);
if (label_text == NULL) if (label_text == NULL)
gail_label->label_length = 0; accessible->label_length = 0;
else else
gail_label->label_length = g_utf8_strlen (label_text, -1); accessible->label_length = g_utf8_strlen (label_text, -1);
} }
static void static void
notify_name_change (AtkObject *atk_obj) notify_name_change (AtkObject *atk_obj)
{ {
GtkLabel *label; GtkLabel *label;
GailLabel *gail_label; GtkLabelAccessible *accessible;
GtkWidget *widget; GtkWidget *widget;
GObject *gail_obj; GObject *gail_obj;
@ -226,25 +225,25 @@ notify_name_change (AtkObject *atk_obj)
gail_obj = G_OBJECT (atk_obj); gail_obj = G_OBJECT (atk_obj);
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
gail_label = GAIL_LABEL (atk_obj); accessible = GTK_LABEL_ACCESSIBLE (atk_obj);
if (gail_label->textutil == NULL) if (accessible->textutil == NULL)
return; return;
/* /*
* Check whether the label has actually changed before emitting * Check whether the label has actually changed before emitting
* notification. * notification.
*/ */
if (gail_label->textutil->buffer) if (accessible->textutil->buffer)
{ {
GtkTextIter start, end; GtkTextIter start, end;
const char *new_label; const char *new_label;
char *old_label; char *old_label;
int same; int same;
gtk_text_buffer_get_start_iter (gail_label->textutil->buffer, &start); gtk_text_buffer_get_start_iter (accessible->textutil->buffer, &start);
gtk_text_buffer_get_end_iter (gail_label->textutil->buffer, &end); gtk_text_buffer_get_end_iter (accessible->textutil->buffer, &end);
old_label = gtk_text_buffer_get_text (gail_label->textutil->buffer, &start, &end, FALSE); old_label = gtk_text_buffer_get_text (accessible->textutil->buffer, &start, &end, FALSE);
new_label = gtk_label_get_text (label); new_label = gtk_label_get_text (label);
same = strcmp (new_label, old_label); same = strcmp (new_label, old_label);
g_free (old_label); g_free (old_label);
@ -255,12 +254,12 @@ notify_name_change (AtkObject *atk_obj)
/* Create a delete text and an insert text signal */ /* Create a delete text and an insert text signal */
g_signal_emit_by_name (gail_obj, "text_changed::delete", 0, g_signal_emit_by_name (gail_obj, "text_changed::delete", 0,
gail_label->label_length); accessible->label_length);
gail_label_init_text_util (gail_label, widget); gtk_label_accessible_init_text_util (accessible, widget);
g_signal_emit_by_name (gail_obj, "text_changed::insert", 0, g_signal_emit_by_name (gail_obj, "text_changed::insert", 0,
gail_label->label_length); accessible->label_length);
if (atk_obj->name == NULL) if (atk_obj->name == NULL)
/* /*
@ -275,24 +274,24 @@ static void
window_created (GObject *obj, window_created (GObject *obj,
gpointer data) gpointer data)
{ {
g_return_if_fail (GAIL_LABEL (data)); g_return_if_fail (GTK_LABEL_ACCESSIBLE (data));
notify_name_change (ATK_OBJECT (data)); notify_name_change (ATK_OBJECT (data));
} }
static void static void
gail_label_real_notify_gtk (GObject *obj, gtk_label_accessible_real_notify_gtk (GObject *obj,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkWidget *widget = GTK_WIDGET (obj); GtkWidget *widget = GTK_WIDGET (obj);
AtkObject* atk_obj = gtk_widget_get_accessible (widget); AtkObject* atk_obj = gtk_widget_get_accessible (widget);
GtkLabel *label; GtkLabel *label;
GailLabel *gail_label; GtkLabelAccessible *accessible;
GObject *gail_obj; GObject *gail_obj;
AtkObject *top_level; AtkObject *top_level;
AtkObject *temp_obj; AtkObject *temp_obj;
gail_label = GAIL_LABEL (atk_obj); accessible = GTK_LABEL_ACCESSIBLE (atk_obj);
if (strcmp (pspec->name, "label") == 0) if (strcmp (pspec->name, "label") == 0)
{ {
@ -303,7 +302,7 @@ gail_label_real_notify_gtk (GObject *obj,
* *
* This happens when [Ctrl+]Alt+Tab is pressed in metacity * This happens when [Ctrl+]Alt+Tab is pressed in metacity
*/ */
if (!gail_label->has_top_level) if (!accessible->has_top_level)
{ {
temp_obj = atk_obj; temp_obj = atk_obj;
top_level = NULL; top_level = NULL;
@ -314,14 +313,14 @@ gail_label_real_notify_gtk (GObject *obj,
} }
if (atk_object_get_role (top_level) != ATK_ROLE_APPLICATION) if (atk_object_get_role (top_level) != ATK_ROLE_APPLICATION)
{ {
if (gail_label->window_create_handler == 0 && if (accessible->window_create_handler == 0 &&
GAIL_IS_WINDOW (top_level)) GAIL_IS_WINDOW (top_level))
gail_label->window_create_handler = g_signal_connect_after (top_level, "create", G_CALLBACK (window_created), atk_obj); accessible->window_create_handler = g_signal_connect_after (top_level, "create", G_CALLBACK (window_created), atk_obj);
} }
else else
gail_label->has_top_level = TRUE; accessible->has_top_level = TRUE;
} }
if (gail_label->has_top_level) if (accessible->has_top_level)
notify_name_change (atk_obj); notify_name_change (atk_obj);
} }
else if (strcmp (pspec->name, "cursor-position") == 0) else if (strcmp (pspec->name, "cursor-position") == 0)
@ -333,27 +332,27 @@ gail_label_real_notify_gtk (GObject *obj,
gail_obj = G_OBJECT (atk_obj); gail_obj = G_OBJECT (atk_obj);
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
if (gail_label->selection_bound != -1 && gail_label->selection_bound < gail_label->cursor_position) if (accessible->selection_bound != -1 && accessible->selection_bound < accessible->cursor_position)
{ {
tmp = gail_label->selection_bound; tmp = accessible->selection_bound;
gail_label->selection_bound = gail_label->cursor_position; accessible->selection_bound = accessible->cursor_position;
gail_label->cursor_position = tmp; accessible->cursor_position = tmp;
} }
if (gtk_label_get_selection_bounds (label, &start, &end)) if (gtk_label_get_selection_bounds (label, &start, &end))
{ {
if (start != gail_label->cursor_position || if (start != accessible->cursor_position ||
end != gail_label->selection_bound) end != accessible->selection_bound)
{ {
if (end != gail_label->selection_bound) if (end != accessible->selection_bound)
{ {
gail_label->selection_bound = start; accessible->selection_bound = start;
gail_label->cursor_position = end; accessible->cursor_position = end;
} }
else else
{ {
gail_label->selection_bound = end; accessible->selection_bound = end;
gail_label->cursor_position = start; accessible->cursor_position = start;
} }
text_caret_moved = TRUE; text_caret_moved = TRUE;
if (start != end) if (start != end)
@ -362,65 +361,66 @@ gail_label_real_notify_gtk (GObject *obj,
} }
else else
{ {
if (gail_label->cursor_position != gail_label->selection_bound) if (accessible->cursor_position != accessible->selection_bound)
selection_changed = TRUE; selection_changed = TRUE;
if (gtk_label_get_selectable (label)) if (gtk_label_get_selectable (label))
{ {
if (gail_label->cursor_position != -1 && start != gail_label->cursor_position) if (accessible->cursor_position != -1 && start != accessible->cursor_position)
text_caret_moved = TRUE; text_caret_moved = TRUE;
if (gail_label->selection_bound != -1 && end != gail_label->selection_bound) if (accessible->selection_bound != -1 && end != accessible
->selection_bound)
{ {
text_caret_moved = TRUE; text_caret_moved = TRUE;
gail_label->cursor_position = end; accessible->cursor_position = end;
gail_label->selection_bound = start; accessible->selection_bound = start;
} }
else else
{ {
gail_label->cursor_position = start; accessible->cursor_position = start;
gail_label->selection_bound = end; accessible->selection_bound = end;
} }
} }
else else
{ {
/* GtkLabel has become non selectable */ /* GtkLabel has become non selectable */
gail_label->cursor_position = 0; accessible->cursor_position = 0;
gail_label->selection_bound = 0; accessible->selection_bound = 0;
text_caret_moved = TRUE; text_caret_moved = TRUE;
} }
} }
if (text_caret_moved) if (text_caret_moved)
g_signal_emit_by_name (gail_obj, "text_caret_moved", g_signal_emit_by_name (gail_obj, "text_caret_moved",
gail_label->cursor_position); accessible->cursor_position);
if (selection_changed) if (selection_changed)
g_signal_emit_by_name (gail_obj, "text_selection_changed"); g_signal_emit_by_name (gail_obj, "text_selection_changed");
} }
else else
GAIL_WIDGET_CLASS (gail_label_parent_class)->notify_gtk (obj, pspec); GAIL_WIDGET_CLASS (gtk_label_accessible_parent_class)->notify_gtk (obj, pspec);
} }
static void static void
gail_label_finalize (GObject *object) gtk_label_accessible_finalize (GObject *object)
{ {
GailLabel *label = GAIL_LABEL (object); GtkLabelAccessible *accessible = GTK_LABEL_ACCESSIBLE (object);
if (label->textutil) if (accessible->textutil)
g_object_unref (label->textutil); g_object_unref (accessible->textutil);
G_OBJECT_CLASS (gail_label_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_label_accessible_parent_class)->finalize (object);
} }
/* atkobject.h */ /* atkobject.h */
static AtkStateSet* static AtkStateSet*
gail_label_ref_state_set (AtkObject *accessible) gtk_label_accessible_ref_state_set (AtkObject *accessible)
{ {
AtkStateSet *state_set; AtkStateSet *state_set;
GtkWidget *widget; GtkWidget *widget;
state_set = ATK_OBJECT_CLASS (gail_label_parent_class)->ref_state_set (accessible); state_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_state_set (accessible);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
if (widget == NULL) if (widget == NULL)
@ -432,12 +432,12 @@ gail_label_ref_state_set (AtkObject *accessible)
} }
AtkRelationSet* AtkRelationSet*
gail_label_ref_relation_set (AtkObject *obj) gtk_label_accessible_ref_relation_set (AtkObject *obj)
{ {
GtkWidget *widget; GtkWidget *widget;
AtkRelationSet *relation_set; AtkRelationSet *relation_set;
g_return_val_if_fail (GAIL_IS_LABEL (obj), NULL); g_return_val_if_fail (GTK_IS_LABEL_ACCESSIBLE (obj), NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL) if (widget == NULL)
@ -446,7 +446,7 @@ gail_label_ref_relation_set (AtkObject *obj)
*/ */
return NULL; return NULL;
relation_set = ATK_OBJECT_CLASS (gail_label_parent_class)->ref_relation_set (obj); relation_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_relation_set (obj);
if (!atk_relation_set_contains (relation_set, ATK_RELATION_LABEL_FOR)) if (!atk_relation_set_contains (relation_set, ATK_RELATION_LABEL_FOR))
{ {
@ -499,13 +499,13 @@ gail_label_ref_relation_set (AtkObject *obj)
} }
static const gchar* static const gchar*
gail_label_get_name (AtkObject *accessible) gtk_label_accessible_get_name (AtkObject *accessible)
{ {
const gchar *name; const gchar *name;
g_return_val_if_fail (GAIL_IS_LABEL (accessible), NULL); g_return_val_if_fail (GTK_IS_LABEL_ACCESSIBLE (accessible), NULL);
name = ATK_OBJECT_CLASS (gail_label_parent_class)->get_name (accessible); name = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->get_name (accessible);
if (name != NULL) if (name != NULL)
return name; return name;
else else
@ -533,27 +533,27 @@ gail_label_get_name (AtkObject *accessible)
static void static void
atk_text_interface_init (AtkTextIface *iface) atk_text_interface_init (AtkTextIface *iface)
{ {
iface->get_text = gail_label_get_text; iface->get_text = gtk_label_accessible_get_text;
iface->get_character_at_offset = gail_label_get_character_at_offset; iface->get_character_at_offset = gtk_label_accessible_get_character_at_offset;
iface->get_text_before_offset = gail_label_get_text_before_offset; iface->get_text_before_offset = gtk_label_accessible_get_text_before_offset;
iface->get_text_at_offset = gail_label_get_text_at_offset; iface->get_text_at_offset = gtk_label_accessible_get_text_at_offset;
iface->get_text_after_offset = gail_label_get_text_after_offset; iface->get_text_after_offset = gtk_label_accessible_get_text_after_offset;
iface->get_character_count = gail_label_get_character_count; iface->get_character_count = gtk_label_accessible_get_character_count;
iface->get_caret_offset = gail_label_get_caret_offset; iface->get_caret_offset = gtk_label_accessible_get_caret_offset;
iface->set_caret_offset = gail_label_set_caret_offset; iface->set_caret_offset = gtk_label_accessible_set_caret_offset;
iface->get_n_selections = gail_label_get_n_selections; iface->get_n_selections = gtk_label_accessible_get_n_selections;
iface->get_selection = gail_label_get_selection; iface->get_selection = gtk_label_accessible_get_selection;
iface->add_selection = gail_label_add_selection; iface->add_selection = gtk_label_accessible_add_selection;
iface->remove_selection = gail_label_remove_selection; iface->remove_selection = gtk_label_accessible_remove_selection;
iface->set_selection = gail_label_set_selection; iface->set_selection = gtk_label_accessible_set_selection;
iface->get_character_extents = gail_label_get_character_extents; iface->get_character_extents = gtk_label_accessible_get_character_extents;
iface->get_offset_at_point = gail_label_get_offset_at_point; iface->get_offset_at_point = gtk_label_accessible_get_offset_at_point;
iface->get_run_attributes = gail_label_get_run_attributes; iface->get_run_attributes = gtk_label_accessible_get_run_attributes;
iface->get_default_attributes = gail_label_get_default_attributes; iface->get_default_attributes = gtk_label_accessible_get_default_attributes;
} }
static gchar* static gchar*
gail_label_get_text (AtkText *text, gtk_label_accessible_get_text (AtkText *text,
gint start_pos, gint start_pos,
gint end_pos) gint end_pos)
{ {
@ -575,15 +575,15 @@ gail_label_get_text (AtkText *text,
return NULL; return NULL;
else else
{ {
if (GAIL_LABEL (text)->textutil == NULL) if (GTK_LABEL_ACCESSIBLE (text)->textutil == NULL)
gail_label_init_text_util (GAIL_LABEL (text), widget); gtk_label_accessible_init_text_util (GTK_LABEL_ACCESSIBLE (text), widget);
return gail_text_util_get_substring (GAIL_LABEL(text)->textutil, return gail_text_util_get_substring (GTK_LABEL_ACCESSIBLE (text)->textutil,
start_pos, end_pos); start_pos, end_pos);
} }
} }
static gchar* static gchar*
gail_label_get_text_before_offset (AtkText *text, gtk_label_accessible_get_text_before_offset (AtkText *text,
gint offset, gint offset,
AtkTextBoundary boundary_type, AtkTextBoundary boundary_type,
gint *start_offset, gint *start_offset,
@ -601,13 +601,13 @@ gail_label_get_text_before_offset (AtkText *text,
/* Get label */ /* Get label */
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
return gail_text_util_get_text (GAIL_LABEL (text)->textutil, return gail_text_util_get_text (GTK_LABEL_ACCESSIBLE (text)->textutil,
gtk_label_get_layout (label), GAIL_BEFORE_OFFSET, gtk_label_get_layout (label), GAIL_BEFORE_OFFSET,
boundary_type, offset, start_offset, end_offset); boundary_type, offset, start_offset, end_offset);
} }
static gchar* static gchar*
gail_label_get_text_at_offset (AtkText *text, gtk_label_accessible_get_text_at_offset (AtkText *text,
gint offset, gint offset,
AtkTextBoundary boundary_type, AtkTextBoundary boundary_type,
gint *start_offset, gint *start_offset,
@ -625,13 +625,13 @@ gail_label_get_text_at_offset (AtkText *text,
/* Get label */ /* Get label */
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
return gail_text_util_get_text (GAIL_LABEL (text)->textutil, return gail_text_util_get_text (GTK_LABEL_ACCESSIBLE (text)->textutil,
gtk_label_get_layout (label), GAIL_AT_OFFSET, gtk_label_get_layout (label), GAIL_AT_OFFSET,
boundary_type, offset, start_offset, end_offset); boundary_type, offset, start_offset, end_offset);
} }
static gchar* static gchar*
gail_label_get_text_after_offset (AtkText *text, gtk_label_accessible_get_text_after_offset (AtkText *text,
gint offset, gint offset,
AtkTextBoundary boundary_type, AtkTextBoundary boundary_type,
gint *start_offset, gint *start_offset,
@ -651,13 +651,13 @@ gail_label_get_text_after_offset (AtkText *text,
/* Get label */ /* Get label */
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
return gail_text_util_get_text (GAIL_LABEL (text)->textutil, return gail_text_util_get_text (GTK_LABEL_ACCESSIBLE (text)->textutil,
gtk_label_get_layout (label), GAIL_AFTER_OFFSET, gtk_label_get_layout (label), GAIL_AFTER_OFFSET,
boundary_type, offset, start_offset, end_offset); boundary_type, offset, start_offset, end_offset);
} }
static gint static gint
gail_label_get_character_count (AtkText *text) gtk_label_accessible_get_character_count (AtkText *text)
{ {
GtkWidget *widget; GtkWidget *widget;
GtkLabel *label; GtkLabel *label;
@ -672,13 +672,13 @@ gail_label_get_character_count (AtkText *text)
} }
static gint static gint
gail_label_get_caret_offset (AtkText *text) gtk_label_accessible_get_caret_offset (AtkText *text)
{ {
return GAIL_LABEL (text)->cursor_position; return GTK_LABEL_ACCESSIBLE (text)->cursor_position;
} }
static gboolean static gboolean
gail_label_set_caret_offset (AtkText *text, gtk_label_accessible_set_caret_offset (AtkText *text,
gint offset) gint offset)
{ {
GtkWidget *widget; GtkWidget *widget;
@ -703,7 +703,7 @@ gail_label_set_caret_offset (AtkText *text,
} }
static gint static gint
gail_label_get_n_selections (AtkText *text) gtk_label_accessible_get_n_selections (AtkText *text)
{ {
GtkWidget *widget; GtkWidget *widget;
GtkLabel *label; GtkLabel *label;
@ -726,7 +726,7 @@ gail_label_get_n_selections (AtkText *text)
} }
static gchar* static gchar*
gail_label_get_selection (AtkText *text, gtk_label_accessible_get_selection (AtkText *text,
gint selection_num, gint selection_num,
gint *start_pos, gint *start_pos,
gint *end_pos) gint *end_pos)
@ -754,7 +754,7 @@ gail_label_get_selection (AtkText *text,
if (label_text == NULL) if (label_text == NULL)
return 0; return 0;
else else
return gail_text_util_get_substring (GAIL_LABEL (text)->textutil, return gail_text_util_get_substring (GTK_LABEL_ACCESSIBLE (text)->textutil,
*start_pos, *end_pos); *start_pos, *end_pos);
} }
else else
@ -762,7 +762,7 @@ gail_label_get_selection (AtkText *text,
} }
static gboolean static gboolean
gail_label_add_selection (AtkText *text, gtk_label_accessible_add_selection (AtkText *text,
gint start_pos, gint start_pos,
gint end_pos) gint end_pos)
{ {
@ -790,7 +790,7 @@ gail_label_add_selection (AtkText *text,
} }
static gboolean static gboolean
gail_label_remove_selection (AtkText *text, gtk_label_accessible_remove_selection (AtkText *text,
gint selection_num) gint selection_num)
{ {
GtkWidget *widget; GtkWidget *widget;
@ -820,7 +820,7 @@ gail_label_remove_selection (AtkText *text,
} }
static gboolean static gboolean
gail_label_set_selection (AtkText *text, gtk_label_accessible_set_selection (AtkText *text,
gint selection_num, gint selection_num,
gint start_pos, gint start_pos,
gint end_pos) gint end_pos)
@ -852,7 +852,7 @@ gail_label_set_selection (AtkText *text,
} }
static void static void
gail_label_get_character_extents (AtkText *text, gtk_label_accessible_get_character_extents (AtkText *text,
gint offset, gint offset,
gint *x, gint *x,
gint *y, gint *y,
@ -884,7 +884,7 @@ gail_label_get_character_extents (AtkText *text,
} }
static gint static gint
gail_label_get_offset_at_point (AtkText *text, gtk_label_accessible_get_offset_at_point (AtkText *text,
gint x, gint x,
gint y, gint y,
AtkCoordType coords) AtkCoordType coords)
@ -918,7 +918,7 @@ gail_label_get_offset_at_point (AtkText *text,
} }
static AtkAttributeSet* static AtkAttributeSet*
gail_label_get_run_attributes (AtkText *text, gtk_label_accessible_get_run_attributes (AtkText *text,
gint offset, gint offset,
gint *start_offset, gint *start_offset,
gint *end_offset) gint *end_offset)
@ -962,7 +962,7 @@ gail_label_get_run_attributes (AtkText *text,
} }
static AtkAttributeSet* static AtkAttributeSet*
gail_label_get_default_attributes (AtkText *text) gtk_label_accessible_get_default_attributes (AtkText *text)
{ {
GtkWidget *widget; GtkWidget *widget;
GtkLabel *label; GtkLabel *label;
@ -982,7 +982,7 @@ gail_label_get_default_attributes (AtkText *text)
} }
static gunichar static gunichar
gail_label_get_character_at_offset (AtkText *text, gtk_label_accessible_get_character_at_offset (AtkText *text,
gint offset) gint offset)
{ {
GtkWidget *widget; GtkWidget *widget;

30
gtk/a11y/gaillabel.h → gtk/a11y/gtklabelaccessible.h
View File

@ -17,25 +17,25 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GAIL_LABEL_H__ #ifndef __GTK_LABEL_ACCESSIBLE_H__
#define __GAIL_LABEL_H__ #define __GTK_LABEL_ACCESSIBLE_H__
#include "gailwidget.h" #include "gailwidget.h"
#include "gailtextutil.h" #include "gailtextutil.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GAIL_TYPE_LABEL (gail_label_get_type ()) #define GTK_TYPE_LABEL_ACCESSIBLE (gtk_label_accessible_get_type ())
#define GAIL_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_LABEL, GailLabel)) #define GTK_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessible))
#define GAIL_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_LABEL, GailLabelClass)) #define GTK_LABEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessibleClass))
#define GAIL_IS_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_LABEL)) #define GTK_IS_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL_ACCESSIBLE))
#define GAIL_IS_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_LABEL)) #define GTK_IS_LABEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL_ACCESSIBLE))
#define GAIL_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_LABEL, GailLabelClass)) #define GTK_LABEL_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessibleClass))
typedef struct _GailLabel GailLabel; typedef struct _GtkLabelAccessible GtkLabelAccessible;
typedef struct _GailLabelClass GailLabelClass; typedef struct _GtkLabelAccessibleClass GtkLabelAccessibleClass;
struct _GailLabel struct _GtkLabelAccessible
{ {
GailWidget parent; GailWidget parent;
@ -47,13 +47,13 @@ struct _GailLabel
gboolean has_top_level; gboolean has_top_level;
}; };
GType gail_label_get_type (void); struct _GtkLabelAccessibleClass
struct _GailLabelClass
{ {
GailWidgetClass parent_class; GailWidgetClass parent_class;
}; };
GType gtk_label_accessible_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GAIL_LABEL_H__ */ #endif /* __GTK_LABEL_ACCESSIBLE_H__ */

3
gtk/gtklabel.c
View File

@ -52,6 +52,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "a11y/gtklabelaccessible.h"
/** /**
* SECTION:gtklabel * SECTION:gtklabel
@ -1093,6 +1094,8 @@ gtk_label_class_init (GtkLabelClass *class)
"activate-current-link", 0); "activate-current-link", 0);
g_type_class_add_private (class, sizeof (GtkLabelPrivate)); g_type_class_add_private (class, sizeof (GtkLabelPrivate));
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LABEL_ACCESSIBLE);
} }
static void static void