#include "actions.h"
#include "gettext.h"
#include "grab.h"
+#include "screen.h"
+
+#include "actions/all.h"
static void actions_definition_ref(ObActionsDefinition *def);
static void actions_definition_unref(ObActionsDefinition *def);
guint ref;
gchar *name;
- ObActionsType type;
ObActionsDataSetupFunc setup;
ObActionsDataFreeFunc free;
{
if (reconfig) return;
-
+ action_all_startup();
}
void actions_shutdown(gboolean reconfig)
{
+ actions_interactive_cancel_act();
+
if (reconfig) return;
/* free all the registered actions */
}
gboolean actions_register(const gchar *name,
- ObActionsType type,
ObActionsDataSetupFunc setup,
ObActionsDataFreeFunc free,
ObActionsRunFunc run,
GSList *it;
ObActionsDefinition *def;
+ g_assert(run != NULL);
+ g_assert((i_input == NULL) == (i_cancel == NULL));
+
for (it = registered; it; it = g_slist_next(it)) {
def = it->data;
if (!g_ascii_strcasecmp(name, def->name)) /* already registered */
return FALSE;
}
- g_assert((i_input == NULL) == (i_cancel == NULL));
-
def = g_new(ObActionsDefinition, 1);
def->ref = 1;
def->name = g_strdup(name);
- def->type = type;
def->setup = setup;
def->free = free;
def->run = run;
def->i_input = i_input;
def->i_cancel = i_cancel;
+
+ registered = g_slist_prepend(registered, def);
+
return TRUE;
}
ObActionsAct* actions_parse_string(const gchar *name)
{
GSList *it;
- ObActionsDefinition *def;
+ ObActionsDefinition *def = NULL;
ObActionsAct *act = NULL;
/* find the requested action */
if (parse_attr_string("name", node, &name)) {
if ((act = actions_parse_string(name)))
/* there is more stuff to parse here */
- act->options = act->def->setup(i, doc, node->children);
+ if (act->def->setup)
+ act->options = act->def->setup(i, doc, node->xmlChildrenNode);
g_free(name);
}
{
if (act && --act->ref == 0) {
/* free the action specific options */
- act->def->free(act->options);
+ if (act->def->free)
+ act->def->free(act->options);
/* unref the definition */
actions_definition_unref(act->def);
g_free(act);
static void actions_setup_data(ObActionsData *data,
ObUserAction uact,
- Time time,
guint state,
gint x,
- gint y)
+ gint y,
+ ObFrameContext con,
+ struct _ObClient *client)
{
- data->any.uact = uact;
- data->any.time = time;
- data->any.state = state;
- data->any.x = x;
- data->any.y = y;
+ data->uact = uact;
+ data->state = state;
+ data->x = x;
+ data->y = y;
+ data->context = con;
+ data->client = client;
}
void actions_run_acts(GSList *acts,
ObUserAction uact,
- Time time,
guint state,
gint x,
gint y,
{
GSList *it;
+ /* Don't allow saving the initial state when running things from the
+ menu */
+ if (uact == OB_USER_ACTION_MENU_SELECTION)
+ state = 0;
+ /* If x and y are < 0 then use the current pointer position */
+ if (x < 0 && y < 0)
+ screen_pointer_pos(&x, &y);
+
for (it = acts; it; it = g_slist_next(it)) {
ObActionsData data;
ObActionsAct *act = it->data;
gboolean ok = TRUE;
- data.type = act->def->type;
- actions_setup_data(&data, uact, time, state, x, y);
- switch (data.type) {
- case OB_ACTION_TYPE_GLOBAL:
- break;
- case OB_ACTION_TYPE_CLIENT:
- data.client.context = con;
- data.client.c = client;
- break;
- default:
- g_assert_not_reached();
- }
+ actions_setup_data(&data, uact, state, x, y, con, client);
if (actions_act_is_interactive(act) &&
(!interactive_act || interactive_act->def != act->def))
if (ok) {
if (!act->def->run(&data, act->options))
actions_interactive_end_act();
- else
- break; /* no actions are run after the interactive one */
+ else {
+ /* make sure its interactive if it returned TRUE */
+ g_assert(act->def->i_cancel && act->def->i_input);
+
+ /* no actions are run after the interactive one */
+ break;
+ }
}
}
}