#include "gtkcellaccessible.h"
#include "gtkcellaccessibleparent.h"
-typedef struct _ActionInfo ActionInfo;
-struct _ActionInfo {
- gchar *name;
- gchar *description;
- gchar *keybinding;
- void (*do_action_func) (GtkCellAccessible *cell);
+static const struct {
+ AtkState atk_state;
+ GtkCellRendererState renderer_state;
+ gboolean invert;
+} state_map[] = {
+ { ATK_STATE_SENSITIVE, GTK_CELL_RENDERER_INSENSITIVE, TRUE },
+ { ATK_STATE_ENABLED, GTK_CELL_RENDERER_INSENSITIVE, TRUE },
+ { ATK_STATE_SELECTED, GTK_CELL_RENDERER_SELECTED, FALSE },
+ /* XXX: why do we map ACTIVE here? */
+ { ATK_STATE_ACTIVE, GTK_CELL_RENDERER_FOCUSED, FALSE },
+ { ATK_STATE_FOCUSED, GTK_CELL_RENDERER_FOCUSED, FALSE },
+ { ATK_STATE_EXPANDABLE,GTK_CELL_RENDERER_EXPANDABLE, FALSE },
+ { ATK_STATE_EXPANDED, GTK_CELL_RENDERER_EXPANDED, FALSE },
};
-
static void atk_action_interface_init (AtkActionIface *iface);
static void atk_component_interface_init (AtkComponentIface *iface);
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
-static void
-destroy_action_info (gpointer action_info)
-{
- ActionInfo *info = (ActionInfo *)action_info;
-
- g_free (info->name);
- g_free (info->description);
- g_free (info->keybinding);
- g_free (info);
-}
-
static void
gtk_cell_accessible_object_finalize (GObject *obj)
{
- GtkCellAccessible *cell = GTK_CELL_ACCESSIBLE (obj);
AtkRelationSet *relation_set;
AtkRelation *relation;
GPtrArray *target;
gpointer target_object;
gint i;
- if (cell->action_list)
- g_list_free_full (cell->action_list, destroy_action_info);
-
relation_set = atk_object_ref_relation_set (ATK_OBJECT (obj));
if (ATK_IS_RELATION_SET (relation_set))
{
GtkCellAccessible *cell_accessible;
AtkStateSet *state_set;
GtkCellRendererState flags;
+ guint i;
cell_accessible = GTK_CELL_ACCESSIBLE (accessible);
flags = _gtk_cell_accessible_get_state (cell_accessible);
+ atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
+ atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
atk_state_set_add_state (state_set, ATK_STATE_TRANSIENT);
+ atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
- if (!(flags & GTK_CELL_RENDERER_INSENSITIVE))
+ for (i = 0; i < G_N_ELEMENTS (state_map); i++)
{
- atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
- atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
+ if (flags & state_map[i].renderer_state)
+ {
+ if (!state_map[i].invert)
+ atk_state_set_add_state (state_set, state_map[i].atk_state);
+ }
+ else
+ {
+ if (state_map[i].invert)
+ atk_state_set_add_state (state_set, state_map[i].atk_state);
+ }
}
- atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
- if (flags & GTK_CELL_RENDERER_SELECTED)
- atk_state_set_add_state (state_set, ATK_STATE_SELECTED);
-
- atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
if (gtk_widget_get_mapped (cell_accessible->widget))
atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
- /* This is not completely right. We should be tracking the
- * focussed cell renderer, but that involves diving into
- * cell areas...
- */
- atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
- if (flags & GTK_CELL_RENDERER_FOCUSED)
- {
- /* XXX: Why do we set ACTIVE here? */
- atk_state_set_add_state (state_set, ATK_STATE_ACTIVE);
- atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
- }
-
- if (flags & GTK_CELL_RENDERER_EXPANDABLE)
- atk_state_set_add_state (state_set, ATK_STATE_EXPANDABLE);
- if (flags & GTK_CELL_RENDERER_EXPANDED)
- atk_state_set_add_state (state_set, ATK_STATE_EXPANDED);
-
return state_set;
}
_gtk_cell_accessible_init (GtkCellAccessible *cell)
{
cell->widget = NULL;
- cell->action_list = NULL;
}
static void
return TRUE;
}
-gboolean
-_gtk_cell_accessible_add_action (GtkCellAccessible *cell,
- const gchar *name,
- const gchar *description,
- const gchar *keybinding,
- void (*func) (GtkCellAccessible *))
-{
- ActionInfo *info;
-
- info = g_new (ActionInfo, 1);
- info->name = g_strdup (name);
- info->description = g_strdup (description);
- info->keybinding = g_strdup (keybinding);
- info->do_action_func = func;
-
- cell->action_list = g_list_append (cell->action_list, info);
-
- return TRUE;
-}
-
-gboolean
-_gtk_cell_accessible_remove_action (GtkCellAccessible *cell,
- gint index)
-{
- GList *l;
-
- l = g_list_nth (cell->action_list, index);
- if (l == NULL)
- return FALSE;
-
- destroy_action_info (l->data);
- cell->action_list = g_list_remove_link (cell->action_list, l);
-
- return TRUE;
-}
-
-
-gboolean
-_gtk_cell_accessible_remove_action_by_name (GtkCellAccessible *cell,
- const gchar *name)
-{
- GList *l;
-
- for (l = cell->action_list; l; l = l->next)
- {
- ActionInfo *info = l->data;
-
- if (g_strcmp0 (info->name, name) == 0)
- break;
- }
-
- if (l == NULL)
- return FALSE;
-
- destroy_action_info (l->data);
- cell->action_list = g_list_remove_link (cell->action_list, l);
-
- return TRUE;
-}
-
-static ActionInfo *
-get_action_info (GtkCellAccessible *cell,
- gint index)
-{
- GList *l;
-
- l = g_list_nth (cell->action_list, index);
- if (l == NULL)
- return NULL;
-
- return (ActionInfo *) (l->data);
-}
-
static gint
gtk_cell_accessible_action_get_n_actions (AtkAction *action)
{
- GtkCellAccessible *cell = GTK_CELL_ACCESSIBLE(action);
- if (cell->action_list != NULL)
- return g_list_length (cell->action_list);
- else
- return 0;
+ return 3;
}
static const gchar *
gtk_cell_accessible_action_get_name (AtkAction *action,
gint index)
{
- GtkCellAccessible *cell = GTK_CELL_ACCESSIBLE (action);
- ActionInfo *info;
-
- info = get_action_info (cell, index);
- if (info == NULL)
- return NULL;
-
- return info->name;
+ switch (index)
+ {
+ case 0:
+ return "expand or contract";
+ case 1:
+ return "edit";
+ case 2:
+ return "activate";
+ default:
+ return NULL;
+ }
}
static const gchar *
gtk_cell_accessible_action_get_description (AtkAction *action,
gint index)
{
- GtkCellAccessible *cell = GTK_CELL_ACCESSIBLE (action);
- ActionInfo *info;
-
- info = get_action_info (cell, index);
- if (info == NULL)
- return NULL;
-
- return info->description;
+ switch (index)
+ {
+ case 0:
+ return "expands or contracts the row in the tree view containing this cell";
+ case 1:
+ return "creates a widget in which the contents of the cell can be edited";
+ case 2:
+ return "activate the cell";
+ default:
+ return NULL;
+ }
}
static const gchar *
gtk_cell_accessible_action_get_keybinding (AtkAction *action,
gint index)
{
- GtkCellAccessible *cell = GTK_CELL_ACCESSIBLE (action);
- ActionInfo *info;
-
- info = get_action_info (cell, index);
- if (info == NULL)
- return NULL;
-
- return info->keybinding;
+ return NULL;
}
static gboolean
gint index)
{
GtkCellAccessible *cell = GTK_CELL_ACCESSIBLE (action);
- ActionInfo *info;
+ GtkCellAccessibleParent *parent;
- info = get_action_info (cell, index);
- if (info == NULL)
+ cell = GTK_CELL_ACCESSIBLE (action);
+ if (cell->widget == NULL)
return FALSE;
- if (info->do_action_func == NULL)
- return FALSE;
+ parent = GTK_CELL_ACCESSIBLE_PARENT (gtk_widget_get_accessible (cell->widget));
- info->do_action_func (cell);
+ switch (index)
+ {
+ case 0:
+ _gtk_cell_accessible_parent_expand_collapse (parent, cell);
+ case 1:
+ _gtk_cell_accessible_parent_edit (parent, cell);
+ case 2:
+ _gtk_cell_accessible_parent_activate (parent, cell);
+ default:
+ return FALSE;
+ }
return TRUE;
}
return _gtk_cell_accessible_parent_get_renderer_state (GTK_CELL_ACCESSIBLE_PARENT (parent), cell);
}
+
+/**
+ * _gtk_cell_accessible_state_changed:
+ * @cell: a #GtkCellAccessible
+ * @added: the flags that were added from @cell
+ * @removed: the flags that were removed from @cell
+ *
+ * Notifies @cell of state changes. Multiple states may be added
+ * or removed at the same time. A state that is @added may not be
+ * @removed at the same time.
+ **/
+void
+_gtk_cell_accessible_state_changed (GtkCellAccessible *cell,
+ GtkCellRendererState added,
+ GtkCellRendererState removed)
+{
+ AtkObject *object;
+ guint i;
+
+ g_return_if_fail (GTK_IS_CELL_ACCESSIBLE (cell));
+ g_return_if_fail ((added & removed) == 0);
+
+ object = ATK_OBJECT (cell);
+
+ for (i = 0; i < G_N_ELEMENTS (state_map); i++)
+ {
+ if (added & state_map[i].renderer_state)
+ atk_object_notify_state_change (object,
+ state_map[i].atk_state,
+ !state_map[i].invert);
+ if (added & state_map[i].renderer_state)
+ atk_object_notify_state_change (object,
+ state_map[i].atk_state,
+ state_map[i].invert);
+ }
+}
projects / ~andy / gtk / blobdiff