#include "startupnotify.h"
#include "gettext.h"
+#include "event.h"
#include <stdlib.h>
void sn_startup(gboolean reconfig) {}
void sn_shutdown(gboolean reconfig) {}
gboolean sn_app_starting() { return FALSE; }
-Time sn_app_started(const gchar *id, const gchar *wmclass)
+Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name)
{
return CurrentTime;
}
gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
void sn_setup_spawn_environment(gchar *program, gchar *name,
- gchar *icon_name, gint desktop, Time time) {}
+ gchar *icon_name, gint desktop) {}
void sn_spawn_cancel() {}
#else
void sn_startup(gboolean reconfig)
{
+ gchar *s;
+
if (reconfig) return;
/* unset this so we don't pass it on unknowingly */
- unsetenv("DESKTOP_STARTUP_ID");
+ s = g_strdup("DESKTOP_STARTUP_ID");
+ putenv(s);
+ g_free(s);
sn_display = sn_display_new(ob_display, NULL, NULL);
sn_context = sn_monitor_context_new(sn_display, ob_screen,
return ret;
}
-gboolean sn_app_starting()
+gboolean sn_app_starting(void)
{
return sn_waits != NULL;
}
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,
+ ob_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC,
sn_wait_timeout, seq,
g_direct_equal,
(GDestroyNotify)sn_startup_sequence_unref);
screen_set_root_cursor();
}
-Time sn_app_started(const gchar *id, const gchar *wmclass)
+Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name)
{
GSList *it;
Time t = CurrentTime;
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)) ||
+ /* seqclass = "a string to match against the "resource name" or
+ "resource class" hints. These are WM_CLASS[0] and WM_CLASS[1]"
+ - from the startup-notification spec
+ */
+ if ((seqclass && !strcmp(seqclass, wmclass)) ||
+ (seqclass && !strcmp(seqclass, name)) ||
+ /* Check the binary name against the class and name hints
+ as well, to help apps that don't have the class set
+ correctly */
(seqbin && !g_ascii_strcasecmp(seqbin, wmclass)) ||
- (seqclass && !strcmp(seqclass, wmclass)))
+ (seqbin && !g_ascii_strcasecmp(seqbin, name)))
+ {
found = TRUE;
+ }
}
if (found) {
}
void sn_setup_spawn_environment(gchar *program, gchar *name,
- gchar *icon_name, gint desktop,
- Time time)
+ gchar *icon_name, gint desktop)
{
gchar *desc;
const char *id;
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);
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);
+ 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,
+ ob_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);
- setenv("DESKTOP_STARTUP_ID", id, TRUE);
+ putenv(g_strdup_printf("DESKTOP_STARTUP_ID=%s", id));
g_free(desc);
}
-void sn_spawn_cancel()
+void sn_spawn_cancel(void)
{
sn_launcher_context_complete(sn_launcher);
}