circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 10:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 967:

Browse Source 
For initial session, use size of command client even if detached.
This commit is contained in:
Tiago Cunha 2011-10-23 15:05:20 +00:00
parent 98e500f598
commit 7d169a3679
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-new-session.c
View File

@ -154,9 +154,17 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
} }
/* Find new session size. */ /* Find new session size. */
if (detached) { if (ctx->cmdclient != NULL) {
sx = ctx->cmdclient->tty.sx;
sy = ctx->cmdclient->tty.sy;
} else if (ctx->curclient != NULL) {
sx = ctx->curclient->tty.sx;
sy = ctx->curclient->tty.sy;
} else {
sx = 80; sx = 80;
sy = 24; sy = 24;
}
if (detached) {
if (args_has(args, 'x')) { if (args_has(args, 'x')) {
sx = strtonum( sx = strtonum(
args_get(args, 'x'), 1, USHRT_MAX, &errstr); args_get(args, 'x'), 1, USHRT_MAX, &errstr);
@ -173,12 +181,6 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
return (-1); return (-1);
} }
} }
} else if (ctx->cmdclient != NULL) {
sx = ctx->cmdclient->tty.sx;
sy = ctx->cmdclient->tty.sy;
} else {
sx = ctx->curclient->tty.sx;
sy = ctx->curclient->tty.sy;
} }
if (sy > 0 && options_get_number(&global_s_options, "status")) if (sy > 0 && options_get_number(&global_s_options, "status"))
sy--; sy--;