}
}
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
{
GSList *it;
ObActionsDefinition *def = NULL;
if ((act = actions_build_act_from_string(name)))
if (act->def->setup)
- act->options = act->def->setup(NULL, NULL, NULL);
+ act->options = act->def->setup(NULL);
return act;
}
-ObActionsAct* actions_parse(ObParseInst *i,
- xmlDocPtr doc,
- xmlNodePtr node)
+ObActionsAct* actions_parse(xmlNodePtr node)
{
gchar *name;
ObActionsAct *act = NULL;
- if (parse_attr_string("name", node, &name)) {
+ if (obt_parse_attr_string(node, "name", &name)) {
if ((act = actions_build_act_from_string(name)))
/* there is more stuff to parse here */
if (act->def->setup)
- act->options = act->def->setup(i, doc, node->xmlChildrenNode);
+ act->options = act->def->setup(node->children);
g_free(name);
}
actions_setup_data(&data, uact, state, x, y, button, con, client);
- if (!interactive_act || interactive_act->def != act->def) {
+ /* if they have the same run function, then we'll assume they are
+ cooperating and not cancel eachother out */
+ if (!interactive_act || interactive_act->def->run != act->def->run) {
if (actions_act_is_interactive(act)) {
/* cancel the old one */
if (interactive_act)
}
}
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
{
return interactive_act != NULL;
}
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
{
if (interactive_act) {
interactive_act->def->i_cancel(interactive_act->options);
/* if using focus_delay, stop the timer now so that focus doesn't go
moving on us, which would kill the action */
event_halt_focus_delay();
-
+
return TRUE;
}
else
return FALSE;
}
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
{
if (interactive_act) {
ungrab_keyboard();
else if (config_focus_follow &&
data->context != OB_FRAME_CONTEXT_CLIENT)
{
- if (!data->button && data->client && !config_focus_under_mouse)
- event_end_ignore_all_enters(ignore_start);
- else {
+ if (data->uact == OB_USER_ACTION_MOUSE_PRESS) {
struct _ObClient *c;
/* usually this is sorta redundant, but with a press action
event_enter_client(c);
}
}
+ else if (!data->button && !config_focus_under_mouse)
+ event_end_ignore_all_enters(ignore_start);
}
}