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

Merge pull request #1488 from erf/replace-ziglyph

Browse Source 
Replace ziglyph.codePointWidth with unicode.table.get(cp).width
This commit is contained in:
Mitchell Hashimoto
2024-02-09 14:13:45 -08:00
committed by GitHub
parent 057341ffae 928d338c2b
commit 9f487810c1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Surface.zig
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 = @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.

1
src/helpgen.zig
View File

@ -3,7 +3,6 @@
//! help, docs, website, etc. //! help, docs, website, etc.
const std = @import("std"); const std = @import("std");
const ziglyph = @import("ziglyph");
const Config = @import("config/Config.zig"); const Config = @import("config/Config.zig");
const Action = @import("cli/action.zig").Action; const Action = @import("cli/action.zig").Action;
const KeybindAction = @import("input/Binding.zig").Action; const KeybindAction = @import("input/Binding.zig").Action;