From 1d073cf0ea962c340155c9b1afe2d7098ccce306 Mon Sep 17 00:00:00 2001 From: Charlotte Meyer Date: Mon, 30 Dec 2019 23:33:07 +0000 Subject: [PATCH] Add Lua library For now only kiwmi.on, kiwmi.quit, kiwmi.view_under_cursor, kiwmi_view:close, lua_callback:cancel, and cursor_button events. --- include/luak.h | 5 + include/server.h | 4 +- kiwmi/luak.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++- kiwmi/server.c | 5 +- 4 files changed, 267 insertions(+), 9 deletions(-) diff --git a/include/luak.h b/include/luak.h index 399ccc8..7714fa6 100644 --- a/include/luak.h +++ b/include/luak.h @@ -14,6 +14,11 @@ #include "server.h" +struct kiwmi_lua { + lua_State *L; +}; + bool luaK_init(struct kiwmi_server *server); +bool luaK_dofile(struct kiwmi_lua *lua, const char *config_path); #endif /* KIWMI_LUAK_H */ diff --git a/include/server.h b/include/server.h index c183949..e721ded 100644 --- a/include/server.h +++ b/include/server.h @@ -10,8 +10,6 @@ #include -#include - #include "desktop/desktop.h" #include "input/input.h" @@ -21,7 +19,7 @@ struct kiwmi_server { struct wlr_backend *backend; const char *socket; char *config_path; - lua_State *L; + struct kiwmi_lua *lua; struct kiwmi_desktop desktop; struct kiwmi_input input; }; diff --git a/kiwmi/luak.c b/kiwmi/luak.c index 48522f2..91d7366 100644 --- a/kiwmi/luak.c +++ b/kiwmi/luak.c @@ -7,12 +7,240 @@ #include "luak.h" +#include + #include #include +#include +#include +#include +#include + +#include "desktop/view.h" +#include "input/cursor.h" +#include "input/input.h" + +struct lua_callback { + struct kiwmi_server *server; + int callback_ref; + struct wl_listener listener; +}; + +static int +l_lua_callback_cancel(lua_State *L) +{ + struct lua_callback *lc = + *(struct lua_callback **)luaL_checkudata(L, 1, "lua_callback"); + lua_pop(L, 1); + + wl_list_remove(&lc->listener.link); + free(lc); + + return 0; +} + +static const luaL_Reg lua_callback_methods[] = { + {"cancel", l_lua_callback_cancel}, + {NULL, NULL}, +}; + +static int +lua_callback_create(lua_State *L) +{ + struct lua_callback *lc = lua_touserdata(L, 1); + + struct lua_callback **lc_ud = lua_newuserdata(L, sizeof(*lc_ud)); + luaL_getmetatable(L, "lua_callback"); + lua_setmetatable(L, -2); + + *lc_ud = lc; + + return 1; +} + +static int +lua_callback_register(lua_State *L) +{ + luaL_newmetatable(L, "lua_callback"); + lua_pushliteral(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_setfuncs(L, lua_callback_methods, 0); + lua_pop(L, 1); + + return 0; +} + +static int +l_kiwmi_view_close(lua_State *L) +{ + struct kiwmi_view *view = + *(struct kiwmi_view **)luaL_checkudata(L, 1, "kiwmi_view"); + + view_close(view); + + return 0; +} + +static const luaL_Reg kiwmi_view_methods[] = { + {"close", l_kiwmi_view_close}, + {NULL, NULL}, +}; + +static int +kiwmi_view_create(lua_State *L) +{ + luaL_checktype(L, 1, LUA_TLIGHTUSERDATA); // kiwmi_view + + struct kiwmi_view *view = lua_touserdata(L, 1); + lua_pop(L, 1); + + struct kiwmi_view **view_ud = lua_newuserdata(L, sizeof(*view_ud)); + luaL_getmetatable(L, "kiwmi_view"); + lua_setmetatable(L, -2); + + *view_ud = view; + + return 1; +} + +static int +kiwmi_view_register(lua_State *L) +{ + luaL_newmetatable(L, "kiwmi_view"); + lua_pushliteral(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_setfuncs(L, kiwmi_view_methods, 0); + lua_pop(L, 1); + + return 0; +} + +static struct kiwmi_server * +get_server(lua_State *L) +{ + lua_pushliteral(L, "kiwmi_server"); + lua_gettable(L, LUA_REGISTRYINDEX); + struct kiwmi_server *server = lua_touserdata(L, -1); + lua_pop(L, 1); + + return server; +} + +static void +lua_callback_listener_notify(struct wl_listener *listener, void *UNUSED(data)) +{ + struct lua_callback *lc = wl_container_of(listener, lc, listener); + struct kiwmi_server *server = lc->server; + struct lua_State *L = server->lua->L; + + lua_rawgeti(L, LUA_REGISTRYINDEX, lc->callback_ref); + lua_pcall(L, 0, 0, 0); +} + +static int +l_on(lua_State *L) +{ + luaL_checktype(L, 1, LUA_TSTRING); // type + luaL_checktype(L, 2, LUA_TFUNCTION); // callback + + // event_handler = registry['kiwmi_events'][type] + lua_pushliteral(L, "kiwmi_events"); + lua_gettable(L, LUA_REGISTRYINDEX); + lua_pushvalue(L, 1); + lua_gettable(L, -2); + lua_CFunction register_callback = lua_tocfunction(L, -1); + lua_pop(L, 2); + + luaL_argcheck(L, register_callback, 1, "invalid event"); + + // return register_callback(callback) + return register_callback(L); +} + +static int +on_cursor_button(lua_State *L) +{ + struct lua_callback *lc = malloc(sizeof(*lc)); + if (!lc) { + return luaL_error(L, "failed to allocate lua_callback"); + } + + struct kiwmi_server *server = get_server(L); + struct kiwmi_cursor *cursor = server->input.cursor; + + lc->server = server; + lc->callback_ref = luaL_ref(L, LUA_REGISTRYINDEX); + + lc->listener.notify = lua_callback_listener_notify; + wl_signal_add(&cursor->cursor->events.button, &lc->listener); + + lua_pushlightuserdata(L, lc); + lua_callback_create(L); + + return 1; +} + +static int +l_quit(lua_State *L) +{ + struct kiwmi_server *server = get_server(L); + + wl_display_terminate(server->wl_display); + + return 0; +} + +static int +l_view_under_cursor(lua_State *L) +{ + struct kiwmi_server *server = get_server(L); + struct kiwmi_cursor *cursor = server->input.cursor; + + struct wlr_surface *surface; + double sx; + double sy; + + struct kiwmi_view *view = view_at( + &server->desktop, + cursor->cursor->x, + cursor->cursor->y, + &surface, + &sx, + &sy); + + if (view) { + lua_pushlightuserdata(L, view); + kiwmi_view_create(L); + } else { + lua_pushnil(L); + } + + return 1; +} + +static const luaL_Reg kiwmi_lib[] = { + {"on", l_on}, + {"quit", l_quit}, + {"view_under_cursor", l_view_under_cursor}, + {NULL, NULL}, +}; + +static const luaL_Reg kiwmi_events[] = { + {"cursor_button", on_cursor_button}, + {NULL, NULL}, +}; bool luaK_init(struct kiwmi_server *server) { + struct kiwmi_lua *lua = malloc(sizeof(*lua)); + if (!lua) { + wlr_log(WLR_ERROR, "Failed to allocate kiwmi_lua"); + return false; + } + lua_State *L = luaL_newstate(); if (!L) { return false; @@ -20,8 +248,38 @@ luaK_init(struct kiwmi_server *server) luaL_openlibs(L); - // TODO: kiwmi library + // registry['kiwmi_server'] = server + lua_pushliteral(L, "kiwmi_server"); + lua_pushlightuserdata(L, server); + lua_settable(L, LUA_REGISTRYINDEX); + + // registry['kiwmi_events'] = {'key_down' = l_key_down, ...} + lua_pushliteral(L, "kiwmi_events"); + luaL_newlib(L, kiwmi_events); + lua_settable(L, LUA_REGISTRYINDEX); + + // register types + lua_callback_register(L); + kiwmi_view_register(L); + + // _G['kiwmi'] = kiwmi_lib + luaL_newlib(L, kiwmi_lib); + lua_setglobal(L, "kiwmi"); + + lua->L = L; + server->lua = lua; + + return true; +} + +bool +luaK_dofile(struct kiwmi_lua *lua, const char *config_path) +{ + if (luaL_dofile(lua->L, config_path)) { + wlr_log( + WLR_ERROR, "Error running config: %s", lua_tostring(lua->L, -1)); + return false; + } - server->L = L; return true; } diff --git a/kiwmi/server.c b/kiwmi/server.c index 5ac41ea..bf29c53 100644 --- a/kiwmi/server.c +++ b/kiwmi/server.c @@ -12,7 +12,6 @@ #include -#include #include #include #include @@ -111,9 +110,7 @@ server_run(struct kiwmi_server *server) setenv("WAYLAND_DISPLAY", server->socket, true); - if (luaL_dofile(server->L, server->config_path)) { - wlr_log( - WLR_ERROR, "Error running config: %s", lua_tostring(server->L, -1)); + if (!luaK_dofile(server->lua, server->config_path)) { wl_display_destroy(server->wl_display); return false; }