diff options
Diffstat (limited to 'framebuffer/font_freetype.c')
| -rw-r--r-- | framebuffer/font_freetype.c | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c index eb7278c81..4381db62a 100644 --- a/framebuffer/font_freetype.c +++ b/framebuffer/font_freetype.c @@ -23,13 +23,14 @@ #include <ft2build.h> #include FT_CACHE_H -#include "css/css.h" -#include "css/utils.h" -#include "render/font.h" #include "utils/filepath.h" #include "utils/utf8.h" #include "utils/log.h" #include "utils/nsoption.h" +#include "css/css.h" +#include "css/utils.h" +#include "render/font.h" +#include "desktop/gui.h" #include "framebuffer/gui.h" #include "framebuffer/font.h" @@ -74,30 +75,6 @@ enum fb_face_e { static fb_faceid_t *fb_faces[FB_FACE_COUNT]; - -nserror utf8_to_local_encoding(const char *string, - size_t len, - char **result) -{ - return utf8_to_enc(string, "UTF-8", len, result); -} - -nserror utf8_from_local_encoding(const char *string, - size_t len, - char **result) -{ - *result = malloc(len + 1); - if (*result == NULL) { - return NSERROR_NOMEM; - } - - memcpy(*result, string, len); - - (*result)[len] = '\0'; - - return NSERROR_OK; -} - /* map cache manager handle to face id */ static FT_Error ft_face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face ) { @@ -581,6 +558,8 @@ const struct font_functions nsfont = { nsfont_split }; +struct gui_utf8_table *framebuffer_utf8_table = NULL; + /* * Local Variables: * c-basic-offset:8 |