mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 19:21:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix face sample rendering

Browse Source
This commit is contained in:
Kovid Goyal
2024-05-14 21:53:50 +05:30
parent db092eb88d
commit d6a7d4a8a1
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kittens/choose_fonts/backend.py
View File

@@ -47,6 +47,12 @@ class TextStyle(TypedDict):
def print(*a: Any) -> None: def print(*a: Any) -> None:
import builtins import builtins
import os
if 'KITTY_STDIO_FORWARDED' in os.environ:
fd = int(os.environ['KITTY_STDIO_FORWARDED'])
with open(fd, 'w', closefd=False) as f:
builtins.print(*a, file=f)
else:
builtins.print(*a, file=sys.stderr) builtins.print(*a, file=sys.stderr)
@@ -72,7 +78,7 @@ def opts_from_cmd(cmd: Dict[str, Any]) -> Tuple[Options, FamilyKey, float, float
return opts, tuple(family_key), ts['dpi_x'], ts['dpi_y'] return opts, tuple(family_key), ts['dpi_x'], ts['dpi_y']
BaseKey = Tuple[FamilyKey, int, int] BaseKey = Tuple[str, int, int]
FaceKey = Tuple[str, BaseKey] FaceKey = Tuple[str, BaseKey]
RenderedSample = Tuple[bytes, Dict[str, Any]] RenderedSample = Tuple[bytes, Dict[str, Any]]
RenderedSampleTransmit = Dict[str, Any] RenderedSampleTransmit = Dict[str, Any]
@@ -99,11 +105,11 @@ def render_family_sample(
opts: Options, family_key: FamilyKey, dpi_x: float, dpi_y: float, width: int, height: int, output_dir: str, opts: Options, family_key: FamilyKey, dpi_x: float, dpi_y: float, width: int, height: int, output_dir: str,
cache: Dict[FaceKey, RenderedSampleTransmit] cache: Dict[FaceKey, RenderedSampleTransmit]
) -> Dict[str, RenderedSampleTransmit]: ) -> Dict[str, RenderedSampleTransmit]:
base_key: BaseKey = family_key, width, height base_key: BaseKey = opts.font_family.created_from_string, width, height
ans: Dict[str, RenderedSampleTransmit] = {} ans: Dict[str, RenderedSampleTransmit] = {}
font_files = get_font_files(opts) font_files = get_font_files(opts)
for x in family_key: for x in family_key:
key: FaceKey = getattr(opts, x).created_from_string, base_key key: FaceKey = x + ': ' + getattr(opts, x).created_from_string, base_key
if x == 'font_family': if x == 'font_family':
desc = font_files['medium'] desc = font_files['medium']
elif x == 'bold_font': elif x == 'bold_font':

2
kittens/choose_fonts/faces.go
View File

@@ -143,7 +143,7 @@ func (self *faces) on_enter(family string) error {
d := func(conf ResolvedFace, setting *string, defval string) { d := func(conf ResolvedFace, setting *string, defval string) {
*setting = utils.IfElse(family == conf.Family, conf.Spec, defval) *setting = utils.IfElse(family == conf.Family, conf.Spec, defval)
} }
d(r.Font_family, &self.settings.font_family, family) d(r.Font_family, &self.settings.font_family, fmt.Sprintf(`family="%s"`, family))
d(r.Bold_font, &self.settings.bold_font, "auto") d(r.Bold_font, &self.settings.bold_font, "auto")
d(r.Italic_font, &self.settings.italic_font, "auto") d(r.Italic_font, &self.settings.italic_font, "auto")
d(r.Bold_italic_font, &self.settings.bold_italic_font, "auto") d(r.Bold_italic_font, &self.settings.bold_italic_font, "auto")

1
kitty/fonts/common.py
View File

@@ -331,6 +331,7 @@ def get_named_style(face_or_descriptor: Union[Face, Descriptor]) -> Optional[Nam
axis_map = d.get('axis_map', {}).copy() axis_map = d.get('axis_map', {}).copy()
else: else:
face: Face = face_or_descriptor face: Face = face_or_descriptor
vd = get_variable_data_for_face(face)
q = face.get_variation() q = face.get_variation()
if q is None: if q is None:
return None return None