#include "openbox/actions.h"
#include "openbox/event.h"
#include "openbox/startupnotify.h"
+#include "openbox/client.h"
+#include "openbox/prompt.h"
#include "openbox/screen.h"
+#include "obt/paths.h"
#include "gettext.h"
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
typedef struct {
gchar *cmd;
gboolean sn;
gchar *sn_name;
gchar *sn_icon;
gchar *sn_wmclass;
+ gchar *prompt;
} Options;
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_func(xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
/*
static void i_cancel_func(gpointer options);
*/
-void action_execute_startup()
+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, NULL, NULL);
}
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
{
xmlNodePtr n;
Options *o;
o = g_new0(Options, 1);
- if ((n = parse_find_node("execute", node))) {
- gchar *s = parse_string(doc, n);
- o->cmd = parse_expand_tilde(s);
+ if ((n = obt_parse_find_node(node, "command")) ||
+ (n = obt_parse_find_node(node, "execute")))
+ {
+ gchar *s = obt_parse_node_string(n);
+ o->cmd = obt_paths_expand_tilde(s);
g_free(s);
}
- if ((n = parse_find_node("startupnotify", node))) {
+ if ((n = obt_parse_find_node(node, "prompt")))
+ o->prompt = obt_parse_node_string(n);
+
+ if ((n = obt_parse_find_node(node, "startupnotify"))) {
xmlNodePtr m;
- if ((m = parse_find_node("enabled", n->xmlChildrenNode)))
- o->sn = parse_bool(doc, m);
- if ((m = parse_find_node("name", n->xmlChildrenNode)))
- o->sn_name = parse_string(doc, m);
- if ((m = parse_find_node("icon", n->xmlChildrenNode)))
- o->sn_icon = parse_string(doc, m);
- if ((m = parse_find_node("wmclass", n->xmlChildrenNode)))
- o->sn_wmclass = parse_string(doc, 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);
}
return o;
}
g_free(o->sn_name);
g_free(o->sn_icon);
g_free(o->sn_wmclass);
+ g_free(o->prompt);
g_free(o);
}
}
+static Options* dup_options(Options *in)
+{
+ Options *o = g_new(Options, 1);
+ 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;
+ return o;
+}
+
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+static void prompt_cb(ObPrompt *p, gint result, gpointer options)
+{
+ if (result)
+ run_func(NULL, options);
+
+ prompt_unref(p);
+ free_func(options);
+}
+
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options)
{
Options *o = options;
if (!o->cmd) return FALSE;
+
+ if (o->prompt) {
+ ObPrompt *p;
+ Options *ocp;
+ ObPromptAnswer answers[] = {
+ { _("No"), 0 },
+ { _("Yes"), 1 }
+ };
+
+ ocp = dup_options(options);
+ p = prompt_new(o->prompt, answers, 2, 0, 0, prompt_cb, ocp);
+ prompt_show(p, NULL, FALSE);
+
+ return FALSE;
+ }
+
cmd = g_filename_from_utf8(o->cmd, -1, NULL, NULL, NULL);
if (!cmd) {
- g_message(_("Failed to convert the path '%s' from utf8"), o->cmd);
+ g_message(_("Failed to convert the path \"%s\" from utf8"), o->cmd);
return FALSE;
}
event_cancel_all_key_grabs();
if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
- g_message(_("Failed to execute '%s': %s"), o->cmd, e->message);
+ g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
g_error_free(e);
}
else {
program = g_path_get_basename(argv[0]);
/* sets up the environment */
sn_setup_spawn_environment(program, o->sn_name, o->sn_icon,
+ o->sn_wmclass,
/* launch it on the current desktop */
screen_desktop);
}
+ if (data->client && data->client->pid) {
+ gchar *pid;
+
+ pid = g_strdup_printf("%u", data->client->pid);
+ setenv("PID", pid, TRUE);
+ g_free(pid);
+ }
+ else
+ unsetenv("PID");
+
+ if (data->client) {
+ gchar *wid;
+
+ wid = g_strdup_printf("%u", data->client->window);
+ setenv("WINDOW_ID", wid, TRUE);
+ g_free(wid);
+ }
+ else
+ unsetenv("WINDOW_ID");
+
if (!g_spawn_async(NULL, argv, NULL,
G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, NULL, &e))
{
- g_message(_("Failed to execute '%s': %s"), o->cmd, e->message);
+ g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
g_error_free(e);
if (o->sn)
if (o->sn)
unsetenv("DESKTOP_STARTUP_ID");
+ unsetenv("PID");
+ unsetenv("WINDOW_ID");
+
g_free(program);
g_strfreev(argv);
}
projects / dana / openbox.git / blobdiff