add GAction base class

This commit is contained in:
Ryan Lortie 2010-08-18 01:45:15 -04:00
parent a3f4ff52ca
commit 8475d6d7d0
8 changed files with 770 additions and 0 deletions

View File

@ -163,6 +163,7 @@
<chapter id="application"> <chapter id="application">
<title>Application support</title> <title>Application support</title>
<xi:include href="xml/gactiongroup.xml"/> <xi:include href="xml/gactiongroup.xml"/>
<xi:include href="xml/gaction.xml"/>
<xi:include href="xml/gapplication.xml"/> <xi:include href="xml/gapplication.xml"/>
</chapter> </chapter>
<chapter id="extending"> <chapter id="extending">

View File

@ -2700,3 +2700,34 @@ G_ACTION_GROUP_CLASS
G_ACTION_GROUP_GET_CLASS G_ACTION_GROUP_GET_CLASS
G_ACTION_GROUP G_ACTION_GROUP
</SECTION> </SECTION>
<SECTION>
<FILE>gaction</FILE>
<TITLE>GAction</TITLE>
GAction
GActionClass
<SUBSECTION>
g_action_get_name
g_action_get_parameter_type
g_action_get_state_type
g_action_get_state_hint
<SUBSECTION>
g_action_get_enabled
g_action_set_enabled
g_action_get_state
g_action_set_state
<SUBSECTION>
g_action_activate
<SUBSECTION Standard>
g_action_get_type
G_TYPE_ACTION
G_IS_ACTION
G_ACTION_CLASS
G_ACTION_GET_CLASS
G_ACTION
</SECTION>

View File

@ -1,3 +1,4 @@
g_action_get_type
g_action_group_get_type g_action_group_get_type
g_app_info_create_flags_get_type g_app_info_create_flags_get_type
g_app_info_get_type g_app_info_get_type

View File

@ -130,10 +130,12 @@ settings_sources = \
application_headers = \ application_headers = \
gactiongroup.h \ gactiongroup.h \
gaction.h \
gapplication.h gapplication.h
application_sources = \ application_sources = \
gactiongroup.c \ gactiongroup.c \
gaction.c \
gapplication.c gapplication.c

597
gio/gaction.c Normal file
View File

