KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add rendering tests

Browse Source
This commit is contained in:
Kovid Goyal 2017-11-05 12:31:50 +05:30
parent ce0e5a893f
commit da8bf5adc7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/core_text.m
View File

@ -313,6 +313,7 @@ display_name(Face *self) {
#define R(x) if (self->x) { Py_INCREF(self->x); return self->x; } #define R(x) if (self->x) { Py_INCREF(self->x); return self->x; }
R(full_name); R(postscript_name); R(family_name); R(path); R(full_name); R(postscript_name); R(family_name); R(path);
#undef R #undef R
Py_RETURN_NONE;
} }
// Boilerplate {{{ // Boilerplate {{{
@ -336,6 +337,7 @@ static PyMemberDef members[] = {
static PyMethodDef methods[] = { static PyMethodDef methods[] = {
METHODB(face_for_text, METH_VARARGS), METHODB(face_for_text, METH_VARARGS),
METHODB(display_name, METH_NOARGS),
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };

19
kitty/fonts/render.py
View File

@ -178,12 +178,8 @@ def render_box_drawing(codepoint):
return ctypes.addressof(buf), buf return ctypes.addressof(buf), buf
def test_render_string(text='Hello, world!', family='monospace', size=144.0, dpi=96.0): def render_string(text, family='monospace', size=11.0, dpi=96.0):
from tempfile import NamedTemporaryFile from kitty.fast_data_types import set_send_sprite_to_gpu, Screen, sprite_map_set_limits, test_render_line
from kitty.fast_data_types import concat_cells, set_send_sprite_to_gpu, Screen, sprite_map_set_limits, test_render_line, current_fonts
from kitty.icat import detect_support, show
if not detect_support():
raise SystemExit('Your terminal does not support the graphics protocol')
sprites = {} sprites = {}
def send_to_gpu(x, y, z, data): def send_to_gpu(x, y, z, data):
@ -205,6 +201,17 @@ def test_render_string(text='Hello, world!', family='monospace', size=144.0, dpi
sp = line.sprite_at(i) sp = line.sprite_at(i)
if sp != (0, 0, 0): if sp != (0, 0, 0):
cells.append(sprites[sp]) cells.append(sprites[sp])
return cell_width, cell_height, cells
def test_render_string(text='Hello, world!', family='monospace', size=144.0, dpi=96.0):
from tempfile import NamedTemporaryFile
from kitty.fast_data_types import concat_cells, current_fonts
from kitty.icat import detect_support, show
if not detect_support():
raise SystemExit('Your terminal does not support the graphics protocol')
cell_width, cell_height, cells = render_string(text, family, size, dpi)
rgb_data = concat_cells(cell_width, cell_height, tuple(cells)) rgb_data = concat_cells(cell_width, cell_height, tuple(cells))
with NamedTemporaryFile(delete=False) as f: with NamedTemporaryFile(delete=False) as f:
f.write(rgb_data) f.write(rgb_data)

14
kitty_tests/fonts.py
View File

@ -5,11 +5,11 @@
from collections import OrderedDict from collections import OrderedDict
from kitty.fast_data_types import ( from kitty.fast_data_types import (
set_send_sprite_to_gpu, sprite_map_set_layout, sprite_map_set_limits, set_send_sprite_to_gpu, sprite_map_set_layout,
test_render_line, test_sprite_position_for sprite_map_set_limits, test_render_line, test_sprite_position_for
) )
from kitty.fonts.box_drawing import box_chars from kitty.fonts.box_drawing import box_chars
from kitty.fonts.render import set_font_family from kitty.fonts.render import render_string, set_font_family
from . import BaseTest from . import BaseTest
@ -51,3 +51,11 @@ class Rendering(BaseTest):
line = s.line(0) line = s.line(0)
test_render_line(line) test_render_line(line)
self.assertEqual(len(self.sprites), prerendered + len(box_chars)) self.assertEqual(len(self.sprites), prerendered + len(box_chars))
def test_rendering(self):
text = 'He\u0347\u0305llo\u0341, w\u0302or\u0306l\u0354d!'
cells = render_string(text)[-1]
self.ae(len(cells), len(text.encode('ascii', 'ignore')))
text = '你好,世界'
cells = render_string(text)[-1]
self.ae(len(cells), 9)