s/ob_display/obt_display/ and remove ob_display

[chaz/openbox] / openbox / startupnotify.c

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 954b9d4ab1193bc92c9ccc7a7766f00bf1073653..1542be06f641b70a5361ee02a701acfe2dfab5eb 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -2,7 +2,7 @@
 
    startupnotify.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,8 +19,9 @@
 
 #include "startupnotify.h"
 #include "gettext.h"
+#include "event.h"
 
-extern gchar **environ;
+#include <stdlib.h>
 
 #ifndef USE_LIBSN
 
@@ -32,17 +33,13 @@ Time sn_app_started(const gchar *id, const gchar *wmclass)
     return CurrentTime;
 }
 gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
-gchar **sn_get_spawn_environment(char *program, char *name,
-                                 char *icon_name, Time time)
-{
-    return g_strdupv(environ);
-}
+void sn_setup_spawn_environment(gchar *program, gchar *name,
+                                gchar *icon_name, gint desktop) {}
 void sn_spawn_cancel() {}
 
 #else
 
 #include "openbox.h"
-#include "mainloop.h"
 #include "screen.h"
 
 #define SN_API_NOT_YET_FROZEN
@@ -60,14 +57,21 @@ static void sn_event_func(SnMonitorEvent *event, gpointer data);
 
 void sn_startup(gboolean reconfig)
 {
+    gchar *s;
+
     if (reconfig) return;
 
-    sn_display = sn_display_new(ob_display, NULL, NULL);
+    /* unset this so we don't pass it on unknowingly */
+    s = g_strdup("DESKTOP_STARTUP_ID");
+    putenv(s);
+    g_free(s);
+
+    sn_display = sn_display_new(obt_display, NULL, NULL);
     sn_context = sn_monitor_context_new(sn_display, ob_screen,
                                         sn_event_func, NULL, NULL);
     sn_launcher = sn_launcher_context_new(sn_display, ob_screen);
 
-    ob_main_loop_x_add(ob_main_loop, sn_handler, NULL, NULL);
+    obt_main_loop_x_add(ob_main_loop, sn_handler, NULL, NULL);
 }
 
 void sn_shutdown(gboolean reconfig)
@@ -76,7 +80,7 @@ void sn_shutdown(gboolean reconfig)
 
     if (reconfig) return;
 
-    ob_main_loop_x_remove(ob_main_loop, sn_handler);
+    obt_main_loop_x_remove(ob_main_loop, sn_handler);
 
     for (it = sn_waits; it; it = g_slist_next(it))
         sn_startup_sequence_unref((SnStartupSequence*)it->data);
@@ -105,7 +109,7 @@ static SnStartupSequence* sequence_find(const gchar *id)
     return ret;
 }
 
-gboolean sn_app_starting()
+gboolean sn_app_starting(void)
 {
     return sn_waits != NULL;
 }
@@ -137,11 +141,12 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
     case SN_MONITOR_EVENT_INITIATED:
         sn_startup_sequence_ref(seq);
         sn_waits = g_slist_prepend(sn_waits, seq);
-        /* 30 second timeout for apps to start if the launcher doesn't
+        /* 20 second timeout for apps to start if the launcher doesn't
            have a timeout */
-        ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC,
-                                 sn_wait_timeout, seq,
-                                 (GDestroyNotify)sn_startup_sequence_unref);
+        obt_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC,
+                                  sn_wait_timeout, seq,
+                                  g_direct_equal,
+                                  (GDestroyNotify)sn_startup_sequence_unref);
         change = TRUE;
         break;
     case SN_MONITOR_EVENT_CHANGED:
@@ -152,8 +157,8 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
     case SN_MONITOR_EVENT_CANCELED:
         if ((seq = sequence_find(sn_startup_sequence_get_id(seq)))) {
             sn_waits = g_slist_remove(sn_waits, seq);
-            ob_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout,
-                                             seq, FALSE);
+            obt_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout,
+                                              seq, FALSE);
             change = TRUE;
         }
         break;
@@ -226,11 +231,10 @@ static gboolean sn_launch_wait_timeout(gpointer data)
     return FALSE; /* don't repeat */
 }
 
-gchar **sn_get_spawn_environment(char *program, char *name,
-                                 char *icon_name, Time time)
+void sn_setup_spawn_environment(gchar *program, gchar *name,
+                                gchar *icon_name, gint desktop)
 {
-    gchar **env, *desc;
-    guint len;
+    gchar *desc;
     const char *id;
 
     desc = g_strdup_printf(_("Running %s\n"), program);
@@ -242,29 +246,28 @@ gchar **sn_get_spawn_environment(char *program, char *name,
 
     sn_launcher_context_set_name(sn_launcher, name ? name : program);
     sn_launcher_context_set_description(sn_launcher, desc);
-    sn_launcher_context_set_icon_name(sn_launcher, icon_name ? icon_name : program);
+    sn_launcher_context_set_icon_name(sn_launcher, icon_name ?
+                                      icon_name : program);
     sn_launcher_context_set_binary_name(sn_launcher, program);
-    sn_launcher_context_initiate(sn_launcher, "openbox", program, time);
+    if (desktop >= 0 && (unsigned) desktop < screen_num_desktops)
+        sn_launcher_context_set_workspace(sn_launcher, (signed) desktop);
+    sn_launcher_context_initiate(sn_launcher, "openbox", program,
+                                 event_curtime);
     id = sn_launcher_context_get_startup_id(sn_launcher);
 
-    /* 30 second timeout for apps to start */
+    /* 20 second timeout for apps to start */
     sn_launcher_context_ref(sn_launcher);
-    ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC,
-                             sn_launch_wait_timeout, sn_launcher,
-                             (GDestroyNotify)sn_launcher_context_unref);
+    obt_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC,
+                              sn_launch_wait_timeout, sn_launcher,
+                              g_direct_equal,
+                              (GDestroyNotify)sn_launcher_context_unref);
 
-    env = g_strdupv(environ);
-    len = g_strv_length(env); /* includes last null */
-    env = g_renew(gchar*, env, ++len); /* add one spot */
-    env[len-2] = g_strdup_printf("DESKTOP_STARTUP_ID=%s", id);
-    env[len-1] = NULL;
+    putenv(g_strdup_printf("DESKTOP_STARTUP_ID=%s", id));
 
     g_free(desc);
-
-    return env;
 }
 
-void sn_spawn_cancel()
+void sn_spawn_cancel(void)
 {
     sn_launcher_context_complete(sn_launcher);
 }