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

Avoid evaluating active_session against every window

Browse Source
This commit is contained in:
Kovid Goyal
2025-08-19 22:28:43 +05:30
parent 746a80487a
commit 4c987cd509
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/boss.py
View File

@@ -535,6 +535,7 @@ class Boss:
if tm is not None:
tab = tm.active_tab
window_id_limit = max(self.window_id_map, default=-1) + 1
active_session = self.active_session
def get_matches(location: str, query: str, candidates: set[int]) -> set[int]:
if location == 'id' and query.startswith('-'):
@@ -544,7 +545,7 @@ class Boss:
return set()
if q < 0:
query = str(window_id_limit + q)
return {wid for wid in candidates if self.window_id_map[wid].matches_query(location, query, tab, self_window)}
return {wid for wid in candidates if self.window_id_map[wid].matches_query(location, query, tab, self_window, active_session)}
for wid in search(match, (
'id', 'title', 'pid', 'cwd', 'cmdline', 'num', 'env', 'var', 'recent', 'state', 'neighbor',

11
kitty/window.py
View File

@@ -888,7 +888,7 @@ class Window:
def has_running_program(self) -> bool:
return not self.at_prompt
def matches(self, field: str, pat: MatchPatternType) -> bool:
def matches(self, field: str, pat: MatchPatternType, active_session: str) -> bool:
if isinstance(pat, tuple):
if field == 'env':
return key_val_matcher(self.child.environ.items(), *pat)
@@ -911,11 +911,14 @@ class Window:
return False
if field == 'session':
if pat.pattern == '.':
return self.created_in_session_name == get_boss().active_session
return self.created_in_session_name == active_session
return pat.search(self.created_in_session_name) is not None
return False
def matches_query(self, field: str, query: str, active_tab: TabType | None = None, self_window: Optional['Window'] = None) -> bool:
def matches_query(
self, field: str, query: str, active_tab: TabType | None = None,
self_window: Optional['Window'] = None, active_session: str = ''
) -> bool:
if field in ('num', 'recent'):
if active_tab is not None:
try:
@@ -964,7 +967,7 @@ class Window:
return gid is not None and t.windows.active_window_in_group_id(gid) is self
pat = compile_match_query(query, field not in ('env', 'var'))
return self.matches(field, pat)
return self.matches(field, pat, active_session)
def set_visible_in_layout(self, val: bool) -> None:
val = bool(val)