Merge branch 'master' into master-2.1

This commit is contained in:
Adam
2022-05-09 21:36:10 -04:00
committed by GitHub
25 changed files with 5607 additions and 101 deletions
+2
View File
@@ -5,6 +5,7 @@ int luaopen_renderer(lua_State *L);
int luaopen_regex(lua_State *L);
int luaopen_process(lua_State *L);
int luaopen_dirmonitor(lua_State* L);
int luaopen_utf8(lua_State* L);
static const luaL_Reg libs[] = {
{ "system", luaopen_system },
@@ -12,6 +13,7 @@ static const luaL_Reg libs[] = {
{ "regex", luaopen_regex },
{ "process", luaopen_process },
{ "dirmonitor", luaopen_dirmonitor },
{ "utf8", luaopen_utf8 },
{ NULL, NULL }
};
+1 -1
View File
@@ -5,4 +5,4 @@ void deinit_dirmonitor(struct dirmonitor_internal* monitor) { }
int get_changes_dirmonitor(struct dirmonitor_internal* monitor, char* buffer, size_t len) { return -1; }
int translate_changes_dirmonitor(struct dirmonitor_internal* monitor, char* buffer, int size, int (*callback)(int, const char*, void*), void* data) { return -1; }
int add_dirmonitor(struct dirmonitor_internal* monitor, const char* path) { return -1; }
void remove_dirmonitor(struct dirmonitor_internal* monitor, int fd) { }
void remove_dirmonitor(struct dirmonitor_internal* monitor, int fd) { }
+3
View File
@@ -161,6 +161,9 @@ top:
} else if (e.window.event == SDL_WINDOWEVENT_RESTORED) {
lua_pushstring(L, "restored");
return 1;
} else if (e.window.event == SDL_WINDOWEVENT_LEAVE) {
lua_pushstring(L, "mouseleft");
return 1;
}
if (e.window.event == SDL_WINDOWEVENT_FOCUS_LOST) {
lua_pushstring(L, "focuslost");
+1305
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -4,6 +4,7 @@ lite_sources = [
'api/regex.c',
'api/system.c',
'api/process.c',
'api/utf8.c',
'renderer.c',
'renwindow.c',
'rencache.c',
+3710
View File
File diff suppressed because it is too large Load Diff