circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2018-06-08 13:02:25 +01:00
commit 713e0ddef3
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-new-session.c
View File

@ -202,19 +202,31 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
sy = 24; sy = 24;
} }
if ((is_control || detached) && args_has(args, 'x')) { if ((is_control || detached) && args_has(args, 'x')) {
sx = strtonum(args_get(args, 'x'), 1, USHRT_MAX, &errstr); tmp = args_get(args, 'x');
if (strcmp(tmp, "-") == 0) {
if (c != NULL)
sx = c->tty.sx;
} else {
sx = strtonum(tmp, 1, USHRT_MAX, &errstr);
if (errstr != NULL) { if (errstr != NULL) {
cmdq_error(item, "width %s", errstr); cmdq_error(item, "width %s", errstr);
goto error; goto error;
} }
} }
}
if ((is_control || detached) && args_has(args, 'y')) { if ((is_control || detached) && args_has(args, 'y')) {
sy = strtonum(args_get(args, 'y'), 1, USHRT_MAX, &errstr); tmp = args_get(args, 'y');
if (strcmp(tmp, "-") == 0) {
if (c != NULL)
sy = c->tty.sy;
} else {
sy = strtonum(tmp, 1, USHRT_MAX, &errstr);
if (errstr != NULL) { if (errstr != NULL) {
cmdq_error(item, "height %s", errstr); cmdq_error(item, "height %s", errstr);
goto error; goto error;
} }
} }
}
if (sx == 0) if (sx == 0)
sx = 1; sx = 1;
if (sy == 0) if (sy == 0)

2
tmux.1
View File

@ -855,6 +855,8 @@ the initial size is 80 x 24;
and and
.Fl y .Fl y
can be used to specify a different size. can be used to specify a different size.
.Ql -
uses the size of the current client if any.
.Pp .Pp
If run from a terminal, any If run from a terminal, any
.Xr termios 4 .Xr termios 4