KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix visual select failing if triggerred when there is already an active visual select

Browse Source
This commit is contained in:
Kovid Goyal
2021-10-31 09:32:12 +05:30
parent 32805ca968
commit 5f9409a91d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/boss.py
View File

@@ -157,6 +157,7 @@ class Boss:
self.window_id_map: WeakValueDictionary[int, Window] = WeakValueDictionary() self.window_id_map: WeakValueDictionary[int, Window] = WeakValueDictionary()
self.startup_colors = {k: opts[k] for k in opts if isinstance(opts[k], Color)} self.startup_colors = {k: opts[k] for k in opts if isinstance(opts[k], Color)}
self.visual_window_select_callback: Optional[Callable[[Optional[Tab], Optional[Window]], None]] = None self.visual_window_select_callback: Optional[Callable[[Optional[Tab], Optional[Window]], None]] = None
self.visual_window_select_active_in_tab_id: int = 0
self.startup_cursor_text_color = opts.cursor_text_color self.startup_cursor_text_color = opts.cursor_text_color
self.pending_sequences: Optional[SubSequenceMap] = None self.pending_sequences: Optional[SubSequenceMap] = None
self.default_pending_action: Optional[KeyAction] = None self.default_pending_action: Optional[KeyAction] = None
@@ -816,6 +817,8 @@ class Boss:
self.dispatch_action(matched_action) self.dispatch_action(matched_action)
def visual_window_select_action(self, tab: Tab, callback: Callable[[Optional[Tab], Optional[Window]], None], choose_msg: str) -> None: def visual_window_select_action(self, tab: Tab, callback: Callable[[Optional[Tab], Optional[Window]], None], choose_msg: str) -> None:
if self.visual_window_select_active_in_tab_id:
self.visual_window_select_action_trigger(self.visual_window_select_active_in_tab_id)
self.visual_window_select_callback = callback self.visual_window_select_callback = callback
if tab.current_layout.only_active_window_visible: if tab.current_layout.only_active_window_visible:
self.select_window_in_tab_using_overlay(tab, choose_msg) self.select_window_in_tab_using_overlay(tab, choose_msg)
@@ -839,12 +842,14 @@ class Boss:
self.set_pending_sequences(pending_sequences, default_pending_action=KeyAction('visual_window_select_action_trigger', (tab.id,))) self.set_pending_sequences(pending_sequences, default_pending_action=KeyAction('visual_window_select_action_trigger', (tab.id,)))
redirect_mouse_handling(True) redirect_mouse_handling(True)
self.mouse_handler = self.focus_visible_window_mouse_handler self.mouse_handler = self.focus_visible_window_mouse_handler
self.visual_window_select_active_in_tab_id = tab.id
else: else:
self.visual_window_select_action_trigger(tab.id) self.visual_window_select_action_trigger(tab.id)
if get_options().enable_audio_bell: if get_options().enable_audio_bell:
ring_bell() ring_bell()
def visual_window_select_action_trigger(self, tab_id: int, window_id: int = 0) -> None: def visual_window_select_action_trigger(self, tab_id: int, window_id: int = 0) -> None:
self.visual_window_select_active_in_tab_id = 0
redirect_mouse_handling(False) redirect_mouse_handling(False)
self.clear_pending_sequences() self.clear_pending_sequences()
cb = self.visual_window_select_callback cb = self.visual_window_select_callback