gchar *sn_icon;
gchar *sn_wmclass;
gchar *prompt;
+ ObActionsData *data;
} Options;
static gpointer setup_func(xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-/*
-static gboolean i_input_func(guint initial_state,
- XEvent *e,
- gpointer options,
- gboolean *used);
-static void i_cancel_func(gpointer options);
-*/
+static void shutdown_func(void);
+static void client_dest(ObClient *client, gpointer data);
+
+static GSList *prompt_opts = NULL;
void action_execute_startup(void)
{
- actions_register("Execute", setup_func, free_func, run_func, NULL, NULL);
+ actions_register("Execute", setup_func, free_func, run_func);
+ actions_set_shutdown("Execute", shutdown_func);
+ actions_set_modifies_focused_window("Execute", FALSE);
+
+ client_add_destroy_notify(client_dest, NULL);
+}
+
+static void client_dest(ObClient *client, gpointer data)
+{
+ GSList *it;
+
+ for (it = prompt_opts; it; it = g_slist_next(it)) {
+ Options *o = it->data;
+ if (o->data->client == client)
+ o->data->client = NULL;
+ }
}
static gpointer setup_func(xmlNodePtr node)
xmlNodePtr n;
Options *o;
- o = g_new0(Options, 1);
+ o = g_slice_new0(Options);
- if ((n = obt_parse_find_node(node, "command")) ||
- (n = obt_parse_find_node(node, "execute")))
+ if ((n = obt_xml_find_node(node, "command")) ||
+ (n = obt_xml_find_node(node, "execute")))
{
- gchar *s = obt_parse_node_string(n);
+ gchar *s = obt_xml_node_string(n);
o->cmd = obt_paths_expand_tilde(s);
g_free(s);
}
- if ((n = obt_parse_find_node(node, "prompt")))
- o->prompt = obt_parse_node_string(n);
+ if ((n = obt_xml_find_node(node, "prompt")))
+ o->prompt = obt_xml_node_string(n);
- if ((n = obt_parse_find_node(node, "startupnotify"))) {
+ if ((n = obt_xml_find_node(node, "startupnotify"))) {
xmlNodePtr m;
- if ((m = obt_parse_find_node(n->children, "enabled")))
- o->sn = obt_parse_node_bool(m);
- if ((m = obt_parse_find_node(n->children, "name")))
- o->sn_name = obt_parse_node_string(m);
- if ((m = obt_parse_find_node(n->children, "icon")))
- o->sn_icon = obt_parse_node_string(m);
- if ((m = obt_parse_find_node(n->children, "wmclass")))
- o->sn_wmclass = obt_parse_node_string(m);
+ if ((m = obt_xml_find_node(n->children, "enabled")))
+ o->sn = obt_xml_node_bool(m);
+ if ((m = obt_xml_find_node(n->children, "name")))
+ o->sn_name = obt_xml_node_string(m);
+ if ((m = obt_xml_find_node(n->children, "icon")))
+ o->sn_icon = obt_xml_node_string(m);
+ if ((m = obt_xml_find_node(n->children, "wmclass")))
+ o->sn_wmclass = obt_xml_node_string(m);
}
return o;
}
+static void shutdown_func(void)
+{
+ client_remove_destroy_notify(client_dest);
+}
+
static void free_func(gpointer options)
{
Options *o = options;
if (o) {
+ prompt_opts = g_slist_remove(prompt_opts, o);
+
g_free(o->cmd);
g_free(o->sn_name);
g_free(o->sn_icon);
g_free(o->sn_wmclass);
g_free(o->prompt);
- g_free(o);
+ if (o->data) g_slice_free(ObActionsData, o->data);
+ g_slice_free(Options, o);
}
}
-static Options* dup_options(Options *in)
+static Options* dup_options(Options *in, ObActionsData *data)
{
- Options *o = g_new(Options, 1);
+ Options *o = g_slice_new(Options);
o->cmd = g_strdup(in->cmd);
o->sn = in->sn;
o->sn_name = g_strdup(in->sn_name);
o->sn_icon = g_strdup(in->sn_icon);
o->sn_wmclass = g_strdup(in->sn_wmclass);
o->prompt = NULL;
+ o->data = g_slice_new(ObActionsData);
+ memcpy(o->data, data, sizeof(ObActionsData));
return o;
}
-static gboolean run_func(ObActionsData *data, gpointer options);
-
static gboolean prompt_cb(ObPrompt *p, gint result, gpointer options)
{
+ Options *o = options;
if (result)
- run_func(NULL, options);
+ run_func(o->data, o);
return TRUE; /* call the cleanup func */
}
{ _("Yes"), 1 }
};
- ocp = dup_options(options);
+ ocp = dup_options(options, data);
p = prompt_new(o->prompt, _("Execute"), answers, 2, 0, 0,
prompt_cb, prompt_cleanup, ocp);
prompt_show(p, NULL, FALSE);
if (data->client) {
gchar *c, *before, *expand;
- /* replace occurances of $pid and $wid */
+ /* replace occurrences of $pid and $wid */
expand = NULL;
before = cmd;
before = c + 4; /* 4 = strlen("$pid") */
}
-
- if ((c[1] == 'w' || c[1] == 'W') &&
- (c[2] == 'i' || c[2] == 'I') &&
- (c[3] == 'd' || c[3] == 'D') &&
- !g_ascii_isalnum(c[4]))
+ else if ((c[1] == 'w' || c[1] == 'W') &&
+ (c[2] == 'i' || c[2] == 'I') &&
+ (c[3] == 'd' || c[3] == 'D') &&
+ !g_ascii_isalnum(c[4]))
{
/* found $wid */
gchar *tmp;
before = c + 4; /* 4 = strlen("$wid") */
}
+ else
+ before = c + 1; /* no infinite loops plz */
}
if (expand) {
/* If there is a keyboard grab going on then we need to cancel
it so the application can grab things */
- event_cancel_all_key_grabs();
+ if (data->uact != OB_USER_ACTION_MENU_SELECTION)
+ event_cancel_all_key_grabs();
e = NULL;
if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
- g_message(e->message, o->cmd);
+ g_message("%s", e->message);
g_error_free(e);
}
else {
G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, NULL, &e);
if (!ok) {
- g_message(e->message, o->cmd);
+ g_message("%s", e->message);
g_error_free(e);
}
if (o->sn) {
if (!ok) sn_spawn_cancel();
- unsetenv("DESKTOP_STARTUP_ID");
+ g_unsetenv("DESKTOP_STARTUP_ID");
}
g_free(program);
projects / dana / openbox.git / blobdiff