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

Fix shortcuts from global menubar not working when keyboard grabbed on macOS

Browse Source
This commit is contained in:
Kovid Goyal
2025-05-18 14:23:38 +05:30
parent abc9b1fc48
commit cc4d4eeaca
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kitty/keys.py
View File

@@ -17,6 +17,7 @@ from .fast_data_types import (
SingleKey, SingleKey,
get_boss, get_boss,
get_options, get_options,
grab_keyboard,
is_modifier_key, is_modifier_key,
ring_bell, ring_bell,
set_ignore_os_keyboard_processing, set_ignore_os_keyboard_processing,
@@ -157,11 +158,14 @@ class Mappings:
is_root_mode = not self.keyboard_mode_stack is_root_mode = not self.keyboard_mode_stack
mode = self.keyboard_modes[''] if is_root_mode else self.keyboard_mode_stack[-1] mode = self.keyboard_modes[''] if is_root_mode else self.keyboard_mode_stack[-1]
key_action = get_shortcut(mode.keymap, ev) key_action = get_shortcut(mode.keymap, ev)
if key_action is None and self.global_shortcuts_map and (global_key_action := get_shortcut(self.global_shortcuts_map, ev)) is not None:
if grab_keyboard(None):
key_action = global_key_action
else:
return True
if key_action is None: if key_action is None:
if is_modifier_key(ev.key): if is_modifier_key(ev.key):
return False return False
if self.global_shortcuts_map and get_shortcut(self.global_shortcuts_map, ev):
return True
if not is_root_mode: if not is_root_mode:
if mode.sequence_keys is not None: if mode.sequence_keys is not None:
self.pop_keyboard_mode() self.pop_keyboard_mode()