mirror of
https://github.com/kovidgoyal/kitty
synced 2026-06-12 03:29:10 +02:00
35946f9386
Store multi cell data in the CPUCell rather than in TextCache. This sends the CPUCell size back to 12 but in benchmarks ASCII performance is untouched and Unicode performace goes back to what it was before multicell
330 lines
9.7 KiB
Python
330 lines
9.7 KiB
Python
#!/usr/bin/env python
|
|
# License: GPLv3 Copyright: 2024, Kovid Goyal <kovid at kovidgoyal.net>
|
|
|
|
|
|
from kitty.fast_data_types import TEXT_SIZE_CODE
|
|
|
|
from . import BaseTest
|
|
from . import draw_multicell as multicell
|
|
|
|
|
|
class TestMulticell(BaseTest):
|
|
|
|
def test_multicell(self):
|
|
test_multicell(self)
|
|
|
|
|
|
def test_multicell(self: TestMulticell) -> None:
|
|
|
|
def ac(x_, y_, **assertions): # assert cell
|
|
cell = s.cpu_cells(y_, x_)
|
|
msg = f'Assertion failed for cell at ({x_}, {y_})\n{cell}\n'
|
|
def ae(key):
|
|
if key not in assertions:
|
|
return
|
|
if key in cell:
|
|
val = cell[key]
|
|
else:
|
|
mcd = cell['mcd']
|
|
if mcd is None:
|
|
raise AssertionError(f'{msg}Unexpectedly not a multicell')
|
|
val = mcd[key]
|
|
if assertions[key] != val:
|
|
raise AssertionError(f'{msg}{assertions[key]!r} != {val!r}')
|
|
|
|
ae('x')
|
|
ae('y')
|
|
ae('width')
|
|
ae('scale')
|
|
ae('subscale')
|
|
ae('vertical_align')
|
|
ae('text')
|
|
ae('explicitly_set')
|
|
|
|
if 'cursor' in assertions:
|
|
self.ae(assertions['cursor'], (s.cursor.x, s.cursor.y), msg)
|
|
|
|
if 'is_multicell' in assertions:
|
|
q = cell['mcd']
|
|
if assertions['is_multicell']:
|
|
if q is None:
|
|
raise AssertionError(f'{msg}Unexpectedly not a multicell')
|
|
else:
|
|
if q is not None:
|
|
raise AssertionError(f'{msg}Unexpectedly is a multicell')
|
|
|
|
def count_multicells(with_text=''):
|
|
ans = 0
|
|
for y in range(s.lines):
|
|
for x in range(s.columns):
|
|
c = s.cpu_cells(y, x)
|
|
if c['mcd'] is not None and (not with_text or c['text'] == with_text):
|
|
ans += 1
|
|
return ans
|
|
|
|
def line_text(y):
|
|
def ct(c):
|
|
if c['text']:
|
|
return c['text']
|
|
if c['mcd']:
|
|
return '_'
|
|
return '\0'
|
|
return ''.join(ct(c) for c in s.cpu_cells(y))
|
|
|
|
def assert_line(text, y=None):
|
|
if y is None:
|
|
y = s.cursor.y
|
|
self.ae(text, line_text(y))
|
|
|
|
s = self.create_screen(cols=6, lines=6)
|
|
|
|
# Test basic multicell drawing
|
|
s.reset()
|
|
ac(0, 0, is_multicell=False)
|
|
multicell(s, 'a')
|
|
ac(0, 0, is_multicell=True, width=1, scale=1, subscale=0, x=0, y=0, text='a', explicitly_set=True, cursor=(1, 0))
|
|
ac(0, 1, is_multicell=False), ac(1, 0, is_multicell=False), ac(1, 1, is_multicell=False)
|
|
s.draw('莊')
|
|
ac(0, 0, is_multicell=True, width=1, scale=1, subscale=0, x=0, y=0, text='a', explicitly_set=True)
|
|
ac(1, 0, is_multicell=True, width=2, scale=1, subscale=0, x=0, y=0, text='莊', explicitly_set=False, cursor=(3, 0))
|
|
ac(2, 0, is_multicell=True, width=2, scale=1, subscale=0, x=1, y=0, text='', explicitly_set=False)
|
|
for x in range(s.columns):
|
|
ac(x, 1, is_multicell=False)
|
|
s.cursor.x = 0
|
|
multicell(s, 'a', width=2, scale=2, subscale=3)
|
|
ac(0, 0, is_multicell=True, width=2, scale=2, subscale=3, x=0, y=0, text='a', explicitly_set=True, cursor=(4, 0))
|
|
for x in range(1, 4):
|
|
ac(x, 0, is_multicell=True, width=2, scale=2, subscale=3, x=x, y=0, text='', explicitly_set=True)
|
|
for x in range(0, 4):
|
|
ac(x, 1, is_multicell=True, width=2, scale=2, subscale=3, x=x, y=1, text='', explicitly_set=True)
|
|
|
|
# Test draw with cursor in a multicell
|
|
s.reset()
|
|
s.draw('莊')
|
|
s.cursor.x -= 1
|
|
s.draw('a'), ac(0, 0, is_multicell=False), ac(1, 0, is_multicell=False)
|
|
s.reset()
|
|
s.draw('莊')
|
|
s.cursor.x = 0
|
|
s.draw('a'), ac(0, 0, is_multicell=False), ac(1, 0, is_multicell=False)
|
|
s.reset()
|
|
multicell(s, 'a', width=2, scale=2, subscale=3)
|
|
s.cursor.x, s.cursor.y = 1, 1
|
|
s.draw('b')
|
|
self.ae(0, count_multicells())
|
|
s.reset()
|
|
s.cursor.x = 1
|
|
s.draw('莊')
|
|
s.cursor.x = 0
|
|
s.draw('莊')
|
|
ac(2, 0, is_multicell=False, text=' ')
|
|
|
|
# Test multicell with cursor in a multicell
|
|
def big_a(x, y):
|
|
s.reset()
|
|
s.cursor.x, s.cursor.y = 1, 1
|
|
multicell(s, 'a', scale=4)
|
|
s.cursor.x, s.cursor.y = x, y
|
|
multicell(s, 'b', scale=2)
|
|
self.ae(4, count_multicells())
|
|
for x in range(1, 5):
|
|
ac(x, 4, text=' ')
|
|
big_a(0, 0), big_a(1, 1), big_a(2, 2), big_a(5, 1)
|
|
|
|
# Test insert chars with multicell (aka right shift)
|
|
s.reset()
|
|
s.draw('a')
|
|
s.cursor.x = 0
|
|
s.insert_characters(1)
|
|
assert_line('\0a\0\0\0\0')
|
|
s.reset()
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 0
|
|
s.insert_characters(1)
|
|
assert_line('\0a_\0\0\0')
|
|
s.reset()
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 0
|
|
s.insert_characters(2)
|
|
assert_line('\0\0a_\0\0')
|
|
s.reset()
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 1
|
|
s.insert_characters(1)
|
|
assert_line('\0\0\0\0\0\0')
|
|
s.reset()
|
|
s.cursor.x = 3
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 0
|
|
s.insert_characters(1)
|
|
assert_line('\0\0\0\0a_')
|
|
s.reset()
|
|
s.cursor.x = s.columns - 2
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 0
|
|
s.insert_characters(1)
|
|
assert_line('\0\0\0\0\0\0')
|
|
# multiline
|
|
s.reset()
|
|
s.draw('a')
|
|
multicell(s, 'b', scale=2)
|
|
assert_line('ab_\0\0\0')
|
|
assert_line('\0__\0\0\0', 1)
|
|
s.cursor.x, s.cursor.y = 0, 0
|
|
s.insert_characters(1)
|
|
assert_line('\0a\0\0\0\0')
|
|
assert_line('\0\0\0\0\0\0', 1)
|
|
s.reset()
|
|
multicell(s, 'a', scale=2)
|
|
s.cursor.x = 3
|
|
s.insert_characters(1)
|
|
assert_line('a_\0\0\0\0')
|
|
assert_line('__\0\0\0\0', 1)
|
|
|
|
# Test delete chars with multicell (aka left shift)
|
|
s.reset()
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 0
|
|
s.delete_characters(1)
|
|
assert_line('\0\0\0\0\0\0')
|
|
s.reset()
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 1
|
|
s.delete_characters(1)
|
|
assert_line('\0\0\0\0\0\0')
|
|
s.reset()
|
|
s.draw('ab')
|
|
multicell(s, 'a', width=2)
|
|
s.cursor.x = 0
|
|
s.delete_characters(2)
|
|
assert_line('a_\0\0\0\0')
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', width=2), s.draw('c')
|
|
s.cursor.x = 0
|
|
s.delete_characters(1)
|
|
assert_line('b_c\0\0\0')
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', width=2), s.draw('c')
|
|
s.cursor.x = 0
|
|
s.delete_characters(1)
|
|
assert_line('b_c\0\0\0')
|
|
s.reset(), s.draw('a'), multicell(s, 'b', width=2), s.draw('c')
|
|
s.cursor.x = 0
|
|
s.delete_characters(2)
|
|
assert_line('\0c\0\0\0\0')
|
|
s.reset(), s.draw('a'), multicell(s, 'b', width=2), s.draw('c')
|
|
s.cursor.x = 1
|
|
s.delete_characters(1)
|
|
assert_line('a\0c\0\0\0')
|
|
s.reset(), s.draw('a'), multicell(s, 'b', width=2), s.draw('c')
|
|
s.cursor.x = 2
|
|
s.delete_characters(1)
|
|
assert_line('a\0c\0\0\0')
|
|
# multiline
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
assert_line('ab_c\0\0')
|
|
assert_line('\0__\0\0\0', 1)
|
|
s.cursor.x, s.cursor.y = 0, 0
|
|
s.delete_characters(1)
|
|
assert_line('\0\0c\0\0\0')
|
|
assert_line('\0\0\0\0\0\0', 1)
|
|
s.reset()
|
|
multicell(s, 'a', scale=2)
|
|
s.cursor.x = 3
|
|
s.delete_characters(1)
|
|
assert_line('a_\0\0\0\0')
|
|
assert_line('__\0\0\0\0', 1)
|
|
|
|
# Erase characters (aka replace with null)
|
|
s.reset()
|
|
s.cursor.x = 1
|
|
s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
s.cursor.x = 0
|
|
s.erase_characters(1)
|
|
assert_line('\0ab_c\0')
|
|
s.erase_characters(2)
|
|
assert_line('\0\0b_c\0')
|
|
assert_line('\0\0__\0\0', 1)
|
|
s.erase_characters(3)
|
|
assert_line('\0\0\0\0c\0')
|
|
assert_line('\0\0\0\0\0\0', 1)
|
|
|
|
# Erase in line
|
|
for x in (1, 2):
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
s.cursor.x = x
|
|
s.erase_in_line(0)
|
|
assert_line('a\0\0\0\0\0')
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', width=2), s.draw('c')
|
|
s.cursor.x = x
|
|
s.erase_in_line(1)
|
|
assert_line('\0\0\0c\0\0')
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
s.erase_in_line(2)
|
|
for y in (0, 1):
|
|
assert_line('\0\0\0\0\0\0', y)
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
s.cursor.y = 1
|
|
s.erase_in_line(2)
|
|
assert_line('a\0\0c\0\0', 0)
|
|
assert_line('\0\0\0\0\0\0', 1)
|
|
|
|
# Clear scrollback
|
|
s.reset()
|
|
s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
for i in range(s.lines):
|
|
s.index()
|
|
s.cursor.y = 0
|
|
assert_line('\0__\0\0\0')
|
|
s.clear_scrollback()
|
|
assert_line('\0\0\0\0\0\0')
|
|
|
|
# Erase in display
|
|
for x in (1, 2):
|
|
s.reset(), s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
s.cursor.x = x
|
|
s.erase_in_display(0)
|
|
assert_line('a\0\0\0\0\0')
|
|
s.reset(), s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
s.cursor.x, s.cursor.y = 2, 1
|
|
s.erase_in_display(0)
|
|
assert_line('a\0\0c\0\0', 0)
|
|
assert_line('\0\0\0\0\0\0', 1)
|
|
s.reset(), s.draw('a'), multicell(s, 'b', scale=2), s.draw('c')
|
|
for i in range(s.lines):
|
|
s.index()
|
|
s.erase_in_display(22)
|
|
assert_line('ab_c\0\0', -2)
|
|
assert_line('\0__\0\0\0', -1)
|
|
self.ae(s.historybuf.line(1).as_ansi(), f'a\x1b]{TEXT_SIZE_CODE};s=2;b\x07c')
|
|
self.ae(s.historybuf.line(0).as_ansi(), '')
|
|
|
|
# Insert lines
|
|
s.reset()
|
|
multicell(s, 'a', scale=2)
|
|
s.cursor.x, s.cursor.y = 0, s.lines - 2
|
|
multicell(s, 'b', scale=2)
|
|
s.cursor.x, s.cursor.y = 0, 1
|
|
s.insert_lines(1)
|
|
for y in range(s.lines):
|
|
assert_line('\0' * s.columns, y)
|
|
s.reset()
|
|
multicell(s, 'a', scale=2)
|
|
s.insert_lines(2)
|
|
assert_line('\0' * s.columns, 0)
|
|
assert_line('a_\0\0\0\0', 2)
|
|
|
|
# Delete lines
|
|
s.reset()
|
|
multicell(s, 'a', scale=2)
|
|
s.cursor.y = 1
|
|
multicell(s, 'b', scale=2)
|
|
s.delete_lines(1)
|
|
for y in range(s.lines):
|
|
assert_line('\0' * s.columns, y)
|