From 02c0ceab111509305157e8ad93fe077e8d816940 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 10 Jan 2024 20:43:22 -0800 Subject: [PATCH] cli: list-colors uses new generated rgb --- src/cli/list_colors.zig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cli/list_colors.zig b/src/cli/list_colors.zig index 4479c8f68..42c8396d3 100644 --- a/src/cli/list_colors.zig +++ b/src/cli/list_colors.zig @@ -1,7 +1,7 @@ const std = @import("std"); const inputpkg = @import("../input.zig"); const args = @import("args.zig"); -const RGBName = @import("rgb_names").RGBName; +const x11_color = @import("../terminal/main.zig").x11_color; pub const Options = struct { pub fn deinit(self: Options) void { @@ -23,9 +23,10 @@ pub fn run(alloc: std.mem.Allocator) !u8 { const stdout = std.io.getStdOut().writer(); - inline for (std.meta.fields(RGBName)) |f| { - const rgb = @field(RGBName, f.name).toRGB(); - try stdout.print("{s} = #{x:0>2}{x:0>2}{x:0>2}\n", .{ f.name, rgb.r, rgb.g, rgb.b }); + inline for (x11_color.map.kvs) |kv| { + const name = kv.key; + const rgb = kv.value; + try stdout.print("{s} = #{x:0>2}{x:0>2}{x:0>2}\n", .{ name, rgb.r, rgb.g, rgb.b }); } return 0;