} setup;
ObActionsDataFreeFunc free;
ObActionsRunFunc run;
+ ObActionsShutdownFunc shutdown;
};
struct _ObActionsAct {
/* free all the registered actions */
while (registered) {
- actions_definition_unref(registered->data);
+ ObActionsDefinition *d = registered->data;
+ if (d->shutdown) d->shutdown();
+ actions_definition_unref(d);
registered = g_slist_delete_link(registered, registered);
}
}
return NULL;
}
- def = g_new(ObActionsDefinition, 1);
+ def = g_slice_new(ObActionsDefinition);
def->ref = 1;
def->name = g_strdup(name);
def->free = free;
def->run = run;
+ def->shutdown = NULL;
registered = g_slist_prepend(registered, def);
return def;
return def != NULL;
}
+gboolean actions_set_shutdown(const gchar *name,
+ ObActionsShutdownFunc shutdown)
+{
+ GSList *it;
+ ObActionsDefinition *def;
+
+ for (it = registered; it; it = g_slist_next(it)) {
+ def = it->data;
+ if (!g_ascii_strcasecmp(name, def->name)) {
+ def->shutdown = shutdown;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
static void actions_definition_ref(ObActionsDefinition *def)
{
++def->ref;
{
if (def && --def->ref == 0) {
g_free(def->name);
- g_free(def);
+ g_slice_free(ObActionsDefinition, def);
}
}
/* if we found the action */
if (def) {
- act = g_new(ObActionsAct, 1);
+ act = g_slice_new(ObActionsAct);
act->ref = 1;
act->def = def;
actions_definition_ref(act->def);
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) {
act->def->free(act->options);
/* unref the definition */
actions_definition_unref(act->def);
- g_free(act);
+ g_slice_free(ObActionsAct, act);
}
}
interactive_act = act;
actions_act_ref(interactive_act);
- interactive_initial_state = state;
+ interactive_initial_state = obt_keyboard_only_modmasks(state);
/* if using focus_delay, stop the timer now so that focus doesn't go
moving on us, which would kill the action */
gboolean used = FALSE;
if (interactive_act) {
if (!interactive_act->i_input(interactive_initial_state, e,
+ grab_input_context(),
interactive_act->options, &used))
{
used = TRUE; /* if it cancelled the action then it has to of
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)