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

Fix native plugins not reloading upon core:restart (#1219) 

* Fix native plugins not reloading upon core:restart

* Move the metatable name definition to api.h

* Replace metatable name with const
This commit is contained in:
Delta-official 2022-12-02 22:06:35 +00:00 committed by GitHub
parent ef4ca03eae
commit 5db5512663
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/api.h
View File

@ -8,6 +8,7 @@
#define API_TYPE_FONT "Font" #define API_TYPE_FONT "Font"
#define API_TYPE_PROCESS "Process" #define API_TYPE_PROCESS "Process"
#define API_TYPE_DIRMONITOR "Dirmonitor" #define API_TYPE_DIRMONITOR "Dirmonitor"
#define API_TYPE_NATIVE_PLUGIN "NativePlugin"
#define API_CONSTANT_DEFINE(L, idx, key, n) (lua_pushnumber(L, n), lua_setfield(L, idx - 1, key)) #define API_CONSTANT_DEFINE(L, idx, key, n) (lua_pushnumber(L, n), lua_setfield(L, idx - 1, key))

16
src/api/system.c
View File

@ -934,6 +934,14 @@ static void* api_require(const char* symbol) {
return NULL; return NULL;
} }
static int f_library_gc(lua_State *L) {
lua_getfield(L, 1, "handle");
void* handle = lua_touserdata(L, -1);
SDL_UnloadObject(handle);
return 0;
}
static int f_load_native_plugin(lua_State *L) { static int f_load_native_plugin(lua_State *L) {
char entrypoint_name[512]; entrypoint_name[sizeof(entrypoint_name) - 1] = '\0'; char entrypoint_name[512]; entrypoint_name[sizeof(entrypoint_name) - 1] = '\0';
int result; int result;
@ -946,9 +954,12 @@ static int f_load_native_plugin(lua_State *L) {
lua_getglobal(L, "package"); lua_getglobal(L, "package");
lua_getfield(L, -1, "native_plugins"); lua_getfield(L, -1, "native_plugins");
lua_newtable(L);
lua_pushlightuserdata(L, library); lua_pushlightuserdata(L, library);
lua_setfield(L, -2, "handle");
luaL_setmetatable(L, API_TYPE_NATIVE_PLUGIN);
lua_setfield(L, -2, name); lua_setfield(L, -2, name);
lua_pop(L, 1); lua_pop(L, 2);
const char *basename = strrchr(name, '.'); const char *basename = strrchr(name, '.');
basename = !basename ? name : basename + 1; basename = !basename ? name : basename + 1;
@ -1068,6 +1079,9 @@ static const luaL_Reg lib[] = {
int luaopen_system(lua_State *L) { int luaopen_system(lua_State *L) {
luaL_newmetatable(L, API_TYPE_NATIVE_PLUGIN);
lua_pushcfunction(L, f_library_gc);
lua_setfield(L, -2, "__gc");
luaL_newlib(L, lib); luaL_newlib(L, lib);
return 1; return 1;
} }