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

Only add an SGR reset at the end if there is atleast one escape code in the ansi output

Browse Source
This commit is contained in:
Kovid Goyal
2022-02-13 15:14:32 +05:30
parent a4abe26d32
commit ebfc19def5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kitty/screen.c
View File

@@ -2461,6 +2461,7 @@ ansi_for_range(Screen *self, const Selection *sel, bool insert_newlines, bool st
if (!ans || !nl) return NULL; if (!ans || !nl) return NULL;
ANSIBuf output = {0}; ANSIBuf output = {0};
const GPUCell *prev_cell = NULL; const GPUCell *prev_cell = NULL;
bool has_escape_codes = false;
for (int i = 0, y = idata.y; y < limit; y++, i++) { for (int i = 0, y = idata.y; y < limit; y++, i++) {
Line *line = range_line_(self, y); Line *line = range_line_(self, y);
XRange xr = xrange_for_iteration(&idata, y, line); XRange xr = xrange_for_iteration(&idata, y, line);
@@ -2482,8 +2483,11 @@ ansi_for_range(Screen *self, const Selection *sel, bool insert_newlines, bool st
PyObject *t = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, output.buf, output.len); PyObject *t = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, output.buf, output.len);
if (!t) return NULL; if (!t) return NULL;
PyTuple_SET_ITEM(ans, i, t); PyTuple_SET_ITEM(ans, i, t);
if (!has_escape_codes) {
for (size_t i = 0; i < output.len; i++) { if (output.buf[i] == 0x1b) { has_escape_codes = true; break; } }
}
} }
PyObject *t = PyUnicode_FromFormat("%s%s", "\x1b[m", output.active_hyperlink_id ? "\x1b]8;;\x1b\\" : ""); PyObject *t = PyUnicode_FromFormat("%s%s", has_escape_codes ? "\x1b[m" : "", output.active_hyperlink_id ? "\x1b]8;;\x1b\\" : "");
if (!t) return NULL; if (!t) return NULL;
PyTuple_SET_ITEM(ans, PyTuple_GET_SIZE(ans) - 1, t); PyTuple_SET_ITEM(ans, PyTuple_GET_SIZE(ans) - 1, t);
Py_INCREF(ans); Py_INCREF(ans);