From 9389cfbec9d7f4a7b5f9d4a580428949db4f6e67 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 1 Oct 2013 23:48:03 +0100 Subject: Support -c for new-session, based on code from J Raynor. --- cmd-queue.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'cmd-queue.c') diff --git a/cmd-queue.c b/cmd-queue.c index 38a88d23..808d4dc0 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -283,3 +283,27 @@ cmdq_flush(struct cmd_q *cmdq) } cmdq->item = NULL; } + +/* Get default path using command queue. */ +const char * +cmdq_default_path(struct cmd_q *cmdq, const char *cwd) +{ + struct client *c = cmdq->client; + struct session *s; + const char *current; + + if ((s = cmd_current_session(cmdq, 0)) == NULL) + return (NULL); + + if (cwd == NULL) + cwd = options_get_string(&s->options, "default-path"); + + if (c != NULL && c->session == NULL && c->cwd != NULL) + current = c->cwd; + else if (s->curw != NULL) + current = osdep_get_cwd(s->curw->window->active->fd); + else + current = NULL; + + return (cmd_default_path(s->cwd, current, cwd)); +} -- cgit