diff options
| -rw-r--r-- | ChangeLog | 34 | ||||
| -rwxr-xr-x | atk/atkeditabletext.c | 7 | ||||
| -rwxr-xr-x | atk/atkobject.c | 20 | ||||
| -rwxr-xr-x | atk/atkobject.h | 10 | ||||
| -rwxr-xr-x | atk/atkselection.c | 32 | ||||
| -rwxr-xr-x | atk/atkselection.h | 5 | ||||
| -rwxr-xr-x | atk/atktable.c | 17 | ||||
| -rwxr-xr-x | atk/atktable.h | 1 | ||||
| -rwxr-xr-x | atk/atktext.c | 17 | ||||
| -rwxr-xr-x | atk/atktext.h | 5 | ||||
| -rw-r--r-- | docs/tmpl/atkobject.sgml | 10 | ||||
| -rw-r--r-- | docs/tmpl/atkselection.sgml | 1 | ||||
| -rw-r--r-- | docs/tmpl/atktable.sgml | 1 | ||||
| -rw-r--r-- | docs/tmpl/atktext.sgml | 77 |
14 files changed, 178 insertions, 59 deletions
@@ -1,3 +1,26 @@ +2001-11-17 Padraig O'Briain <padraig.obriain@sun.com> + + * atk/atkeditabletext.c: + Remove unused structure _AtkEditableTextIfaceClass + + * atk/atkobject.[c|h] + Remove signals model_changed and selection_changed + + * atk/selection.[c|h] + Add signal selection_changed + + * atk/atktable.[c|h] + Remove unused structure _AtkTableIfaceClass + Add signal model_changed + + * atk/atktext.[c|h] + Remove unused structure _AtkTextIfaceClass + Add signal text_selection_changed + + * docs/tmpl/atkobject.sgml, docs/tmpl/atkselection.sgml, + docs/tmpl/atktable.sgml, atk/tmpl/atktext.sgml: + Documentation changes + 2001-11-17 Tor Lillqvist <tml@iki.fi> * atk-zip.sh.in: Build separate runtime and developer packages. @@ -8,13 +31,14 @@ * atk/atkutil.h : Added API - atk_util_add_key_event_listener (AtkKeySnoopFunc *listener, - gpointer data); - atk_util_remove_key_event_listener (AtkKeySnoopFunc *listener, - gpointer data); + atk_add_key_event_listener (AtkKeySnoopFunc *listener, + gpointer data); + atk_remove_key_event_listener (AtkKeySnoopFunc *listener, + gpointer data); to allow non-GTK-dependent installation of key snoop functions. - This also meant adding definitions of AtkKeySnoopFunc and AtkKeyEventStruct. + This also meant adding definitions of AtkKeySnoopFunc and + AtkKeyEventStruct. 2001-11-08 Padraig O'Briain <padraig.obriain@sun.com> diff --git a/atk/atkeditabletext.c b/atk/atkeditabletext.c index f23b8fa..92360c1 100755 --- a/atk/atkeditabletext.c +++ b/atk/atkeditabletext.c @@ -20,13 +20,6 @@ #include "atkeditabletext.h" -struct _AtkEditableTextIfaceClass -{ - GObjectClass parent; -}; - -typedef struct _AtkEditableTextIfaceClass AtkEditableTextIfaceClass; - GType atk_editable_text_get_type () { diff --git a/atk/atkobject.c b/atk/atkobject.c index 0d9c163..5a9450a 100755 --- a/atk/atkobject.c +++ b/atk/atkobject.c @@ -46,9 +46,7 @@ enum enum { CHILDREN_CHANGED, FOCUS_EVENT, - MODEL_CHANGED, PROPERTY_CHANGE, - SELECTION_CHANGED, VISIBLE_DATA_CHANGED, LAST_SIGNAL @@ -174,9 +172,7 @@ atk_object_class_init (AtkObjectClass *klass) */ klass->children_changed = NULL; klass->focus_event = NULL; - klass->model_changed = NULL; klass->property_change = NULL; - klass->selection_changed = NULL; klass->visible_data_changed = NULL; g_object_class_install_property (gobject_class, @@ -294,14 +290,6 @@ atk_object_class_init (AtkObjectClass *klass) g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - atk_object_signals[MODEL_CHANGED] = - g_signal_new ("model_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkObjectClass, model_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); atk_object_signals[PROPERTY_CHANGE] = g_signal_new ("property_change", G_TYPE_FROM_CLASS (klass), @@ -311,14 +299,6 @@ atk_object_class_init (AtkObjectClass *klass) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - atk_object_signals[SELECTION_CHANGED] = - g_signal_new ("selection_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkObjectClass, selection_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); atk_object_signals[VISIBLE_DATA_CHANGED] = g_signal_new ("visible_data_changed", G_TYPE_FROM_CLASS (klass), diff --git a/atk/atkobject.h b/atk/atkobject.h index 9d042e1..80ea0ad 100755 --- a/atk/atkobject.h +++ b/atk/atkobject.h @@ -339,22 +339,12 @@ void (* remove_property_change_handler) (AtkObject void (*focus_event) (AtkObject *accessible, gboolean focus_in); /* - * The signal handler which is executed when there is a model change - * for an object - */ - void (*model_changed) (AtkObject *accessible); - /* * The signal handler which is executed when there is a property_change * signal for an object. */ gint (*property_change) (AtkObject *accessible, AtkPropertyValues *values); /* - * The signal handler which is executed when there is a selection change - * for an object - */ - void (*selection_changed) (AtkObject *accessible); - /* * The signal handler which is executed when there is a change in the * visible data for an object */ diff --git a/atk/atkselection.c b/atk/atkselection.c index 25bb656..cc157d7 100755 --- a/atk/atkselection.c +++ b/atk/atkselection.c @@ -19,6 +19,15 @@ #include "atkselection.h" +enum { + SELECTION_CHANGED, + LAST_SIGNAL +}; + +static void atk_selection_base_init (gpointer *g_class); + +static guint atk_selection_signals[LAST_SIGNAL] = { 0 }; + GType atk_selection_get_type () { @@ -28,7 +37,7 @@ atk_selection_get_type () GTypeInfo tinfo = { sizeof (AtkSelectionIface), - (GBaseInitFunc) NULL, + (GBaseInitFunc)atk_selection_base_init, (GBaseFinalizeFunc) NULL, }; @@ -39,6 +48,27 @@ atk_selection_get_type () return type; } +static void +atk_selection_base_init (gpointer *g_class) +{ + static gboolean initialized = FALSE; + + if (! initialized) + { + atk_selection_signals[SELECTION_CHANGED] = + g_signal_new ("selection_changed", + ATK_TYPE_SELECTION, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkSelectionIface, selection_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + + initialized = TRUE; + } +} + /** * atk_selection_add_selection: * @selection: a #GObject instance that implements AtkSelectionIface diff --git a/atk/atkselection.h b/atk/atkselection.h index dc4c905..1059fde 100755 --- a/atk/atkselection.h +++ b/atk/atkselection.h @@ -59,6 +59,11 @@ struct _AtkSelectionIface gboolean (* remove_selection) (AtkSelection *selection, gint i); gboolean (* select_all_selection) (AtkSelection *selection); + + /* signal handlers */ + + void (*selection_changed) (AtkSelection *selection); + }; GType atk_selection_get_type (); diff --git a/atk/atktable.c b/atk/atktable.c index ea94111..012ad53 100755 --- a/atk/atktable.c +++ b/atk/atktable.c @@ -27,16 +27,10 @@ enum { COLUMN_DELETED, ROW_REORDERED, COLUMN_REORDERED, + MODEL_CHANGED, LAST_SIGNAL }; -struct _AtkTableIfaceClass -{ - GObjectClass parent; -}; - -typedef struct _AtkTableIfaceClass AtkTableIfaceClass; - static void atk_table_base_init (gpointer *g_class); static guint atk_table_signals[LAST_SIGNAL] = { 0 }; @@ -123,6 +117,15 @@ atk_table_base_init (gpointer *g_class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + atk_table_signals[MODEL_CHANGED] = + g_signal_new ("model_changed", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, model_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + initialized = TRUE; } } diff --git a/atk/atktable.h b/atk/atktable.h index cc7c516..2ebe834 100755 --- a/atk/atktable.h +++ b/atk/atktable.h @@ -131,6 +131,7 @@ struct _AtkTableIface gint num_deleted); void (* row_reordered) (AtkTable *table); void (* column_reordered) (AtkTable *table); + void (* model_changed) (AtkTable *table); }; GType atk_table_get_type (); diff --git a/atk/atktext.c b/atk/atktext.c index ea954ab..eb4348a 100755 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -23,6 +23,7 @@ enum { TEXT_CHANGED, CARET_MOVED, + TEXT_SELECTION_CHANGED, LAST_SIGNAL }; @@ -88,13 +89,6 @@ static const gchar *underline[] = {"none", "double", "low"}; -struct _AtkTextIfaceClass -{ - GObjectClass parent; -}; - -typedef struct _AtkTextIfaceClass AtkTextIfaceClass; - static void atk_text_base_init (gpointer *g_class); static guint atk_text_signals[LAST_SIGNAL] = { 0 }; @@ -153,6 +147,15 @@ atk_text_base_init (gpointer *g_class) g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + atk_text_signals[TEXT_SELECTION_CHANGED] = + g_signal_new ("text_selection_changed", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTextIface, text_selection_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + initialized = TRUE; } diff --git a/atk/atktext.h b/atk/atktext.h index b8a9a44..d8b92ca 100755 --- a/atk/atktext.h +++ b/atk/atktext.h @@ -213,9 +213,12 @@ struct _AtkTextIface /* * signal handlers */ - void (* text_changed) (AtkText *text); + void (* text_changed) (AtkText *text, + gint position, + gint length); void (* caret_changed) (AtkText *text, gint location); + void (* text_selection_changed) (AtkText *text); }; GType atk_text_get_type (void); diff --git a/docs/tmpl/atkobject.sgml b/docs/tmpl/atkobject.sgml index 7ae76ec..37091eb 100644 --- a/docs/tmpl/atkobject.sgml +++ b/docs/tmpl/atkobject.sgml @@ -290,3 +290,13 @@ of the other ATK interfaces: @handler_id: +<!-- ##### FUNCTION atk_object_notify_state_change ##### --> +<para> + +</para> + +@accessible: +@state: +@value: + + diff --git a/docs/tmpl/atkselection.sgml b/docs/tmpl/atkselection.sgml index 300a0d8..609b356 100644 --- a/docs/tmpl/atkselection.sgml +++ b/docs/tmpl/atkselection.sgml @@ -37,6 +37,7 @@ can be selected should support the AtkSelection interface. @is_child_selected: @remove_selection: @select_all_selection: +@selection_changed: <!-- ##### FUNCTION atk_selection_add_selection ##### --> <para> diff --git a/docs/tmpl/atktable.sgml b/docs/tmpl/atktable.sgml index 9dbab84..25dc585 100644 --- a/docs/tmpl/atktable.sgml +++ b/docs/tmpl/atktable.sgml @@ -61,6 +61,7 @@ AtkTable @column_deleted: @row_reordered: @column_reordered: +@model_changed: <!-- ##### FUNCTION atk_table_ref_at ##### --> <para> diff --git a/docs/tmpl/atktext.sgml b/docs/tmpl/atktext.sgml index a452c05..5e157ba 100644 --- a/docs/tmpl/atktext.sgml +++ b/docs/tmpl/atktext.sgml @@ -32,7 +32,8 @@ AtkText @get_character_at_offset: @get_text_before_offset: @get_caret_offset: -@ref_run_attributes: +@get_run_attributes: +@get_default_attributes: @get_character_extents: @get_character_count: @get_offset_at_point: @@ -44,6 +45,7 @@ AtkText @set_caret_offset: @text_changed: @caret_changed: +@text_selection_changed: <!-- ##### ENUM AtkTextBoundary ##### --> <para> @@ -72,6 +74,39 @@ AtkText </para> +<!-- ##### ENUM AtkTextAttribute ##### --> +<para> + +</para> + +@ATK_TEXT_ATTR_LEFT_MARGIN: +@ATK_TEXT_ATTR_RIGHT_MARGIN: +@ATK_TEXT_ATTR_INDENT: +@ATK_TEXT_ATTR_INVISIBLE: +@ATK_TEXT_ATTR_EDITABLE: +@ATK_TEXT_ATTR_PIXELS_ABOVE_LINES: +@ATK_TEXT_ATTR_PIXELS_BELOW_LINES: +@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: +@ATK_TEXT_ATTR_BG_FULL_HEIGHT: +@ATK_TEXT_ATTR_RISE: +@ATK_TEXT_ATTR_UNDERLINE: +@ATK_TEXT_ATTR_STRIKETHROUGH: +@ATK_TEXT_ATTR_SIZE: +@ATK_TEXT_ATTR_SCALE: +@ATK_TEXT_ATTR_WEIGHT: +@ATK_TEXT_ATTR_LANGUAGE: +@ATK_TEXT_ATTR_FAMILY_NAME: +@ATK_TEXT_ATTR_BG_COLOR: +@ATK_TEXT_ATTR_FG_COLOR: +@ATK_TEXT_ATTR_BG_STIPPLE: +@ATK_TEXT_ATTR_FG_STIPPLE: +@ATK_TEXT_ATTR_WRAP_MODE: +@ATK_TEXT_ATTR_DIRECTION: +@ATK_TEXT_ATTR_JUSTIFICATION: +@ATK_TEXT_ATTR_STRETCH: +@ATK_TEXT_ATTR_VARIANT: +@ATK_TEXT_ATTR_STYLE: + <!-- ##### FUNCTION atk_text_get_text ##### --> <para> @@ -166,6 +201,27 @@ AtkText @length: +<!-- ##### FUNCTION atk_text_get_run_attributes ##### --> +<para> + +</para> + +@text: +@offset: +@start_offset: +@end_offset: +@Returns: + + +<!-- ##### FUNCTION atk_text_get_default_attributes ##### --> +<para> + +</para> + +@text: +@Returns: + + <!-- ##### FUNCTION atk_text_get_character_count ##### --> <para> @@ -259,3 +315,22 @@ AtkText @attrib_set: +<!-- ##### FUNCTION atk_attribute_get_name ##### --> +<para> + +</para> + +@attr: +@Returns: + + +<!-- ##### FUNCTION atk_attribute_get_value ##### --> +<para> + +</para> + +@attr: +@index: +@Returns: + + |