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

Pass arguments to on("cursor_button")

Browse source 
Loses the genericity, but I don't think we have a choice.
This commit is contained in:
Tadeo Kondrak 2019-12-30 22:15:58 -07:00
parent 849cda7021
commit 23a387a217
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
kiwmi/luak.c
View file

@ -145,17 +145,6 @@ get_server(lua_State *L)
return server; 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 static int
l_on(lua_State *L) l_on(lua_State *L)
{ {
@ -176,6 +165,26 @@ l_on(lua_State *L)
return register_callback(L); return register_callback(L);
} }
static void
on_cursor_button_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 wlr_event_pointer_button *event = data;
lua_rawgeti(L, LUA_REGISTRYINDEX, lc->callback_ref);
lua_pushinteger(L, event->state);
lua_pushinteger(L, event->button);
lua_pushinteger(L, event->time_msec);
lua_pushlightuserdata(L, event->device); // TODO: make un-opaque
if (lua_pcall(L, 4, 0, 0)) {
wlr_log(WLR_ERROR, "%s", lua_tostring(L, 1));
}
}
static int static int
on_cursor_button(lua_State *L) on_cursor_button(lua_State *L)
{ {
@ -192,7 +201,7 @@ on_cursor_button(lua_State *L)
lc->server = server; lc->server = server;
lc->callback_ref = luaL_ref(L, LUA_REGISTRYINDEX); lc->callback_ref = luaL_ref(L, LUA_REGISTRYINDEX);
lc->listener.notify = lua_callback_listener_notify; lc->listener.notify = on_cursor_button_notify;
wl_signal_add(&cursor->cursor->events.button, &lc->listener); wl_signal_add(&cursor->cursor->events.button, &lc->listener);
lua_pushlightuserdata(L, lc); lua_pushlightuserdata(L, lc);