diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-08-14 01:34:54 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-08-14 01:34:54 +0100 |
| commit | 54773d23b5ceb779c524dcac6bf3b848886fb6d6 (patch) | |
| tree | 5c60007637121f63c8c730a04f4e8e741577c21a /cmd-attach-session.c | |
| parent | 4c07367bfe626fce990f5b5b2d00516ae8249a93 (diff) | |
| parent | 63aa96864280ff07f706ebbae302b7c15abb964f (diff) | |
| download | rtmux-54773d23b5ceb779c524dcac6bf3b848886fb6d6.tar.gz rtmux-54773d23b5ceb779c524dcac6bf3b848886fb6d6.tar.bz2 rtmux-54773d23b5ceb779c524dcac6bf3b848886fb6d6.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'cmd-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 6a7ebba7..c2074f4f 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -124,17 +124,9 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag, if (!Eflag) environ_update(s->options, c->environ, s->environ); - c->session = s; + server_client_set_session(c, s); if (~cmdq_get_flags(item) & CMDQ_STATE_REPEAT) server_client_set_key_table(c, NULL); - tty_update_client_offset(c); - status_timer_start(c); - notify_client("client-session-changed", c); - session_update_activity(s, NULL); - gettimeofday(&s->last_attached_time, NULL); - server_redraw_client(c); - s->curw->flags &= ~WINLINK_ALERTFLAGS; - s->curw->window->latest = c; } else { if (server_client_open(c, &cause) != 0) { cmdq_error(item, "open terminal failed: %s", cause); @@ -156,25 +148,14 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag, if (!Eflag) environ_update(s->options, c->environ, s->environ); - c->session = s; + server_client_set_session(c, s); server_client_set_key_table(c, NULL); - tty_update_client_offset(c); - status_timer_start(c); - notify_client("client-session-changed", c); - session_update_activity(s, NULL); - gettimeofday(&s->last_attached_time, NULL); - server_redraw_client(c); - s->curw->flags &= ~WINLINK_ALERTFLAGS; - s->curw->window->latest = c; if (~c->flags & CLIENT_CONTROL) proc_send(c->peer, MSG_READY, -1, NULL, 0); notify_client("client-attached", c); c->flags |= CLIENT_ATTACHED; } - recalculate_sizes(); - alerts_check_session(s); - server_update_socket(); return (CMD_RETURN_NORMAL); } |