if ((act = actions_build_act_from_string(name))) {
if (act->def->canbeinteractive) {
- if (act->def->setup.i) {
+ if (act->def->setup.i)
act->options = act->def->setup.i(NULL,
&act->i_pre,
&act->i_input,
&act->i_cancel,
&act->i_post);
- g_assert(!!act->i_input == !!act->i_cancel);
- }
}
else {
if (act->def->setup.n)
gchar *name;
ObActionsAct *act = NULL;
- if (obt_parse_attr_string(node, "name", &name)) {
+ if (obt_xml_attr_string(node, "name", &name)) {
if ((act = actions_build_act_from_string(name))) {
/* there is more stuff to parse here */
if (act->def->canbeinteractive) {
- if (act->def->setup.i) {
+ if (act->def->setup.i)
act->options = act->def->setup.i(node->children,
&act->i_pre,
&act->i_input,
&act->i_cancel,
&act->i_post);
- g_assert(!!act->i_input == !!act->i_cancel);
- }
}
else {
if (act->def->setup.n)
gboolean actions_act_is_interactive(ObActionsAct *act)
{
- return act->i_cancel != NULL;
+ return act->i_input != NULL;
}
void actions_act_ref(ObActionsAct *act)
if (interactive_act)
actions_interactive_cancel_act();
if (act->i_pre)
- act->i_pre(act->options);
- ok = actions_interactive_begin_act(act, state);
+ if (!act->i_pre(state, act->options))
+ act->i_input = NULL; /* remove the interactivity */
}
+ /* check again cuz it might have been cancelled */
+ if (actions_act_is_interactive(act))
+ ok = actions_interactive_begin_act(act, state);
}
/* fire the action's run function with this data */
actions_interactive_end_act();
} else {
/* make sure its interactive if it returned TRUE */
- g_assert(act->i_cancel);
+ g_assert(act->i_input);
/* no actions are run after the interactive one */
break;
void actions_interactive_cancel_act(void)
{
if (interactive_act) {
- interactive_act->i_cancel(interactive_act->options);
+ if (interactive_act->i_cancel)
+ interactive_act->i_cancel(interactive_act->options);
actions_interactive_end_act();
}
}
are ignored during a grab, so don't force fake ones when they
should be ignored
*/
- if ((c = client_under_pointer()) && c != data->client &&
- !grab_on_pointer())
- {
- ob_debug_type(OB_DEBUG_FOCUS,
- "Generating fake enter because we did a "
- "mouse-event action");
- event_enter_client(c);
+ if (!grab_on_pointer()) {
+ if ((c = client_under_pointer()) && c != data->client) {
+ ob_debug_type(OB_DEBUG_FOCUS,
+ "Generating fake enter because we did a "
+ "mouse-event action");
+ event_enter_client(c);
+ }
+ else if (!c && c != data->client) {
+ ob_debug_type(OB_DEBUG_FOCUS,
+ "Generating fake leave because we did a "
+ "mouse-event action");
+ event_enter_client(data->client);
+ }
}
}
else if (!data->button && !config_focus_under_mouse)