wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 21:32:13 +03:00
Code Issues Projects Releases Wiki Activity

term: don't force zero-width graphemes into cells

Browse Source 
This isn't ideal, as we're discarding information, but in #1422
where the problem codepoint is a unicode bidi control, we can't and
don't use that information anyway.

We'll need to figure out how to incorporate that when we get to it.

For now, this makes the presentation work correctly.

refs: #1422
This commit is contained in:
Wez Furlong 2021-12-23 12:13:38 -07:00
parent 4bd29ae5cc
commit cde8fe0e85
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
term/src/terminalstate/performer.rs
View File

@ -109,6 +109,16 @@ impl<'a> Performer<'a> {
g
};
let print_width = grapheme_column_width(g, Some(self.unicode_version));
if print_width == 0 {
// We got a zero-width grapheme.
// We used to force them into a cell to guarantee that we
// preserved them in the model, but it introduces presentation
// problems, such as <https://github.com/wez/wezterm/issues/1422>
log::trace!("Eliding zero-width grapheme {:?}", g);
continue;
}
if self.wrap_next {
// Since we're implicitly moving the cursor to the next
// line, we need to tag the current position as wrapped
@ -130,12 +140,7 @@ impl<'a> Performer<'a> {
let width = self.left_and_right_margins.end;
let pen = self.pen.clone();
// the max(1) here is to ensure that we advance to the next cell
// position for zero-width graphemes. We want to make sure that
// they occupy a cell so that we can re-emit them when we output them.
// If we didn't do this, then we'd effectively filter them out from
// the model, which seems like a lossy design choice.
let print_width = grapheme_column_width(g, Some(self.unicode_version)).max(1);
let wrappable = x + print_width >= width;
let cell = Cell::new_grapheme_with_width(g, print_width, pen);