mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-17 05:54:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix shortcuts that become entries in the global menubar being reported as removed shortcuts in the debug output

Browse Source
This commit is contained in:
Kovid Goyal
2024-09-08 09:48:14 +05:30
parent f9504b4fba
commit 3b8c7f6dd9
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kitty/debug_config.py
View File

@@ -70,7 +70,7 @@ def compare_maps(
def compare_opts(opts: KittyOpts, print: Print) -> None:
def compare_opts(opts: KittyOpts, global_shortcuts: dict[str, SingleKey] | None, print: Print) -> None:
from .config import load_config
print()
print('Config options different from defaults:')
@@ -134,6 +134,11 @@ def compare_opts(opts: KittyOpts, print: Print) -> None:
initial = {as_sc(k, v[0]): as_str(v) for k, v in initial_.keymap.items()}
final_ = opts.keyboard_modes.get(kmn, KeyboardMode(kmn))
final = {as_sc(k, v[0]): as_str(v) for k, v in final_.keymap.items()}
if not kmn and global_shortcuts:
for action, sk in global_shortcuts.items():
sc = Shortcut((sk,))
if sc not in final:
final[sc] = action
compare_maps(final, opts.kitty_mod, initial, default_opts.kitty_mod, print, mode_name=kmn)
new_keyboard_modes = set(opts.keyboard_modes) - set(default_opts.keyboard_modes)
for kmn in new_keyboard_modes:
@@ -229,7 +234,7 @@ def compositor_name() -> str:
return ans
def debug_config(opts: KittyOpts) -> str:
def debug_config(opts: KittyOpts, global_shortcuts: dict[str, SingleKey] | None = None) -> str:
from io import StringIO
out = StringIO()
p = partial(print, file=out)
@@ -276,7 +281,7 @@ def debug_config(opts: KittyOpts) -> str:
if opts.config_overrides:
p(green('Loaded config overrides:'))
p(' ', '\n '.join(opts.config_overrides))
compare_opts(opts, p)
compare_opts(opts, global_shortcuts, p)
p()
p(green('Important environment variables seen by the kitty process:'))