diff --git a/kitty/data-types.c b/kitty/data-types.c index 4dece45b1..9370591c4 100644 --- a/kitty/data-types.c +++ b/kitty/data-types.c @@ -74,8 +74,6 @@ static PyMethodDef module_methods[] = { {"change_wcwidth", (PyCFunction)change_wcwidth_wrap, METH_O, ""}, #ifdef __APPLE__ CORE_TEXT_FUNC_WRAPPERS -#else - {"get_fontconfig_font", (PyCFunction)get_fontconfig_font, METH_VARARGS, ""}, #endif GLFW_FUNC_WRAPPERS SPRITE_FUNC_WRAPPERS diff --git a/kitty/data-types.h b/kitty/data-types.h index 9002550f9..848e64da9 100644 --- a/kitty/data-types.h +++ b/kitty/data-types.h @@ -402,5 +402,3 @@ DECLARE_CH_SCREEN_HANDLER(backspace) DECLARE_CH_SCREEN_HANDLER(tab) DECLARE_CH_SCREEN_HANDLER(linefeed) DECLARE_CH_SCREEN_HANDLER(carriage_return) - -PyObject *get_fontconfig_font(PyObject *self, PyObject *args); diff --git a/kitty/fontconfig.c b/kitty/fontconfig.c index 6bc2221bf..7000805a0 100644 --- a/kitty/fontconfig.c +++ b/kitty/fontconfig.c @@ -8,7 +8,7 @@ #include "data-types.h" #include -PyObject* +static PyObject* get_fontconfig_font(PyObject UNUSED *self, PyObject *args) { char *family; int bold, italic, allow_bitmapped_fonts, index = 0, hint_style=0, weight=0, slant=0; @@ -74,11 +74,17 @@ end: return ans; } +static PyMethodDef module_methods[] = { + {"get_fontconfig_font", (PyCFunction)get_fontconfig_font, METH_VARARGS, ""}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + bool -init_fontconfig_library(PyObject UNUSED *m) { +init_fontconfig_library(PyObject *module) { if (!FcInit()) { PyErr_SetString(PyExc_RuntimeError, "Failed to initialize the fontconfig library"); return false; } + if (PyModule_AddFunctions(module, module_methods) != 0) return false; return true; }