mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-13 05:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17329 from cryptomilk/asn-vterm-0-2

Browse Source 
build(deps): bump libvterm to 0.3-RC1
This commit is contained in:
Christian Clason
2022-09-06 22:41:37 +02:00
committed by GitHub
parent 74a8b5982a b76e33b598
commit 694ac26946
5 changed files with 41 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/nvim/terminal.c
View File

@@ -120,6 +120,10 @@ struct terminal {
// window height has increased) and must be deleted from the terminal buffer
int sb_pending;
char *title; // VTermStringFragment buffer
size_t title_len; // number of rows pushed to sb_buffer
size_t title_size; // sb_buffer size
// buf_T instance that acts as a "drawing surface" for libvterm
// we can't store a direct reference to the buffer because the
// refresh_timer_cb may be called after the buffer was freed, and there's
@@ -230,7 +234,7 @@ Terminal *terminal_open(buf_T *buf, TerminalOptions opts)
set_option_value("wrap", false, NULL, OPT_LOCAL);
set_option_value("list", false, NULL, OPT_LOCAL);
if (buf->b_ffname != NULL) {
buf_set_term_title(buf, buf->b_ffname);
buf_set_term_title(buf, buf->b_ffname, strlen((char *)buf->b_ffname));
}
RESET_BINDING(curwin);
// Reset cursor in current window.
@@ -636,6 +640,7 @@ void terminal_destroy(Terminal **termpp)
xfree(term->sb_buffer[i]);
}
xfree(term->sb_buffer);
xfree(term->title);
vterm_free(term->vt);
xfree(term);
*termpp = NULL; // coverity[dead-store]
@@ -858,13 +863,13 @@ static int term_movecursor(VTermPos new, VTermPos old, int visible, void *data)
return 1;
}
static void buf_set_term_title(buf_T *buf, char *title)
static void buf_set_term_title(buf_T *buf, const char *title, size_t len)
FUNC_ATTR_NONNULL_ALL
{
Error err = ERROR_INIT;
dict_set_var(buf->b_vars,
STATIC_CSTR_AS_STRING("term_title"),
STRING_OBJ(cstr_as_string(title)),
STRING_OBJ(((String){ .data = (char *)title, .size = len })),
false,
false,
&err);
@@ -887,7 +892,34 @@ static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
case VTERM_PROP_TITLE: {
buf_T *buf = handle_get_buffer(term->buf_handle);
buf_set_term_title(buf, val->string);
#if VTERM_VERSION_MAJOR > 0 || (VTERM_VERSION_MAJOR == 0 && VTERM_VERSION_MINOR >= 2)
VTermStringFragment frag = val->string;
if (frag.initial && frag.final) {
buf_set_term_title(buf, frag.str, frag.len);
break;
}
if (frag.initial) {
term->title_len = 0;
term->title_size = MAX(frag.len, 1024);
term->title = xmalloc(sizeof(char *) * term->title_size);
} else if (term->title_len + frag.len > term->title_size) {
term->title_size *= 2;
term->title = xrealloc(term->title, sizeof(char *) * term->title_size);
}
memcpy(term->title + term->title_len, frag.str, frag.len);
term->title_len += frag.len;
if (frag.final) {
buf_set_term_title(buf, term->title, term->title_len);
xfree(term->title);
term->title = NULL;
}
#else
buf_set_term_title(buf, val->string, strlen(val->string));
#endif
break;
}