CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-05-13 16:37:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Restore fast path for printable ASCII

Browse source
This commit is contained in:
Kovid Goyal 2025-04-10 18:45:44 +05:30
parent 3f919cbc56
commit c03dd673ae
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gen/wcwidth.py
View file

@ -1164,6 +1164,13 @@ def gen_char_props() -> None:
is_extended_pictographic=x.is_extended_pictographic) for x in prop_array)
test_grapheme_segmentation(partial(split_into_graphemes, gsprops))
gseg_results = tuple(GraphemeSegmentationKey.from_int(i).result() for i in range(1 << 16))
s = GraphemeSegmentationResult.make()
for ch in range(32, 127):
k = int(GraphemeSegmentationKey(s.new_state, gsprops[ch]))
s = gseg_results[k]
print(111111, chr(ch), s)
test_grapheme_segmentation(partial(split_into_graphemes_with_table, gsprops, gseg_results))
t1, t2, t3, t_shift = splitbins(prop_array, CharProps.bitsize() // 8)
g1, g2, g3, g_shift = splitbins(gseg_results, GraphemeSegmentationResult.bitsize() // 8)

44
kitty/screen.c
View file

@ -1104,28 +1104,38 @@ draw_control_char(Screen *self, text_loop_state *s, uint32_t ch) {
static void
draw_text_loop(Screen *self, const uint32_t *chars, size_t num_chars, text_loop_state *s) {
init_text_loop_line(self, s);
int char_width;
for (size_t i = 0; i < num_chars; i++) {
uint32_t ch = map_char(self, chars[i]);
CharProps cp = char_props_for(ch);
if (cp.is_invalid) {
if (ch < ' ') draw_control_char(self, s, ch);
continue;
}
s->seg = grapheme_segmentation_step(s->seg, cp);
if (UNLIKELY(s->seg.add_to_current_cell && s->prev.cc)) {
draw_combining_char(self, s, ch);
continue;
}
int char_width = wcwidth_std(cp);
if (UNLIKELY(char_width < 1)) {
if (char_width == 0) {
// Preserve zero width chars as combining chars even though
// they were not added to the prev cell by grapheme segmentation.
// Zero width chars can only be represented as combining chars.
if (s->prev.cc) draw_combining_char(self, s, ch);
if (ch < DEL && s->seg.grapheme_break == GBP_None) { // fast path for printable ASCII
if (ch < ' ') {
draw_control_char(self, s, ch);
continue;
}
char_width = 1;
s->seg = (GraphemeSegmentationResult){.grapheme_break=GBP_None};
} else {
CharProps cp = char_props_for(ch);
if (cp.is_invalid) {
if (ch < ' ') draw_control_char(self, s, ch);
continue;
}
s->seg = grapheme_segmentation_step(s->seg, cp);
if (UNLIKELY(s->seg.add_to_current_cell && s->prev.cc)) {
draw_combining_char(self, s, ch);
continue;
}
char_width = wcwidth_std(cp);
if (UNLIKELY(char_width < 1)) {
if (char_width == 0) {
// Preserve zero width chars as combining chars even though
// they were not added to the prev cell by grapheme segmentation.
// Zero width chars can only be represented as combining chars.
if (s->prev.cc) draw_combining_char(self, s, ch);
continue;
}
char_width = 1;
}
}
if (self->cursor->x < self->columns && s->cp[self->cursor->x].is_multicell) {