mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make switching OS window focus more robust under Wayland at various call sites

Browse Source
This commit is contained in:
Kovid Goyal
2025-08-17 13:33:16 +05:30
parent c2389a1adc
commit d233cd0a53
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kitty/boss.py
View File

@@ -593,6 +593,20 @@ class Boss:
if q:
yield q
def focus_os_window(self, os_window_id: int, if_needed_only: bool = True) -> bool:
if if_needed_only and current_focused_os_window_id() == os_window_id:
return False
def doit(token: str = '') -> None:
focus_os_window(os_window_id, True, token)
if is_wayland():
if not run_with_activation_token(doit):
doit()
else:
doit()
return True
def set_active_window(
self, window: Window, switch_os_window_if_needed: bool = False, for_keep_focus: bool = False, activation_token: str = ''
) -> int | None:
@@ -1560,7 +1574,7 @@ class Boss:
initial_tab_id = tm.active_tab.id
tm.set_active_tab(tab)
if initial_os_window_id != tab.os_window_id:
focus_os_window(tab.os_window_id, True)
self.focus_os_window(tab.os_window_id, False)
self.current_visual_select = VisualSelect(tab.id, tab.os_window_id, initial_tab_id, initial_os_window_id, choose_msg, callback, reactivate_prev_tab)
if tab.current_layout.only_active_window_visible:
self.select_window_in_tab_using_overlay(tab, choose_msg, only_window_ids)
@@ -1838,11 +1852,11 @@ class Boss:
return
if num == 0:
os_window_id = current_focused_os_window_id() or last_focused_os_window_id()
focus_os_window(os_window_id, True)
self.focus_os_window(os_window_id)
elif num > 0:
ids = tuple(self.os_window_map.keys())
os_window_id = ids[min(num, len(ids)) - 1]
focus_os_window(os_window_id, True)
self.focus_os_window(os_window_id)
elif num < 0:
fc_map = os_window_focus_counters()
s = sorted(fc_map.keys(), key=fc_map.__getitem__)
@@ -1852,7 +1866,7 @@ class Boss:
os_window_id = s[num-1]
except IndexError:
os_window_id = s[0]
focus_os_window(os_window_id, True)
self.focus_os_window(os_window_id)
@ac('win', 'Close the currently active OS Window')
def close_os_window(self) -> None:
@@ -1933,7 +1947,7 @@ class Boss:
if tab is not None:
ctm = tab.tab_manager_ref()
if ctm is not None and tab in ctm and w in tab:
focus_os_window(ctm.os_window_id)
self.focus_os_window(ctm.os_window_id)
ctm.set_active_tab(tab)
tab.set_active_window(w)
return

8
kitty/session.py
View File

@@ -365,17 +365,21 @@ seen_session_paths: dict[str, str] = {}
def create_session(boss: BossType, path: str) -> str:
session_name = ''
for i, s in enumerate(create_sessions(get_options(), default_session=path)):
if i == 0:
session_name = s.session_name
if s.num_of_windows_in_definition == 0: # leading new_os_window
continue
tm = boss.active_tab_manager
if tm is None:
boss.add_os_window(s)
os_window_id = boss.add_os_window(s)
else:
os_window_id = tm.os_window_id
tm.add_tabs_from_session(s)
else:
boss.add_os_window(s)
os_window_id = boss.add_os_window(s)
if s.focus_os_window:
boss.focus_os_window(os_window_id)
seen_session_paths[session_name] = path
return session_name

4
kitty/tabs.py
View File

@@ -32,7 +32,6 @@ from .fast_data_types import (
buffer_keys_in_window,
current_focused_os_window_id,
detach_window,
focus_os_window,
get_boss,
get_click_interval,
get_options,
@@ -275,8 +274,7 @@ class Tab: # {{{
tm.set_active_tab(target_tab)
if target_tab.active_window is not w:
target_tab.set_active_window(w)
if current_focused_os_window_id() != w.os_window_id:
focus_os_window(w.os_window_id, True)
boss.focus_os_window(w.os_window_id)
with suppress(IndexError):
self.windows.set_active_window_group_for(self.windows.all_windows[session_tab.active_window_idx])