G_DEFINE_TYPE (AtspiStateSet, atspi_state_set, G_TYPE_OBJECT)
-static const char *state_names [] =
-{
- "invalid",
- "active",
- "armed",
- "busy",
- "checked",
- "collapsed",
- "defunct",
- "editable",
- "enabled",
- "expandable",
- "expanded",
- "focusable",
- "focused",
- "has-tool-tip",
- "horizontal",
- "iconified",
- "modal",
- "multi-line",
- "multiselectable",
- "opaque",
- "pressed",
- "resizable",
- "selectable",
- "selected",
- "sensitive",
- "showing",
- "singleLine",
- "stale",
- "transient",
- "vertical",
- "visible",
- "manages-descendants",
- "indeterminate",
- "required",
- "truncated",
- "animated",
- "invalid-entry",
- "supports-autocompletion",
- "selectable-text",
- "is-default",
- "visited",
- NULL
-};
-
static void
atspi_state_set_init (AtspiStateSet *set)
{
{
}
-/*
+/**
* atspi_state_set_new:
+ * @states: (element-type AtspiStateType): An array of states with which the
+ * method initializes the state set.
*
- * @states: (element-type AtspiStateType): An array of states with which to initialize
- * the state set.
+ * Generates an #AtspiStateSet with the given @states.
*
* Returns: A new #AtspiStateSet with the given states.
**/
return set;
}
+/**
+ * atspi_state_set_set_by_name:
+ * @set: a pointer to the #AtspiStateSet object on which to operate.
+ * @name: a string corresponding to a state name.
+ * @enabled: if #TRUE, @name should be enabled in the @set in question;
+ * otherwise, it should be disabled.
+ *
+ * Enables/disables a state in an #AtspiStateSet according to its @name.
+ **/
void
atspi_state_set_set_by_name (AtspiStateSet *set, const gchar *name, gboolean enabled)
{
- gint i = 0;
+ GTypeClass *type_class;
+ GEnumValue *value;
+
+ type_class = g_type_class_ref (ATSPI_TYPE_STATE_TYPE);
if (set->accessible &&
!(set->accessible->cached_properties & ATSPI_CACHE_STATES))
return;
- /* TODO: This could perhaps be optimized */
- for (i = 0; state_names [i]; i++)
+ value = g_enum_get_value_by_nick (G_ENUM_CLASS (type_class), name);
+ if (!value)
{
- if (!strcmp (state_names [i], name))
- {
- if (enabled)
- set->states |= ((gint64)1 << i);
- else
- set->states &= ~((gint64)1 << i);
- return;
- }
+ g_warning ("AT-SPI: Attempt to set unknown state '%s'", name);
}
- g_warning ("at-spi: Attempt to set unknown state '%s'", name);
+
+ if (enabled)
+ set->states |= ((gint64)1 << value->value);
+ else
+ set->states &= ~((gint64)1 << value->value);
}
static void
states = (dbus_uint32_t *) state_array->data;
set->states = ((gint64)states [1]) << 32;
- set->states += states [0];
+ set->states |= (gint64) states [0];
g_array_free (state_array, TRUE);
}
/**
* atspi_state_set_add:
- *
* @set: a pointer to the #AtspiStateSet object on which to operate.
* @state: an #AtspiStateType to be added to the specified #AtspiStateSet.
*
- * Add a particular #AtspiState to an #AtspiStateSet (i.e. set the
- * given state to #TRUE in the stateset.
+ * Adds a particular #AtspiState to an #AtspiStateSet (i.e. sets the
+ * given state to #TRUE in the stateset).
*
**/
void
/**
* atspi_state_set_compare:
* @set: a pointer to the first #AtspiStateSet object on which to operate.
- * @set: a pointer to the second #AtspiStateSet setect on which to operate.
+ * @set2: a pointer to the second #AtspiStateSet object on which to operate.
*
- * Determine the differences between two instances of #AtspiStateSet.
- *.
- * @see AtspiStateSet_equals().
+ * Determines the differences between two instances of #AtspiStateSet.
+ *
+ * @see #atspi_state_set_equals.
*
* Returns: (transfer full): an #AtspiStateSet object containing all states
- * contained on one of the two sets but not the other.
+ * contained on one of the two sets but not the other.
*
**/
AtspiStateSet *
* atspi_state_set_contains:
* @set: a pointer to the #AtspiStateSet object on which to operate.
* @state: an #AtspiStateType for which the specified #AtspiStateSet
- * will be queried.
+ * will be queried.
*
- * Determine whether a given #AtspiStateSet includes a given state; that is,
- * whether @state is true for the stateset in question.
+ * Determines whether a given #AtspiStateSet includes a given state; that is,
+ * whether @state is true for the @set in question.
*
* Returns: #TRUE if @state is true/included in the given #AtspiStateSet,
* otherwise #FALSE.
* @set: a pointer to the first #AtspiStateSet object on which to operate.
* @set2: a pointer to the second #AtspiStateSet object on which to operate.
*
- * Determine whether two instances of #AtspiStateSet are equivalent (i.e.
- * consist of the same #AtspiStates). Useful for checking multiple
- * state variables at once; construct the target state then compare against it.
+ * Determines whether two instances of #AtspiStateSet are equivalent (i.e.
+ * consist of the same #AtspiStates). Useful for checking multiple
+ * state variables at once.
*
- * @see AtspiStateSet_compare().
+ * @see #atspi_state_set_compare.
*
* Returns: #TRUE if the two #AtspiStateSets are equivalent,
- * otherwise #FALSE.
+ * otherwise #FALSE.
*
**/
gboolean
/**
* atspi_state_set_get_states:
- *
* @set: The #AtspiStateSet to be queried.
*
- * Return the states in an #AtspiStateSet as an array.
+ * Returns the states in an #AtspiStateSet as an array.
*
* Returns: (element-type AtspiStateType) (transfer full): A #GArray of state
* types representing the current state.
for (i = 0; i < 64; i++)
{
if (set->states & val)
- {
- GArray *new_array = g_array_append_val (ret, i);
- if (new_array)
- ret = new_array;
- }
+ ret = g_array_append_val (ret, i);
val <<= 1;
}
return ret;
/**
* atspi_state_set_is_empty:
- *
* @set: The #AtspiStateSet to query.
*
* Returns: #TRUE if the state set contains no states; #FALSE otherwise.
/**
* atspi_state_set_remove:
- *
* @set: a pointer to the #AtspiStateSet object on which to operate.
- * @state: an #AtspiStateType to remove from the specifiedn state set.
+ * @state: an #AtspiStateType to remove from the specified @set.
*
- * Remove a particular #AtspiState to an #AtspiStateSet (i.e. set the
+ * Removes a particular #AtspiState to an #AtspiStateSet (i.e. sets the
* given state to #FALSE in the stateset.)
*
**/
g_return_if_fail (set != NULL);
set->states &= ~((gint64)1 << state);
}
-