pass the targeted window's PID (if available) and WINDOW_ID to the environment of...

[dana/openbox.git] / openbox / actions / execute.c

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index ff73bf2..69690fa 100644 (file)
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -1,6 +1,8 @@
 #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"
@@ -15,6 +17,7 @@ typedef struct {
     gchar   *sn_name;
     gchar   *sn_icon;
     gchar   *sn_wmclass;
+    gchar   *prompt;
 } Options;
 
 static gpointer setup_func(xmlNodePtr node);
@@ -48,6 +51,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")))
@@ -71,10 +77,34 @@ static void free_func(gpointer options)
         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)
 {
@@ -84,6 +114,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);
@@ -110,6 +156,26 @@ static gboolean run_func(ObActionsData *data, gpointer options)
                                        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))
@@ -123,6 +189,9 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         if (o->sn)
             unsetenv("DESKTOP_STARTUP_ID");
 
+        unsetenv("PID");
+        unsetenv("WINDOW_ID");
+
         g_free(program);
         g_strfreev(argv);
     }