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

Workaround for bug in less that causes colors to reset at wrapped lines

Browse Source 
Fixes #2381
This commit is contained in:
Kovid Goyal 2020-02-25 19:14:24 +05:30
parent af8fdf1dbe
commit 511c4da6a3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -58,6 +58,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
- Fix colors in scrollback pager off if the window has redefined terminal - Fix colors in scrollback pager off if the window has redefined terminal
colors using escape codes (:iss:`2381`) colors using escape codes (:iss:`2381`)
- Workaround for bug in less that causes colors to reset at wrapped lines
(:iss:`2381`)
0.16.0 [2020-01-28] 0.16.0 [2020-01-28]
-------------------- --------------------

14
kitty/line.c
View File

@ -746,6 +746,7 @@ as_text_generic(PyObject *args, void *container, get_line_func get_line, index_t
Py_UCS4 *buf = NULL; Py_UCS4 *buf = NULL;
PyObject *nl = PyUnicode_FromString("\n"); PyObject *nl = PyUnicode_FromString("\n");
PyObject *cr = PyUnicode_FromString("\r"); PyObject *cr = PyUnicode_FromString("\r");
PyObject *sgr_reset = PyUnicode_FromString("\x1b[m");
const GPUCell *prev_cell = NULL; const GPUCell *prev_cell = NULL;
if (nl == NULL || cr == NULL) goto end; if (nl == NULL || cr == NULL) goto end;
if (as_ansi) { if (as_ansi) {
@ -761,8 +762,19 @@ as_text_generic(PyObject *args, void *container, get_line_func get_line, index_t
} }
if (as_ansi) { if (as_ansi) {
bool truncated; bool truncated;
// less has a bug where it resets colors when it sees a \r, so work
// around it by resetting SGR at the start of every line. This is
// pretty sad performance wise, but I guess it will remain till I
// get around to writing a nice pager kitten.
// see https://github.com/kovidgoyal/kitty/issues/2381
prev_cell = NULL;
index_type num = line_as_ansi(line, buf, columns * 100 - 2, &truncated, &prev_cell); index_type num = line_as_ansi(line, buf, columns * 100 - 2, &truncated, &prev_cell);
t = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buf, num); t = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buf, num);
if (t && num > 0) {
ret = PyObject_CallFunctionObjArgs(callback, sgr_reset, NULL);
if (ret == NULL) goto end;
Py_CLEAR(ret);
}
} else { } else {
t = line_as_unicode(line); t = line_as_unicode(line);
} }
@ -776,7 +788,7 @@ as_text_generic(PyObject *args, void *container, get_line_func get_line, index_t
} }
} }
end: end:
Py_CLEAR(nl); Py_CLEAR(cr); free(buf); Py_CLEAR(nl); Py_CLEAR(cr); Py_CLEAR(sgr_reset); free(buf);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
Py_RETURN_NONE; Py_RETURN_NONE;
} }