replace ziglyph codePointWidth -> table.get

This commit is contained in:
Erlend Lind Madsen
2024-02-09 20:04:51 +01:00
parent fc459ad827
commit cf0d498e75

View File

@ -21,7 +21,7 @@ const assert = std.debug.assert;
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const ArenaAllocator = std.heap.ArenaAllocator; const ArenaAllocator = std.heap.ArenaAllocator;
const oni = @import("oniguruma"); const oni = @import("oniguruma");
const ziglyph = @import("ziglyph"); const unicode = @import("unicode/main.zig");
const main = @import("main.zig"); const main = @import("main.zig");
const renderer = @import("renderer.zig"); const renderer = @import("renderer.zig");
const termio = @import("termio.zig"); const termio = @import("termio.zig");
@ -1231,7 +1231,7 @@ pub fn preeditCallback(self: *Surface, preedit_: ?[]const u8) !void {
var codepoints: std.ArrayListUnmanaged(Codepoint) = .{}; var codepoints: std.ArrayListUnmanaged(Codepoint) = .{};
defer codepoints.deinit(self.alloc); defer codepoints.deinit(self.alloc);
while (it.nextCodepoint()) |cp| { while (it.nextCodepoint()) |cp| {
const width = ziglyph.display_width.codePointWidth(cp, .half); const width: usize = if (cp <= 0xFF) 1 else @intCast(unicode.table.get(cp).width);
// I've never seen a preedit text with a zero-width character. In // I've never seen a preedit text with a zero-width character. In
// theory its possible but we can't really handle it right now. // theory its possible but we can't really handle it right now.