From b07bfbc6c70fd0bba8dff85fe4149feb9fa9b8d4 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 23 Nov 2023 10:40:04 +1100 Subject: Add a second font, flesh out browser screen --- lib/luavgl/src/font.c | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) (limited to 'lib/luavgl/src/font.c') diff --git a/lib/luavgl/src/font.c b/lib/luavgl/src/font.c index 95f2a6f1..383f5974 100644 --- a/lib/luavgl/src/font.c +++ b/lib/luavgl/src/font.c @@ -240,7 +240,7 @@ static int luavgl_font_create(lua_State *L) { int weight; int size; - char *str, *name; + const char *name; const lv_font_t *font = NULL; if (!lua_isstring(L, 1)) { @@ -271,39 +271,9 @@ static int luavgl_font_create(lua_State *L) weight = FONT_WEIGHT_NORMAL; } - str = strdup(lua_tostring(L, 1)); - if (str == NULL) { - return luaL_error(L, "no memory."); - } - - name = to_lower(str); - while (*name) { - if (*name == ' ') { - name++; - continue; - } - - char *end = strchr(name, ','); - if (end != NULL) { - *end = '\0'; - } else { - end = name + strlen(name); - } - - char *trim = end - 1; - while (*trim == ' ') { - *trim-- = '\0'; /* trailing space. */ - } - - font = _luavgl_font_create(L, name, size, weight); - if (font) { - break; - } - - name = end + 1; /* next */ - } + name = lua_tostring(L, 1); + font = _luavgl_font_create(L, name, size, weight); - free(str); if (font) { lua_pushlightuserdata(L, (void *)font); return 1; -- cgit v1.2.3