steven/beansprout-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Utf-8 -> codepoint conversion to utils

Browse source 
Once we add more text to the bar, it makes sense to move this into a
helper function.
This commit is contained in:
Ben Buhse 2026-02-26 17:29:22 -06:00
commit 062748967c
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
3 changed files with 57 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Bar.zig
View file

@ -224,17 +224,9 @@ pub fn draw(bar: *Bar) !void {
var fbs = io.fixedBufferStream(&buf);
try dt.strftime(fbs.writer(), "%H:%M");
// Convert ASCII text string to unicode
// XXX: Not sure if this even needs to be converted to unicode
var codepoint_it = (try unicode.Utf8View.init(fbs.getWritten())).iterator();
const codepoint_count = try unicode.utf8CountCodepoints(fbs.getWritten());
// We use u32 for fcft even if zig uses u21
var codepoints: []u32 = try utils.gpa.alloc(u32, codepoint_count);
// Convert date string to Unicode codepoints
const codepoints = try utils.utf8ToCodepoints(fbs.getWritten());
defer utils.gpa.free(codepoints);
var i: usize = 0;
while (codepoint_it.nextCodepoint()) |cp| : (i += 1) {
codepoints[i] = cp;
}
const text_width = try bar.textWidth(codepoints);
var x: i32 = @divFloor(buffer.width - text_width, 2);
@ -393,7 +385,6 @@ const assert = std.debug.assert;
const io = std.io;
const mem = std.mem;
const process = std.process;
const unicode = std.unicode;
const wayland = @import("wayland");
const wl = wayland.client.wl;