From 7cdcd44e0ca10ebdc796638190ed1d9b45d99ef0 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Mon, 15 Jan 2024 12:31:20 +1100 Subject: Begin migration of remaining screens to Lua --- lib/luavgl/src/widgets/slider.c | 88 ++++++++++++++++++++++++++++++++++++++++ lib/luavgl/src/widgets/switch.c | 57 ++++++++++++++++++++++++++ lib/luavgl/src/widgets/widgets.c | 24 +++++++++++ 3 files changed, 169 insertions(+) create mode 100644 lib/luavgl/src/widgets/slider.c create mode 100644 lib/luavgl/src/widgets/switch.c (limited to 'lib/luavgl/src/widgets') diff --git a/lib/luavgl/src/widgets/slider.c b/lib/luavgl/src/widgets/slider.c new file mode 100644 index 00000000..c385f6bb --- /dev/null +++ b/lib/luavgl/src/widgets/slider.c @@ -0,0 +1,88 @@ +#include "lua.h" +#include "luavgl.h" +#include "private.h" +#include + +static int luavgl_slider_create(lua_State *L) { + return luavgl_obj_create_helper(L, lv_slider_create); +} + +static void _lv_slider_set_range(void *obj, lua_State *L) { + int min = 0, max = 100; + + int type = lua_type(L, -1); + if (type == LUA_TTABLE) { + lua_getfield(L, -1, "min"); + min = lua_tointeger(L, -1); + lua_pop(L, 1); + lua_getfield(L, -1, "max"); + max = luavgl_tointeger(L, -1); + lua_pop(L, 1); + } + + lv_slider_set_range(obj, min, max); +} + +static void _lv_slider_set_value(void *obj, int value) { + lv_slider_set_value(obj, value, LV_ANIM_OFF); +} + +static const luavgl_value_setter_t slider_property_table[] = { + {"range", SETTER_TYPE_STACK, {.setter_stack = _lv_slider_set_range}}, + {"value", SETTER_TYPE_INT, {.setter = (setter_int_t)_lv_slider_set_value}}, +}; + +LUALIB_API int luavgl_slider_set_property_kv(lua_State *L, void *data) { + lv_obj_t *obj = data; + int ret = luavgl_set_property(L, obj, slider_property_table); + + if (ret == 0) { + return 0; + } + /* a base obj property? */ + ret = luavgl_obj_set_property_kv(L, obj); + if (ret != 0) { + debug("unkown property for slider.\n"); + } + + return ret; +} + +static int luavgl_slider_set(lua_State *L) { + lv_obj_t *obj = luavgl_to_obj(L, 1); + + if (!lua_istable(L, -1)) { + luaL_error(L, "expect a table on 2nd para."); + return 0; + } + + luavgl_iterate(L, -1, luavgl_slider_set_property_kv, obj); + + return 0; +} + +static int luavgl_slider_value(lua_State *L) { + lv_obj_t *obj = luavgl_to_obj(L, 1); + lua_pushinteger(L, lv_slider_get_value(obj)); + return 1; +} + +static int luavgl_slider_tostring(lua_State *L) { + lv_obj_t *obj = luavgl_to_obj(L, 1); + lua_pushfstring(L, "lv_slider:%p", obj); + return 1; +} + +static const luaL_Reg luavgl_slider_methods[] = { + {"set", luavgl_slider_set}, + {"value", luavgl_slider_value}, + {NULL, NULL}, +}; + +static void luavgl_slider_init(lua_State *L) { + luavgl_obj_newmetatable(L, &lv_slider_class, "lv_slider", + luavgl_slider_methods); + lua_pushcfunction(L, luavgl_slider_tostring); + lua_setfield(L, -2, "__tostring"); + lua_pop(L, 1); +} diff --git a/lib/luavgl/src/widgets/switch.c b/lib/luavgl/src/widgets/switch.c new file mode 100644 index 00000000..e66f620e --- /dev/null +++ b/lib/luavgl/src/widgets/switch.c @@ -0,0 +1,57 @@ +#include "luavgl.h" +#include "private.h" +#include + +static int luavgl_switch_create(lua_State *L) { + return luavgl_obj_create_helper(L, lv_switch_create); +} + +LUALIB_API int luavgl_switch_set_property_kv(lua_State *L, void *data) { + lv_obj_t *obj = data; + /* switches only use base properties */ + int ret = luavgl_obj_set_property_kv(L, obj); + if (ret != 0) { + debug("unkown property for switch.\n"); + } + + return ret; +} + +static int luavgl_switch_set(lua_State *L) { + lv_obj_t *obj = luavgl_to_obj(L, 1); + + if (!lua_istable(L, -1)) { + luaL_error(L, "expect a table on 2nd para."); + return 0; + } + + luavgl_iterate(L, -1, luavgl_switch_set_property_kv, obj); + + return 0; +} + +static int luavgl_switch_enabled(lua_State *L) { + lv_obj_t *obj = luavgl_to_obj(L, 1); + lua_pushboolean(L, lv_obj_has_state(obj, LV_STATE_CHECKED)); + return 1; +} + +static int luavgl_switch_tostring(lua_State *L) { + lv_obj_t *obj = luavgl_to_obj(L, 1); + lua_pushfstring(L, "lv_switch:%p", obj); + return 1; +} + +static const luaL_Reg luavgl_switch_methods[] = { + {"set", luavgl_switch_set}, + {"enabled", luavgl_switch_enabled}, + {NULL, NULL}, +}; + +static void luavgl_switch_init(lua_State *L) { + luavgl_obj_newmetatable(L, &lv_switch_class, "lv_switch", + luavgl_switch_methods); + lua_pushcfunction(L, luavgl_switch_tostring); + lua_setfield(L, -2, "__tostring"); + lua_pop(L, 1); +} diff --git a/lib/luavgl/src/widgets/widgets.c b/lib/luavgl/src/widgets/widgets.c index e5f64f23..4a7a126e 100644 --- a/lib/luavgl/src/widgets/widgets.c +++ b/lib/luavgl/src/widgets/widgets.c @@ -45,6 +45,14 @@ #include "roller.c" #endif +#if LV_USE_SLIDER +#include "slider.c" +#endif + +#if LV_USE_SWITCH +#include "switch.c" +#endif + #if LV_USE_TEXTAREA #include "textarea.c" #endif @@ -98,6 +106,14 @@ static const luaL_Reg widget_create_methods[] = { {"Roller", luavgl_roller_create }, #endif +#if LV_USE_SLIDER + {"Slider", luavgl_slider_create}, +#endif + +#if LV_USE_SWITCH + {"Switch", luavgl_switch_create}, +#endif + #if LV_USE_TEXTAREA {"Textarea", luavgl_textarea_create}, #endif @@ -154,4 +170,12 @@ static void luavgl_widgets_init(lua_State *L) luavgl_bar_init(L); #endif +#if LV_USE_SLIDER + luavgl_slider_init(L); +#endif + +#if LV_USE_SWITCH + luavgl_switch_init(L); +#endif + } -- cgit v1.2.3