mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-07 00:15:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tests for combining char on multicell

Browse Source
This commit is contained in:
Kovid Goyal
2024-12-10 12:18:08 +05:30
parent 06c428ba7b
commit 27bcd96071
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kitty/screen.c
View File

@@ -1030,13 +1030,11 @@ draw_text_loop(Screen *self, const uint32_t *chars, size_t num_chars, text_loop_
draw_control_char(self, s, ch);
continue;
}
if (ts_cursor_on_multicell(self, s)) {
if (ts_cursor_on_multicell(self, s) && !is_combining_char(ch)) {
if (s->cp[self->cursor->x].y) {
move_cursor_past_multicell(self, 1);
init_text_loop_line(self, s);
} else {
if (!is_combining_char(ch)) nuke_multicell_char_at(self, self->cursor->x, self->cursor->y, s->cp[self->cursor->x].x != 0);
}
} else nuke_multicell_char_at(self, self->cursor->x, self->cursor->y, s->cp[self->cursor->x].x != 0);
}
int char_width = 1;

8
kitty_tests/multicell.py
View File

@@ -106,6 +106,14 @@ def test_multicell(self: TestMulticell) -> None:
ac(x, 0, is_multicell=True, width=2, scale=2, subscale_n=3, x=x, y=0, text='', natural_width=False)
for x in range(0, 4):
ac(x, 1, is_multicell=True, width=2, scale=2, subscale_n=3, x=x, y=1, text='', natural_width=False)
for y in range(2):
for x in range(1, 3):
s.reset()
multicell(s, 'a', scale=2)
s.cursor.x, s.cursor.y = x, y
s.draw('\u0301')
assert_cursor_at(x, y)
ac(0, 0, text='a' if y else 'a\u0301', is_multicell=True)
# Test wrapping
s.reset()