From e2fda5d1c4c346abcddb228ac062346ee813f25b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 15 Mar 2023 15:32:04 +0530 Subject: [PATCH] ... --- kitty/conf/generate.py | 2 +- tools/utils/style/wrapper.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/kitty/conf/generate.py b/kitty/conf/generate.py index 0f4661110..178eeb7bf 100644 --- a/kitty/conf/generate.py +++ b/kitty/conf/generate.py @@ -472,7 +472,7 @@ def go_type_data(parser_func: ParserFuncType, ctype: str, is_multiple: bool = Fa if p == 'unit_float': return 'float64', 'config.UnitFloat(val, 10, 64)' if p == 'python_string': - return 'string', 'config.StringLiteral(val, 10, 64)' + return 'string', 'config.StringLiteral(val)' th = get_type_hints(parser_func) rettype = th['return'] return {int: 'int64', str: 'string', float: 'float64'}[rettype], f'{p}(val)' diff --git a/tools/utils/style/wrapper.go b/tools/utils/style/wrapper.go index 72fd95cc4..59a4e7255 100644 --- a/tools/utils/style/wrapper.go +++ b/tools/utils/style/wrapper.go @@ -157,6 +157,20 @@ func ParseColor(color string) (RGBA, error) { return RGBA{}, fmt.Errorf("Not a valid color name: %#v", color) } +type NullableColor struct { + Color RGBA + IsNull bool +} + +func ParseColorOrNone(color string) (NullableColor, error) { + raw := strings.TrimSpace(strings.ToLower(color)) + if raw == "none" { + return NullableColor{IsNull: true}, nil + } + c, err := ParseColor(raw) + return NullableColor{Color: c}, err +} + var named_colors = map[string]uint8{ "black": 0, "red": 1, "green": 2, "yellow": 3, "blue": 4, "magenta": 5, "cyan": 6, "gray": 7, "white": 7,