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
#include "startupnotify.h"
#include "gettext.h"
-extern gchar **environ;
+#include <stdlib.h>
#ifndef USE_LIBSN
return CurrentTime;
}
gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
-gchar **sn_get_spawn_environment(char *program, Time time)
-{
- return g_strdupv(environ);
-}
+void sn_setup_spawn_environment(gchar *program, gchar *name,
+ gchar *icon_name, gint desktop, Time time) {}
void sn_spawn_cancel() {}
#else
{
if (reconfig) return;
+ /* unset this so we don't pass it on unknowingly */
+ unsetenv("DESKTOP_STARTUP_ID");
+
sn_display = sn_display_new(ob_display, NULL, NULL);
sn_context = sn_monitor_context_new(sn_display, ob_screen,
sn_event_func, NULL, NULL);
have a timeout */
ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC,
sn_wait_timeout, seq,
+ g_direct_equal,
(GDestroyNotify)sn_startup_sequence_unref);
change = TRUE;
break;
GSList *it;
Time t = CurrentTime;
+ if (!id && !wmclass)
+ return t;
+
for (it = sn_waits; it; it = g_slist_next(it)) {
SnStartupSequence *seq = it->data;
- const gchar *seqid, *seqclass;
+ gboolean found = FALSE;
+ const gchar *seqid, *seqclass, *seqname, *seqbin;
seqid = sn_startup_sequence_get_id(seq);
seqclass = sn_startup_sequence_get_wmclass(seq);
- if ((seqid && id && !strcmp(seqid, id)) ||
- (seqclass && wmclass && !strcmp(seqclass, wmclass)))
- {
+ seqname = sn_startup_sequence_get_name(seq);
+ seqbin = sn_startup_sequence_get_binary_name(seq);
+
+ if (id && seqid) {
+ /* if the app has a startup id, then look for that for highest
+ accuracy */
+ if (!strcmp(seqid, id))
+ found = TRUE;
+ } else {
+ seqclass = sn_startup_sequence_get_wmclass(seq);
+ seqname = sn_startup_sequence_get_name(seq);
+ seqbin = sn_startup_sequence_get_binary_name(seq);
+
+ if ((seqname && !g_ascii_strcasecmp(seqname, wmclass)) ||
+ (seqbin && !g_ascii_strcasecmp(seqbin, wmclass)) ||
+ (seqclass && !strcmp(seqclass, wmclass)))
+ found = TRUE;
+ }
+
+ if (found) {
sn_startup_sequence_complete(seq);
t = sn_startup_sequence_get_timestamp(seq);
break;
return FALSE; /* don't repeat */
}
-gchar **sn_get_spawn_environment(char *program, Time time)
+void sn_setup_spawn_environment(gchar *program, gchar *name,
+ gchar *icon_name, gint desktop,
+ Time time)
{
- gchar **env, *desc;
- guint len;
+ gchar *desc;
const char *id;
desc = g_strdup_printf(_("Running %s\n"), program);
sn_launcher = sn_launcher_context_new(sn_display, ob_screen);
}
- sn_launcher_context_set_name(sn_launcher, program);
+ 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, program);
+ sn_launcher_context_set_icon_name(sn_launcher, icon_name ? icon_name : program);
sn_launcher_context_set_binary_name(sn_launcher, program);
+ 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, time);
id = sn_launcher_context_get_startup_id(sn_launcher);
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,
+ 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;
+ setenv("DESKTOP_STARTUP_ID", id, TRUE);
g_free(desc);
-
- return env;
}
void sn_spawn_cancel()