zig/libvaxis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

print: continue on 0 width graphemes or words

Browse source 
Don't print 0 width graphemes or words. Usually these will be
overwritten since we advance by 0 columns, however if one is at the end
of text it can mess up rendering.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
This commit is contained in:
Tim Culverhouse 2024-03-11 19:01:43 -05:00
parent c5891399f1
commit 5e940fd295
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Window.zig
View file

@ -146,6 +146,7 @@ pub fn print(self: Window, segments: []Segment, opts: PrintOptions) !bool {
continue; continue;
} }
const w = self.gwidth(s); const w = self.gwidth(s);
if (w == 0) continue;
self.writeCell(col, row, .{ self.writeCell(col, row, .{
.char = .{ .char = .{
.grapheme = s, .grapheme = s,
@ -174,6 +175,7 @@ pub fn print(self: Window, segments: []Segment, opts: PrintOptions) !bool {
// break lines when we can't fit this word, and the word isn't longer // break lines when we can't fit this word, and the word isn't longer
// than our width // than our width
const word_width = self.gwidth(word.bytes); const word_width = self.gwidth(word.bytes);
if (word_width == 0) continue;
if (word_width + col > self.width and word_width < self.width) { if (word_width + col > self.width and word_width < self.width) {
row += 1; row += 1;
col = 0; col = 0;
@ -214,6 +216,7 @@ pub fn print(self: Window, segments: []Segment, opts: PrintOptions) !bool {
const s = grapheme.slice(segment.text); const s = grapheme.slice(segment.text);
if (std.mem.eql(u8, s, "\n")) return true; if (std.mem.eql(u8, s, "\n")) return true;
const w = self.gwidth(s); const w = self.gwidth(s);
if (w == 0) continue;
self.writeCell(col, row, .{ self.writeCell(col, row, .{
.char = .{ .char = .{
.grapheme = s, .grapheme = s,