mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

vt: implement 'insert mode'

Browse source
This commit is contained in:
Daniel Eklöf 2019-08-30 22:08:37 +02:00
parent f4291690ee
commit 2707cf0fc4
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

47
vt.c
View file

@ -12,6 +12,8 @@
#include "grid.h" #include "grid.h"
#include "osc.h" #include "osc.h"
#define max(x, y) ((x) > (y) ? (x) : (y))
#define UNHANDLED() LOG_ERR("unhandled: %s", esc_as_string(term, final)) #define UNHANDLED() LOG_ERR("unhandled: %s", esc_as_string(term, final))
/* https://vt100.net/emu/dec_ansi_parser */ /* https://vt100.net/emu/dec_ansi_parser */
@ -703,17 +705,21 @@ post_print(struct terminal *term)
} }
static inline void static inline void
print_insert(struct terminal *term) print_insert(struct terminal *term, int width)
{ {
if (unlikely(term->insert_mode)) { if (unlikely(term->insert_mode)) {
assert(false && "untested"); struct row *row = term->grid->cur_row;
const size_t move_count = max(0, term->cols - term->cursor.col - width);
struct row *row = term->grid->cur_row; memmove(
memmove( &row->cells[term->cursor.col + width],
&row[term->cursor.col + 1], &row->cells[term->cursor.col],
&row[term->cursor.col], move_count * sizeof(struct cell));
term->cols - term->cursor.col - 1);
} /* Mark moved cells as dirty */
for (size_t i = term->cursor.col + width; i < term->cols; i++)
row->cells[i].attrs.clean = 0;
}
} }
static void static void
@ -724,20 +730,23 @@ action_print_utf8(struct terminal *term)
struct row *row = term->grid->cur_row; struct row *row = term->grid->cur_row;
struct cell *cell = &row->cells[term->cursor.col]; struct cell *cell = &row->cells[term->cursor.col];
row->dirty = true; /* Convert to wchar */
cell->attrs.clean = 0;
print_insert(term);
mbstate_t ps = {0}; mbstate_t ps = {0};
if (mbrtowc(&cell->wc, (const char *)term->vt.utf8.data, term->vt.utf8.idx, &ps) < 0) wchar_t wc;
cell->wc = 0; if (mbrtowc(&wc, (const char *)term->vt.utf8.data, term->vt.utf8.idx, &ps) < 0)
wc = 0;
term->vt.utf8.idx = 0;
int width = wcwidth(wc);
print_insert(term, width);
row->dirty = true;
cell->wc = wc;
cell->attrs.clean = 0;
cell->attrs = term->vt.attrs; cell->attrs = term->vt.attrs;
int width = wcwidth(cell->wc); /* Reset VT utf8 state */
term->vt.utf8.idx = 0;
if (width <= 0) { if (width <= 0) {
/* Skip post_print() below - i.e. don't advance cursor */ /* Skip post_print() below - i.e. don't advance cursor */
return; return;
@ -768,7 +777,7 @@ action_print(struct terminal *term, uint8_t c)
row->dirty = true; row->dirty = true;
cell->attrs.clean = 0; cell->attrs.clean = 0;
print_insert(term); print_insert(term, 1);
/* 0x60 - 0x7e */ /* 0x60 - 0x7e */
static const wchar_t vt100_0[] = { static const wchar_t vt100_0[] = {