diff options
| author | Thomas <thomas@xteddy.org> | 2014-01-20 10:48:12 +0000 |
|---|---|---|
| committer | Thomas <thomas@xteddy.org> | 2014-01-20 10:48:12 +0000 |
| commit | d02c4bda3a4b456f654fb0c1b454ba9724bff0f3 (patch) | |
| tree | 95f3d17d7f1525e05ed298a015166af557988a0e /cmd-attach-session.c | |
| parent | ba014c1a605f78b301b47ef922dd24a3c5c2c4c1 (diff) | |
| parent | 938768ed3de3e38cb96344b8ec7b794b5e828acf (diff) | |
| download | rtmux-d02c4bda3a4b456f654fb0c1b454ba9724bff0f3.tar.gz rtmux-d02c4bda3a4b456f654fb0c1b454ba9724bff0f3.tar.bz2 rtmux-d02c4bda3a4b456f654fb0c1b454ba9724bff0f3.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index e4c0b232..8094d78b 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -47,6 +47,9 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, { struct session *s; struct client *c; + struct winlink *wl = NULL; + struct window *w = NULL; + struct window_pane *wp = NULL; const char *update; char *cause; u_int i; @@ -59,12 +62,31 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, return (CMD_RETURN_ERROR); } - if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL) - return (CMD_RETURN_ERROR); + if (tflag == NULL) { + if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL) + return (CMD_RETURN_ERROR); + } else if (tflag[strcspn(tflag, ":.")] != '\0') { + if ((wl = cmd_find_pane(cmdq, tflag, &s, &wp)) == NULL) + return (CMD_RETURN_ERROR); + } else { + if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL) + return (CMD_RETURN_ERROR); + w = cmd_lookup_windowid(tflag); + if (w == NULL && (wp = cmd_lookup_paneid(tflag)) != NULL) + w = wp->window; + if (w != NULL) + wl = winlink_find_by_window(&s->windows, w); + } if (cmdq->client == NULL) return (CMD_RETURN_NORMAL); + if (wl != NULL) { + if (wp != NULL) + window_set_active_pane(wp->window, wp); + session_set_current(s, wl); + } + if (cmdq->client->session != NULL) { if (dflag) { /* |