Use a faster implementation of the Color type

Now implemented in C

kittens/diff/options/types.py

@@ -3,8 +3,8 @@
 import typing
 from kitty.conf.utils import KeyAction, KittensKeyMap
 import kitty.conf.utils
-from kitty.rgb import Color
-import kitty.rgb
+from kitty.fast_data_types import Color
+import kitty.fast_data_types
 from kitty.types import ParsedShortcut
 import kitty.types
 
@@ -39,31 +39,31 @@ option_names = (  # {{{
 
 
 class Options:
-    added_bg: Color = Color(red=230, green=255, blue=237)
-    added_margin_bg: Color = Color(red=205, green=255, blue=216)
-    background: Color = Color(red=255, green=255, blue=255)
+    added_bg: Color = Color(230, 255, 237)
+    added_margin_bg: Color = Color(205, 255, 216)
+    background: Color = Color(255, 255, 255)
     diff_cmd: str = 'auto'
-    filler_bg: Color = Color(red=250, green=251, blue=252)
-    foreground: Color = Color(red=0, green=0, blue=0)
-    highlight_added_bg: Color = Color(red=172, green=242, blue=189)
-    highlight_removed_bg: Color = Color(red=253, green=184, blue=192)
-    hunk_bg: Color = Color(red=241, green=248, blue=255)
-    hunk_margin_bg: Color = Color(red=219, green=237, blue=255)
-    margin_bg: Color = Color(red=250, green=251, blue=252)
-    margin_fg: Color = Color(red=170, green=170, blue=170)
-    margin_filler_bg: typing.Optional[kitty.rgb.Color] = None
+    filler_bg: Color = Color(250, 251, 252)
+    foreground: Color = Color(0, 0, 0)
+    highlight_added_bg: Color = Color(172, 242, 189)
+    highlight_removed_bg: Color = Color(253, 184, 192)
+    hunk_bg: Color = Color(241, 248, 255)
+    hunk_margin_bg: Color = Color(219, 237, 255)
+    margin_bg: Color = Color(250, 251, 252)
+    margin_fg: Color = Color(170, 170, 170)
+    margin_filler_bg: typing.Optional[kitty.fast_data_types.Color] = None
     num_context_lines: int = 3
     pygments_style: str = 'default'
-    removed_bg: Color = Color(red=255, green=238, blue=240)
-    removed_margin_bg: Color = Color(red=255, green=220, blue=224)
+    removed_bg: Color = Color(255, 238, 240)
+    removed_margin_bg: Color = Color(255, 220, 224)
     replace_tab_by: str = '    '
-    search_bg: Color = Color(red=68, green=68, blue=68)
-    search_fg: Color = Color(red=255, green=255, blue=255)
-    select_bg: Color = Color(red=180, green=213, blue=254)
-    select_fg: typing.Optional[kitty.rgb.Color] = Color(red=0, green=0, blue=0)
+    search_bg: Color = Color(68, 68, 68)
+    search_fg: Color = Color(255, 255, 255)
+    select_bg: Color = Color(180, 213, 254)
+    select_fg: typing.Optional[kitty.fast_data_types.Color] = Color(0, 0, 0)
     syntax_aliases: typing.Dict[str, str] = {'pyj': 'py', 'pyi': 'py', 'recipe': 'py'}
-    title_bg: Color = Color(red=255, green=255, blue=255)
-    title_fg: Color = Color(red=0, green=0, blue=0)
+    title_bg: Color = Color(255, 255, 255)
+    title_fg: Color = Color(0, 0, 0)
     map: typing.List[typing.Tuple[kitty.types.ParsedShortcut, kitty.conf.utils.KeyAction]] = []
     key_definitions: KittensKeyMap = {}
     config_paths: typing.Tuple[str, ...] = ()

kittens/themes/collection.py

@@ -18,7 +18,7 @@ from urllib.request import Request, urlopen
 from kitty.config import atomic_save, parse_config
 from kitty.constants import cache_dir, config_dir
 from kitty.options.types import Options as KittyOptions
-from kitty.rgb import Color
+from kitty.fast_data_types import Color
 from kitty.utils import reload_conf_in_all_kitties
 
 from ..choose.match import match

kittens/tui/operations.py

@@ -6,10 +6,11 @@ from contextlib import contextmanager
 from enum import Enum, auto
 from functools import wraps
 from typing import (
-    IO, Any, Callable, Dict, Generator, Optional, Tuple, TypeVar, Union
+    IO, Any, Callable, Dict, Generator, Optional, TypeVar, Union
 )
 
-from kitty.rgb import Color, color_as_sharp, to_color
+from kitty.fast_data_types import Color
+from kitty.rgb import color_as_sharp, to_color
 from kitty.typing import GraphicsCommandType, HandlerType, ScreenSize
 
 from .operations_stub import CMD
@@ -170,7 +171,7 @@ UNDERLINE_STYLES = {name: i + 1 for i, name in enumerate(
     'straight double curly'.split())}
 
 
-ColorSpec = Union[int, str, Tuple[int, int, int]]
+ColorSpec = Union[int, str, Color]
 
 
 def color_code(color: ColorSpec, intense: bool = False, base: int = 30) -> str:
@@ -179,7 +180,7 @@ def color_code(color: ColorSpec, intense: bool = False, base: int = 30) -> str:
     elif isinstance(color, int):
         e = f'{base + 8}:5:{max(0, min(color, 255))}'
     else:
-        e = '{}:2:{}:{}:{}'.format(base + 8, *color)
+        e = f'{base + 8}{color.as_sgr}'
     return e
 
 
@@ -454,7 +455,7 @@ def as_type_stub() -> str:
     ans = [
         'from typing import *  # noqa',
         'from kitty.typing import GraphicsCommandType, ScreenSize',
-        'from kitty.rgb import Color',
+        'from kitty.fast_data_types import Color',
         'import kitty.rgb',
         'import kittens.tui.operations',
     ]