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

Linux: Fix fonts not being correctly read from TrueType Collection (.ttc) files.

Browse Source 
kitty was always selecting the first font rather than the
actual matched font. Fixes #577
This commit is contained in:
Kovid Goyal
2018-05-27 12:30:28 +05:30
parent f36e6f0461
commit 4f18342ea6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kitty/fontconfig.c
View File

@@ -178,11 +178,16 @@ specialize_font_descriptor(PyObject *base_descriptor) {
if (idx == NULL) { PyErr_SetString(PyExc_ValueError, "Base descriptor has no index"); return NULL; }
FcPattern *pat = FcPatternCreate();
if (pat == NULL) return PyErr_NoMemory();
long face_idx = MAX(0, PyLong_AsLong(idx));
AP(FcPatternAddString, FC_FILE, (const FcChar8*)PyUnicode_AsUTF8(p), "path");
AP(FcPatternAddInteger, FC_INDEX, PyLong_AsLong(idx), "index");
AP(FcPatternAddInteger, FC_INDEX, face_idx, "index");
AP(FcPatternAddDouble, FC_SIZE, global_state.font_sz_in_pts, "size");
AP(FcPatternAddDouble, FC_DPI, (global_state.logical_dpi_x + global_state.logical_dpi_y) / 2.0, "dpi");
ans = _fc_match(pat);
if (face_idx > 0) {
// For some reason FcFontMatch sets the index to zero, so manually restore it.
PyDict_SetItemString(ans, "index", idx);
}
end:
if (pat != NULL) FcPatternDestroy(pat);
return ans;