@ -0,0 +1,597 @@
/*
* Copyright © 2010 Codethink Limited
*
* This program 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 licence 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.
*
* Authors: Ryan Lortie <desrt@desrt.ca>
*/
#include "gaction.h"
G_DEFINE_TYPE (GAction, g_action, G_TYPE_OBJECT)
/**
* SECTION:gaction
* @title: GAction
* @short_description: an action
*
* #GAction represents a single named action.
*
* The main interface to an action is that it can be activated with
* g_action_activate(). This results in the 'activate' signal being
* emitted. An activation has a #GVariant parameter (which may be
* %NULL). The correct type for the parameter is determined by a static
* parameter type (which is given at construction time).
*
* An action may optionally have a state, in which case the state may be
* set with g_action_set_state(). This call takes a #GVariant. The
* correct type for the state is determined by a static state type
* (which is given at construction time).
*
* The state may have a hint associated with it, specifying its valid
* range.
*
* #GAction is intended to be used both as a simple action class and as
* a base class for more complicated action types. The base class
* itself supports activation and state. Not supported are state hints
* and filtering requests to set the state based on the requested value.
* You should subclass if you require either of these abilities.
*
* In all cases, the base class is responsible for storing the name of
* the action, the parameter type, the enabled state, the optional state
* type and the state and emitting the appropriate signals when these
* change. The base class is also responsbile for filtering calls to
* g_action_activate() and g_action_set_state() for type safety and for
* the state being enabled.
*
* Probably the only useful thing to do with a #GAction is to put it
* inside of a #GSimpleActionGroup.
**/
struct _GActionPrivate
{
gchar *name;
GVariantType *parameter_type;
gboolean enabled;
GVariantType *state_type;
GVariant *state;
};
enum
{
PROP_NONE,
PROP_NAME,
PROP_PARAMETER_TYPE,
PROP_ENABLED,
PROP_STATE_TYPE,
PROP_STATE
};
enum
{
SIGNAL_ACTIVATE,
NR_SIGNALS
};
static guint g_action_signals[NR_SIGNALS];
static void
g_action_real_set_state (GAction *action,
GVariant *value)
{
if (action->priv->state == value)
return;
if (!action->priv->state || !g_variant_equal (action->priv->state, value))
{
if (action->priv->state)
g_variant_unref (action->priv->state);
action->priv->state = g_variant_ref (value);
g_object_notify (G_OBJECT (action), "state");
}
}
static GVariant *
g_action_real_get_state_hint (GAction *action)
{
return NULL;
}
static void
g_action_set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
GAction *action = G_ACTION (object);
switch (prop_id)
{
case PROP_NAME:
g_assert (action->priv->name == NULL);
action->priv->name = g_value_dup_string (value);
break;
case PROP_PARAMETER_TYPE:
g_assert (action->priv->parameter_type == NULL);
action->priv->parameter_type = g_value_dup_boxed (value);
break;
case PROP_ENABLED:
g_action_set_enabled (action, g_value_get_boolean (value));
break;
case PROP_STATE_TYPE:
g_assert (action->priv->state_type == NULL);
action->priv->state_type = g_value_dup_boxed (value);
break;
case PROP_STATE:
g_action_set_state (action, g_value_get_variant (value));
break;
default:
g_assert_not_reached ();
}
}
static void
g_action_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
GAction *action = G_ACTION (object);
switch (prop_id)
{
case PROP_NAME:
g_value_set_string (value, g_action_get_name (action));
break;
case PROP_PARAMETER_TYPE:
g_value_set_boxed (value, g_action_get_parameter_type (action));
break;
case PROP_ENABLED:
g_value_set_boolean (value, g_action_get_enabled (action));
break;
case PROP_STATE_TYPE:
g_value_set_boxed (value, g_action_get_state_type (action));
break;
case PROP_STATE:
g_value_set_variant (value, g_action_get_state (action));
break;
default:
g_assert_not_reached ();
}
}
static void
g_action_finalize (GObject *object)
{
GAction *action = G_ACTION (object);
g_free (action->priv->name);
if (action->priv->parameter_type)
g_variant_type_free (action->priv->parameter_type);
if (action->priv->state_type)
g_variant_type_free (action->priv->state_type);
if (action->priv->state)
g_variant_unref (action->priv->state);
G_OBJECT_CLASS (g_action_parent_class)
->finalize (object);
}
void
g_action_init (GAction *action)
{
action->priv = G_TYPE_INSTANCE_GET_PRIVATE (action,
G_TYPE_ACTION,
GActionPrivate);
}
void
g_action_class_init (GActionClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
class->get_state_hint = g_action_real_get_state_hint;
class->set_state = g_action_real_set_state;
object_class->get_property = g_action_get_property;
object_class->set_property = g_action_set_property;
object_class->finalize = g_action_finalize;
/**
* GAction::activate:
* @action: the #GAction
* @parameter: (allow-none): the parameter to the activation
*
* Indicates that the action was just activated.
*
* @parameter will always be of the expected type. In the event that
* an incorrect type was given, no signal will be emitted.
**/
g_action_signals[SIGNAL_ACTIVATE] =
g_signal_new ("activate", G_TYPE_ACTION, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GActionClass, activate),
NULL, NULL, g_cclosure_marshal_VOID__VARIANT,
G_TYPE_NONE, 1, G_TYPE_VARIANT);
/**
* GAction:name:
*
* The name of the action. This is mostly meaningful for identifying
* the action once it has been added to a #GActionGroup.
**/
g_object_class_install_property (object_class, PROP_NAME,
g_param_spec_string ("name", "action name",
"the name used to invoke the action",
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
/**
* GAction:parameter-type:
*
* The type of the parameter that must be given when activating the
* action.
**/
g_object_class_install_property (object_class, PROP_PARAMETER_TYPE,
g_param_spec_boxed ("parameter-type", "parameter type",
"the type of GVariant passed to activate()",
G_TYPE_VARIANT_TYPE, G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GAction:enabled:
*
* If @action is currently enabled.
*
* If the action is disabled then calls to g_action_activate() and
* g_action_set_state() have no effect.
**/
g_object_class_install_property (object_class, PROP_ENABLED,
g_param_spec_boolean ("enabled", "enabled",
"if the action can be activated", TRUE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GAction:state-type:
*
* The #GVariantType of the state that the action has, or %NULL if the
* action is stateless.
**/
g_object_class_install_property (object_class, PROP_STATE_TYPE,
g_param_spec_boxed ("state-type", "state type",
"the type of the state kept by the action",
G_TYPE_VARIANT_TYPE, G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GAction:state:
*
* The state of the action, or %NULL if the action is stateless.
**/
g_object_class_install_property (object_class, PROP_STATE,
g_param_spec_variant ("state", "state", "the state the action is in",
G_VARIANT_TYPE_ANY, NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_type_class_add_private (class, sizeof (GActionPrivate));
}
/**
* g_action_set_state:
* @action: a #GAction
* @value: the new state
*
* Request for the state of @action to be changed to @value.
*
* The action must be stateful and @value must be of the correct type.
* See g_action_get_state_type().
*
* This call merely requests a change. The action may refuse to change
* its state or may change its state to something other than @value.
* See g_action_get_state_hint().
*
* Since: 2.26
**/
void
g_action_set_state (GAction *action,
GVariant *value)
{
g_return_if_fail (G_IS_ACTION (action));
g_return_if_fail ((action->priv->state_type == NULL && value == NULL) ||
g_variant_is_of_type (value, action->priv->state_type));
g_variant_ref_sink (value);
if (action->priv->enabled)
G_ACTION_GET_CLASS (action)
->set_state (action, value);
g_variant_unref (value);
}
/**
* g_action_get_state:
* @action: a #GAction
*
* Queries the current state of @action.
*
* If the action is not stateful then %NULL will be returned. If the
* action is stateful then the type of the return value is the type
* given by g_action_get_state_type().
*
* The return value (if non-%NULL) should be freed with
* g_variant_unref() when it is no longer required.
*
* Returns: (allow-none): the current state of the action
*
* Since: 2.26
**/
GVariant *
g_action_get_state (GAction *action)
{
g_return_val_if_fail (G_IS_ACTION (action), NULL);
return action->priv->state;
}
/**
* g_action_get_name:
* @action: a #GAction
*
* Queries the name of @action.
*
* Returns: the name of the action
*
* Since: 2.26
**/
const gchar *
g_action_get_name (GAction *action)
{
g_return_val_if_fail (G_IS_ACTION (action), NULL);
return action->priv->name;
}
/**
* g_action_get_parameter_type:
* @action: a #GAction
*
* Queries the type of the parameter that must be given when activating
* @action.
*
* When activating the action using g_action_activate(), the #GVariant
* given to that function must be of the type returned by this function.
*
* In the case that this function returns %NULL, you must not give any
* #GVariant, but %NULL instead.
*
* Returns: (allow-none): the parameter type
*
* Since: 2.26
**/
const GVariantType *
g_action_get_parameter_type (GAction *action)
{
g_return_val_if_fail (G_IS_ACTION (action), NULL);
return action->priv->parameter_type;
}
/**
* g_action_get_state_type:
* @action: a #GAction
*
* Queries the type of the state of @action.
*
* If the action is stateful (ie: was created with
* g_action_new_stateful()) then this function returns the #GVariantType
* of the state. This is the type of the initial value given as the
* state. All calls to g_action_set_state() must give a #GVariant of
* this type and g_action_get_state() will return a #GVariant of the
* same type.
*
* If the action is not stateful (ie: created with g_action_new()) then
* this function will return %NULL. In that case, g_action_get_state()
* will return %NULL and you must not call g_action_set_state().
*
* Returns: (allow-none): the state type, if the action is stateful
*
* Since: 2.26
**/
const GVariantType *
g_action_get_state_type (GAction *action)
{
g_return_val_if_fail (G_IS_ACTION (action), NULL);
return action->priv->state_type;
}
/**
* g_action_get_state_hint:
* @action: a #GAction
*
* Requests a hint about the valid range of values for the state of
* @action.
*
* If %NULL is returned it either means that the action is not stateful
* or that there is no hint about the valid range of values for the
* state of the action.
*
* If a #GVariant array is returned then each item in the array is a
* possible value for the state. If a #GVariant pair (ie: two-tuple) is
* returned then the tuple specifies the inclusive lower and upper bound
* of valid values for the state.
*
* In any case, the information is merely a hint. It may be possible to
* have a state value outside of the hinted range and setting a value
* within the range may fail.
*
* The return value (if non-%NULL) should be freed with
* g_variant_unref() when it is no longer required.
*
* Returns: (allow-none): the state range hint
*
* Since: 2.26
**/
GVariant *
g_action_get_state_hint (GAction *action)
{
g_return_val_if_fail (G_IS_ACTION (action), NULL);
return G_ACTION_GET_CLASS (action)
->get_state_hint (action);
}
/**
* g_action_get_enabled:
* @action: a #GAction
*
* Checks if @action is currently enabled.
*
* An action must be enabled in order to be activated or in order to
* have its state changed from outside callers.
*
* Returns: whether the action is enabled
*
* Since: 2.26
**/
gboolean
g_action_get_enabled (GAction *action)
{
g_return_val_if_fail (G_IS_ACTION (action), FALSE);
return action->priv->enabled;
}
/**
* g_action_set_enabled:
* @action: a #GAction
* @enabled: whether the action is enabled
*
* Sets the action as enabled or not.
*
* An action must be enabled in order to be activated or in order to
* have its state changed from outside callers.
*
* Since: 2.26
**/
void
g_action_set_enabled (GAction *action,
gboolean enabled)
{
g_return_if_fail (G_IS_ACTION (action));
enabled = !!enabled;
if (action->priv->enabled != enabled)
{
action->priv->enabled = enabled;
g_object_notify (G_OBJECT (action), "enabled");
}
}
/**
* g_action_activate:
* @action: a #GAction
* @parameter: the parameter to the activation
*
* Activates the action.
*
* @parameter must be the correct type of parameter for the action (ie:
* the parameter type given at construction time). If the parameter
* type was %NULL then @parameter must also be %NULL.
*
* Since: 2.26
**/
void
g_action_activate (GAction *action,
GVariant *parameter)
{
g_return_if_fail (G_IS_ACTION (action));
g_return_if_fail (action->priv->parameter_type == NULL ?
parameter == NULL :
(parameter != NULL &&
g_variant_is_of_type (parameter,
action->priv->parameter_type)));
if (parameter)
g_variant_ref_sink (parameter);
if (action->priv->enabled)
g_signal_emit (action, g_action_signals[SIGNAL_ACTIVATE], 0, parameter);
if (parameter)
g_variant_unref (parameter);
}
/**
* g_action_new:
* @name: the name of the action
* @parameter_type: the type of parameter to the activate function
*
* Creates a new action.
*
* The created action is stateless. See g_action_new_stateful().
*
* Returns: a new #GAction
*
* Since: 2.26
**/
GAction *
g_action_new (const gchar *name,
const GVariantType *parameter_type)
{
return g_object_new (G_TYPE_ACTION,
"name", name,
"parameter-type", parameter_type,
NULL);
}
/**
* g_action_new_stateful:
* @name: the name of the action
* @parameter_type: the type of the parameter to the activate function
* @state: the initial state of the action
*
* Creates a new stateful action.
*
* @state is the initial state of the action. All future state values
* must have the same #GVariantType as the initial state.
*
* Returns: a new #GAction
*
* Since: 2.26
**/
GAction *
g_action_new_stateful (const gchar *name,
const GVariantType *parameter_type,
GVariant *state)
{
return g_object_new (G_TYPE_ACTION,
"name", name,
"parameter-type", parameter_type,
"state", state,
NULL);
}

120
gio/gaction.h Normal file
View File

@ -0,0 +1,120 @@
/*
* Copyright © 2010 Codethink Limited
*
* This program 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 licence 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.
*
* Authors: Ryan Lortie <desrt@desrt.ca>
*/
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
#ifndef __G_ACTION_H__
#define __G_ACTION_H__
#include <gio/giotypes.h>
G_BEGIN_DECLS
#define G_TYPE_ACTION (g_action_get_type ())
#define G_ACTION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
G_TYPE_ACTION, GAction))
#define G_ACTION_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \
G_TYPE_ACTION, GActionClass))
#define G_IS_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_ACTION))
#define G_IS_ACTION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_ACTION))
#define G_ACTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
G_TYPE_ACTION, GActionClass))
typedef struct _GActionPrivate GActionPrivate;
typedef struct _GActionClass GActionClass;
/**
* GAction:
*
* The <structname>GAction</structname> structure contains private
* data and should only be accessed using the provided API
*
* Since: 2.26
*/
struct _GAction
{
/*< private >*/
GObject parent_instance;
GActionPrivate *priv;
};
/**
* GActionClass:
* @get_state_hint: the virtual function pointer for g_action_get_state_hint()
* @set_state: the virtual function pointer for g_action_set_state(). The implementation should check the value
* for validity and then chain up to the handler in the base class in order to actually update the
* state.
* @activate: the class closure for the activate signal
*
* Since: 2.26
*/
struct _GActionClass
{
GObjectClass parent_class;
/*< public >*/
/* virtual functions */
GVariant * (* get_state_hint) (GAction *action);
void (* set_state) (GAction *action,
GVariant *state);
/*< private >*/
gpointer vfunc_padding[6];
/*< public >*/
/* signals */
void (* activate) (GAction *action,
GVariant *parameter);
/*< private >*/
gpointer signal_padding[6];
};
GType g_action_get_type (void) G_GNUC_CONST;
GAction * g_action_new (const gchar *name,
const GVariantType *parameter_type);
GAction * g_action_new_stateful (const gchar *name,
const GVariantType *parameter_type,
GVariant *state);
const gchar * g_action_get_name (GAction *action);
const GVariantType * g_action_get_parameter_type (GAction *action);
const GVariantType * g_action_get_state_type (GAction *action);
GVariant * g_action_get_state_hint (GAction *action);
gboolean g_action_get_enabled (GAction *action);
void g_action_set_enabled (GAction *action,
gboolean enabled);
GVariant * g_action_get_state (GAction *action);
void g_action_set_state (GAction *action,
GVariant *value);
void g_action_activate (GAction *action,
GVariant *parameter);
G_END_DECLS
#endif /* __G_ACTION_H__ */

View File

@ -1842,3 +1842,20 @@ g_action_group_set_state
#endif #endif
#endif #endif
#if IN_HEADER(__G_ACTION_H__)
#if IN_FILE(__G_ACTION_C__)
g_action_activate
g_action_get_enabled
g_action_get_name
g_action_get_parameter_type
g_action_get_state
g_action_get_state_hint
g_action_get_state_type
g_action_get_type
g_action_new
g_action_new_stateful
g_action_set_enabled
g_action_set_state
#endif
#endif

View File

@ -48,6 +48,7 @@ typedef struct _GZlibCompressor GZlibCompressor;
typedef struct _GZlibDecompressor GZlibDecompressor; typedef struct _GZlibDecompressor GZlibDecompressor;
typedef struct _GActionGroup GActionGroup; typedef struct _GActionGroup GActionGroup;
typedef struct _GAction GAction;
typedef struct _GSettingsBackend GSettingsBackend; typedef struct _GSettingsBackend GSettingsBackend;
typedef struct _GSettings GSettings; typedef struct _GSettings GSettings;
typedef struct _GPermission GPermission; typedef struct _GPermission GPermission;