patch 8.0.1711: term_setsize() is not implemented yet

Problem:    Term_setsize() is not implemented yet.
Solution:   Implement it.
This commit is contained in:
Bram Moolenaar
2018-04-14 17:05:38 +02:00
parent 2a43230ce3
commit a42d363bac
6 changed files with 70 additions and 8 deletions
+1
View File
@@ -876,6 +876,7 @@ static struct fst
# endif
{"term_setkill", 2, 2, f_term_setkill},
{"term_setrestore", 2, 2, f_term_setrestore},
{"term_setsize", 3, 3, f_term_setsize},
{"term_start", 1, 2, f_term_start},
{"term_wait", 1, 2, f_term_wait},
#endif
+2 -1
View File
@@ -32,19 +32,20 @@ int term_swap_diff(void);
void f_term_dumpdiff(typval_T *argvars, typval_T *rettv);
void f_term_dumpload(typval_T *argvars, typval_T *rettv);
void f_term_getaltscreen(typval_T *argvars, typval_T *rettv);
void f_term_getansicolors(typval_T *argvars, typval_T *rettv);
void f_term_getattr(typval_T *argvars, typval_T *rettv);
void f_term_getcursor(typval_T *argvars, typval_T *rettv);
void f_term_getjob(typval_T *argvars, typval_T *rettv);
void f_term_getline(typval_T *argvars, typval_T *rettv);
void f_term_getscrolled(typval_T *argvars, typval_T *rettv);
void f_term_getsize(typval_T *argvars, typval_T *rettv);
void f_term_setsize(typval_T *argvars, typval_T *rettv);
void f_term_getstatus(typval_T *argvars, typval_T *rettv);
void f_term_gettitle(typval_T *argvars, typval_T *rettv);
void f_term_gettty(typval_T *argvars, typval_T *rettv);
void f_term_list(typval_T *argvars, typval_T *rettv);
void f_term_scrape(typval_T *argvars, typval_T *rettv);
void f_term_sendkeys(typval_T *argvars, typval_T *rettv);
void f_term_getansicolors(typval_T *argvars, typval_T *rettv);
void f_term_setansicolors(typval_T *argvars, typval_T *rettv);
void f_term_setrestore(typval_T *argvars, typval_T *rettv);
void f_term_setkill(typval_T *argvars, typval_T *rettv);
+27 -3
View File
@@ -40,7 +40,6 @@
* TODO:
* - Win32: Make terminal used for :!cmd in the GUI work better. Allow for
* redirection. Probably in call to channel_set_pipes().
* - implement term_setsize()
* - add an optional limit for the scrollback size. When reaching it remove
* 10% at the start.
* - Copy text in the vterm to the Vim buffer once in a while, so that
@@ -4602,6 +4601,31 @@ f_term_getsize(typval_T *argvars, typval_T *rettv)
list_append_number(l, buf->b_term->tl_cols);
}
/*
* "term_setsize(buf, rows, cols)" function
*/
void
f_term_setsize(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{
buf_T *buf = term_get_buf(argvars, "term_setsize()");
term_T *term;
varnumber_T rows, cols;
if (buf == NULL || buf->b_term->tl_vterm == NULL)
return;
term = buf->b_term;
rows = get_tv_number(&argvars[1]);
rows = rows <= 0 ? term->tl_rows : rows;
cols = get_tv_number(&argvars[2]);
cols = cols <= 0 ? term->tl_cols : cols;
vterm_set_size(term->tl_vterm, rows, cols);
/* handle_resize() will resize the windows */
/* Get and remember the size we ended up with. Update the pty. */
vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols);
term_report_winsize(term, term->tl_rows, term->tl_cols);
}
/*
* "term_getstatus(buf)" function
*/
@@ -5432,7 +5456,7 @@ term_free_vterm(term_T *term)
}
/*
* Request size to terminal.
* Report the size to the terminal.
*/
static void
term_report_winsize(term_T *term, int rows, int cols)
@@ -5514,7 +5538,7 @@ term_free_vterm(term_T *term)
}
/*
* Request size to terminal.
* Report the size to the terminal.
*/
static void
term_report_winsize(term_T *term, int rows, int cols)
+11 -2
View File
@@ -286,9 +286,18 @@ func Test_terminal_size()
vsplit
exe 'terminal ++rows=5 ++cols=33 ' . cmd
let size = term_getsize('')
call assert_equal([5, 33], term_getsize(''))
call term_setsize('', 6, 0)
call assert_equal([6, 33], term_getsize(''))
call term_setsize('', 0, 35)
call assert_equal([6, 35], term_getsize(''))
call term_setsize('', 7, 30)
call assert_equal([7, 30], term_getsize(''))
bwipe!
call assert_equal([5, 33], size)
call term_start(cmd, {'term_rows': 6, 'term_cols': 36})
let size = term_getsize('')
+2
View File
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1711,
/**/
1710,
/**/