Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 16:26:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2460 from 0xcharly/font-codepoint-map

Browse Source 
Tentative fix for unexpected `font-codepoint-map` behavior
This commit is contained in:
Mitchell Hashimoto
2024-10-19 09:34:15 -07:00
committed by GitHub
parent 05787e7848 96b4ff39a6
commit ed1bb5eed3
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/font/CodepointMap.zig
View File

@ -54,8 +54,9 @@ pub fn add(self: *CodepointMap, alloc: Allocator, entry: Entry) !void {
/// Get a descriptor for a codepoint. /// Get a descriptor for a codepoint.
pub fn get(self: *const CodepointMap, cp: u21) ?discovery.Descriptor { pub fn get(self: *const CodepointMap, cp: u21) ?discovery.Descriptor {
const items = self.list.items(.range); const items = self.list.items(.range);
for (items, 0..) |range, forward_i| { for (0..items.len) |forward_i| {
const i = items.len - forward_i - 1; const i = items.len - forward_i - 1;
const range = items[i];
if (range[0] <= cp and cp <= range[1]) { if (range[0] <= cp and cp <= range[1]) {
const descs = self.list.items(.descriptor); const descs = self.list.items(.descriptor);
return descs[i]; return descs[i];
@ -110,4 +111,15 @@ test "codepointmap" {
// Non-matching // Non-matching
try testing.expect(m.get(0) == null); try testing.expect(m.get(0) == null);
try testing.expect(m.get(3) == null); try testing.expect(m.get(3) == null);
try m.add(alloc, .{ .range = .{ 3, 4 }, .descriptor = .{ .family = "C" } });
try m.add(alloc, .{ .range = .{ 5, 6 }, .descriptor = .{ .family = "D" } });
{
const d = m.get(3).?;
try testing.expectEqualStrings("C", d.family.?);
}
{
const d = m.get(1).?;
try testing.expectEqualStrings("B", d.family.?);
}
} }