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

Speedup as_unicode by avoiding an unnecessary malloc/free

Browse Source
This commit is contained in:
Kovid Goyal
2017-09-09 13:35:12 +05:30
parent f97127f587
commit 3274327fe7
2 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/char_grid.py
View File

@@ -272,7 +272,7 @@ class CharGrid:
if x is not None:
l = self.screen_line(y)
if l is not None:
text = l.as_base_text()
text = str(l)
for m in self.url_pat.finditer(text):
if m.start() <= x < m.end():
return True
@@ -283,7 +283,7 @@ class CharGrid:
if x is not None:
l = self.screen_line(y)
if l is not None:
text = l.as_base_text()
text = str(l)
for m in self.url_pat.finditer(text):
if m.start() <= x < m.end():
url = ''.join(l[i] for i in range(*m.span())).rstrip('.')

23
kitty/line.c
View File

@@ -61,9 +61,8 @@ text_at(Line* self, Py_ssize_t xval) {
static PyObject *
as_unicode(Line* self) {
Py_ssize_t n = 0;
Py_UCS4 *buf = PyMem_Malloc(3 * self->xnum * sizeof(Py_UCS4));
if (buf == NULL) return PyErr_NoMemory();
index_type xlimit = self->xnum;
static Py_UCS4 buf[4096];
index_type xlimit = MIN(sizeof(buf)/sizeof(buf[0]), self->xnum);
if (BLANK_CHAR == 0) {
while (xlimit != 0) {
if ((self->cells[xlimit - 1].ch & CHAR_MASK) != BLANK_CHAR) break;
@@ -87,22 +86,7 @@ as_unicode(Line* self) {
}
previous_width = (self->cells[i].ch >> ATTRS_SHIFT) & WIDTH_MASK;
}
PyObject *ans = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buf, n);
PyMem_Free(buf);
return ans;
}
static PyObject *
as_base_text(Line* self) {
#define as_base_text_doc "Return the line as a string, discarding all combining characters"
PyObject *ans = PyUnicode_New(self->xnum, 1114111);
if (ans == NULL) return PyErr_NoMemory();
for(index_type i = 0; i < self->xnum; i++) {
char_type attrs = self->cells[i].ch >> ATTRS_SHIFT;
if ((attrs & WIDTH_MASK) < 1) continue;
PyUnicode_WRITE(PyUnicode_4BYTE_KIND, PyUnicode_DATA(ans), i, self->cells[i].ch & CHAR_MASK);
}
return ans;
return PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buf, n);
}
static inline bool
@@ -493,7 +477,6 @@ static PyMethodDef methods[] = {
METHOD(left_shift, METH_VARARGS)
METHOD(set_char, METH_VARARGS)
METHOD(set_attribute, METH_VARARGS)
METHOD(as_base_text, METH_NOARGS)
METHOD(as_ansi, METH_NOARGS)
METHOD(is_continued, METH_NOARGS)
METHOD(width, METH_O)