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

Fix #4605

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-01 12:01:08 +05:30
parent a899a8ab6d
commit 8fffd6070a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kitty/tab_bar.py
View File

@ -3,6 +3,7 @@
import os import os
from functools import lru_cache, partial, wraps from functools import lru_cache, partial, wraps
from string import Formatter as StringFormatter
from typing import ( from typing import (
Any, Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union Any, Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union
) )
@ -162,6 +163,15 @@ def draw_attributed_string(title: str, screen: Screen) -> None:
screen.draw(title) screen.draw(title)
@lru_cache(maxsize=16)
def template_has_field(template: str, field: str) -> bool:
q = StringFormatter()
for (literal_text, field_name, format_spec, conversion) in q.parse(template):
if field_name and field in field_name.split():
return True
return False
def draw_title(draw_data: DrawData, screen: Screen, tab: TabBarData, index: int) -> None: def draw_title(draw_data: DrawData, screen: Screen, tab: TabBarData, index: int) -> None:
data = { data = {
'index': index, 'index': index,
@ -187,10 +197,13 @@ def draw_title(draw_data: DrawData, screen: Screen, tab: TabBarData, index: int)
template = draw_data.title_template template = draw_data.title_template
if tab.is_active and draw_data.active_title_template is not None: if tab.is_active and draw_data.active_title_template is not None:
template = draw_data.active_title_template template = draw_data.active_title_template
if '{activity_symbol' not in template: prefix = ''
template = '{fmt.fg.red}{activity_symbol}{fmt.fg.default}' + template if eval_locals['bell_symbol'] and not template_has_field(template, 'bell_symbol'):
if '{bell_symbol' not in template: prefix = '{fmt.fg.red}{bell_symbol}{fmt.fg.default}'
template = '{fmt.fg.red}{bell_symbol}{fmt.fg.default}' + template if eval_locals['activity_symbol'] and not template_has_field(template, 'activity_symbol'):
prefix += '{fmt.fg.red}{activity_symbol}{fmt.fg.default}'
if prefix:
template = prefix + template
try: try:
title = eval(compile_template(template), {'__builtins__': {}}, eval_locals) title = eval(compile_template(template), {'__builtins__': {}}, eval_locals)
except Exception as e: except Exception as e: