From 8781f19de7fe4a2d97b7f10de9c26173f2a0a5cb Mon Sep 17 00:00:00 2001 From: Charlotte Meyer Date: Wed, 8 Jan 2020 21:38:32 +0000 Subject: [PATCH] Add output:on_resize, fix missing output:on --- include/desktop/output.h | 3 ++ kiwmi/desktop/output.c | 23 ++++++++++++++ kiwmi/luak/kiwmi_output.c | 65 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) diff --git a/include/desktop/output.h b/include/desktop/output.h index c1a246b..21597e4 100644 --- a/include/desktop/output.h +++ b/include/desktop/output.h @@ -16,9 +16,12 @@ struct kiwmi_output { struct wlr_output *wlr_output; struct wl_listener frame; struct wl_listener destroy; + struct wl_listener mode; + struct wl_listener transform; struct { struct wl_signal destroy; + struct wl_signal resize; } events; }; diff --git a/kiwmi/desktop/output.c b/kiwmi/desktop/output.c index 798a184..d1b1854 100644 --- a/kiwmi/desktop/output.c +++ b/kiwmi/desktop/output.c @@ -134,6 +134,22 @@ output_destroy_notify(struct wl_listener *listener, void *UNUSED(data)) free(output); } +static void +output_mode_notify(struct wl_listener *listener, void *UNUSED(data)) +{ + struct kiwmi_output *output = wl_container_of(listener, output, mode); + + wl_signal_emit(&output->events.resize, output); +} + +static void +output_transform_notify(struct wl_listener *listener, void *UNUSED(data)) +{ + struct kiwmi_output *output = wl_container_of(listener, output, transform); + + wl_signal_emit(&output->events.resize, output); +} + static struct kiwmi_output * output_create(struct wlr_output *wlr_output, struct kiwmi_desktop *desktop) { @@ -151,6 +167,12 @@ output_create(struct wlr_output *wlr_output, struct kiwmi_desktop *desktop) output->destroy.notify = output_destroy_notify; wl_signal_add(&wlr_output->events.destroy, &output->destroy); + output->mode.notify = output_mode_notify; + wl_signal_add(&wlr_output->events.mode, &output->mode); + + output->transform.notify = output_transform_notify; + wl_signal_add(&wlr_output->events.transform, &output->transform); + return output; } @@ -187,6 +209,7 @@ new_output_notify(struct wl_listener *listener, void *data) wlr_output_create_global(wlr_output); wl_signal_init(&output->events.destroy); + wl_signal_init(&output->events.resize); wl_signal_emit(&desktop->events.new_output, output); } diff --git a/kiwmi/luak/kiwmi_output.c b/kiwmi/luak/kiwmi_output.c index 5347335..32757fe 100644 --- a/kiwmi/luak/kiwmi_output.c +++ b/kiwmi/luak/kiwmi_output.c @@ -92,6 +92,7 @@ static const luaL_Reg kiwmi_output_methods[] = { {"auto", l_kiwmi_output_auto}, {"move", l_kiwmi_output_move}, {"name", l_kiwmi_output_name}, + {"on", luaK_callback_register_dispatch}, {"pos", l_kiwmi_output_pos}, {"size", l_kiwmi_output_size}, {NULL, NULL}, @@ -122,6 +123,45 @@ kiwmi_output_on_destroy_notify(struct wl_listener *listener, void *data) } } +static void +kiwmi_output_on_resize_notify(struct wl_listener *listener, void *data) +{ + struct kiwmi_lua_callback *lc = wl_container_of(listener, lc, listener); + struct kiwmi_server *server = lc->server; + lua_State *L = server->lua->L; + struct kiwmi_output *output = data; + + int width; + int height; + wlr_output_transformed_resolution(output->wlr_output, &width, &height); + + lua_rawgeti(L, LUA_REGISTRYINDEX, lc->callback_ref); + + lua_newtable(L); + + lua_pushcfunction(L, luaK_kiwmi_output_new); + lua_pushlightuserdata(L, output); + + if (lua_pcall(L, 1, 1, 0)) { + wlr_log(WLR_ERROR, "%s", lua_tostring(L, -1)); + lua_pop(L, 1); + return; + } + + lua_setfield(L, -2, "output"); + + lua_pushinteger(L, width); + lua_setfield(L, -2, "width"); + + lua_pushinteger(L, height); + lua_setfield(L, -2, "height"); + + if (lua_pcall(L, 1, 0, 0)) { + wlr_log(WLR_ERROR, "%s", lua_tostring(L, -1)); + lua_pop(L, 1); + } +} + static int l_kiwmi_output_on_destroy(lua_State *L) { @@ -146,8 +186,33 @@ l_kiwmi_output_on_destroy(lua_State *L) return 1; } +static int +l_kiwmi_output_on_resize(lua_State *L) +{ + struct kiwmi_output *output = + *(struct kiwmi_output **)luaL_checkudata(L, 1, "kiwmi_output"); + luaL_checktype(L, 2, LUA_TFUNCTION); + + struct kiwmi_desktop *desktop = output->desktop; + struct kiwmi_server *server = wl_container_of(desktop, server, desktop); + + lua_pushcfunction(L, luaK_kiwmi_lua_callback_new); + lua_pushlightuserdata(L, server); + lua_pushvalue(L, 2); + lua_pushlightuserdata(L, kiwmi_output_on_resize_notify); + lua_pushlightuserdata(L, &output->events.resize); + + if (lua_pcall(L, 4, 1, 0)) { + wlr_log(WLR_ERROR, "%s", lua_tostring(L, -1)); + return 0; + } + + return 1; +} + static const luaL_Reg kiwmi_output_events[] = { {"destroy", l_kiwmi_output_on_destroy}, + {"resize", l_kiwmi_output_on_resize}, {NULL, NULL}, };