X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fexecute.c;fp=openbox%2Factions%2Fexecute.c;h=fa66a484a8b4828f0ab5ead4487f827163046c1a;hb=8bd02bf4b883fa369dd68df2053974407024ddaf;hp=ff73bf2bce288eb13e5804372f48b44f286c6669;hpb=26cc41f6c6187dabd5c7ee4365c8fa44751009e5;p=chaz%2Fopenbox diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c index ff73bf2b..fa66a484 100644 --- a/openbox/actions/execute.c +++ b/openbox/actions/execute.c @@ -1,6 +1,7 @@ #include "openbox/actions.h" #include "openbox/event.h" #include "openbox/startupnotify.h" +#include "openbox/prompt.h" #include "openbox/screen.h" #include "obt/paths.h" #include "gettext.h" @@ -15,6 +16,7 @@ typedef struct { gchar *sn_name; gchar *sn_icon; gchar *sn_wmclass; + gchar *prompt; } Options; static gpointer setup_func(xmlNodePtr node); @@ -48,6 +50,9 @@ static gpointer setup_func(xmlNodePtr node) g_free(s); } + 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 = obt_parse_find_node(n->children, "enabled"))) @@ -75,6 +80,36 @@ static void free_func(gpointer options) } } +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 data) +{ + Options *options = data; + + if (result) + run_func(NULL, options); + + prompt_unref(p); + + g_free(options->cmd); + g_free(options->sn_name); + g_free(options->sn_icon); + g_free(options->sn_wmclass); + g_free(options); +} + /* Always return FALSE because its not interactive */ static gboolean run_func(ObActionsData *data, gpointer options) { @@ -84,6 +119,22 @@ 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);