From 0b09afe668af05f51d56186c2fa792b9fc5ce17a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 6 May 2024 14:05:21 +0530
Subject: [PATCH] Make kitty +list-fonts a wrapper around choose font

---
 kitty/fonts/list.py | 41 ++++-------------------------------------
 1 file changed, 4 insertions(+), 37 deletions(-)

diff --git a/kitty/fonts/list.py b/kitty/fonts/list.py
index 62dfda9f4..710a1b8ca 100644
--- a/kitty/fonts/list.py
+++ b/kitty/fonts/list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # License: GPL v3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
-from typing import IO, Any, Dict, List, Optional, Sequence
+from typing import Dict, List, Optional, Sequence
 
 from kitty.constants import is_macos
 
@@ -31,45 +31,12 @@ def as_json(indent: Optional[int] = None) -> str:
     return json.dumps(groups, indent=indent)
 
 
-def handle_io(from_kitten: IO[bytes], to_kitten: IO[bytes]) -> None:
-    import json
-    global exception_in_io_handler
-
-    def send_to_kitten(x: Any) -> None:
-        to_kitten.write(json.dumps(x).encode())
-        to_kitten.write(b'\n')
-        to_kitten.flush()
-
-    send_to_kitten(create_family_groups())
-    for line in from_kitten:
-        cmd = json.loads(line)
-        action = cmd['action']
-        if action == 'read_variable_data':
-            ans = []
-            for descriptor in cmd['descriptors']:
-                ans.append(get_variable_data_for_descriptor(descriptor))
-            send_to_kitten(ans)
-
-
 def main(argv: Sequence[str]) -> None:
     import os
-    import subprocess
 
-    from kitty.constants import kitten_exe
+    from kitty.constants import kitten_exe, kitty_exe
     argv = list(argv)
     if '--psnames' in argv:
         argv.remove('--psnames')
-    pass_fds = []
-    if os.environ.get('KITTY_STDIO_FORWARDED'):
-        pass_fds.append(int(os.environ['KITTY_STDIO_FORWARDED']))
-    p = subprocess.Popen([kitten_exe(), '__list_fonts__'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, pass_fds=pass_fds)
-    assert p.stdout is not None and p.stdin is not None
-    try:
-        handle_io(p.stdout, p.stdin)
-    except Exception:
-        ret = p.wait()
-        import traceback
-        traceback.print_exc()
-    else:
-        ret = p.wait()
-    raise SystemExit(ret)
+    os.environ['KITTY_PATH_TO_KITTY_EXE'] = kitty_exe()
+    os.execlp(kitten_exe(), 'kitten', 'choose-fonts')