ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't fail to start if the user deletes the hintstyle key from their fontconfig configuration. Fixes #480

Browse source
This commit is contained in:
Kovid Goyal 2018-04-22 20:29:46 +05:30
parent d866c0d202
commit 99ff92a5a7
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kitty/freetype.c
View file

@ -214,15 +214,21 @@ ft_face_from_path_and_psname(PyObject* path, const char* psname, void *extra_dat
PyObject*
face_from_descriptor(PyObject *descriptor) {
#define D(key, conv) { PyObject *t = PyDict_GetItemString(descriptor, #key); if (t == NULL) { PyErr_SetString(PyExc_KeyError, "font descriptor is missing the key: " #key); return NULL; } key = conv(t); t = NULL; }
#define D(key, conv, missing_ok, defval) { \
PyObject *t = PyDict_GetItemString(descriptor, #key); \
if (t == NULL) { \
if (!missing_ok) { PyErr_SetString(PyExc_KeyError, "font descriptor is missing the key: " #key); return NULL; } \
else key = defval; \
} else key = conv(t); \
}
char *path;
long index;
bool hinting;
long hint_style;
D(path, PyUnicode_AsUTF8);
D(index, PyLong_AsLong);
D(hinting, PyObject_IsTrue);
D(hint_style, PyLong_AsLong);
D(path, PyUnicode_AsUTF8, false, "");
D(index, PyLong_AsLong, true, 0);
D(hinting, PyObject_IsTrue, true, 1);
D(hint_style, PyLong_AsLong, true, 1);
#undef D
Face *self = (Face *)Face_Type.tp_alloc(&Face_Type, 0);
if (self != NULL) {