mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-07-22 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'grapheme-break' into grapheme-width-changes

Browse Source
This commit is contained in:
Jacob Sandlund
2025-11-24 11:51:08 -05:00
parent 96c69c9f9b bc42c821bb
commit d240a194e1
7 changed files with 122 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/unicode/props.zig
View File

@@ -21,16 +21,14 @@ pub const Properties = packed struct {
grapheme_break: uucode.x.types.GraphemeBreakNoControl = .other,
/// Emoji VS compatibility
emoji_vs_text: bool = false,
emoji_vs_emoji: bool = false,
emoji_vs_base: bool = false,
// Needed for lut.Generator
pub fn eql(a: Properties, b: Properties) bool {
return a.width == b.width and
a.width_zero_in_grapheme == b.width_zero_in_grapheme and
a.grapheme_break == b.grapheme_break and
a.emoji_vs_text == b.emoji_vs_text and
a.emoji_vs_emoji == b.emoji_vs_emoji;
a.emoji_vs_base == b.emoji_vs_base;
}
// Needed for lut.Generator
@@ -43,15 +41,13 @@ pub const Properties = packed struct {
\\ .width= {},
\\ .width_zero_in_grapheme= {},
\\ .grapheme_break= .{s},
\\ .emoji_vs_text= {},
\\ .emoji_vs_emoji= {},
\\ .emoji_vs_base= {},
\\}}
, .{
self.width,
self.width_zero_in_grapheme,
@tagName(self.grapheme_break),
self.emoji_vs_text,
self.emoji_vs_emoji,
self.emoji_vs_base,
});
}
};

6
src/unicode/props_uucode.zig
View File

@@ -10,16 +10,14 @@ pub fn get(cp: u21) Properties {
.width = 1,
.width_zero_in_grapheme = true,
.grapheme_break = .other,
.emoji_vs_text = false,
.emoji_vs_emoji = false,
.emoji_vs_base = false,
};
return .{
.width = uucode.get(.width, cp),
.width_zero_in_grapheme = uucode.get(.wcwidth_zero_in_grapheme, cp),
.grapheme_break = uucode.get(.grapheme_break_no_control, cp),
.emoji_vs_text = uucode.get(.is_emoji_vs_text, cp),
.emoji_vs_emoji = uucode.get(.is_emoji_vs_emoji, cp),
.emoji_vs_base = uucode.get(.is_emoji_vs_base, cp),
};
}