kitchen/kiwmi
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add view event to kiwmi_server

Browse source
This commit is contained in:
buffet 2020-01-01 18:13:24 +00:00
parent 77f7d14fe1
commit e4256f5476
4 changed files with 57 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/desktop/desktop.h
View file

@ -22,6 +22,10 @@ struct kiwmi_desktop {
struct wl_listener xdg_shell_new_surface;
struct wl_listener new_output;
struct {
struct wl_signal view_map;
} events;
};
bool desktop_init(struct kiwmi_desktop *desktop, struct wlr_renderer *renderer);

2
kiwmi/desktop/desktop.c
View file

@ -49,5 +49,7 @@ desktop_init(struct kiwmi_desktop *desktop, struct wlr_renderer *renderer)
desktop->new_output.notify = new_output_notify;
wl_signal_add(&server->backend->events.new_output, &desktop->new_output);
wl_signal_init(&desktop->events.view_map);
return true;
}

3
kiwmi/desktop/xdg_shell.c
View file

@ -19,7 +19,8 @@ xdg_surface_map_notify(struct wl_listener *listener, void *UNUSED(data))
{
struct kiwmi_view *view = wl_container_of(listener, view, map);
view->mapped = true;
view_focus(view);
wl_signal_emit(&view->desktop->events.view_map, view);
}
static void

50
kiwmi/luak.c
View file

@ -244,6 +244,27 @@ on_cursor_button_notify(struct wl_listener *listener, void *data)
}
}
static void
on_view_notify(struct wl_listener *listener, void *data)
{
struct lua_callback *lc = wl_container_of(listener, lc, listener);
struct kiwmi_server *server = lc->server;
struct lua_State *L = server->lua->L;
struct kiwmi_view *view = data;
lua_rawgeti(L, LUA_REGISTRYINDEX, lc->callback_ref);
lua_pushcfunction(L, kiwmi_view_create);
lua_pushlightuserdata(L, view);
if (lua_pcall(L, 1, 1, 0)) {
wlr_log(WLR_ERROR, "%s", lua_tostring(L, -1));
}
if (lua_pcall(L, 1, 0, 0)) {
wlr_log(WLR_ERROR, "%s", lua_tostring(L, -1));
}
}
static int
on_cursor_button(lua_State *L)
{
@ -273,7 +294,33 @@ on_cursor_button(lua_State *L)
}
static int
l_quit(lua_State *L)
on_view(lua_State *L)
{
struct kiwmi_server *server =
*(struct kiwmi_server **)luaL_checkudata(L, 1, "kiwmi_server");
luaL_checktype(L, 2, LUA_TFUNCTION); // callback
struct lua_callback *lc = malloc(sizeof(*lc));
if (!lc) {
return luaL_error(L, "failed to allocate lua_callback");
}
wl_list_insert(&server->lua->callbacks, &lc->link);
lc->server = server;
lc->callback_ref = luaL_ref(L, LUA_REGISTRYINDEX);
lc->listener.notify = on_view_notify;
wl_signal_add(&server->desktop.events.view_map, &lc->listener);
lua_pushlightuserdata(L, lc);
lua_callback_create(L);
return 1;
}
static int
l_kiwmi_server_quit(lua_State *L)
{
struct kiwmi_server *server = *(struct kiwmi_server**)luaL_checkudata(L, 1, "kiwmi_server");
@ -351,6 +398,7 @@ kiwmi_server_register(lua_State *L)
static const luaL_Reg kiwmi_events[] = {
{"cursor_button", on_cursor_button},
{"view", on_view},
{NULL, NULL},
};