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

line_as_ansi: don't reset SGR at start of line

Browse Source 
less does not carry the mode over from the previous line anyway, let's
save a few bytes for every line
This commit is contained in:
Dominique Martinet 2018-09-16 04:34:41 +09:00
parent 3d862da2be
commit c421d3bb59
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kitty/line.c
View File

@ -235,7 +235,6 @@ line_as_ansi(Line *self, Py_UCS4 *buf, index_type buflen) {
if (limit == 0) return 0; if (limit == 0) return 0;
char_type previous_width = 0; char_type previous_width = 0;
WRITE_SGR("0");
Cursor c1 = {{0}}, c2 = {{0}}; Cursor c1 = {{0}}, c2 = {{0}};
Cursor *cursor = &c1, *prev_cursor = &c2; Cursor *cursor = &c1, *prev_cursor = &c2;
char_type prev_attrs = 0; char_type prev_attrs = 0;

10
kitty_tests/datatypes.py
View File

@ -447,10 +447,10 @@ class TestDataTypes(BaseTest):
def test_ansi_repr(self): def test_ansi_repr(self):
lb = filled_line_buf() lb = filled_line_buf()
l0 = lb.line(0) l0 = lb.line(0)
self.ae(l0.as_ansi(), '\x1b[0m00000') self.ae(l0.as_ansi(), '00000')
a = [] a = []
lb.as_ansi(a.append) lb.as_ansi(a.append)
self.ae(a, ['\x1b[0m' + str(lb.line(i)) + '\n' for i in range(lb.ynum)]) self.ae(a, [str(lb.line(i)) + '\n' for i in range(lb.ynum)])
l2 = lb.line(0) l2 = lb.line(0)
c = C() c = C()
c.bold = c.italic = c.reverse = c.strikethrough = c.dim = True c.bold = c.italic = c.reverse = c.strikethrough = c.dim = True
@ -458,15 +458,15 @@ class TestDataTypes(BaseTest):
c.bg = (1 << 24) | (2 << 16) | (3 << 8) | 2 c.bg = (1 << 24) | (2 << 16) | (3 << 8) | 2
c.decoration_fg = (5 << 8) | 1 c.decoration_fg = (5 << 8) | 1
l2.set_text('1', 0, 1, c) l2.set_text('1', 0, 1, c)
self.ae(l2.as_ansi(), '\x1b[0m\x1b[1;2;3;7;9;34;48:2:1:2:3;58:5:5m' '1' self.ae(l2.as_ansi(), '\x1b[1;2;3;7;9;34;48:2:1:2:3;58:5:5m' '1'
'\x1b[22;23;27;29;39;49;59m' '0000') '\x1b[22;23;27;29;39;49;59m' '0000')
lb = filled_line_buf() lb = filled_line_buf()
for i in range(lb.ynum): for i in range(lb.ynum):
lb.set_continued(i, True) lb.set_continued(i, True)
a = [] a = []
lb.as_ansi(a.append) lb.as_ansi(a.append)
self.ae(a, ['\x1b[0m' + str(lb.line(i)) for i in range(lb.ynum)]) self.ae(a, [str(lb.line(i)) for i in range(lb.ynum)])
hb = filled_history_buf(5, 5) hb = filled_history_buf(5, 5)
a = [] a = []
hb.as_ansi(a.append) hb.as_ansi(a.append)
self.ae(a, ['\x1b[0m' + str(hb.line(i)) + '\n' for i in range(hb.count - 1, -1, -1)]) self.ae(a, [str(hb.line(i)) + '\n' for i in range(hb.count - 1, -1, -1)])

2
kitty_tests/screen.py
View File

@ -441,4 +441,4 @@ class TestScreen(BaseTest):
return ''.join(d) return ''.join(d)
self.ae(as_text(), 'ababababab\nc\n\n') self.ae(as_text(), 'ababababab\nc\n\n')
self.ae(as_text(True), '\x1b[0mababa\x1b[0mbabab\n\x1b[0mc\n\n') self.ae(as_text(True), 'ababababab\nc\n\n')