#include <sys/types.h>
#include <sys/wait.h>
+#include <paths.h>
#define SN_API_NOT_YET_FROZEN 1
#include <libsn/sn-launcher.h>
}
/*
- * Some applications (such as Firefox) mark a startup sequence as completede
+ * Some applications (such as Firefox) mark a startup sequence as completed
* *before* they even map a window. Therefore, we cannot entirely delete the
* startup sequence once it’s marked as complete. Instead, we’ll mark it for
* deletion in 30 seconds and use that chance to delete old sequences.
* the root window cursor.
*
*/
-static int _delete_startup_sequence(struct Startup_Sequence *sequence) {
+static int _prune_startup_sequences(void) {
time_t current_time = time(NULL);
int active_sequences = 0;
- /* Mark the given sequence for deletion in 30 seconds. */
- sequence->delete_at = current_time + 30;
- DLOG("Will delete startup sequence %s at timestamp %ld\n",
- sequence->id, sequence->delete_at);
-
/* Traverse the list and delete everything which was marked for deletion 30
* seconds ago or earlier. */
struct Startup_Sequence *current, *next;
for (next = TAILQ_FIRST(&startup_sequences);
- next != TAILQ_END(&startup_sequences);
- ) {
+ next != TAILQ_END(&startup_sequences);) {
current = next;
next = TAILQ_NEXT(next, sequences);
if (current_time <= current->delete_at)
continue;
- DLOG("Deleting startup sequence %s, delete_at = %ld, current_time = %ld\n",
- current->id, current->delete_at, current_time);
-
- /* Unref the context, will be free()d */
- sn_launcher_context_unref(current->context);
-
- /* Delete our internal sequence */
- TAILQ_REMOVE(&startup_sequences, current, sequences);
+ startup_sequence_delete(current);
}
return active_sequences;
+}
+
+/**
+ * Deletes a startup sequence, ignoring whether its timeout has elapsed.
+ * Useful when e.g. a window is moved between workspaces and its children
+ * shouldn't spawn on the original workspace.
+ *
+ */
+void startup_sequence_delete(struct Startup_Sequence *sequence) {
+ assert(sequence != NULL);
+ DLOG("Deleting startup sequence %s, delete_at = %ld, current_time = %ld\n",
+ sequence->id, sequence->delete_at, time(NULL));
+
+ /* Unref the context, will be free()d */
+ sn_launcher_context_unref(sequence->context);
+
+ /* Delete our internal sequence */
+ TAILQ_REMOVE(&startup_sequences, sequence, sequences);
+ free(sequence->id);
+ free(sequence->workspace);
+ FREE(sequence);
}
/*
* the application is reparented to init (process-id 1), which correctly handles
* childs, so we don’t have to do it :-).
*
- * The shell is determined by looking for the SHELL environment variable. If it
- * does not exist, /bin/sh is used.
+ * The shell used to start applications is the system's bourne shell (i.e.,
+ * /bin/sh).
*
* The no_startup_id flag determines whether a startup notification context
* (and ID) should be created, which is the default and encouraged behavior.
}
unsetenv("LISTEN_PID");
unsetenv("LISTEN_FDS");
+ signal(SIGPIPE, SIG_DFL);
if (fork() == 0) {
/* Setup the environment variable(s) */
if (!no_startup_id)
sn_launcher_context_setup_child_process(context);
- /* Stores the path of the shell */
- static const char *shell = NULL;
-
- if (shell == NULL)
- if ((shell = getenv("SHELL")) == NULL)
- shell = "/bin/sh";
-
- /* This is the child */
- execl(shell, shell, "-c", command, (void*)NULL);
+ execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, (void *)NULL);
/* not reached */
}
_exit(0);
/* Change the pointer of the root window to indicate progress */
if (xcursor_supported)
xcursor_set_root_cursor(XCURSOR_CURSOR_WATCH);
- else xcb_set_root_cursor(XCURSOR_CURSOR_WATCH);
+ else
+ xcb_set_root_cursor(XCURSOR_CURSOR_WATCH);
}
}
case SN_MONITOR_EVENT_COMPLETED:
DLOG("startup sequence %s completed\n", sn_startup_sequence_get_id(snsequence));
- if (_delete_startup_sequence(sequence) == 0) {
+ /* Mark the given sequence for deletion in 30 seconds. */
+ time_t current_time = time(NULL);
+ sequence->delete_at = current_time + 30;
+ DLOG("Will delete startup sequence %s at timestamp %ld\n",
+ sequence->id, sequence->delete_at);
+
+ if (_prune_startup_sequences() == 0) {
DLOG("No more startup sequences running, changing root window cursor to default pointer.\n");
/* Change the pointer of the root window to indicate progress */
if (xcursor_supported)
xcursor_set_root_cursor(XCURSOR_CURSOR_POINTER);
- else xcb_set_root_cursor(XCURSOR_CURSOR_POINTER);
+ else
+ xcb_set_root_cursor(XCURSOR_CURSOR_POINTER);
}
break;
default:
}
}
-/*
- * Checks if the given window belongs to a startup notification by checking if
- * the _NET_STARTUP_ID property is set on the window (or on its leader, if it’s
- * unset).
- *
- * If so, returns the workspace on which the startup was initiated.
- * Returns NULL otherwise.
+/**
+ * Gets the stored startup sequence for the _NET_STARTUP_ID of a given window.
*
*/
-char *startup_workspace_for_window(i3Window *cwindow, xcb_get_property_reply_t *startup_id_reply) {
+struct Startup_Sequence *startup_sequence_get(i3Window *cwindow,
+ xcb_get_property_reply_t *startup_id_reply, bool ignore_mapped_leader) {
/* The _NET_STARTUP_ID is only needed during this function, so we get it
* here and don’t save it in the 'cwindow'. */
if (startup_id_reply == NULL || xcb_get_property_value_length(startup_id_reply) == 0) {
FREE(startup_id_reply);
- DLOG("No _NET_STARTUP_ID set on this window\n");
+ DLOG("No _NET_STARTUP_ID set on window 0x%08x\n", cwindow->id);
if (cwindow->leader == XCB_NONE)
return NULL;
- xcb_get_property_cookie_t cookie;
- cookie = xcb_get_property(conn, false, cwindow->leader, A__NET_STARTUP_ID, XCB_GET_PROPERTY_TYPE_ANY, 0, 512);
+ /* This is a special case that causes the leader's startup sequence
+ * to only be returned if it has never been mapped, useful primarily
+ * when trying to delete a sequence.
+ *
+ * It's generally inappropriate to delete a leader's sequence when
+ * moving a child window, but if the leader has no container, it's
+ * likely permanently unmapped and the child is the "real" window. */
+ if (ignore_mapped_leader && con_by_window_id(cwindow->leader) != NULL) {
+ DLOG("Ignoring leader window 0x%08x\n", cwindow->leader);
+ return NULL;
+ }
+
DLOG("Checking leader window 0x%08x\n", cwindow->leader);
+
+ xcb_get_property_cookie_t cookie;
+
+ cookie = xcb_get_property(conn, false, cwindow->leader,
+ A__NET_STARTUP_ID, XCB_GET_PROPERTY_TYPE_ANY, 0, 512);
startup_id_reply = xcb_get_property_reply(conn, cookie, NULL);
- if (startup_id_reply == NULL || xcb_get_property_value_length(startup_id_reply) == 0) {
- DLOG("No _NET_STARTUP_ID set on the leader either\n");
+ if (startup_id_reply == NULL ||
+ xcb_get_property_value_length(startup_id_reply) == 0) {
FREE(startup_id_reply);
+ DLOG("No _NET_STARTUP_ID set on the leader either\n");
return NULL;
}
}
char *startup_id;
if (asprintf(&startup_id, "%.*s", xcb_get_property_value_length(startup_id_reply),
- (char*)xcb_get_property_value(startup_id_reply)) == -1) {
+ (char *)xcb_get_property_value(startup_id_reply)) == -1) {
perror("asprintf()");
DLOG("Could not get _NET_STARTUP_ID\n");
free(startup_id_reply);
free(startup_id);
free(startup_id_reply);
+
+ return sequence;
+}
+
+/*
+ * Checks if the given window belongs to a startup notification by checking if
+ * the _NET_STARTUP_ID property is set on the window (or on its leader, if it’s
+ * unset).
+ *
+ * If so, returns the workspace on which the startup was initiated.
+ * Returns NULL otherwise.
+ *
+ */
+char *startup_workspace_for_window(i3Window *cwindow, xcb_get_property_reply_t *startup_id_reply) {
+ struct Startup_Sequence *sequence = startup_sequence_get(cwindow, startup_id_reply, false);
+ if (sequence == NULL)
+ return NULL;
+
+ /* If the startup sequence's time span has elapsed, delete it. */
+ time_t current_time = time(NULL);
+ if (sequence->delete_at > 0 && current_time > sequence->delete_at) {
+ DLOG("Deleting expired startup sequence %s\n", sequence->id);
+ startup_sequence_delete(sequence);
+ return NULL;
+ }
+
return sequence->workspace;
}
projects / i3 / i3 / blobdiff