walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 17 Wiki Activity

save a reference to the font when calling renderer.draw_text. (#1156) 

This prevents the GC from killing it.
This commit is contained in:
Takase 2022-10-14 10:52:38 +08:00 committed by GitHub
parent 42ac231f01
commit 7107f88f9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/api/renderer.c
View File

@ -3,6 +3,9 @@
#include "../renderer.h" #include "../renderer.h"
#include "../rencache.h" #include "../rencache.h"
// a reference index to a table that stores the fonts
static int RENDERER_FONT_REF = LUA_NOREF;
static int font_get_options( static int font_get_options(
lua_State *L, lua_State *L,
ERenFontAntialiasing *antialiasing, ERenFontAntialiasing *antialiasing,
@ -255,6 +258,9 @@ static int f_begin_frame(UNUSED lua_State *L) {
static int f_end_frame(UNUSED lua_State *L) { static int f_end_frame(UNUSED lua_State *L) {
rencache_end_frame(); rencache_end_frame();
// clear the font reference table
lua_newtable(L);
lua_rawseti(L, LUA_REGISTRYINDEX, RENDERER_FONT_REF);
return 0; return 0;
} }
@ -291,6 +297,19 @@ static int f_draw_rect(lua_State *L) {
static int f_draw_text(lua_State *L) { static int f_draw_text(lua_State *L) {
RenFont* fonts[FONT_FALLBACK_MAX]; RenFont* fonts[FONT_FALLBACK_MAX];
font_retrieve(L, fonts, 1); font_retrieve(L, fonts, 1);
// stores a reference to this font to the reference table
lua_rawgeti(L, LUA_REGISTRYINDEX, RENDERER_FONT_REF);
if (lua_istable(L, -1))
{
lua_pushvalue(L, 1);
lua_pushboolean(L, 1);
lua_rawset(L, -3);
} else {
fprintf(stderr, "warning: failed to reference count fonts\n");
}
lua_pop(L, 1);
const char *text = luaL_checkstring(L, 2); const char *text = luaL_checkstring(L, 2);
float x = luaL_checknumber(L, 3); float x = luaL_checknumber(L, 3);
int y = luaL_checknumber(L, 4); int y = luaL_checknumber(L, 4);
@ -326,6 +345,10 @@ static const luaL_Reg fontLib[] = {
}; };
int luaopen_renderer(lua_State *L) { int luaopen_renderer(lua_State *L) {
// gets a reference on the registry to store font data
lua_newtable(L);
RENDERER_FONT_REF = luaL_ref(L, LUA_REGISTRYINDEX);
luaL_newlib(L, lib); luaL_newlib(L, lib);
luaL_newmetatable(L, API_TYPE_FONT); luaL_newmetatable(L, API_TYPE_FONT);
luaL_setfuncs(L, fontLib, 0); luaL_setfuncs(L, fontLib, 0);