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

Fix regression in handling zero cells caused by refactoring

Browse Source
This commit is contained in:
Kovid Goyal
2017-10-30 21:31:02 +05:30
parent 8fc9f97c12
commit 646e8dab0a
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kitty/line.c
View File

@@ -166,9 +166,9 @@ text_at(Line* self, Py_ssize_t xval) {
}
size_t
cell_as_unicode(Cell *cell, bool include_cc, Py_UCS4 *buf) {
cell_as_unicode(Cell *cell, bool include_cc, Py_UCS4 *buf, char_type zero_char) {
size_t n = 1;
buf[0] = cell->ch;
buf[0] = cell->ch ? cell->ch : zero_char;
if (include_cc) {
char_type cc = cell->cc;
Py_UCS4 cc1 = cc & CC_MASK, cc2;
@@ -191,9 +191,8 @@ unicode_in_range(Line *self, index_type start, index_type limit, bool include_cc
char_type ch = self->cells[i].ch;
if (ch == 0) {
if (previous_width == 2) { previous_width = 0; continue; };
ch = ' ';
}
n += cell_as_unicode(self->cells + i, include_cc, buf + n);
n += cell_as_unicode(self->cells + i, include_cc, buf + n, ' ');
previous_width = self->cells[i].attrs & WIDTH_MASK;
}
return PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buf, n);