From 0d420c966517992b97c2cfbd830827b3d3a29f34 Mon Sep 17 00:00:00 2001 From: jim Date: Sun, 4 Mar 2018 08:32:52 +0800 Subject: [PATCH] 1.add api doc. 2.add lua generator --- .sconsign.dblite | Bin 122245 -> 131996 bytes SConstruct | 9 +- demos/SConscript | 7 +- demos/demo1_app.c | 6 +- demos/demo1_main.c | 19 +- demos/res/theme.data | 6 +- demos/resource.c | 2 +- lua/SConscript | 6 +- lua/button.lua | 32 + lua/custom.c | 92 + lua/demo1.c | 99 - lua/demo1.lua | 10 - lua/lftk_lua.c | 2597 ++++++++++++++++++++++++--- lua/lftk_run.c | 26 - lua/run_lua.c | 30 + lua/str.lua | 4 + lua/test.lua | 24 + lua/value.lua | 15 +- lua/window.lua | 20 + src/base/button.c | 16 +- src/base/button.h | 26 + src/base/check_button.c | 12 +- src/base/check_button.h | 54 +- src/base/dialog.c | 20 +- src/base/dialog.h | 51 + src/base/emitter.c | 56 +- src/base/emitter.h | 11 +- src/base/enums.c | 18 +- src/base/events.c | 36 + src/base/events.h | 151 +- src/base/group_box.h | 18 + src/base/image.h | 28 + src/base/label.c | 8 +- src/base/label.h | 70 +- src/base/lftk.c | 51 + src/base/lftk.h | 65 + src/base/main_loop.h | 4 +- src/base/progress_bar.c | 8 +- src/base/progress_bar.h | 61 +- src/base/rect.h | 52 +- src/base/theme.c | 8 +- src/base/theme.h | 130 +- src/base/types_def.h | 43 + src/base/value.c | 21 +- src/base/value.h | 10 +- src/base/widget.c | 60 +- src/base/widget.h | 575 +++++- src/base/window.c | 2 +- src/base/window.h | 18 + src/base/window_manager.h | 5 + src/main_loop/main_loop_rtthread.c | 4 +- src/main_loop/main_loop_rtthread.h | 2 +- src/main_loop/main_loop_sdl2.c | 4 +- src/main_loop/main_loop_sdl2.h | 2 +- src/main_loop/main_loop_stm32_raw.c | 4 +- src/main_loop/main_loop_stm32_raw.h | 2 +- src/ui_loader/ui_builder_default.c | 2 +- tests/button_test.cc | 4 +- tests/common.cc | 2 +- tests/emitter_test.cc | 2 +- tests/theme_gen_test.cc | 24 +- tests/ui_loader_default_test.cc | 4 +- tests/ui_loader_xml_test.cc | 4 +- tests/widget_test.cc | 29 +- tools/idl_gen/.vscode/launch.json | 20 + tools/idl_gen/gen_idl.js | 35 +- tools/idl_gen/gen_lua.js | 328 +++- tools/idl_gen/idl.json | 1511 +++++++++++++++- 68 files changed, 5982 insertions(+), 693 deletions(-) create mode 100644 lua/button.lua create mode 100644 lua/custom.c delete mode 100644 lua/demo1.c delete mode 100644 lua/demo1.lua delete mode 100644 lua/lftk_run.c create mode 100644 lua/run_lua.c create mode 100644 lua/str.lua create mode 100644 lua/test.lua create mode 100644 lua/window.lua create mode 100644 src/base/events.c create mode 100755 src/base/lftk.c create mode 100755 src/base/lftk.h create mode 100644 tools/idl_gen/.vscode/launch.json diff --git a/.sconsign.dblite b/.sconsign.dblite index 2d69ac22d6de02baffd6d9f43bb9ef24bcfd3f28..cd1c864e13ad170116d7dbd58095dfb30525306e 100644 GIT binary patch delta 47235 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 delta 39079 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 diff --git a/SConstruct b/SConstruct index 87387dad4..648e28b9d 100644 --- a/SConstruct +++ b/SConstruct @@ -28,7 +28,8 @@ os.environ['LFTK_ROOT'] = LFTK_ROOT; os.environ['GTEST_ROOT'] = GTEST_ROOT; DefaultEnvironment(CCFLAGS = OS_FLAGS + ' -DLFTK_ROOT=\\\"'+LFTK_ROOT+'\\\"', - CPPPATH = [LFTK_SRC, LFTK_3RD_ROOT, LFTK_TOOLS_ROOT] + OS_CPPPATH, + CPPPATH = [LFTK_ROOT, LFTK_SRC, LFTK_3RD_ROOT, LFTK_TOOLS_ROOT, + ] + OS_CPPPATH, LIBS=['lftk_base', 'platform'] + OS_LIBS, LINKFLAGS=OS_LINKFLAGS, OS_SUBSYSTEM_CONSOLE=OS_SUBSYSTEM_CONSOLE, @@ -44,6 +45,7 @@ DefaultEnvironment(CCFLAGS = OS_FLAGS + ' -DLFTK_ROOT=\\\"'+LFTK_ROOT+'\\\"', os.path.join(LFTK_ROOT, 'src/image_loader'), os.path.join(LFTK_ROOT, 'tools/common'), os.path.join(LFTK_ROOT, 'tools/font_gen'), + os.path.join(LFTK_ROOT, 'demos'), os.path.join(LFTK_ROOT, 'tools/image_gen'), os.path.join(LFTK_ROOT, 'tools/theme_gen')] + OS_LIBPATH) @@ -61,5 +63,6 @@ SConscript([ 'tools/theme_gen/SConscript', 'tools/font_gen/SConscript', 'tools/image_gen/SConscript', - 'lua/SConscript', - 'tests/SConscript']) + 'tests/SConscript', + 'lua/SConscript' + ]) diff --git a/demos/SConscript b/demos/SConscript index 5b6b71c71..51e04d740 100644 --- a/demos/SConscript +++ b/demos/SConscript @@ -1,9 +1,12 @@ import os env=DefaultEnvironment().Clone(); -env['LIBS'] = ['sdl_main_loop', 'sdl_lcd', 'SDL2', 'fontbitmap', 'imageloaderbitmap'] + env['LIBS'] + +env.Library('resource', ['resource.c']); + +env['LIBS'] = ['resource', 'sdl_main_loop', 'sdl_lcd', 'SDL2', 'fontbitmap', 'imageloaderbitmap'] + env['LIBS'] env['LINKFLAGS'] = env['OS_SUBSYSTEM_WINDOWS'] + env['LINKFLAGS']; -env.Program('demo1', ['demo1_main.c', 'demo1_app.c', 'resource.c']); +env.Program('demo1', ['demo1_main.c', 'demo1_app.c']); diff --git a/demos/demo1_app.c b/demos/demo1_app.c index adeabc3af..68ce7f9d1 100644 --- a/demos/demo1_app.c +++ b/demos/demo1_app.c @@ -159,13 +159,13 @@ ret_t application_init() { check_button = check_button_create(win, 100, 150, 80, 30); widget_set_text(check_button, L"Food"); - radio_button = radio_button_create(win, 10, 200, 80, 30); + radio_button = check_button_create_radio(win, 10, 200, 80, 30); widget_set_text(radio_button, L"Book"); - radio_button = radio_button_create(win, 100, 200, 80, 30); + radio_button = check_button_create_radio(win, 100, 200, 80, 30); widget_set_text(radio_button, L"Food"); - radio_button = radio_button_create(win, 190, 200, 80, 30); + radio_button = check_button_create_radio(win, 190, 200, 80, 30); widget_set_text(radio_button, L"Pencil"); widget_set_value(radio_button, TRUE); diff --git a/demos/demo1_main.c b/demos/demo1_main.c index dbf45729c..d90a717df 100644 --- a/demos/demo1_main.c +++ b/demos/demo1_main.c @@ -20,7 +20,7 @@ */ #include "resource.h" -#include "base/platform.h" +#include "base/lftk.h" ret_t application_init(void); @@ -59,25 +59,12 @@ int WINAPI WinMain(HINSTANCE hinstance, HINSTANCE hprevinstance, LPSTR lpcmdline int main(void) { #endif - platform_prepare(); - mem_init(s_heap_mem, sizeof(s_heap_mem)); + lftk_init(320, 480, s_heap_mem, sizeof(s_heap_mem)); resource_init(); application_init(); -#ifdef WITH_STM32F103ZE_RAW - main_loop_stm32_raw_init(320, 480); -#elif defined(WITH_RT_THREAD) - main_loop_rtthread_init(320, 480); -#else - main_loop_sdl2_init(320, 480); -#endif - - application_init(); - - main_loop_run(default_main_loop()); - - main_loop_destroy(default_main_loop()); + lftk_run(); return 0; } diff --git a/demos/res/theme.data b/demos/res/theme.data index cffe61053..fe54175ac 100644 --- a/demos/res/theme.data +++ b/demos/res/theme.data @@ -2,9 +2,9 @@ const unsigned char theme_data[] = { 0xfd,0xfc,0xfb,0xfa,0x00,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x6c,0x00,0x00,0x00, 0x01,0x00,0x04,0x00,0x95,0x00,0x00,0x00,0x01,0x00,0x07,0x00,0xce,0x00,0x00,0x00,0x02,0x00,0x07,0x00, 0xee,0x00,0x00,0x00,0x03,0x00,0x07,0x00,0x0e,0x01,0x00,0x00,0x04,0x00,0x07,0x00,0x2e,0x01,0x00,0x00, -0x01,0x00,0x06,0x00,0x4e,0x01,0x00,0x00,0x01,0x00,0x0a,0x00,0x6e,0x01,0x00,0x00,0x07,0x00,0x0c,0x00, -0x96,0x01,0x00,0x00,0x08,0x00,0x0c,0x00,0xba,0x01,0x00,0x00,0x07,0x00,0x0d,0x00,0xe0,0x01,0x00,0x00, -0x08,0x00,0x0d,0x00,0x0a,0x02,0x00,0x00,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff, +0x01,0x00,0x06,0x00,0x4e,0x01,0x00,0x00,0x01,0x00,0x0a,0x00,0x6e,0x01,0x00,0x00,0x06,0x00,0x0c,0x00, +0x96,0x01,0x00,0x00,0x07,0x00,0x0c,0x00,0xba,0x01,0x00,0x00,0x06,0x00,0x0d,0x00,0xe0,0x01,0x00,0x00, +0x07,0x00,0x0d,0x00,0x0a,0x02,0x00,0x00,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff, 0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x04,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x03,0x00,0x00,0x00,0x73,0x61,0x6e,0x73,0x00,0x05,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0, 0xff,0x02,0x00,0x00,0x00,0x80,0x80,0x80,0xff,0x09,0x00,0x00,0x00,0x80,0x80,0x80,0xff,0x06,0x00,0x00, diff --git a/demos/resource.c b/demos/resource.c index 2b5029b82..ef42994d8 100644 --- a/demos/resource.c +++ b/demos/resource.c @@ -35,7 +35,7 @@ #include "image_loader/image_loader_bitmap.h" ret_t resource_init() { - default_theme_init(theme_data); + theme_init(theme_data); image_loader_t* bitmap_loader = image_loader_bitmap_create(10); font_manager_add(default_fm(), font_bitmap_create(font_font20)); diff --git a/lua/SConscript b/lua/SConscript index de1040e2d..fd21c10d9 100644 --- a/lua/SConscript +++ b/lua/SConscript @@ -3,10 +3,8 @@ import sys env=DefaultEnvironment().Clone() -env['LIBS'] = ['lua'] + env['LIBS'] -env.Library('lftk_lua', ['lftk_lua.c']) -env.Program('lftk_run', ["lftk_run.c", 'lftk_lua.c']) -env.Program('demo1', ["demo1.c"]) +env['LIBS'] = ['resource', 'sdl_main_loop', 'sdl_lcd', 'SDL2', 'fontbitmap', 'imageloaderbitmap', 'lua'] + env['LIBS'] +env.Program('run_lua', ["run_lua.c", 'lftk_lua.c']) diff --git a/lua/button.lua b/lua/button.lua new file mode 100644 index 000000000..acfc396eb --- /dev/null +++ b/lua/button.lua @@ -0,0 +1,32 @@ +function on_click(ctx, evt) + print('on_click'); +end + +function application_init() + local win = Window.create(NULL, 0, 0, 0, 0); + ok = Button.create(win, 10, 5, 80, 30); + ok:set_text(to_wstr("ok")); + + print(ok, getmetatable(ok)); + label = Label.create(win, 100, 5, 80, 30); + label:set_text(to_wstr("text")); + print(ok, getmetatable(ok)); + print(label, getmetatable(label)); + + rid = ok:on(EventType.EVT_CLICK, function(evt) + print(ok, getmetatable(ok)); + print(evt, getmetatable(evt)); + local e = PointerEvent.cast(evt); + print(ok, getmetatable(ok)); + print(e, getmetatable(e)); + print("on click:" .. tostring(e.x) .. " " .. tostring(e.y)) + -- ok:off(rid) + return Ret.OK; + end); + + print(tostring(rid)) +end + +application_init() + + diff --git a/lua/custom.c b/lua/custom.c new file mode 100644 index 000000000..fb23fa593 --- /dev/null +++ b/lua/custom.c @@ -0,0 +1,92 @@ + +static lua_State* s_current_L = NULL; +extern void luaL_openlib (lua_State *L, const char *libname, const luaL_Reg *l, int nup); + +static const luaL_Reg* find_member(const luaL_Reg* funcs, const char* name) { + const luaL_Reg* iter = funcs; + + while(iter->name) { + if(strcmp(iter->name, name) == 0) { + return iter; + } + iter++; + } + + return NULL; +} + +static void* lftk_checkudata(lua_State* L, int idx, const char* name) { + (void)name; + return lua_touserdata(L, idx); +} + +static ret_t call_on_event(void* ctx, event_t* e) { + lua_State* L = (lua_State*)s_current_L; + int func_id = (char*)ctx - (char*)NULL; + + lua_settop(L, 0); + lua_rawgeti(L, LUA_REGISTRYINDEX, func_id); + lua_pushlightuserdata(L, e); + + lua_pcall(L,1,1,0); + + return RET_OK; +} + +static int wrap_widget_on(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + event_type_t type = (event_type_t)luaL_checkinteger(L, 2); + + if(lua_isfunction(L, 3)) { + int func_id = 0; + lua_pushvalue(L, 3); + func_id = luaL_ref(L, LUA_REGISTRYINDEX); + ret = (ret_t)widget_on(widget, type, call_on_event, (char*)NULL + func_id); + lua_pushnumber(L,(lua_Number)ret); + return 1; + } else { + return 0; + } +} + +static int wrap_widget_off(lua_State* L) { + ret_t ret = 0; + printf("top=%d\n", lua_gettop(L)); + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint32_t id = (uint32_t)luaL_checkinteger(L, 2); + emitter_item_t* item = emitter_find(widget->emitter, id); + printf("%s id=%d\n", __func__, id); + if(item) { + uint32_t func_id = (char*)(item->ctx) - (char*)NULL; + luaL_unref(L, LUA_REGISTRYINDEX, func_id); + ret = (ret_t)widget_off(widget, id); + } + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int to_wstr(lua_State* L) { + const char* str = (const char*)luaL_checkstring(L, 1); + uint32_t size = (strlen(str) + 1) * sizeof(wchar_t); + wchar_t* p = (wchar_t*)lua_newuserdata(L, size); + + utf8_to_utf16(str, p, size); + lua_pushlightuserdata(L, p); + + return 1; +} + +static int to_str(lua_State* L) { + const wchar_t* str = (const wchar_t*)lua_touserdata(L, 1); + uint32_t size = (wcslen(str) + 1) * 3; + char* p = (char*)lua_newuserdata(L, size); + + utf8_from_utf16(str, p, size); + lua_pushstring(L, p); + + return 1; +} + diff --git a/lua/demo1.c b/lua/demo1.c deleted file mode 100644 index bc9348405..000000000 --- a/lua/demo1.c +++ /dev/null @@ -1,99 +0,0 @@ -#define LUA_COMPAT_MODULE -#include -#include -#include -#include -#include -#include -#include - -typedef struct _NumArray { - int size; - int values[1]; -} NumArray; - -static NumArray *checkarray (lua_State *L) { - void *ud = luaL_checkudata(L, 1, "lftk.array"); - luaL_argcheck(L, ud != NULL, 1, "`array' expected"); - return (NumArray *)ud; -} - -static int newarray(lua_State* L) { - int n = luaL_checkint(L, 1); - size_t nbytes = sizeof(NumArray) + (n - 1) * sizeof(double); - NumArray* a = (NumArray*)calloc(1, nbytes); - - lua_pushlightuserdata(L, (void*)a); - luaL_getmetatable(L, "lftk.array"); - lua_setmetatable(L, -2); - - a->size = n; - - return 1; /* new userdatum is already on the stack */ -} - -static int setarray(lua_State* L) { - NumArray* a = checkarray(L); - - int index = luaL_checkint(L, 2); - double value = luaL_checknumber(L, 3); - luaL_argcheck(L, a != NULL, 1, "`array' expected"); - luaL_argcheck(L, 1 <= index && index <= a->size, 2, "index out of range"); - - a->values[index - 1] = value; - - return 0; -} - -static int getarray(lua_State* L) { - NumArray* a = checkarray(L); - - int index = luaL_checkint(L, 2); - luaL_argcheck(L, a != NULL, 1, "'array' expected"); - luaL_argcheck(L, 1 <= index && index <= a->size, 2, "index out of range"); - - lua_pushnumber(L, a->values[index - 1]); - - return 1; -} - -static int getsize(lua_State* L) { - NumArray* a = checkarray(L); - luaL_argcheck(L, a != NULL, 1, "`array' expected"); - - lua_pushnumber(L, a->size); - - return 1; -} - -static const struct luaL_Reg arraylib_f[] = {{"new", newarray}, {NULL, NULL}}; - -static const struct luaL_Reg arraylib_m[] = { - {"set", setarray}, {"get", getarray}, {"size", getsize}, {NULL, NULL}}; - -int luaopen_array(lua_State* L) { - luaL_newmetatable(L, "lftk.array"); - lua_pushstring(L, "__index"); - lua_pushvalue(L, -2); /* pushes the metatable */ - lua_settable(L, -3); /* metatable.__index = metatable */ - - luaL_openlib(L, NULL, arraylib_m, 0); - luaL_openlib(L, "array", arraylib_f, 0); - - return 1; -} - -int main(void) { - lua_State* L = luaL_newstate(); // 创建Lua状态机。 - luaL_openlibs(L); // 打开Lua状态机"L"中的所有Lua标准库。 - luaopen_array(L); - - if(luaL_dofile(L, "./demo1.lua")) { - fprintf(stderr, "%s\n", lua_tostring(L, -1)); - lua_pop(L, 1); - } - - lua_close(L); // 关闭Lua状态机。 - - return 0; -} diff --git a/lua/demo1.lua b/lua/demo1.lua deleted file mode 100644 index 3b5c216ae..000000000 --- a/lua/demo1.lua +++ /dev/null @@ -1,10 +0,0 @@ -print("hello") - -a = array.new(1000) - -print(a:size()) --> 1000 - -a:set(10, 3.4) - -print(a:get(10)) --> 3.4 - diff --git a/lua/lftk_lua.c b/lua/lftk_lua.c index 3bf298bf0..f54ca9e57 100644 --- a/lua/lftk_lua.c +++ b/lua/lftk_lua.c @@ -1,401 +1,1854 @@ -#define LUA_COMPAT_MODULE +/*XXX: generated by lua_gen. dont edit it.*/ #include "lua.h" +#include "lualib.h" #include "lauxlib.h" +#include "base/utf8.h" +#include "base/button.h" +#include "base/check_button.h" +#include "base/dialog.h" +#include "base/events.h" +#include "base/group_box.h" +#include "base/image.h" +#include "base/label.h" +#include "base/lftk.h" +#include "base/progress_bar.h" +#include "base/rect.h" +#include "base/theme.h" +#include "base/types_def.h" #include "base/value.h" +#include "base/widget.h" +#include "base/window_manager.h" +#include "base/window.h" + +#include "custom.c" + +static int wrap_button_t_get_prop(lua_State* L); +static int wrap_button_t_set_prop(lua_State* L); +static int wrap_check_button_t_get_prop(lua_State* L); +static int wrap_check_button_t_set_prop(lua_State* L); +static int wrap_dialog_t_get_prop(lua_State* L); +static int wrap_dialog_t_set_prop(lua_State* L); +static int wrap_event_t_get_prop(lua_State* L); +static int wrap_event_t_set_prop(lua_State* L); +static int wrap_pointer_event_t_get_prop(lua_State* L); +static int wrap_pointer_event_t_set_prop(lua_State* L); +static int wrap_key_event_t_get_prop(lua_State* L); +static int wrap_key_event_t_set_prop(lua_State* L); +static int wrap_group_box_t_get_prop(lua_State* L); +static int wrap_group_box_t_set_prop(lua_State* L); +static int wrap_image_t_get_prop(lua_State* L); +static int wrap_image_t_set_prop(lua_State* L); +static int wrap_label_t_get_prop(lua_State* L); +static int wrap_label_t_set_prop(lua_State* L); +static int wrap_progress_bar_t_get_prop(lua_State* L); +static int wrap_progress_bar_t_set_prop(lua_State* L); +static int wrap_point_t_get_prop(lua_State* L); +static int wrap_point_t_set_prop(lua_State* L); +static int wrap_rect_t_get_prop(lua_State* L); +static int wrap_rect_t_set_prop(lua_State* L); +static int wrap_style_t_get_prop(lua_State* L); +static int wrap_style_t_set_prop(lua_State* L); +static int wrap_theme_t_get_prop(lua_State* L); +static int wrap_theme_t_set_prop(lua_State* L); +static int wrap_value_t_get_prop(lua_State* L); +static int wrap_value_t_set_prop(lua_State* L); +static int wrap_widget_t_get_prop(lua_State* L); +static int wrap_widget_t_set_prop(lua_State* L); +static int wrap_window_manager_t_get_prop(lua_State* L); +static int wrap_window_manager_t_set_prop(lua_State* L); +static int wrap_window_t_get_prop(lua_State* L); +static int wrap_window_t_set_prop(lua_State* L); + +static int wrap_lftk_quit(lua_State* L) { + ret_t ret = 0; + ret = (ret_t)lftk_quit(); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static void globals_init(lua_State* L) { + lua_pushcfunction(L, wrap_lftk_quit); + lua_setglobal(L, "lftk_quit"); + lua_pushcfunction(L, to_str); + lua_setglobal(L, "to_str"); + lua_pushcfunction(L, to_wstr); + lua_setglobal(L, "to_wstr"); +} + +static int wrap_button_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)button_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.button_t"); + lua_setmetatable(L, -2); + + return 1; +} + +static int wrap_button_set_text(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + wchar_t* text = (wchar_t*)lua_touserdata(L, 2); + ret = (ret_t)button_set_text(widget, text); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + + +static const struct luaL_Reg button_t_member_funcs[] = { + {"set_text", wrap_button_set_text}, + {NULL, NULL} +}; + +static int wrap_button_t_set_prop(lua_State* L) { + button_t* obj = (button_t*)lftk_checkudata(L, 1, "lftk.button_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + return wrap_widget_t_set_prop(L); + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_button_t_get_prop(lua_State* L) { + button_t* obj = (button_t*)lftk_checkudata(L, 1, "lftk.button_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(button_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void button_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_button_create}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_button_t_get_prop}, + {"__newindex", wrap_button_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.button_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Button", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_check_button_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)check_button_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.check_button_t"); + lua_setmetatable(L, -2); + + return 1; +} + +static int wrap_check_button_create_radio(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)check_button_create_radio(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.check_button_t"); + lua_setmetatable(L, -2); + + return 1; +} + +static int wrap_check_button_set_text(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + wchar_t* text = (wchar_t*)lua_touserdata(L, 2); + ret = (ret_t)check_button_set_text(widget, text); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_check_button_set_value(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint32_t value = (uint32_t)luaL_checkinteger(L, 2); + ret = (ret_t)check_button_set_value(widget, value); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + + +static const struct luaL_Reg check_button_t_member_funcs[] = { + {"set_text", wrap_check_button_set_text}, + {"set_value", wrap_check_button_set_value}, + {NULL, NULL} +}; + +static int wrap_check_button_t_set_prop(lua_State* L) { + check_button_t* obj = (check_button_t*)lftk_checkudata(L, 1, "lftk.check_button_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "value") == 0) { + printf("value is readonly\n"); + return 0; + } + else { + return wrap_widget_t_set_prop(L); + } +} + +static int wrap_check_button_t_get_prop(lua_State* L) { + check_button_t* obj = (check_button_t*)lftk_checkudata(L, 1, "lftk.check_button_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(check_button_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "value") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->value)); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void check_button_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_check_button_create}, + {"create_radio", wrap_check_button_create_radio}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_check_button_t_get_prop}, + {"__newindex", wrap_check_button_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.check_button_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "CheckButton", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_dialog_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)dialog_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.dialog_t"); + lua_setmetatable(L, -2); + + return 1; +} + +static int wrap_dialog_set_icon(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + char* name = (char*)luaL_checkstring(L, 2); + ret = (ret_t)dialog_set_icon(widget, name); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_dialog_set_title(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + wchar_t* title = (wchar_t*)lua_touserdata(L, 2); + ret = (ret_t)dialog_set_title(widget, title); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_dialog_modal(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + ret = (ret_t)dialog_modal(widget); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_dialog_quit(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint32_t code = (uint32_t)luaL_checkinteger(L, 2); + ret = (ret_t)dialog_quit(widget, code); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + + +static const struct luaL_Reg dialog_t_member_funcs[] = { + {"set_icon", wrap_dialog_set_icon}, + {"set_title", wrap_dialog_set_title}, + {"modal", wrap_dialog_modal}, + {"quit", wrap_dialog_quit}, + {NULL, NULL} +}; + +static int wrap_dialog_t_set_prop(lua_State* L) { + dialog_t* obj = (dialog_t*)lftk_checkudata(L, 1, "lftk.dialog_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + return wrap_widget_t_set_prop(L); + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_dialog_t_get_prop(lua_State* L) { + dialog_t* obj = (dialog_t*)lftk_checkudata(L, 1, "lftk.dialog_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(dialog_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void dialog_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_dialog_create}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_dialog_t_get_prop}, + {"__newindex", wrap_dialog_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.dialog_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Dialog", static_funcs, 0); + lua_settop(L, 0); +} +static void event_type_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "EventType"); + lua_getglobal(L, "EventType"); + + lua_pushstring(L, "EVT_NONE"); + lua_pushinteger(L, EVT_NONE); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_POINTER_DOWN"); + lua_pushinteger(L, EVT_POINTER_DOWN); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_POINTER_MOVE"); + lua_pushinteger(L, EVT_POINTER_MOVE); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_POINTER_UP"); + lua_pushinteger(L, EVT_POINTER_UP); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_POINTER_ENTER"); + lua_pushinteger(L, EVT_POINTER_ENTER); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_POINTER_LEAVE"); + lua_pushinteger(L, EVT_POINTER_LEAVE); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_CLICK"); + lua_pushinteger(L, EVT_CLICK); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_KEY_DOWN"); + lua_pushinteger(L, EVT_KEY_DOWN); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_KEY_UP"); + lua_pushinteger(L, EVT_KEY_UP); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_MOVE"); + lua_pushinteger(L, EVT_MOVE); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_RESIZE"); + lua_pushinteger(L, EVT_RESIZE); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_DESTROY"); + lua_pushinteger(L, EVT_DESTROY); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_MOVE_RESIZE"); + lua_pushinteger(L, EVT_MOVE_RESIZE); + lua_settable(L, -3); + + lua_pushstring(L, "EVT_PROP_CHANGED"); + lua_pushinteger(L, EVT_PROP_CHANGED); + lua_settable(L, -3); + +} + + +static const struct luaL_Reg event_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_event_t_set_prop(lua_State* L) { + event_t* obj = (event_t*)lftk_checkudata(L, 1, "lftk.event_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "type") == 0) { + printf("type is readonly\n"); + return 0; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 0; + } +} + +static int wrap_event_t_get_prop(lua_State* L) { + event_t* obj = (event_t*)lftk_checkudata(L, 1, "lftk.event_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(event_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "type") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->type)); + return 1; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 1; + } +} + +static void event_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_event_t_get_prop}, + {"__newindex", wrap_event_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.event_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Event", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_pointer_event_cast(lua_State* L) { + pointer_event_t* ret = NULL; + event_t* event = (event_t*)lftk_checkudata(L, 1, "lftk.event_t"); + ret = (pointer_event_t*)pointer_event_cast(event); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.pointer_event_t"); + lua_setmetatable(L, -2); + + return 1; +} + + +static const struct luaL_Reg pointer_event_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_pointer_event_t_set_prop(lua_State* L) { + pointer_event_t* obj = (pointer_event_t*)lftk_checkudata(L, 1, "lftk.pointer_event_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "x") == 0) { + printf("x is readonly\n"); + return 0; + } + else if(strcmp(name, "y") == 0) { + printf("y is readonly\n"); + return 0; + } + else if(strcmp(name, "button") == 0) { + printf("button is readonly\n"); + return 0; + } + else if(strcmp(name, "pressed") == 0) { + printf("pressed is readonly\n"); + return 0; + } + else { + return wrap_event_t_set_prop(L); + } +} + +static int wrap_pointer_event_t_get_prop(lua_State* L) { + pointer_event_t* obj = (pointer_event_t*)lftk_checkudata(L, 1, "lftk.pointer_event_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(pointer_event_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "x") == 0) { + lua_pushnumber(L,(lua_Number)(obj->x)); + return 1; + } + else if(strcmp(name, "y") == 0) { + lua_pushnumber(L,(lua_Number)(obj->y)); + return 1; + } + else if(strcmp(name, "button") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->button)); + return 1; + } + else if(strcmp(name, "pressed") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->pressed)); + return 1; + } + else { + return wrap_event_t_get_prop(L); + } +} + +static void pointer_event_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"cast", wrap_pointer_event_cast}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_pointer_event_t_get_prop}, + {"__newindex", wrap_pointer_event_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.pointer_event_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "PointerEvent", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_key_event_cast(lua_State* L) { + key_event_t* ret = NULL; + event_t* event = (event_t*)lftk_checkudata(L, 1, "lftk.event_t"); + ret = (key_event_t*)key_event_cast(event); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.key_event_t"); + lua_setmetatable(L, -2); + + return 1; +} + + +static const struct luaL_Reg key_event_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_key_event_t_set_prop(lua_State* L) { + key_event_t* obj = (key_event_t*)lftk_checkudata(L, 1, "lftk.key_event_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "key") == 0) { + printf("key is readonly\n"); + return 0; + } + else if(strcmp(name, "alt") == 0) { + printf("alt is readonly\n"); + return 0; + } + else if(strcmp(name, "ctrl") == 0) { + printf("ctrl is readonly\n"); + return 0; + } + else if(strcmp(name, "shift") == 0) { + printf("shift is readonly\n"); + return 0; + } + else { + return wrap_event_t_set_prop(L); + } +} + +static int wrap_key_event_t_get_prop(lua_State* L) { + key_event_t* obj = (key_event_t*)lftk_checkudata(L, 1, "lftk.key_event_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(key_event_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "key") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->key)); + return 1; + } + else if(strcmp(name, "alt") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->alt)); + return 1; + } + else if(strcmp(name, "ctrl") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->ctrl)); + return 1; + } + else if(strcmp(name, "shift") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->shift)); + return 1; + } + else { + return wrap_event_t_get_prop(L); + } +} + +static void key_event_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"cast", wrap_key_event_cast}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_key_event_t_get_prop}, + {"__newindex", wrap_key_event_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.key_event_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "KeyEvent", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_group_box_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)group_box_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.group_box_t"); + lua_setmetatable(L, -2); + + return 1; +} + + +static const struct luaL_Reg group_box_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_group_box_t_set_prop(lua_State* L) { + group_box_t* obj = (group_box_t*)lftk_checkudata(L, 1, "lftk.group_box_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + return wrap_widget_t_set_prop(L); + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_group_box_t_get_prop(lua_State* L) { + group_box_t* obj = (group_box_t*)lftk_checkudata(L, 1, "lftk.group_box_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(group_box_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void group_box_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_group_box_create}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_group_box_t_get_prop}, + {"__newindex", wrap_group_box_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.group_box_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "GroupBox", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_image_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)image_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.image_t"); + lua_setmetatable(L, -2); + + return 1; +} + +static int wrap_image_set_image_name(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + char* name = (char*)luaL_checkstring(L, 2); + ret = (ret_t)image_set_image_name(widget, name); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + + +static const struct luaL_Reg image_t_member_funcs[] = { + {"set_image_name", wrap_image_set_image_name}, + {NULL, NULL} +}; + +static int wrap_image_t_set_prop(lua_State* L) { + image_t* obj = (image_t*)lftk_checkudata(L, 1, "lftk.image_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + return wrap_widget_t_set_prop(L); + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_image_t_get_prop(lua_State* L) { + image_t* obj = (image_t*)lftk_checkudata(L, 1, "lftk.image_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(image_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void image_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_image_create}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_image_t_get_prop}, + {"__newindex", wrap_image_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.image_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Image", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_label_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)label_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.label_t"); + lua_setmetatable(L, -2); + + return 1; +} + +static int wrap_label_set_border(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint8_t border = (uint8_t)luaL_checkinteger(L, 2); + ret = (ret_t)label_set_border(widget, border); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_label_set_text_align_h(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint8_t text_align_h = (uint8_t)luaL_checkinteger(L, 2); + ret = (ret_t)label_set_text_align_h(widget, text_align_h); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_label_set_text_align_v(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint8_t text_align_v = (uint8_t)luaL_checkinteger(L, 2); + ret = (ret_t)label_set_text_align_v(widget, text_align_v); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_label_set_text(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + wchar_t* text = (wchar_t*)lua_touserdata(L, 2); + ret = (ret_t)label_set_text(widget, text); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + + +static const struct luaL_Reg label_t_member_funcs[] = { + {"set_border", wrap_label_set_border}, + {"set_text_align_h", wrap_label_set_text_align_h}, + {"set_text_align_v", wrap_label_set_text_align_v}, + {"set_text", wrap_label_set_text}, + {NULL, NULL} +}; + +static int wrap_label_t_set_prop(lua_State* L) { + label_t* obj = (label_t*)lftk_checkudata(L, 1, "lftk.label_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "border") == 0) { + printf("border is readonly\n"); + return 0; + } + else if(strcmp(name, "text_align_v") == 0) { + printf("text_align_v is readonly\n"); + return 0; + } + else if(strcmp(name, "text_align_h") == 0) { + printf("text_align_h is readonly\n"); + return 0; + } + else { + return wrap_widget_t_set_prop(L); + } +} + +static int wrap_label_t_get_prop(lua_State* L) { + label_t* obj = (label_t*)lftk_checkudata(L, 1, "lftk.label_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(label_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "border") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->border)); + return 1; + } + else if(strcmp(name, "text_align_v") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->text_align_v)); + return 1; + } + else if(strcmp(name, "text_align_h") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->text_align_h)); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void label_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_label_create}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_label_t_get_prop}, + {"__newindex", wrap_label_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.label_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Label", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_progress_bar_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)progress_bar_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.progress_bar_t"); + lua_setmetatable(L, -2); + + return 1; +} + +static int wrap_progress_bar_set_value(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint8_t value = (uint8_t)luaL_checkinteger(L, 2); + ret = (ret_t)progress_bar_set_value(widget, value); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_progress_bar_set_vertical(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + bool_t vertical = (bool_t)lua_toboolean(L, 2); + ret = (ret_t)progress_bar_set_vertical(widget, vertical); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_progress_bar_set_show_text(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + bool_t show_text = (bool_t)lua_toboolean(L, 2); + ret = (ret_t)progress_bar_set_show_text(widget, show_text); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + + +static const struct luaL_Reg progress_bar_t_member_funcs[] = { + {"set_value", wrap_progress_bar_set_value}, + {"set_vertical", wrap_progress_bar_set_vertical}, + {"set_show_text", wrap_progress_bar_set_show_text}, + {NULL, NULL} +}; + +static int wrap_progress_bar_t_set_prop(lua_State* L) { + progress_bar_t* obj = (progress_bar_t*)lftk_checkudata(L, 1, "lftk.progress_bar_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "value") == 0) { + printf("value is readonly\n"); + return 0; + } + else if(strcmp(name, "vertical") == 0) { + printf("vertical is readonly\n"); + return 0; + } + else if(strcmp(name, "show_text") == 0) { + printf("show_text is readonly\n"); + return 0; + } + else { + return wrap_widget_t_set_prop(L); + } +} + +static int wrap_progress_bar_t_get_prop(lua_State* L) { + progress_bar_t* obj = (progress_bar_t*)lftk_checkudata(L, 1, "lftk.progress_bar_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(progress_bar_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "value") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->value)); + return 1; + } + else if(strcmp(name, "vertical") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->vertical)); + return 1; + } + else if(strcmp(name, "show_text") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->show_text)); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void progress_bar_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_progress_bar_create}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_progress_bar_t_get_prop}, + {"__newindex", wrap_progress_bar_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.progress_bar_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "ProgressBar", static_funcs, 0); + lua_settop(L, 0); +} + +static const struct luaL_Reg point_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_point_t_set_prop(lua_State* L) { + point_t* obj = (point_t*)lftk_checkudata(L, 1, "lftk.point_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "x") == 0) { + printf("x is readonly\n"); + return 0; + } + else if(strcmp(name, "y") == 0) { + printf("y is readonly\n"); + return 0; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 0; + } +} + +static int wrap_point_t_get_prop(lua_State* L) { + point_t* obj = (point_t*)lftk_checkudata(L, 1, "lftk.point_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(point_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "x") == 0) { + lua_pushnumber(L,(lua_Number)(obj->x)); + return 1; + } + else if(strcmp(name, "y") == 0) { + lua_pushnumber(L,(lua_Number)(obj->y)); + return 1; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 1; + } +} + +static void point_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_point_t_get_prop}, + {"__newindex", wrap_point_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.point_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Point", static_funcs, 0); + lua_settop(L, 0); +} + +static const struct luaL_Reg rect_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_rect_t_set_prop(lua_State* L) { + rect_t* obj = (rect_t*)lftk_checkudata(L, 1, "lftk.rect_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "x") == 0) { + printf("x is readonly\n"); + return 0; + } + else if(strcmp(name, "y") == 0) { + printf("y is readonly\n"); + return 0; + } + else if(strcmp(name, "w") == 0) { + printf("w is readonly\n"); + return 0; + } + else if(strcmp(name, "h") == 0) { + printf("h is readonly\n"); + return 0; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 0; + } +} + +static int wrap_rect_t_get_prop(lua_State* L) { + rect_t* obj = (rect_t*)lftk_checkudata(L, 1, "lftk.rect_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(rect_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "x") == 0) { + lua_pushnumber(L,(lua_Number)(obj->x)); + return 1; + } + else if(strcmp(name, "y") == 0) { + lua_pushnumber(L,(lua_Number)(obj->y)); + return 1; + } + else if(strcmp(name, "w") == 0) { + lua_pushnumber(L,(lua_Number)(obj->w)); + return 1; + } + else if(strcmp(name, "h") == 0) { + lua_pushnumber(L,(lua_Number)(obj->h)); + return 1; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 1; + } +} + +static void rect_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_rect_t_get_prop}, + {"__newindex", wrap_rect_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.rect_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Rect", static_funcs, 0); + lua_settop(L, 0); +} + +static const struct luaL_Reg style_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_style_t_set_prop(lua_State* L) { + style_t* obj = (style_t*)lftk_checkudata(L, 1, "lftk.style_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_style_t_get_prop(lua_State* L) { + style_t* obj = (style_t*)lftk_checkudata(L, 1, "lftk.style_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(style_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 1; + } +} + +static void style_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_style_t_get_prop}, + {"__newindex", wrap_style_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.style_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Style", static_funcs, 0); + lua_settop(L, 0); +} + +static const struct luaL_Reg theme_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_theme_t_set_prop(lua_State* L) { + theme_t* obj = (theme_t*)lftk_checkudata(L, 1, "lftk.theme_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_theme_t_get_prop(lua_State* L) { + theme_t* obj = (theme_t*)lftk_checkudata(L, 1, "lftk.theme_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(theme_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 1; + } +} + +static void theme_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_theme_t_get_prop}, + {"__newindex", wrap_theme_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.theme_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Theme", static_funcs, 0); + lua_settop(L, 0); +} +static void style_type_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "StyleType"); + lua_getglobal(L, "StyleType"); + + lua_pushstring(L, "STYLE_ID_BG_COLOR"); + lua_pushinteger(L, STYLE_ID_BG_COLOR); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_BG_COLOR"); + lua_pushinteger(L, STYLE_ID_BG_COLOR); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_FONT_NAME"); + lua_pushinteger(L, STYLE_ID_FONT_NAME); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_FONT_SIZE"); + lua_pushinteger(L, STYLE_ID_FONT_SIZE); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_FONT_STYLE"); + lua_pushinteger(L, STYLE_ID_FONT_STYLE); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_TEXT_COLOR"); + lua_pushinteger(L, STYLE_ID_TEXT_COLOR); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_TEXT_ALIGN_H"); + lua_pushinteger(L, STYLE_ID_TEXT_ALIGN_H); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_TEXT_ALIGN_V"); + lua_pushinteger(L, STYLE_ID_TEXT_ALIGN_V); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_BORDER_COLOR"); + lua_pushinteger(L, STYLE_ID_BORDER_COLOR); + lua_settable(L, -3); + + lua_pushstring(L, "STYLE_ID_ICON"); + lua_pushinteger(L, STYLE_ID_ICON); + lua_settable(L, -3); + +} + +static void align_v_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "AlignV"); + lua_getglobal(L, "AlignV"); + + lua_pushstring(L, "NONE"); + lua_pushinteger(L, ALIGN_V_NONE); + lua_settable(L, -3); + + lua_pushstring(L, "MIDDLE"); + lua_pushinteger(L, ALIGN_V_MIDDLE); + lua_settable(L, -3); + + lua_pushstring(L, "TOP"); + lua_pushinteger(L, ALIGN_V_TOP); + lua_settable(L, -3); + + lua_pushstring(L, "BOTTOM"); + lua_pushinteger(L, ALIGN_V_BOTTOM); + lua_settable(L, -3); + +} + +static void align_h_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "AlignH"); + lua_getglobal(L, "AlignH"); + + lua_pushstring(L, "NONE"); + lua_pushinteger(L, ALIGN_H_NONE); + lua_settable(L, -3); + + lua_pushstring(L, "CENTER"); + lua_pushinteger(L, ALIGN_H_CENTER); + lua_settable(L, -3); + + lua_pushstring(L, "LEFT"); + lua_pushinteger(L, ALIGN_H_LEFT); + lua_settable(L, -3); + + lua_pushstring(L, "RIGHT"); + lua_pushinteger(L, ALIGN_H_RIGHT); + lua_settable(L, -3); + +} + +static void ret_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "Ret"); + lua_getglobal(L, "Ret"); + + lua_pushstring(L, "OK"); + lua_pushinteger(L, RET_OK); + lua_settable(L, -3); + + lua_pushstring(L, "OOM"); + lua_pushinteger(L, RET_OOM); + lua_settable(L, -3); + + lua_pushstring(L, "FAIL"); + lua_pushinteger(L, RET_FAIL); + lua_settable(L, -3); + + lua_pushstring(L, "QUIT"); + lua_pushinteger(L, RET_QUIT); + lua_settable(L, -3); + + lua_pushstring(L, "FOUND"); + lua_pushinteger(L, RET_FOUND); + lua_settable(L, -3); + + lua_pushstring(L, "REMOVE"); + lua_pushinteger(L, RET_REMOVE); + lua_settable(L, -3); + + lua_pushstring(L, "REPEAT"); + lua_pushinteger(L, RET_REPEAT); + lua_settable(L, -3); + + lua_pushstring(L, "NOT_FOUND"); + lua_pushinteger(L, RET_NOT_FOUND); + lua_settable(L, -3); + + lua_pushstring(L, "BAD_PARAMS"); + lua_pushinteger(L, RET_BAD_PARAMS); + lua_settable(L, -3); + +} static void value_type_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "ValueType"); + lua_getglobal(L, "ValueType"); + + lua_pushstring(L, "INVALID"); lua_pushinteger(L, VALUE_TYPE_INVALID); - lua_setglobal(L, "VALUE_TYPE_INVALID"); + lua_settable(L, -3); + + lua_pushstring(L, "BOOL"); lua_pushinteger(L, VALUE_TYPE_BOOL); - lua_setglobal(L, "VALUE_TYPE_BOOL"); + lua_settable(L, -3); + + lua_pushstring(L, "INT8"); lua_pushinteger(L, VALUE_TYPE_INT8); - lua_setglobal(L, "VALUE_TYPE_INT8"); + lua_settable(L, -3); + + lua_pushstring(L, "UINT8"); lua_pushinteger(L, VALUE_TYPE_UINT8); - lua_setglobal(L, "VALUE_TYPE_UINT8"); + lua_settable(L, -3); + + lua_pushstring(L, "INT16"); lua_pushinteger(L, VALUE_TYPE_INT16); - lua_setglobal(L, "VALUE_TYPE_INT16"); + lua_settable(L, -3); + + lua_pushstring(L, "UINT16"); lua_pushinteger(L, VALUE_TYPE_UINT16); - lua_setglobal(L, "VALUE_TYPE_UINT16"); + lua_settable(L, -3); + + lua_pushstring(L, "INT32"); lua_pushinteger(L, VALUE_TYPE_INT32); - lua_setglobal(L, "VALUE_TYPE_INT32"); + lua_settable(L, -3); + + lua_pushstring(L, "UINT32"); lua_pushinteger(L, VALUE_TYPE_UINT32); - lua_setglobal(L, "VALUE_TYPE_UINT32"); + lua_settable(L, -3); + + lua_pushstring(L, "INT64"); lua_pushinteger(L, VALUE_TYPE_INT64); - lua_setglobal(L, "VALUE_TYPE_INT64"); + lua_settable(L, -3); + + lua_pushstring(L, "UINT64"); lua_pushinteger(L, VALUE_TYPE_UINT64); - lua_setglobal(L, "VALUE_TYPE_UINT64"); + lua_settable(L, -3); + + lua_pushstring(L, "POINTER"); lua_pushinteger(L, VALUE_TYPE_POINTER); - lua_setglobal(L, "VALUE_TYPE_POINTER"); - lua_pushinteger(L, VALUE_TYPE_FLOAT32); - lua_setglobal(L, "VALUE_TYPE_FLOAT32"); - lua_pushinteger(L, VALUE_TYPE_FLOAT64); - lua_setglobal(L, "VALUE_TYPE_FLOAT64"); + lua_settable(L, -3); + + lua_pushstring(L, "FLOAT"); + lua_pushinteger(L, VALUE_TYPE_FLOAT); + lua_settable(L, -3); + + lua_pushstring(L, "DOUBLE"); + lua_pushinteger(L, VALUE_TYPE_DOUBLE); + lua_settable(L, -3); + + lua_pushstring(L, "STRING"); lua_pushinteger(L, VALUE_TYPE_STRING); - lua_setglobal(L, "VALUE_TYPE_STRING"); + lua_settable(L, -3); + + lua_pushstring(L, "WSTRING"); lua_pushinteger(L, VALUE_TYPE_WSTRING); - lua_setglobal(L, "VALUE_TYPE_WSTRING"); + lua_settable(L, -3); + } static int wrap_value_set_bool(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); bool_t value = (bool_t)lua_toboolean(L, 2); - ret = value_set_bool(v, value); + ret = (value_t*)value_set_bool(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_bool(lua_State* L) { bool_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_bool(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (bool_t)value_bool(v); lua_pushboolean(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_int8(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - int8_t value = (int8_t)luaL_checkinteger(L,2); - ret = value_set_int8(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + int8_t value = (int8_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_int8(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_int8(lua_State* L) { int8_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_int8(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (int8_t)value_int8(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_uint8(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - uint8_t value = (uint8_t)luaL_checkinteger(L,2); - ret = value_set_uint8(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + uint8_t value = (uint8_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_uint8(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_uint8(lua_State* L) { int8_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_uint8(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (int8_t)value_uint8(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_int16(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - int16_t value = (int16_t)luaL_checkinteger(L,2); - ret = value_set_int16(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + int16_t value = (int16_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_int16(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_int16(lua_State* L) { int16_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_int16(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (int16_t)value_int16(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_uint16(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - uint16_t value = (uint16_t)luaL_checkinteger(L,2); - ret = value_set_uint16(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + uint16_t value = (uint16_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_uint16(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_uint16(lua_State* L) { uint16_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_uint16(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (uint16_t)value_uint16(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_int32(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - int32_t value = (int32_t)luaL_checkinteger(L,2); - ret = value_set_int32(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + int32_t value = (int32_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_int32(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_int32(lua_State* L) { int32_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_int32(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (int32_t)value_int32(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_uint32(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - uint32_t value = (uint32_t)luaL_checkinteger(L,2); - ret = value_set_uint32(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + uint32_t value = (uint32_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_uint32(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_uint32(lua_State* L) { uint32_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_uint32(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (uint32_t)value_uint32(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_int64(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - int64_t value = (int64_t)luaL_checkinteger(L,2); - ret = value_set_int64(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + int64_t value = (int64_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_int64(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_int64(lua_State* L) { int64_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_int64(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (int64_t)value_int64(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_uint64(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - uint64_t value = (uint64_t)luaL_checkinteger(L,2); - ret = value_set_uint64(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + uint64_t value = (uint64_t)luaL_checkinteger(L, 2); + ret = (value_t*)value_set_uint64(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_uint64(lua_State* L) { uint64_t ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_uint64(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (uint64_t)value_uint64(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); - - return 1; -} - -static int wrap_value_set_pointer(lua_State* L) { - value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - pointer_t value = (pointer_t)luaL_checkinteger(L,2); - ret = value_set_pointer(v, value); - - lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); - - return 1; -} - -static int wrap_value_pointer(lua_State* L) { - void* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_pointer(v); - - lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_float(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - float value = (float)luaL_checknumber(L,2); - ret = value_set_float(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + float value = (float)luaL_checknumber(L, 2); + ret = (value_t*)value_set_float(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_float(lua_State* L) { float ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_float(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (float)value_float(v); lua_pushnumber(L,(lua_Number)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_double(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - double value = (double)luaL_checknumber(L,2); - ret = value_set_double(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + double value = (double)luaL_checknumber(L, 2); + ret = (value_t*)value_set_double(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_double(lua_State* L) { double ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_double(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (double)value_double(v); lua_pushnumber(L,(lua_Number)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_set_str(lua_State* L) { value_t* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - char* value = (char*)luaL_checkstring(L,2); - ret = value_set_str(v, value); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + char* value = (char*)luaL_checkstring(L, 2); + ret = (value_t*)value_set_str(v, value); lua_pushlightuserdata(L,(void*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_str(lua_State* L) { const char* ret = NULL; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_str(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (const char*)value_str(v); lua_pushstring(L,(char*)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_is_null(lua_State* L) { bool_t ret = 0; - value_t* value = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_is_null(value); + value_t* value = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (bool_t)value_is_null(value); lua_pushboolean(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_int(lua_State* L) { int ret = 0; - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - ret = value_int(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + ret = (int)value_int(v); lua_pushinteger(L,(lua_Integer)(ret)); - luaL_getmetatable(L, "lftk.value_t"); - lua_setmetatable(L, -2); return 1; } static int wrap_value_copy(lua_State* L) { - value_t* dst = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - value_t* src = (value_t*)luaL_checkudata(L, 2, "lftk.value_t"); - value_copy(dst, src); + value_t* dst = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + value_t* src = (value_t*)lftk_checkudata(L, 2, "lftk.value_t"); + (void)value_copy(dst, src); return 0; } static int wrap_value_create(lua_State* L) { value_t* ret = NULL; - ret = value_create(); + ret = (value_t*)value_create(); lua_pushlightuserdata(L,(void*)(ret)); luaL_getmetatable(L, "lftk.value_t"); @@ -405,84 +1858,814 @@ static int wrap_value_create(lua_State* L) { } static int wrap_value_destroy(lua_State* L) { - value_t* v = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - value_destroy(v); + value_t* v = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + (void)value_destroy(v); return 0; } + +static const struct luaL_Reg value_t_member_funcs[] = { + {"set_bool", wrap_value_set_bool}, + {"bool", wrap_value_bool}, + {"set_int8", wrap_value_set_int8}, + {"int8", wrap_value_int8}, + {"set_uint8", wrap_value_set_uint8}, + {"uint8", wrap_value_uint8}, + {"set_int16", wrap_value_set_int16}, + {"int16", wrap_value_int16}, + {"set_uint16", wrap_value_set_uint16}, + {"uint16", wrap_value_uint16}, + {"set_int32", wrap_value_set_int32}, + {"int32", wrap_value_int32}, + {"set_uint32", wrap_value_set_uint32}, + {"uint32", wrap_value_uint32}, + {"set_int64", wrap_value_set_int64}, + {"int64", wrap_value_int64}, + {"set_uint64", wrap_value_set_uint64}, + {"uint64", wrap_value_uint64}, + {"set_float", wrap_value_set_float}, + {"float", wrap_value_float}, + {"set_double", wrap_value_set_double}, + {"double", wrap_value_double}, + {"set_str", wrap_value_set_str}, + {"str", wrap_value_str}, + {"is_null", wrap_value_is_null}, + {"int", wrap_value_int}, + {"copy", wrap_value_copy}, + {"destroy", wrap_value_destroy}, + {NULL, NULL} +}; + static int wrap_value_t_set_prop(lua_State* L) { - value_t* obj = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - const char* name = (const char*)luaL_checkstring(L,2); + value_t* obj = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; if(strcmp(name, "type") == 0) { printf("type is readonly\n"); + return 0; } else { - printf("not supported %s\n", name); - } + printf("%s: not supported %s\n", __func__, name); return 0; + } } + static int wrap_value_t_get_prop(lua_State* L) { - value_t* obj = (value_t*)luaL_checkudata(L, 1, "lftk.value_t"); - const char* name = (const char*)luaL_checkstring(L,2); + value_t* obj = (value_t*)lftk_checkudata(L, 1, "lftk.value_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(value_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } if(strcmp(name, "type") == 0) { lua_pushinteger(L,(lua_Integer)(obj->type)); + return 1; } else { - printf("not supported %s\n", name); + printf("%s: not supported %s\n", __func__, name); + return 1; } - return 1; } + static void value_t_init(lua_State* L) { static const struct luaL_Reg static_funcs[] = { {"create", wrap_value_create}, {NULL, NULL} }; - static const struct luaL_Reg member_funcs[] = { - {"set_bool", wrap_value_set_bool}, - {"bool", wrap_value_bool}, - {"set_int8", wrap_value_set_int8}, - {"int8", wrap_value_int8}, - {"set_uint8", wrap_value_set_uint8}, - {"uint8", wrap_value_uint8}, - {"set_int16", wrap_value_set_int16}, - {"int16", wrap_value_int16}, - {"set_uint16", wrap_value_set_uint16}, - {"uint16", wrap_value_uint16}, - {"set_int32", wrap_value_set_int32}, - {"int32", wrap_value_int32}, - {"set_uint32", wrap_value_set_uint32}, - {"uint32", wrap_value_uint32}, - {"set_int64", wrap_value_set_int64}, - {"int64", wrap_value_int64}, - {"set_uint64", wrap_value_set_uint64}, - {"uint64", wrap_value_uint64}, - {"set_pointer", wrap_value_set_pointer}, - {"pointer", wrap_value_pointer}, - {"set_float", wrap_value_set_float}, - {"float", wrap_value_float}, - {"set_double", wrap_value_set_double}, - {"double", wrap_value_double}, - {"set_str", wrap_value_set_str}, - {"str", wrap_value_str}, - {"is_null", wrap_value_is_null}, - {"int", wrap_value_int}, - {"copy", wrap_value_copy}, - {"destroy", wrap_value_destroy}, - {"_set", wrap_value_t_set_prop}, - {"_get", wrap_value_t_get_prop}, + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_value_t_get_prop}, + {"__newindex", wrap_value_t_set_prop}, {NULL, NULL} }; + luaL_newmetatable(L, "lftk.value_t"); lua_pushstring(L, "__index"); lua_pushvalue(L, -2); lua_settable(L, -3); - luaL_openlib(L, NULL, member_funcs, 0); - luaL_openlib(L, "value_t", static_funcs, 0); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Value", static_funcs, 0); + lua_settop(L, 0); +} +static void widget_state_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "WidgetState"); + lua_getglobal(L, "WidgetState"); + + lua_pushstring(L, "NONE"); + lua_pushinteger(L, WIDGET_STATE_NONE); + lua_settable(L, -3); + + lua_pushstring(L, "NORMAL"); + lua_pushinteger(L, WIDGET_STATE_NORMAL); + lua_settable(L, -3); + + lua_pushstring(L, "PRESSED"); + lua_pushinteger(L, WIDGET_STATE_PRESSED); + lua_settable(L, -3); + + lua_pushstring(L, "OVER"); + lua_pushinteger(L, WIDGET_STATE_OVER); + lua_settable(L, -3); + + lua_pushstring(L, "DISABLE"); + lua_pushinteger(L, WIDGET_STATE_DISABLE); + lua_settable(L, -3); + + lua_pushstring(L, "FOCUSED"); + lua_pushinteger(L, WIDGET_STATE_FOCUSED); + lua_settable(L, -3); + + lua_pushstring(L, "CHECKED"); + lua_pushinteger(L, WIDGET_STATE_CHECKED); + lua_settable(L, -3); + + lua_pushstring(L, "UNCHECKED"); + lua_pushinteger(L, WIDGET_STATE_UNCHECKED); + lua_settable(L, -3); + } +static void widget_type_t_init(lua_State* L) { + lua_newtable(L); + lua_setglobal(L, "WidgetType"); + lua_getglobal(L, "WidgetType"); + + lua_pushstring(L, "WIDGET_NONE"); + lua_pushinteger(L, WIDGET_NONE); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_WINDOW_MANAGER"); + lua_pushinteger(L, WIDGET_WINDOW_MANAGER); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_NORMAL_WINDOW"); + lua_pushinteger(L, WIDGET_NORMAL_WINDOW); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_TOOLBAR"); + lua_pushinteger(L, WIDGET_TOOLBAR); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_DIALOG"); + lua_pushinteger(L, WIDGET_DIALOG); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_POPUP"); + lua_pushinteger(L, WIDGET_POPUP); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_LABEL"); + lua_pushinteger(L, WIDGET_LABEL); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_BUTTON"); + lua_pushinteger(L, WIDGET_BUTTON); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_IMAGE"); + lua_pushinteger(L, WIDGET_IMAGE); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_EDIT"); + lua_pushinteger(L, WIDGET_EDIT); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_PROGRESS_BAR"); + lua_pushinteger(L, WIDGET_PROGRESS_BAR); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_GROUP_BOX"); + lua_pushinteger(L, WIDGET_GROUP_BOX); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_CHECK_BUTTON"); + lua_pushinteger(L, WIDGET_CHECK_BUTTON); + lua_settable(L, -3); + + lua_pushstring(L, "WIDGET_RADIO_BUTTON"); + lua_pushinteger(L, WIDGET_RADIO_BUTTON); + lua_settable(L, -3); + +} + +static int wrap_widget_count_children(lua_State* L) { + uint32_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + ret = (uint32_t)widget_count_children(widget); + + lua_pushinteger(L,(lua_Integer)(ret)); + + return 1; +} + +static int wrap_widget_get_child(lua_State* L) { + widget_t* ret = NULL; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint32_t index = (uint32_t)luaL_checkinteger(L, 2); + ret = (widget_t*)widget_get_child(widget, index); + + lua_pushlightuserdata(L,(void*)(ret)); + + return 1; +} + +static int wrap_widget_move(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + ret = (ret_t)widget_move(widget, x, y); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_resize(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + wh_t w = (wh_t)luaL_checkinteger(L, 2); + wh_t h = (wh_t)luaL_checkinteger(L, 3); + ret = (ret_t)widget_resize(widget, w, h); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_move_resize(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (ret_t)widget_move_resize(widget, x, y, w, h); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_set_value(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + uint32_t value = (uint32_t)luaL_checkinteger(L, 2); + ret = (ret_t)widget_set_value(widget, value); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_set_text(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + wchar_t* text = (wchar_t*)lua_touserdata(L, 2); + ret = (ret_t)widget_set_text(widget, text); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_get_value(lua_State* L) { + uint32_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + ret = (uint32_t)widget_get_value(widget); + + lua_pushinteger(L,(lua_Integer)(ret)); + + return 1; +} + +static int wrap_widget_get_text(lua_State* L) { + wchar_t* ret = NULL; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + ret = (wchar_t*)widget_get_text(widget); + + lua_pushlightuserdata(L,(void*)(ret)); + + return 1; +} + +static int wrap_widget_to_local(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + point_t* p = (point_t*)lftk_checkudata(L, 2, "lftk.point_t"); + ret = (ret_t)widget_to_local(widget, p); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_to_global(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + point_t* p = (point_t*)lftk_checkudata(L, 2, "lftk.point_t"); + ret = (ret_t)widget_to_global(widget, p); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_set_name(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + char* name = (char*)luaL_checkstring(L, 2); + ret = (ret_t)widget_set_name(widget, name); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_set_enable(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + bool_t enable = (bool_t)lua_toboolean(L, 2); + ret = (ret_t)widget_set_enable(widget, enable); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_set_focused(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + bool_t focused = (bool_t)lua_toboolean(L, 2); + ret = (ret_t)widget_set_focused(widget, focused); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_set_state(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + widget_state_t state = (widget_state_t)luaL_checkinteger(L, 2); + ret = (ret_t)widget_set_state(widget, state); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_destroy_children(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + ret = (ret_t)widget_destroy_children(widget); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_add_child(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + widget_t* child = (widget_t*)lftk_checkudata(L, 2, "lftk.widget_t"); + ret = (ret_t)widget_add_child(widget, child); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_remove_child(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + widget_t* child = (widget_t*)lftk_checkudata(L, 2, "lftk.widget_t"); + ret = (ret_t)widget_remove_child(widget, child); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_lookup(lua_State* L) { + widget_t* ret = NULL; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + char* name = (char*)luaL_checkstring(L, 2); + bool_t recursive = (bool_t)lua_toboolean(L, 3); + ret = (widget_t*)widget_lookup(widget, name, recursive); + + lua_pushlightuserdata(L,(void*)(ret)); + + return 1; +} + +static int wrap_widget_set_visible(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + bool_t visible = (bool_t)lua_toboolean(L, 2); + bool_t recursive = (bool_t)lua_toboolean(L, 3); + ret = (ret_t)widget_set_visible(widget, visible, recursive); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_invalidate(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + rect_t* r = (rect_t*)lftk_checkudata(L, 2, "lftk.rect_t"); + ret = (ret_t)widget_invalidate(widget, r); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_get_prop(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + char* name = (char*)luaL_checkstring(L, 2); + value_t* v = (value_t*)lftk_checkudata(L, 3, "lftk.value_t"); + ret = (ret_t)widget_get_prop(widget, name, v); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_set_prop(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + char* name = (char*)luaL_checkstring(L, 2); + value_t* v = (value_t*)lftk_checkudata(L, 3, "lftk.value_t"); + ret = (ret_t)widget_set_prop(widget, name, v); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_grab(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + widget_t* child = (widget_t*)lftk_checkudata(L, 2, "lftk.widget_t"); + ret = (ret_t)widget_grab(widget, child); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_ungrab(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + widget_t* child = (widget_t*)lftk_checkudata(L, 2, "lftk.widget_t"); + ret = (ret_t)widget_ungrab(widget, child); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + +static int wrap_widget_destroy(lua_State* L) { + ret_t ret = 0; + widget_t* widget = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + ret = (ret_t)widget_destroy(widget); + + lua_pushnumber(L,(lua_Number)(ret)); + + return 1; +} + + +static const struct luaL_Reg widget_t_member_funcs[] = { + {"count_children", wrap_widget_count_children}, + {"get_child", wrap_widget_get_child}, + {"move", wrap_widget_move}, + {"resize", wrap_widget_resize}, + {"move_resize", wrap_widget_move_resize}, + {"set_value", wrap_widget_set_value}, + {"set_text", wrap_widget_set_text}, + {"get_value", wrap_widget_get_value}, + {"get_text", wrap_widget_get_text}, + {"to_local", wrap_widget_to_local}, + {"to_global", wrap_widget_to_global}, + {"set_name", wrap_widget_set_name}, + {"set_enable", wrap_widget_set_enable}, + {"set_focused", wrap_widget_set_focused}, + {"set_state", wrap_widget_set_state}, + {"destroy_children", wrap_widget_destroy_children}, + {"add_child", wrap_widget_add_child}, + {"remove_child", wrap_widget_remove_child}, + {"lookup", wrap_widget_lookup}, + {"set_visible", wrap_widget_set_visible}, + {"on", wrap_widget_on}, + {"off", wrap_widget_off}, + {"invalidate", wrap_widget_invalidate}, + {"get_prop", wrap_widget_get_prop}, + {"set_prop", wrap_widget_set_prop}, + {"grab", wrap_widget_grab}, + {"ungrab", wrap_widget_ungrab}, + {"destroy", wrap_widget_destroy}, + {NULL, NULL} +}; + +static int wrap_widget_t_set_prop(lua_State* L) { + widget_t* obj = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + if(strcmp(name, "x") == 0) { + printf("x is readonly\n"); + return 0; + } + else if(strcmp(name, "y") == 0) { + printf("y is readonly\n"); + return 0; + } + else if(strcmp(name, "w") == 0) { + printf("w is readonly\n"); + return 0; + } + else if(strcmp(name, "h") == 0) { + printf("h is readonly\n"); + return 0; + } + else if(strcmp(name, "type") == 0) { + printf("type is readonly\n"); + return 0; + } + else if(strcmp(name, "subtype") == 0) { + printf("subtype is readonly\n"); + return 0; + } + else if(strcmp(name, "state") == 0) { + printf("state is readonly\n"); + return 0; + } + else if(strcmp(name, "enable") == 0) { + printf("enable is readonly\n"); + return 0; + } + else if(strcmp(name, "visible") == 0) { + printf("visible is readonly\n"); + return 0; + } + else if(strcmp(name, "focused") == 0) { + printf("focused is readonly\n"); + return 0; + } + else if(strcmp(name, "name") == 0) { + printf("name is readonly\n"); + return 0; + } + else if(strcmp(name, "parent") == 0) { + printf("parent is readonly\n"); + return 0; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 0; + } +} + +static int wrap_widget_t_get_prop(lua_State* L) { + widget_t* obj = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(widget_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + if(strcmp(name, "x") == 0) { + lua_pushnumber(L,(lua_Number)(obj->x)); + return 1; + } + else if(strcmp(name, "y") == 0) { + lua_pushnumber(L,(lua_Number)(obj->y)); + return 1; + } + else if(strcmp(name, "w") == 0) { + lua_pushnumber(L,(lua_Number)(obj->w)); + return 1; + } + else if(strcmp(name, "h") == 0) { + lua_pushnumber(L,(lua_Number)(obj->h)); + return 1; + } + else if(strcmp(name, "type") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->type)); + return 1; + } + else if(strcmp(name, "subtype") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->subtype)); + return 1; + } + else if(strcmp(name, "state") == 0) { + lua_pushinteger(L,(lua_Integer)(obj->state)); + return 1; + } + else if(strcmp(name, "enable") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->enable)); + return 1; + } + else if(strcmp(name, "visible") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->visible)); + return 1; + } + else if(strcmp(name, "focused") == 0) { + lua_pushboolean(L,(lua_Integer)(obj->focused)); + return 1; + } + else if(strcmp(name, "name") == 0) { + lua_pushstring(L,(char*)(obj->name)); + return 1; + } + else if(strcmp(name, "parent") == 0) { + lua_pushlightuserdata(L,(void*)(obj->parent)); + return 1; + } + else { + printf("%s: not supported %s\n", __func__, name); + return 1; + } +} + +static void widget_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_widget_t_get_prop}, + {"__newindex", wrap_widget_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.widget_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Widget", static_funcs, 0); + lua_settop(L, 0); +} + +static const struct luaL_Reg window_manager_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_window_manager_t_set_prop(lua_State* L) { + window_manager_t* obj = (window_manager_t*)lftk_checkudata(L, 1, "lftk.window_manager_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + return wrap_widget_t_set_prop(L); + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_window_manager_t_get_prop(lua_State* L) { + window_manager_t* obj = (window_manager_t*)lftk_checkudata(L, 1, "lftk.window_manager_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(window_manager_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void window_manager_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_window_manager_t_get_prop}, + {"__newindex", wrap_window_manager_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.window_manager_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "WindowManager", static_funcs, 0); + lua_settop(L, 0); +} +static int wrap_window_create(lua_State* L) { + widget_t* ret = NULL; + widget_t* parent = (widget_t*)lftk_checkudata(L, 1, "lftk.widget_t"); + xy_t x = (xy_t)luaL_checkinteger(L, 2); + xy_t y = (xy_t)luaL_checkinteger(L, 3); + wh_t w = (wh_t)luaL_checkinteger(L, 4); + wh_t h = (wh_t)luaL_checkinteger(L, 5); + ret = (widget_t*)window_create(parent, x, y, w, h); + + lua_pushlightuserdata(L,(void*)(ret)); + luaL_getmetatable(L, "lftk.window_t"); + lua_setmetatable(L, -2); + + return 1; +} + + +static const struct luaL_Reg window_t_member_funcs[] = { + {NULL, NULL} +}; + +static int wrap_window_t_set_prop(lua_State* L) { + window_t* obj = (window_t*)lftk_checkudata(L, 1, "lftk.window_t"); + const char* name = (const char*)luaL_checkstring(L, 2); +(void)obj; +(void)name; + return wrap_widget_t_set_prop(L); + printf("%s: not supported %s\n", __func__, name); + return 0; +} + +static int wrap_window_t_get_prop(lua_State* L) { + window_t* obj = (window_t*)lftk_checkudata(L, 1, "lftk.window_t"); + const char* name = (const char*)luaL_checkstring(L, 2); + const luaL_Reg* ret = find_member(window_t_member_funcs, name); + + (void)obj; + (void)name; + if(ret) { + lua_pushcfunction(L, ret->func); + return 1; + } + else { + return wrap_widget_t_get_prop(L); + } +} + +static void window_t_init(lua_State* L) { + static const struct luaL_Reg static_funcs[] = { + {"create", wrap_window_create}, + {NULL, NULL} + }; + + static const struct luaL_Reg index_funcs[] = { + {"__index", wrap_window_t_get_prop}, + {"__newindex", wrap_window_t_set_prop}, + {NULL, NULL} + }; + + luaL_newmetatable(L, "lftk.window_t"); + lua_pushstring(L, "__index"); + lua_pushvalue(L, -2); + lua_settable(L, -3); + luaL_openlib(L, NULL, index_funcs, 0); + luaL_openlib(L, "Window", static_funcs, 0); + lua_settop(L, 0); +} void luaL_openlftk(lua_State* L) { + globals_init(L); + button_t_init(L); + check_button_t_init(L); + dialog_t_init(L); + event_type_t_init(L); + event_t_init(L); + pointer_event_t_init(L); + key_event_t_init(L); + group_box_t_init(L); + image_t_init(L); + label_t_init(L); + progress_bar_t_init(L); + point_t_init(L); + rect_t_init(L); + style_t_init(L); + theme_t_init(L); + style_type_t_init(L); + align_v_t_init(L); + align_h_t_init(L); + ret_t_init(L); value_type_t_init(L); value_t_init(L); + widget_state_t_init(L); + widget_type_t_init(L); + widget_t_init(L); + window_manager_t_init(L); + window_t_init(L); + s_current_L = L; } diff --git a/lua/lftk_run.c b/lua/lftk_run.c deleted file mode 100644 index 5a046cc5a..000000000 --- a/lua/lftk_run.c +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include -#include -#include "base/mem.h" - -extern void luaL_openlftk(lua_State* L); - -int main(int argc, char* argv[]) { - lua_State* L = luaL_newstate(); - static uint32_t s_mem_heap[10 * 1024]; - const char* lua_file = argc == 2 ? argv[1] : "./demo.lua"; - - luaL_openlibs(L); - luaL_openlftk(L); - - mem_init(s_mem_heap, sizeof(s_mem_heap)); - - if(luaL_dofile(L, lua_file)) { - fprintf(stderr, "%s\n", lua_tostring(L, -1)); - lua_pop(L, 1); - } - - lua_close(L); - - return 0; -} diff --git a/lua/run_lua.c b/lua/run_lua.c new file mode 100644 index 000000000..a4f0cd2eb --- /dev/null +++ b/lua/run_lua.c @@ -0,0 +1,30 @@ +#include +#include +#include +#include "base/lftk.h" +#include "demos/resource.h" + +extern void luaL_openlftk(lua_State* L); + +int main(int argc, char* argv[]) { + lua_State* L = luaL_newstate(); + static uint32_t s_heap_mem[10 * 1024]; + const char* lua_file = argc == 2 ? argv[1] : "./demo.lua"; + + luaL_openlibs(L); + luaL_openlftk(L); + + lftk_init(320, 480, s_heap_mem, sizeof(s_heap_mem)); + resource_init(); + + if (luaL_dofile(L, lua_file)) { + fprintf(stderr, "%s\n", lua_tostring(L, -1)); + lua_pop(L, 1); + } else { + lftk_run(); + } + + lua_close(L); + + return 0; +} diff --git a/lua/str.lua b/lua/str.lua new file mode 100644 index 000000000..82124b37f --- /dev/null +++ b/lua/str.lua @@ -0,0 +1,4 @@ + +local wstr = to_wstr("hello") +local str = to_str(wstr) +print(str); diff --git a/lua/test.lua b/lua/test.lua new file mode 100644 index 000000000..d81acdbe9 --- /dev/null +++ b/lua/test.lua @@ -0,0 +1,24 @@ +function on_click(ctx, evt) + print('on_click'); +end + +function application_init() + local win = Window.create(NULL, 0, 0, 0, 0); + ok = Button.create(win, 10, 5, 80, 30); + ok:set_text(to_wstr("ok")); + + print(ok, getmetatable(ok)); + label = Label.create(win, 100, 5, 80, 30); + label:set_text(to_wstr("text")); + print(ok, getmetatable(ok)); + print(label, getmetatable(label)); + p = ProgressBar.create(win, 200, 5, 80, 30); + print(ok, getmetatable(ok)); + print(label, getmetatable(label)); + print(p, getmetatable(p)); + +end + +application_init() + + diff --git a/lua/value.lua b/lua/value.lua index 8c5421054..cce787bc5 100644 --- a/lua/value.lua +++ b/lua/value.lua @@ -1,5 +1,5 @@ -local v = value_t.create() +local v = Value.create() local a = 100; v:set_int8(100); @@ -12,10 +12,13 @@ v:set_bool(true) v:set_bool() print(v:bool()); -v:_set("test", 123); -print(v:_get("test")); - -print("VALUE_TYPE_INVALID=" .. VALUE_TYPE_INVALID); -print("VALUE_TYPE_STRING=" .. VALUE_TYPE_STRING); +print(v.type); +print(ValueType) +print(ValueType.INVALID); +print(ValueType.BOOL); +print(ValueType.FLOAT); v:destroy(); + +lftk_quit(); + diff --git a/lua/window.lua b/lua/window.lua new file mode 100644 index 000000000..fed1c5a05 --- /dev/null +++ b/lua/window.lua @@ -0,0 +1,20 @@ +function on_click(ctx, evt) + print('on_click'); +end + +function application_init() + local win = Window.create(NULL, 0, 0, 0, 0); + local ok = Button.create(win, 10, 5, 80, 30); + ok:set_text(to_wstr("ok")); + + rid = ok:on(EventType.EVT_CLICK, function(evt) + print("on click:" .. tostring(rid)) + ok:off(rid) + end); + + print(tostring(rid)) +end + +application_init() + + diff --git a/src/base/button.c b/src/base/button.c index d75b11f62..489e98fe0 100644 --- a/src/base/button.c +++ b/src/base/button.c @@ -30,16 +30,16 @@ static ret_t button_on_paint_self(widget_t* widget, canvas_t* c) { button_t* button = BUTTON(widget); color_t color = color_init(0xff, 0xff, 0xff, 0xff); - canvas_set_fill_color(c, style_get_color(style, E_BG_COLOR, color)); - canvas_set_text_color(c, style_get_color(style, E_TEXT_COLOR, color)); - canvas_set_stroke_color(c, style_get_color(style, E_BORDER_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_BG_COLOR, color)); + canvas_set_text_color(c, style_get_color(style, STYLE_ID_TEXT_COLOR, color)); + canvas_set_stroke_color(c, style_get_color(style, STYLE_ID_BORDER_COLOR, color)); canvas_fill_rect(c, 0, 0, widget->w, widget->h); canvas_stroke_rect(c, 0, 0, widget->w, widget->h); if (button->text.size > 0) { - const char* font_name = style_get_str(style, E_FONT_NAME, NULL); - uint16_t font_size = style_get_int(style, E_FONT_SIZE, 20); + const char* font_name = style_get_str(style, STYLE_ID_FONT_NAME, NULL); + uint16_t font_size = style_get_int(style, STYLE_ID_FONT_SIZE, 20); canvas_set_font(c, font_name, font_size); w = canvas_measure_text(c, button->text.str, button->text.size); @@ -89,9 +89,11 @@ static ret_t button_on_event(widget_t* widget, event_t* e) { widget_set_state(widget, WIDGET_STATE_PRESSED); break; case EVT_POINTER_UP: { - event_t click_e = {EVT_CLICK, widget}; + pointer_event_t evt = *(pointer_event_t*)e; + evt.e.type = EVT_CLICK; + evt.e.target = widget; widget_set_state(widget, WIDGET_STATE_OVER); - widget_dispatch(widget, &click_e); + widget_dispatch(widget, (event_t*)&evt); break; } case EVT_POINTER_LEAVE: diff --git a/src/base/button.h b/src/base/button.h index 9a13e90c8..9d3b73a9c 100755 --- a/src/base/button.h +++ b/src/base/button.h @@ -27,13 +27,39 @@ BEGIN_C_DECLS +/** + * @class button_t + * @parent widget_t + * @scriptable + * 按钮控件。 + */ typedef struct _button_t { widget_t widget; wstr_t text; }button_t; +/** + * @method button_create + * @constructor + * 创建button对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* button_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); +/** + * @method button_set_text + * 设置控件的文本。 + * @param {widget_t*} widget button对象。 + * @param {wchar_t*} text 文本。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t button_set_text(widget_t* widget, const wchar_t* text); #define BUTTON(widget) ((button_t*)(widget)) diff --git a/src/base/check_button.c b/src/base/check_button.c index 68096ea9d..f205cbd42 100644 --- a/src/base/check_button.c +++ b/src/base/check_button.c @@ -57,12 +57,12 @@ static ret_t check_button_on_paint_self(widget_t* widget, canvas_t* c) { color_t color = color_init(0xff, 0xff, 0xff, 0xff); return_value_if_fail(widget != NULL && c != NULL, RET_BAD_PARAMS); - icon_name = style_get_str(style, E_ICON, NULL); + icon_name = style_get_str(style, STYLE_ID_ICON, NULL); return_value_if_fail(icon_name != NULL, RET_BAD_PARAMS); return_value_if_fail(image_manager_load(default_im(), icon_name, &bitmap) == RET_OK, RET_FAIL); - canvas_set_text_color(c, style_get_color(style, E_TEXT_COLOR, color)); - canvas_set_fill_color(c, style_get_color(style, E_BG_COLOR, color)); + canvas_set_text_color(c, style_get_color(style, STYLE_ID_TEXT_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_BG_COLOR, color)); if (bitmap.data != NULL) { rect_t src; @@ -77,8 +77,8 @@ static ret_t check_button_on_paint_self(widget_t* widget, canvas_t* c) { x += widget->h; if (check_button->text.size > 0) { - const char* font_name = style_get_str(style, E_FONT_NAME, NULL); - uint16_t font_size = style_get_int(style, E_FONT_SIZE, 20); + const char* font_name = style_get_str(style, STYLE_ID_FONT_NAME, NULL); + uint16_t font_size = style_get_int(style, STYLE_ID_FONT_SIZE, 20); canvas_set_font(c, font_name, font_size); y = (widget->h >> 1); @@ -178,7 +178,7 @@ widget_t* check_button_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) return widget; } -widget_t* radio_button_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) { +widget_t* check_button_create_radio(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) { widget_t* widget = check_button_create(parent, x, y, w, h); check_button_t* check_button = CHECK_BUTTON(widget); return_value_if_fail(widget != NULL, NULL); diff --git a/src/base/check_button.h b/src/base/check_button.h index 97d58bc1c..ec15a2039 100755 --- a/src/base/check_button.h +++ b/src/base/check_button.h @@ -27,18 +27,70 @@ BEGIN_C_DECLS +/** + * @class check_button_t + * @parent widget_t + * @scriptable + * 勾选控件。 + */ typedef struct _check_button_t { widget_t widget; + /** + * @property {bool_t} value + * @readonly + * 值。 + */ bool_t value; bool_t radio; wstr_t text; }check_button_t; +/** + * @method check_button_create + * @constructor + * 创建check_button对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* check_button_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); -widget_t* radio_button_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); +/** + * @method check_button_create_radio + * @constructor + * 创建check_button对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ +widget_t* check_button_create_radio(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); +/** + * @method check_button_set_text + * 设置控件的文本。 + * @param {widget_t*} widget check_button对象。 + * @param {wchar_t*} text 文本。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t check_button_set_text(widget_t* widget, const wchar_t* text); + +/** + * @method check_button_set_value + * 设置控件的值。 + * @param {widget_t*} widget check_button对象。 + * @param {uint32_t} value 值 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t check_button_set_value(widget_t* widget, bool_t value); #define CHECK_BUTTON(widget) ((check_button_t*)(widget)) diff --git a/src/base/dialog.c b/src/base/dialog.c index ee5c402bf..442e9ef76 100644 --- a/src/base/dialog.c +++ b/src/base/dialog.c @@ -35,13 +35,13 @@ static ret_t dialog_on_paint_self(widget_t* widget, canvas_t* c) { dialog_t* dialog = DIALOG(widget); color_t color = color_init(0x80, 0x80, 0x80, 0xff); - canvas_set_fill_color(c, style_get_color(style, E_FG_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_FG_COLOR, color)); canvas_fill_rect(c, 0, 0, widget->w, TITLE_H); - canvas_set_fill_color(c, style_get_color(style, E_BG_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_BG_COLOR, color)); canvas_fill_rect(c, 0, TITLE_H, widget->w, widget->h - TITLE_H); - canvas_set_stroke_color(c, style_get_color(style, E_BORDER_COLOR, color)); + canvas_set_stroke_color(c, style_get_color(style, STYLE_ID_BORDER_COLOR, color)); canvas_stroke_rect(c, 0, 0, widget->w, widget->h); if (dialog->icon.data != NULL) { @@ -58,11 +58,11 @@ static ret_t dialog_on_paint_self(widget_t* widget, canvas_t* c) { x += TITLE_H; y = (TITLE_H >> 1); if (dialog->title.size > 0) { - const char* font_name = style_get_str(style, E_FONT_NAME, NULL); - uint16_t font_size = style_get_int(style, E_FONT_SIZE, 20); + const char* font_name = style_get_str(style, STYLE_ID_FONT_NAME, NULL); + uint16_t font_size = style_get_int(style, STYLE_ID_FONT_SIZE, 20); canvas_set_font(c, font_name, font_size); - canvas_set_fill_color(c, style_get_color(style, E_FG_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_FG_COLOR, color)); canvas_draw_text(c, dialog->title.str, dialog->title.size, x, y); } @@ -139,14 +139,14 @@ ret_t dialog_set_title(widget_t* widget, const wchar_t* title) { uint32_t dialog_modal(widget_t* widget) { dialog_t* dialog = DIALOG(widget); - bool_t running = default_main_loop()->running; + bool_t running = main_loop_get_default()->running; return_value_if_fail(dialog != NULL, RET_BAD_PARAMS); log_debug("%s run\n", __func__); widget_invalidate(widget, NULL); - main_loop_run(default_main_loop()); - default_main_loop()->running = running; + main_loop_run(main_loop_get_default()); + main_loop_get_default()->running = running; log_debug("%s quit\n", __func__); @@ -158,7 +158,7 @@ ret_t dialog_quit(widget_t* widget, uint32_t code) { return_value_if_fail(widget != NULL, RET_BAD_PARAMS); dialog->quit_code = code; - main_loop_quit(default_main_loop()); + main_loop_quit(main_loop_get_default()); return RET_OK; } diff --git a/src/base/dialog.h b/src/base/dialog.h index a33156321..adf21caf7 100755 --- a/src/base/dialog.h +++ b/src/base/dialog.h @@ -27,6 +27,12 @@ BEGIN_C_DECLS +/** + * @class dialog_t + * @parent widget_t + * @scriptable + * 对话框控件。 + */ typedef struct _dialog_t { widget_t widget; bitmap_t icon; @@ -35,12 +41,57 @@ typedef struct _dialog_t { uint32_t quit_code; }dialog_t; +/** + * @method dialog_create + * @constructor + * 创建dialog对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* dialog_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); +/** + * @method dialog_set_icon + * 设置对话框的标题图标。 + * @param {widget_t*} widget dialog对象。 + * @param {char*} name 图标名称。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t dialog_set_icon(widget_t* widget, const char* name); + +/** + * @method dialog_set_title + * 设置对话框的标题文本。 + * @param {widget_t*} widget dialog对象。 + * @param {wchar_t*} title 标题。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t dialog_set_title(widget_t* widget, const wchar_t* title); +/** + * @method dialog_modal + * 模态显示对话框。 + * @param {widget_t*} widget dialog对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ uint32_t dialog_modal(widget_t* widget); + +/** + * @method dialog_quit + * 退出模态显示。 + * @param {widget_t*} widget dialog对象。 + * @param {uint32_t} code 退出码，作为dialog_modal的返回值。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t dialog_quit(widget_t* widget, uint32_t code); #define DIALOG(widget) ((dialog_t*)(widget)) diff --git a/src/base/emitter.c b/src/base/emitter.c index 2f970fa09..9e5f1dcbc 100644 --- a/src/base/emitter.c +++ b/src/base/emitter.c @@ -32,6 +32,7 @@ emitter_t* emitter_init(emitter_t* emitter) { return_value_if_fail(emitter, NULL); memset(emitter, 0x00, sizeof(emitter_t)); emitter->enable = TRUE; + emitter->curr_id = 1; return emitter; } @@ -87,21 +88,66 @@ static ret_t emitter_extends(emitter_t* emitter, uint32_t nr) { return RET_OK; } -ret_t emitter_on(emitter_t* emitter, uint16_t etype, event_handler handler, void* ctx) { +uint32_t emitter_on(emitter_t* emitter, uint16_t etype, event_func_t handler, void* ctx) { emitter_item_t* iter = NULL; - return_value_if_fail(emitter != NULL && handler != NULL, RET_BAD_PARAMS); - return_value_if_fail(emitter_extends(emitter, 1) == RET_OK, RET_FAIL); + return_value_if_fail(emitter != NULL && handler != NULL, 0); + return_value_if_fail(emitter_extends(emitter, 1) == RET_OK, 0); iter = emitter->items + emitter->size; iter->type = etype; iter->ctx = ctx; iter->handler = handler; + iter->id = emitter->curr_id++; + emitter->size++; - return RET_OK; + return iter->id; } -ret_t emitter_off(emitter_t* emitter, uint16_t etype, event_handler handler, void* ctx) { +emitter_item_t* emitter_find(emitter_t* emitter, uint32_t id) { + return_value_if_fail(emitter != NULL, NULL); + + if (emitter->items) { + uint32_t i = 0; + uint32_t size = emitter->size; + emitter_item_t* items = emitter->items; + + for (i = 0; i < size; i++) { + emitter_item_t* iter = items + i; + if (iter->id == id) { + return iter; + } + } + } + + return NULL; +} + +ret_t emitter_off(emitter_t* emitter, uint32_t id) { + return_value_if_fail(emitter != NULL, RET_BAD_PARAMS); + + if (emitter->items) { + uint32_t i = 0; + uint32_t size = emitter->size; + emitter_item_t* items = emitter->items; + + for (i = 0; i < size; i++) { + emitter_item_t* iter = items + i; + if (iter->id == id) { + for (; i < (size - 1); i++) { + items[i] = items[i + 1]; + } + emitter->size--; + + return RET_OK; + } + } + } + + return RET_FAIL; +} + +ret_t emitter_off_by_func(emitter_t* emitter, uint16_t etype, event_func_t handler, void* ctx) { return_value_if_fail(emitter != NULL && handler != NULL, RET_BAD_PARAMS); if (emitter->items) { diff --git a/src/base/emitter.h b/src/base/emitter.h index 18cc1421f..156ff8a9d 100755 --- a/src/base/emitter.h +++ b/src/base/emitter.h @@ -27,9 +27,10 @@ BEGIN_C_DECLS typedef struct _emitter_item_t { + uint32_t id; uint16_t type; void* ctx; - event_handler handler; + event_func_t handler; }emitter_item_t; typedef struct _emitter_t { @@ -38,13 +39,17 @@ typedef struct _emitter_t { uint8_t stop; uint8_t enable; emitter_item_t* items; + uint32_t curr_id; }emitter_t; emitter_t* emitter_create(void); emitter_t* emitter_init(emitter_t* emitter); ret_t emitter_dispatch(emitter_t* emitter, event_t* e); -ret_t emitter_on(emitter_t* emitter, uint16_t etype, event_handler handler, void* ctx); -ret_t emitter_off(emitter_t* emitter, uint16_t etype, event_handler handler, void* ctx); + +uint32_t emitter_on(emitter_t* emitter, uint16_t etype, event_func_t handler, void* ctx); +ret_t emitter_off(emitter_t* emitter, uint32_t id); +emitter_item_t* emitter_find(emitter_t* emitter, uint32_t id); +ret_t emitter_off_by_func(emitter_t* emitter, uint16_t etype, event_func_t handler, void* ctx); ret_t emitter_stop(emitter_t* emitter); ret_t emitter_enable(emitter_t* emitter); diff --git a/src/base/enums.c b/src/base/enums.c index 1a73df670..9993d0fe7 100644 --- a/src/base/enums.c +++ b/src/base/enums.c @@ -34,18 +34,18 @@ static const key_type_value_t widget_name_value[] = {{"widget", 0, WIDGET_NONE}, {"progress_bar", 0, WIDGET_PROGRESS_BAR}}; static const key_type_value_t style_name_value[] = { - {"bg-color", TYPE_COLOR, E_BG_COLOR}, {"fg-color", TYPE_COLOR, E_FG_COLOR}, - {"text-color", TYPE_COLOR, E_TEXT_COLOR}, {"border-color", TYPE_COLOR, E_BORDER_COLOR}, - {"font-name", TYPE_STRING, E_FONT_NAME}, {"font-size", TYPE_INT, E_FONT_SIZE}, - {"font-style", TYPE_INT, E_FONT_STYLE}, {"text-align-h", TYPE_INT, E_TEXT_ALIGN_H}, - {"text-align-v", TYPE_INT, E_TEXT_ALIGN_V}, {"icon", TYPE_STRING, E_ICON}, + {"bg-color", TYPE_COLOR, STYLE_ID_BG_COLOR}, {"fg-color", TYPE_COLOR, STYLE_ID_FG_COLOR}, + {"text-color", TYPE_COLOR, STYLE_ID_TEXT_COLOR}, {"border-color", TYPE_COLOR, STYLE_ID_BORDER_COLOR}, + {"font-name", TYPE_STRING, STYLE_ID_FONT_NAME}, {"font-size", TYPE_INT, STYLE_ID_FONT_SIZE}, + {"font-style", TYPE_INT, STYLE_ID_FONT_STYLE}, {"text-align-h", TYPE_INT, STYLE_ID_TEXT_ALIGN_H}, + {"text-align-v", TYPE_INT, STYLE_ID_TEXT_ALIGN_V}, {"icon", TYPE_STRING, STYLE_ID_ICON}, }; static const key_type_value_t state_name_value[] = { - {"normal", 0, WIDGET_STATE_NORMAL}, {"over", 0, WIDGET_STATE_OVER}, - {"pressed", 0, WIDGET_STATE_PRESSED}, {"disable", 0, WIDGET_STATE_DISABLE}, - {"focus", 0, WIDGET_STATE_FOCUS}, {"selected", 0, WIDGET_STATE_SELECTED}, - {"checked", 0, WIDGET_STATE_CHECKED}, {"unchecked", 0, WIDGET_STATE_UNCHECKED}}; + {"normal", 0, WIDGET_STATE_NORMAL}, {"over", 0, WIDGET_STATE_OVER}, + {"pressed", 0, WIDGET_STATE_PRESSED}, {"disable", 0, WIDGET_STATE_DISABLE}, + {"focused", 0, WIDGET_STATE_FOCUSED}, {"checked", 0, WIDGET_STATE_CHECKED}, + {"unchecked", 0, WIDGET_STATE_UNCHECKED}}; static const key_type_value_t align_v_name_value[] = { {"top", 0, ALIGN_V_TOP}, {"middle", 0, ALIGN_V_MIDDLE}, {"bottom", 0, ALIGN_V_BOTTOM}}; diff --git a/src/base/events.c b/src/base/events.c new file mode 100644 index 000000000..f89873f3a --- /dev/null +++ b/src/base/events.c @@ -0,0 +1,36 @@ +/** + * File: events.c + * Author: Li XianJing + * Brief: events structs + * + * Copyright (c) 2018 - 2018 Li XianJing + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * License file for more details. + * + */ + +/** + * History: + * ================================================================ + * 2018-03-02 Li XianJing created + * + */ + +#include "base/events.h" + +pointer_event_t* pointer_event_cast(event_t* event) { + return_value_if_fail(event != NULL, NULL); + return_value_if_fail(event->type >= EVT_POINTER_DOWN && event->type <= EVT_CLICK, NULL); + + return (pointer_event_t*)event; +} + +key_event_t* key_event_cast(event_t* event) { + return_value_if_fail(event != NULL, NULL); + return_value_if_fail(event->type >= EVT_KEY_DOWN && event->type <= EVT_KEY_UP, NULL); + + return (key_event_t*)event; +} diff --git a/src/base/events.h b/src/base/events.h index 1edd7c8ee..b276d57da 100755 --- a/src/base/events.h +++ b/src/base/events.h @@ -26,45 +26,192 @@ BEGIN_C_DECLS +/** + * @enum event_type_t + * @scriptable + * 类型常量定义。 + */ typedef enum _event_type_t { +/** + * @const EVT_NONE + * 无效事件名称。 + */ EVT_NONE, +/** + * @const EVT_POINTER_DOWN + * 指针按下事件名。 + */ EVT_POINTER_DOWN, +/** + * @const EVT_POINTER_MOVE + * 指针移动事件名。 + */ EVT_POINTER_MOVE, +/** + * @const EVT_POINTER_UP + * 指针抬起事件名。 + */ EVT_POINTER_UP, +/** + * @const EVT_POINTER_ENTER + * 指针进入事件名。 + */ EVT_POINTER_ENTER, +/** + * @const EVT_POINTER_LEAVE + * 指针离开事件名。 + */ EVT_POINTER_LEAVE, +/** + * @const EVT_CLICK + * 点击事件名。 + */ EVT_CLICK, +/** + * @const EVT_KEY_DOWN + * 键按下事件名。 + */ EVT_KEY_DOWN, +/** + * @const EVT_KEY_UP + * 键抬起事件名。 + */ EVT_KEY_UP, +/** + * @const EVT_MOVE + * Widget移动事件名。 + */ EVT_MOVE, +/** + * @const EVT_RESIZE + * Widget调整大小事件名。 + */ EVT_RESIZE, +/** + * @const EVT_DESTROY + * 对象销毁事件名。 + */ EVT_DESTROY, +/** + * @const EVT_MOVE_RESIZE + * Widget调整大小/移动事件名。 + */ EVT_MOVE_RESIZE, +/** + * @const EVT_PROP_CHANGED + * 对象的属性改变事件名。 + */ EVT_PROP_CHANGED }event_type_t; +/** + * @class event_t + * @scriptable + * 事件基类。 + */ typedef struct _event_t { +/** + * @property {int16_t} type + * @readonly + * 类型。 + */ uint16_t type; void* target; }event_t; +/** + * @class pointer_event_t + * @scriptable + * @parent event_t + * 指针事件。 + */ + typedef struct _pointer_event_t { event_t e; + /** + * @property {xy_t} x + * @readonly + * x坐标。 + */ xy_t x; + /** + * @property {xy_t} y + * @readonly + * y坐标。 + */ xy_t y; - uint8_t button; + /** + * @property {uint8_t} button + * @readonly + * button。 + */ + xy_t button; + /** + * @property {bool_t} pressed + * @readonly + * 指针是否按下。 + */ uint8_t pressed:1; }pointer_event_t; +/** + * @method pointer_event_cast + * @constructor + * 把event对象转pointer_event_t对象 + * @param {event_t*} event event对象。 + * + * @return {pointer_event_t*} 对象。 + */ +pointer_event_t* pointer_event_cast(event_t* event); + + +/** + * @class key_event_t + * @scriptable + * @parent event_t + * 按键事件。 + */ + typedef struct _key_event_t { event_t e; + /** + * @property {uint8_t} key + * @readonly + * 键值。 + */ uint8_t key; + /** + * @property {bool_t} alt + * @readonly + * alt键是否按下。 + */ uint8_t alt:1; + /** + * @property {bool_t} ctrl + * @readonly + * ctrl键是否按下。 + */ uint8_t ctrl:1; + /** + * @property {bool_t} shift + * @readonly + * shift键是否按下。 + */ uint8_t shift:1; }key_event_t; -typedef ret_t (*event_handler)(void* ctx, event_t* e); +/** + * @method key_event_cast + * @constructor + * 把event对象转key_event_t对象 + * @param {event_t*} event event对象。 + * + * @return {key_event_t*} 对象。 + */ +key_event_t* key_event_cast(event_t* event); + + +typedef ret_t (*event_func_t)(void* ctx, event_t* e); END_C_DECLS diff --git a/src/base/group_box.h b/src/base/group_box.h index 7c30c86b4..0cebcb77c 100755 --- a/src/base/group_box.h +++ b/src/base/group_box.h @@ -26,10 +26,28 @@ BEGIN_C_DECLS +/** + * @class group_box_t + * @parent widget_t + * @scriptable + * 分组控件。 + */ typedef struct _group_box_t { widget_t widget; }group_box_t; +/** + * @method group_box_create + * @constructor + * 创建group_box对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* group_box_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); END_C_DECLS diff --git a/src/base/image.h b/src/base/image.h index 2be6290be..b78be84f8 100755 --- a/src/base/image.h +++ b/src/base/image.h @@ -28,13 +28,41 @@ BEGIN_C_DECLS +/** + * @class image_t + * @parent widget_t + * @scriptable + * 图片控件。 + */ typedef struct _image_t { widget_t widget; bitmap_t bitmap; }image_t; +/** + * @method image_create + * @constructor + * 创建image对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* image_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); + +/** + * @method image_set_image_name + * 设置控件的图片名称。 + * @param {widget_t*} widget image对象。 + * @param {char*} name 图片名称。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t image_set_image_name(widget_t* widget, const char* name); + ret_t image_set_image(widget_t* widget, bitmap_t* image); #define IMAGE(widget) (image_t*)(widget) diff --git a/src/base/label.c b/src/base/label.c index 2ff7040d0..84c4ec68f 100644 --- a/src/base/label.c +++ b/src/base/label.c @@ -34,14 +34,14 @@ static ret_t label_on_paint_self(widget_t* widget, canvas_t* c) { return_value_if_fail(widget != NULL && c != NULL, RET_BAD_PARAMS); canvas_set_font(c, NULL, 20); - canvas_set_fill_color(c, style_get_color(style, E_BG_COLOR, color)); - canvas_set_text_color(c, style_get_color(style, E_TEXT_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_BG_COLOR, color)); + canvas_set_text_color(c, style_get_color(style, STYLE_ID_TEXT_COLOR, color)); canvas_fill_rect(c, 0, 0, widget->w, widget->h); w = canvas_measure_text(c, label->text.str, label->text.size); - text_align_h = style_get_int(style, E_TEXT_ALIGN_H, label->text_align_h); - text_align_v = style_get_int(style, E_TEXT_ALIGN_V, label->text_align_v); + text_align_h = style_get_int(style, STYLE_ID_TEXT_ALIGN_H, label->text_align_h); + text_align_v = style_get_int(style, STYLE_ID_TEXT_ALIGN_V, label->text_align_v); switch (text_align_v) { case ALIGN_V_TOP: diff --git a/src/base/label.h b/src/base/label.h index 765ce634d..1873af6b1 100755 --- a/src/base/label.h +++ b/src/base/label.h @@ -27,21 +27,89 @@ BEGIN_C_DECLS +/** + * @class label_t + * @parent widget_t + * @scriptable + * 文本控件。 + */ typedef struct _label_t { widget_t widget; wstr_t text; + /** + * @property {uint8_t} border + * @readonly + * 边距。 + */ uint8_t border; + /** + * @property {uint8_t} text_align_v + * @readonly + * 文本垂直对齐方式。 + */ uint8_t text_align_v; + /** + * @property {uint8_t} text_align_h + * @readonly + * 文本水平对齐方式。 + */ uint8_t text_align_h; }label_t; +/** + * @method label_create + * @constructor + * 创建label对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* label_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); -ret_t label_set_text(widget_t* widget, const wchar_t* text); +/** + * @method label_set_border + * 设置控件的边距。 + * @param {widget_t*} widget label对象。 + * @param {uint8_t} border 边距 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t label_set_border(widget_t* widget, uint8_t border); + +/** + * @method label_set_text_align_h + * 设置控件的文本水平对齐方式。 + * @param {widget_t*} widget label对象。 + * @param {uint8_t} text_align_h 文本水平对齐方式。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t label_set_text_align_h(widget_t* widget, uint8_t text_align_h); + +/** + * @method label_set_text_align_v + * 设置控件的文本垂直对齐方式。 + * @param {widget_t*} widget label对象。 + * @param {uint8_t} text_align_v 文本垂直对齐方式。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t label_set_text_align_v(widget_t* widget, uint8_t text_align_v); +/** + * @method label_set_text + * 设置控件的文本。 + * @param {widget_t*} widget label对象。 + * @param {wchar_t*} text 文本。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t label_set_text(widget_t* widget, const wchar_t* text); + #define LABEL(widget) ((label_t*)(widget)) END_C_DECLS diff --git a/src/base/lftk.c b/src/base/lftk.c new file mode 100755 index 000000000..d2674dfdd --- /dev/null +++ b/src/base/lftk.c @@ -0,0 +1,51 @@ +/** + * File: lftk.c + * Author: Li XianJing + * Brief: lftk + * + * Copyright (c) 2018 - 2018 Li XianJing + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * License file for more details. + * + */ + +/** + * History: + * ================================================================ + * 2018-03-03 Li XianJing created + * + */ + +#include "base/mem.h" +#include "base/lftk.h" +#include "base/timer.h" +#include "base/platform.h" +#include "base/main_loop.h" + +ret_t lftk_init(wh_t w, wh_t h, uint32_t* heap, uint32_t size) { + return_value_if_fail(platform_prepare() == RET_OK, RET_FAIL); + return_value_if_fail(mem_init(heap, size) == RET_OK, RET_FAIL); + return_value_if_fail(main_loop_init(w, h) != NULL, RET_FAIL); + + return RET_OK; +} + +ret_t lftk_run() { + main_loop_run(main_loop_get_default()); + main_loop_destroy(main_loop_get_default()); + + return RET_OK; +} + +static ret_t lftk_quit_idle(const f_timer_t* timer) { + return main_loop_quit(main_loop_get_default()); +} + +ret_t lftk_quit() { + return timer_add(lftk_quit_idle, NULL, 0); +} + + diff --git a/src/base/lftk.h b/src/base/lftk.h new file mode 100755 index 000000000..9d82f1d3b --- /dev/null +++ b/src/base/lftk.h @@ -0,0 +1,65 @@ +/** + * File: lftk.h + * Author: Li XianJing + * Brief: lftk + * + * Copyright (c) 2018 - 2018 Li XianJing + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * License file for more details. + * + */ + +/** + * History: + * ================================================================ + * 2018-03-03 Li XianJing created + * + */ + +#ifndef LFTK_MAIN_H +#define LFTK_MAIN_H + +#include "base/types_def.h" + +BEGIN_C_DECLS + +/** + * @method lftk_init + * 初始化LFTK。 + * @global + * @scriptable no + * @param {wh_t} w LCD宽度。 + * @param {wh_t} h LCD高度。 + * @param {uint32_t*} heap 动态内存空间。 + * @param {uint32_t} size 动态内存空间的大小。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t lftk_init(wh_t w, wh_t h, uint32_t* heap, uint32_t size); + +/** + * @method lftk_run + * 进入LFTK事件主循环。 + * @global + * @scriptable no + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t lftk_run(); + +/** + * @method lftk_quit + * 退出LFTK事件主循环。 + * @global + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t lftk_quit(); + +END_C_DECLS + +#endif/*LFTK_MAIN_H*/ + diff --git a/src/base/main_loop.h b/src/base/main_loop.h index 8a4d97849..8558553b7 100755 --- a/src/base/main_loop.h +++ b/src/base/main_loop.h @@ -41,7 +41,9 @@ struct _main_loop_t { bool_t running; }; -main_loop_t* default_main_loop(void); +main_loop_t* main_loop_init(int w, int h); + +main_loop_t* main_loop_get_default(void); ret_t main_loop_run(main_loop_t* l); ret_t main_loop_quit(main_loop_t* l); diff --git a/src/base/progress_bar.c b/src/base/progress_bar.c index 7bf3af433..c2e8a5ae3 100644 --- a/src/base/progress_bar.c +++ b/src/base/progress_bar.c @@ -33,9 +33,9 @@ static ret_t progress_bar_on_paint_self(widget_t* widget, canvas_t* c) { color_t color = color_init(0xff, 0xff, 0xff, 0xff); return_value_if_fail(widget != NULL && c != NULL, RET_BAD_PARAMS); - canvas_set_text_color(c, style_get_color(style, E_TEXT_COLOR, color)); + canvas_set_text_color(c, style_get_color(style, STYLE_ID_TEXT_COLOR, color)); - canvas_set_fill_color(c, style_get_color(style, E_FG_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_FG_COLOR, color)); if (progress_bar->vertical) { h = (widget->h * progress_bar->value) / 100; canvas_fill_rect(c, x, y + widget->h - h, widget->w, h); @@ -44,7 +44,7 @@ static ret_t progress_bar_on_paint_self(widget_t* widget, canvas_t* c) { canvas_fill_rect(c, x, y, w, widget->h); } - canvas_set_fill_color(c, style_get_color(style, E_BG_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_BG_COLOR, color)); if (progress_bar->vertical) { h = widget->h - h; canvas_fill_rect(c, x, y, widget->w, h); @@ -54,7 +54,7 @@ static ret_t progress_bar_on_paint_self(widget_t* widget, canvas_t* c) { canvas_fill_rect(c, x, y, w, widget->h); } - canvas_set_stroke_color(c, style_get_color(style, E_BORDER_COLOR, color)); + canvas_set_stroke_color(c, style_get_color(style, STYLE_ID_BORDER_COLOR, color)); canvas_stroke_rect(c, 0, 0, widget->w, widget->h); if (progress_bar->show_text) { diff --git a/src/base/progress_bar.h b/src/base/progress_bar.h index e58633042..bc1a51b1d 100755 --- a/src/base/progress_bar.h +++ b/src/base/progress_bar.h @@ -26,17 +26,76 @@ BEGIN_C_DECLS +/** + * @class progress_bar_t + * @parent widget_t + * @scriptable + * 进度条控件。 + */ typedef struct _progress_bar_t { widget_t widget; - uint8_t value; /*0-100*/ + /** + * @property {uint8_t} value + * @readonly + * 进度条的值[0-100]。 + */ + uint8_t value; + /** + * @property {bool_t} vertical + * @readonly + * 进度条的是否为垂直方向。 + */ bool_t vertical; + /** + * @property {bool_t} show_text + * @readonly + * 是否显示文本。 + */ bool_t show_text; }progress_bar_t; +/** + * @method progress_bar_create + * @constructor + * 创建progress_bar对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* progress_bar_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); +/** + * @method progress_bar_set_value + * 设置进度条的进度。 + * @param {widget_t*} widget 控件对象。 + * @param {uint8_t} value 进度 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t progress_bar_set_value(widget_t* widget, uint8_t value); + +/** + * @method progress_bar_set_vertical + * 设置进度条的方向。 + * @param {widget_t*} widget 控件对象。 + * @param {bool_t} vertical 是否为垂直方向。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t progress_bar_set_vertical(widget_t* widget, bool_t vertical); + +/** + * @method progress_bar_set_show_text + * 设置进度条的是否显示文本。 + * @param {widget_t*} widget 控件对象。 + * @param {bool_t} show_text 是否显示文本。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t progress_bar_set_show_text(widget_t* widget, bool_t show_text); #define PROGRESS_BAR(widget) ((progress_bar_t*)(widget)) diff --git a/src/base/rect.h b/src/base/rect.h index bff2a5af9..a9c56d20a 100755 --- a/src/base/rect.h +++ b/src/base/rect.h @@ -26,16 +26,56 @@ BEGIN_C_DECLS +/** + * @class point_t + * @scriptable + * 点。包括一个x坐标和一个y坐标。 + */ typedef struct _point_t { - xy_t x; - xy_t y; + /** + * @property {xy_t} x + * @readonly + * x坐标。 + */ + xy_t x; + /** + * @property {xy_t} y + * @readonly + * y坐标。 + */ + xy_t y; }point_t; +/** + * @class rect_t + * @scriptable + * 矩形。包括一个x坐标、y坐标、宽度和高度。 + */ typedef struct _rect_t { - xy_t x; - xy_t y; - wh_t w; - wh_t h; + /** + * @property {xy_t} x + * @readonly + * x坐标。 + */ + xy_t x; + /** + * @property {xy_t} y + * @readonly + * y坐标。 + */ + xy_t y; + /** + * @property {wh_t} w + * @readonly + * 宽度。 + */ + wh_t w; + /** + * @property {wh_t} h + * @readonly + * 高度。 + */ + wh_t h; }rect_t; #define rect_init(r, xx, yy, ww, hh) r.x = (xx); r.y = (yy); r.w = (ww); r.h = (hh); diff --git a/src/base/theme.c b/src/base/theme.c index 852bd4a7f..6a8e29d3e 100644 --- a/src/base/theme.c +++ b/src/base/theme.c @@ -113,16 +113,14 @@ const uint8_t* theme_find_style(theme_t* t, uint16_t type, uint8_t subtype, uint } static theme_t s_theme; -theme_t* default_theme() { - return_value_if_fail(s_theme.data != NULL, NULL); - +theme_t* theme_get_default() { return &s_theme; } -theme_t* default_theme_init(const uint8_t* data) { +theme_t* theme_init(const uint8_t* data) { return_value_if_fail(data != NULL, NULL); s_theme.data = data; - return default_theme(); + return theme_get_default(); } diff --git a/src/base/theme.h b/src/base/theme.h index 4aeb6ea40..1d73f6ec3 100755 --- a/src/base/theme.h +++ b/src/base/theme.h @@ -26,6 +26,10 @@ BEGIN_C_DECLS +/** + * @class style_t + * 控件风格的参数。 + */ typedef struct _style_t { const uint8_t* data; }style_t; @@ -34,41 +38,131 @@ uint32_t style_get_int(style_t* s, uint32_t name, uint32_t defval); color_t style_get_color(style_t* s, uint32_t name, color_t defval); const char* style_get_str(style_t* s, uint32_t name, const char* defval); +/** + * @class theme_t + * 主题。 + */ typedef struct _theme_t { const uint8_t* data; }theme_t; -theme_t* default_theme(void); -theme_t* default_theme_init(const uint8_t* data); +theme_t* theme_get_default(void); +theme_t* theme_init(const uint8_t* data); const uint8_t* theme_find_style(theme_t* t, uint16_t type, uint8_t subtype, uint8_t state); -enum { - E_BG_COLOR = 1, - E_FG_COLOR, - E_FONT_NAME, - E_FONT_SIZE, - E_FONT_STYLE, - E_TEXT_COLOR, - E_TEXT_ALIGN_H, - E_TEXT_ALIGN_V, - E_BORDER_COLOR, - E_ICON -}; +/** + * @enum style_type_t + * 类型常量定义。 + */ +typedef enum _style_id_t { + /** + * @const STYLE_ID_BG_COLOR + * 背景颜色。 + */ + STYLE_ID_BG_COLOR = 1, + /** + * @const STYLE_ID_BG_COLOR + * 前景颜色。 + */ + STYLE_ID_FG_COLOR, + /** + * @const STYLE_ID_FONT_NAME + * 字体名称。 + */ + STYLE_ID_FONT_NAME, + /** + * @const STYLE_ID_FONT_SIZE + * 字体大小。 + */ + STYLE_ID_FONT_SIZE, + /** + * @const STYLE_ID_FONT_STYLE + * 字体风格(粗体、斜体等)。 + */ + STYLE_ID_FONT_STYLE, + /** + * @const STYLE_ID_TEXT_COLOR + * 文本颜色。 + */ + STYLE_ID_TEXT_COLOR, + /** + * @const STYLE_ID_TEXT_ALIGN_H + * 文本水平对齐的方式。 + */ + STYLE_ID_TEXT_ALIGN_H, + /** + * @const STYLE_ID_TEXT_ALIGN_V + * 文本垂直对齐的方式。 + */ + STYLE_ID_TEXT_ALIGN_V, + /** + * @const STYLE_ID_BORDER_COLOR + * 边框颜色。 + */ + STYLE_ID_BORDER_COLOR, + /** + * @const STYLE_ID_ICON + * 图标的名称。 + */ + STYLE_ID_ICON +}style_id_t; -enum { +/** + * @enum align_v_t + * @scriptable + * 类型常量定义。 + */ +typedef enum _align_v_t { + /** + * @const ALIGN_V_NONE + * 无效对齐方式。 + */ ALIGN_V_NONE= 0, + /** + * @const ALIGN_V_MIDDLE + * 居中对齐。 + */ ALIGN_V_MIDDLE, + /** + * @const ALIGN_V_TOP + * 顶部对齐。 + */ ALIGN_V_TOP, + /** + * @const ALIGN_V_BOTTOM + * 底部对齐。 + */ ALIGN_V_BOTTOM -}; +}align_v_t; -enum { +/** + * @enum align_h_t + * @scriptable + * 类型常量定义。 + */ +typedef enum _align_h_t { + /** + * @const ALIGN_H_NONE + * 无效对齐方式。 + */ ALIGN_H_NONE = 0, + /** + * @const ALIGN_H_CENTER + * 居中对齐。 + */ ALIGN_H_CENTER, + /** + * @const ALIGN_H_LEFT + * 左边对齐。 + */ ALIGN_H_LEFT, + /** + * @const ALIGN_H_RIGHT + * 右边对齐。 + */ ALIGN_H_RIGHT -}; +}align_h_t; #define THEME_MAGIC 0xFAFBFCFD diff --git a/src/base/types_def.h b/src/base/types_def.h index 76fd86858..5069b164d 100755 --- a/src/base/types_def.h +++ b/src/base/types_def.h @@ -33,14 +33,56 @@ typedef int xy_t; typedef uint32_t id_t; typedef uint32_t wh_t; +/** + * @enum ret_t + * @scriptable + * 函数返回值常量定义。 + */ typedef enum _ret_t { + /** + * @const RET_OK + * 成功。 + */ RET_OK, + /** + * @const RET_OOM + * Out of memory。 + */ + RET_OOM, + /** + * @const RET_FAIL + * 失败。 + */ RET_FAIL, + /** + * @const RET_QUIT + * 退出。通常用于主循环。 + */ RET_QUIT, + /** + * @const RET_FOUND + * 找到。 + */ RET_FOUND, + /** + * @const RET_REMOVE + * 移出。通常用于定时器。 + */ RET_REMOVE, + /** + * @const RET_REPEAT + * 重复。通常用于定时器。 + */ RET_REPEAT, + /** + * @const RET_NOT_FOUND + * 没找到。 + */ RET_NOT_FOUND, + /** + * @const RET_BAD_PARAMS + * 无效参数。 + */ RET_BAD_PARAMS }ret_t; @@ -138,3 +180,4 @@ enum { }; #endif/*TYPES_DEF_H*/ + diff --git a/src/base/value.c b/src/base/value.c index e0326e978..fe6e80f12 100644 --- a/src/base/value.c +++ b/src/base/value.c @@ -174,14 +174,14 @@ pointer_t value_pointer(const value_t* v) { value_t* value_set_float(value_t* v, float value) { return_value_if_fail(v != NULL, NULL); - v->type = VALUE_TYPE_FLOAT32; + v->type = VALUE_TYPE_FLOAT; v->value.f32 = value; return v; } float value_float(const value_t* v) { - return_value_if_fail(v->type == VALUE_TYPE_FLOAT32, 0.0); + return_value_if_fail(v->type == VALUE_TYPE_FLOAT, 0.0); return v->value.f32; } @@ -189,14 +189,14 @@ float value_float(const value_t* v) { value_t* value_set_double(value_t* v, double value) { return_value_if_fail(v != NULL, NULL); - v->type = VALUE_TYPE_FLOAT64; + v->type = VALUE_TYPE_DOUBLE; v->value.f64 = value; return v; } double value_double(const value_t* v) { - return_value_if_fail(v->type == VALUE_TYPE_FLOAT64, 0); + return_value_if_fail(v->type == VALUE_TYPE_DOUBLE, 0); return v->value.f64; } @@ -269,10 +269,10 @@ int value_int(const value_t* v) { case VALUE_TYPE_UINT64: { return (int)v->value.u64; } - case VALUE_TYPE_FLOAT32: { + case VALUE_TYPE_FLOAT: { return (int)v->value.f32; } - case VALUE_TYPE_FLOAT64: { + case VALUE_TYPE_DOUBLE: { return (int)v->value.f64; } case VALUE_TYPE_STRING: { @@ -287,11 +287,6 @@ int value_int(const value_t* v) { value_t* value_set_int(value_t* v, int32_t value) { return value_set_int32(v, value); } -value_t* value_create() { - return MEM_ZALLOC(value_t); -} - -void value_destroy(value_t* v) { - MEM_FREE(v); -} +value_t* value_create() { return MEM_ZALLOC(value_t); } +void value_destroy(value_t* v) { MEM_FREE(v); } diff --git a/src/base/value.h b/src/base/value.h index 9ef3c4cdb..508b5cda2 100755 --- a/src/base/value.h +++ b/src/base/value.h @@ -88,15 +88,15 @@ typedef enum _value_type_t { */ VALUE_TYPE_POINTER, /** - * @const VALUE_TYPE_FLOAT32 + * @const VALUE_TYPE_FLOAT * float类型。 */ - VALUE_TYPE_FLOAT32, + VALUE_TYPE_FLOAT, /** - * @const VALUE_TYPE_FLOAT64 + * @const VALUE_TYPE_DOUBLE * double类型。 */ - VALUE_TYPE_FLOAT64, + VALUE_TYPE_DOUBLE, /** * @const VALUE_TYPE_STRING * char*类型。 @@ -314,6 +314,7 @@ uint64_t value_uint64(const value_t* v); /** * @method value_set_pointer * 设置类型为pointer的值。 + * @scriptable no * @param {value_t*} v value对象。 * @param {pointer_t} value 待设置的值。 * @@ -324,6 +325,7 @@ value_t* value_set_pointer(value_t* v, pointer_t value); /** * @method value_pointer * 获取类型为pointer的值。 + * @scriptable no * @param {value_t*} v value对象。 * * @return {void*} 值。 diff --git a/src/base/widget.c b/src/base/widget.c index 7732fef10..8b420a9d0 100644 --- a/src/base/widget.c +++ b/src/base/widget.c @@ -108,11 +108,11 @@ ret_t widget_set_enable(widget_t* widget, bool_t enable) { return RET_OK; } -ret_t widget_set_selected(widget_t* widget, bool_t selected) { +ret_t widget_set_focused(widget_t* widget, bool_t focused) { return_value_if_fail(widget != NULL, RET_BAD_PARAMS); - if (widget->selected != selected) { - widget->selected = selected; + if (widget->focused != focused) { + widget->focused = focused; widget_update_style(widget); widget_invalidate(widget, NULL); } @@ -132,7 +132,7 @@ ret_t widget_set_state(widget_t* widget, widget_state_t state) { return RET_OK; } -ret_t widget_remove_children(widget_t* widget) { +ret_t widget_destroy_children(widget_t* widget) { uint32_t i = 0; uint32_t n = 0; return_value_if_fail(widget != NULL, RET_BAD_PARAMS); @@ -169,7 +169,7 @@ ret_t widget_remove_child(widget_t* widget, widget_t* child) { return array_remove(widget->children, NULL, child) ? RET_OK : RET_NOT_FOUND; } -widget_t* widget_lookup_child(widget_t* widget, const char* name) { +static widget_t* widget_lookup_child(widget_t* widget, const char* name) { uint32_t i = 0; uint32_t n = 0; return_value_if_fail(widget != NULL && name != NULL, NULL); @@ -186,7 +186,7 @@ widget_t* widget_lookup_child(widget_t* widget, const char* name) { return NULL; } -widget_t* widget_lookup(widget_t* widget, const char* name) { +static widget_t* widget_lookup_all(widget_t* widget, const char* name) { uint32_t i = 0; uint32_t n = 0; return_value_if_fail(widget != NULL && name != NULL, NULL); @@ -197,7 +197,7 @@ widget_t* widget_lookup(widget_t* widget, const char* name) { if (strcmp(iter->name, name) == 0) { return iter; } else { - iter = widget_lookup(iter, name); + iter = widget_lookup_all(iter, name); if (iter != NULL) { return iter; } @@ -208,7 +208,15 @@ widget_t* widget_lookup(widget_t* widget, const char* name) { return NULL; } -ret_t widget_set_visible(widget_t* widget, bool_t visible) { +widget_t* widget_lookup(widget_t* widget, const char* name, bool_t recursive) { + if (recursive) { + return widget_lookup_all(widget, name); + } else { + return widget_lookup_child(widget, name); + } +} + +static ret_t widget_set_visible_self(widget_t* widget, bool_t visible) { return_value_if_fail(widget != NULL, RET_BAD_PARAMS); if (widget->visible != visible) { @@ -220,7 +228,7 @@ ret_t widget_set_visible(widget_t* widget, bool_t visible) { return RET_OK; } -ret_t widget_set_visible_recursive(widget_t* widget, bool_t visible) { +static ret_t widget_set_visible_recursive(widget_t* widget, bool_t visible) { uint32_t i = 0; uint32_t n = 0; return_value_if_fail(widget != NULL, RET_BAD_PARAMS); @@ -236,6 +244,14 @@ ret_t widget_set_visible_recursive(widget_t* widget, bool_t visible) { return RET_OK; } +ret_t widget_set_visible(widget_t* widget, bool_t visible, bool_t recursive) { + if (recursive) { + return widget_set_visible_recursive(widget, visible); + } else { + return widget_set_visible_self(widget, visible); + } +} + widget_t* widget_find_target(widget_t* widget, xy_t x, xy_t y) { widget_t* ret = NULL; return_value_if_fail(widget != NULL, NULL); @@ -266,7 +282,7 @@ ret_t widget_dispatch(widget_t* widget, event_t* e) { return ret; } -ret_t widget_on(widget_t* widget, event_type_t type, event_handler on_event, void* ctx) { +ret_t widget_on(widget_t* widget, event_type_t type, event_func_t on_event, void* ctx) { return_value_if_fail(widget != NULL && on_event != NULL, RET_BAD_PARAMS); if (widget->emitter == NULL) { widget->emitter = emitter_create(); @@ -275,11 +291,18 @@ ret_t widget_on(widget_t* widget, event_type_t type, event_handler on_event, voi return emitter_on(widget->emitter, type, on_event, ctx); } -ret_t widget_off(widget_t* widget, event_type_t type, event_handler on_event, void* ctx) { +ret_t widget_off(widget_t* widget, uint32_t id) { + return_value_if_fail(widget != NULL, RET_BAD_PARAMS); + return_value_if_fail(widget->emitter != NULL, RET_BAD_PARAMS); + + return emitter_off(widget->emitter, id); +} + +ret_t widget_off_by_func(widget_t* widget, event_type_t type, event_func_t on_event, void* ctx) { return_value_if_fail(widget != NULL && on_event != NULL, RET_BAD_PARAMS); return_value_if_fail(widget->emitter != NULL, RET_BAD_PARAMS); - return emitter_off(widget->emitter, type, on_event, ctx); + return emitter_off_by_func(widget->emitter, type, on_event, ctx); } ret_t widget_paint(widget_t* widget, canvas_t* c) { @@ -576,7 +599,7 @@ ret_t widget_destroy(widget_t* widget) { } if (widget->children != NULL) { - widget_remove_children(widget); + widget_destroy_children(widget); array_destroy(widget->children); } @@ -615,11 +638,11 @@ ret_t widget_update_style(widget_t* widget) { state = widget->state; if (!widget->enable) { state = WIDGET_STATE_DISABLE; - } else if (widget->selected) { - state = WIDGET_STATE_SELECTED; + } else if (widget->focused) { + state = WIDGET_STATE_FOCUSED; } - widget->style.data = theme_find_style(default_theme(), widget->type, widget->subtype, state); + widget->style.data = theme_find_style(theme_get_default(), widget->type, widget->subtype, state); return RET_OK; } @@ -642,7 +665,10 @@ widget_t* widget_init(widget_t* widget, widget_t* parent, uint8_t type) { if (!widget->vt) { widget->vt = widget_vtable_default(); } - widget_update_style(widget); + + if(type != WIDGET_WINDOW_MANAGER) { + widget_update_style(widget); + } return widget; } diff --git a/src/base/widget.h b/src/base/widget.h index 81f38981c..07dba2582 100755 --- a/src/base/widget.h +++ b/src/base/widget.h @@ -31,21 +31,135 @@ BEGIN_C_DECLS -struct _widget_t; -typedef struct _widget_t widget_t; - +/** + * @enum widget_state_t + * @scriptable + * 控件状态常量定义。 + */ typedef enum _widget_state_t { + /** + * @const WIDGET_STATE_NONE + * 无效状态。 + */ WIDGET_STATE_NONE, + /** + * @const WIDGET_STATE_NORMAL + * 正常状态。 + */ WIDGET_STATE_NORMAL, + /** + * @const WIDGET_STATE_PRESSED + * 指针按下状态。 + */ WIDGET_STATE_PRESSED, + /** + * @const WIDGET_STATE_OVER + * 指针悬浮状态。 + */ WIDGET_STATE_OVER, + /** + * @const WIDGET_STATE_DISABLE + * 禁用状态。 + */ WIDGET_STATE_DISABLE, - WIDGET_STATE_FOCUS, - WIDGET_STATE_SELECTED, + /** + * @const WIDGET_STATE_FOCUSED + * 聚焦状态。 + */ + WIDGET_STATE_FOCUSED, + /** + * @const WIDGET_STATE_CHECKED + * 勾选状态。 + */ WIDGET_STATE_CHECKED, + /** + * @const WIDGET_STATE_UNCHECKED + * 没勾选状态。 + */ WIDGET_STATE_UNCHECKED }widget_state_t; +/** + * @enum widget_type_t + * @scriptable + * 控件类型常量定义。 + */ +typedef enum _widget_type_t { + /** + * @const WIDGET_NONE + * 无效类型。 + */ + WIDGET_NONE = 0, + /** + * @const WIDGET_WINDOW_MANAGER + * 窗口管理器。 + */ + WIDGET_WINDOW_MANAGER, + /** + * @const WIDGET_NORMAL_WINDOW + * 窗口。 + */ + WIDGET_NORMAL_WINDOW, + /** + * @const WIDGET_TOOLBAR + * 工具条。 + */ + WIDGET_TOOLBAR, + /** + * @const WIDGET_DIALOG + * 对话框。 + */ + WIDGET_DIALOG, + /** + * @const WIDGET_POPUP + * 弹出框。 + */ + WIDGET_POPUP, + /** + * @const WIDGET_LABEL + * 简单文本。 + */ + WIDGET_LABEL, + /** + * @const WIDGET_BUTTON + * 按钮。 + */ + WIDGET_BUTTON, + /** + * @const WIDGET_IMAGE + * 图片。 + */ + WIDGET_IMAGE, + /** + * @const WIDGET_EDIT + * 文本编辑器。 + */ + WIDGET_EDIT, + /** + * @const WIDGET_PROGRESS_BAR + * 进度条。 + */ + WIDGET_PROGRESS_BAR, + /** + * @const WIDGET_GROUP_BOX + * 分组框。 + */ + WIDGET_GROUP_BOX, + /** + * @const WIDGET_CHECK_BUTTON + * 多选按钮。 + */ + WIDGET_CHECK_BUTTON, + /** + * @const WIDGET_RADIO_BUTTON + * 单选按钮。 + */ + WIDGET_RADIO_BUTTON, +}widget_type_t; + +struct _widget_t; +typedef struct _widget_t widget_t; + typedef ret_t (*widget_invalidate_t)(widget_t* widget, rect_t* r); typedef ret_t (*widget_on_event_t)(widget_t* widget, event_t* e); typedef ret_t (*widget_on_paint_self_t)(widget_t* widget, canvas_t* c); @@ -82,93 +196,456 @@ typedef struct _widget_vtable_t { widget_destroy_t destroy; }widget_vtable_t; -enum { - WIDGET_NONE = 0, - WIDGET_WINDOW_MANAGER, - WIDGET_NORMAL_WINDOW, - WIDGET_TOOLBAR, - WIDGET_DIALOG, - WIDGET_POPUP, - WIDGET_LABEL, - WIDGET_BUTTON, - WIDGET_IMAGE, - WIDGET_EDIT, - WIDGET_PROGRESS_BAR, - WIDGET_GROUP_BOX, - WIDGET_CHECK_BUTTON, - WIDGET_RADIO_BUTTON, -}; - +/** + * @class widget_t + * @scriptable + * 窗口基类。 + */ struct _widget_t { + /** + * @property {xy_t} x + * @readonly + * x坐标。 + */ xy_t x; + /** + * @property {xy_t} y + * @readonly + * y坐标。 + */ xy_t y; + /** + * @property {wh_t} w + * @readonly + * 宽度。 + */ wh_t w; + /** + * @property {wh_t} h + * @readonly + * 高度。 + */ wh_t h; + /** + * @property {uint8_t} type + * @readonly + * 类型。 + */ uint8_t type; + /** + * @property {uint8_t} subtype + * @readonly + * 子类型，仅用于控制控件的Style。 + */ uint8_t subtype:4; /*for style*/ + /** + * @property {uint8_t} state + * @readonly + * 控件的状态。 + */ uint8_t state:4; + /** + * @property {bool_t} enable + * @readonly + * 启用/禁用状态。 + */ uint8_t enable:1; + /** + * @property {bool_t} visible + * @readonly + * 是否可见。 + */ uint8_t visible:1; - uint8_t selected:1; + /** + * @property {bool_t} focused + * @readonly + * 是否得到焦点。 + */ + uint8_t focused:1; + /** + * @property {bool_t} initializing + * @readonly + * @scriptable no + * 标识控件是否还在初始化中。 + */ uint8_t initializing:1; + /** + * @property {char*} name + * @readonly + * 控件名字 + */ char name[NAME_LEN+1]; - - style_t style; + /** + * @property {widget_t*} parent + * @readonly + * 父控件 + */ widget_t* parent; + /** + * @property {widget_t*} target + * @readonly + * @scriptable no + * 接收事件的子控件。 + */ widget_t* target; + /** + * @property {array_t*} children + * @readonly + * @scriptable no + * 全部子控件。 + */ array_t* children; + /** + * @property {emitter*} emitter + * @private + * 事件发射器。 + */ emitter_t* emitter; + /** + * @property {style_t} style + * @private + * Style数据。 + */ + style_t style; + /** + * @property {widget_vtable_t} vt + * @private + * 虚函数表。 + */ const widget_vtable_t* vt; }; +/** + * @method widget_init + * 初始化控件。仅在子类控件构造函数中使用。 + * @private + * @param {widget_t*} widget widget对象。 + * @param {widget_t*} parent widget的父控件。 + * @param {uint8_t} type 控件的类型。 + * + * @return {widget*} widget对象本身。 + */ widget_t* widget_init(widget_t* widget, widget_t* parent, uint8_t type); +/** + * @method widget_update_style + * 让控件根据自己当前状态更新style。 + * @private + * @param {widget_t*} widget widget对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_update_style(widget_t* widget); +/** + * @method widget_count_children + * 获取子控件的个数。 + * @param {widget_t*} widget 控件对象。 + * + * @return {uint32_t} 子控件的个数。 + */ uint32_t widget_count_children(widget_t* widget); + +/** + * @method widget_get_child + * 获取指定索引的子控件。 + * @param {widget_t*} widget 控件对象。 + * @param {uint32_t} index 索引 + * + * @return {widget_t*} 子控件。 + */ widget_t* widget_get_child(widget_t* widget, uint32_t index); +/** + * @method widget_move + * 移动控件。 + * @param {widget_t*} widget 控件对象。 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_move(widget_t* widget, xy_t x, xy_t y); + +/** + * @method widget_resize + * 调整控件的大小。 + * @param {widget_t*} widget 控件对象。 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_resize(widget_t* widget, wh_t w, wh_t h); + +/** + * @method widget_move_resize + * 移动控件并调整控件的大小。 + * @param {widget_t*} widget 控件对象。 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_move_resize(widget_t* widget, xy_t x, xy_t y, wh_t w, wh_t h); +/** + * @method widget_set_value + * 设置控件的值。只是对widget_set_prop的包装，值的意义由子类控件决定。 + * @param {widget_t*} widget 控件对象。 + * @param {uint32_t} value 值 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_set_value(widget_t* widget, uint32_t value); + +/** + * @method widget_set_text + * 设置控件的文本。只是对widget_set_prop的包装，文本的意义由子类控件决定。 + * @param {widget_t*} widget 控件对象。 + * @param {wchar_t*} text 文本。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_set_text(widget_t* widget, const wchar_t* text); +/** + * @method widget_get_value + * 获取控件的值。只是对widget_get_prop的包装，值的意义由子类控件决定。 + * @param {widget_t*} widget 控件对象。 + * + * @return {uint32_t} 返回值。 + */ uint32_t widget_get_value(widget_t* widget); + +/** + * @method widget_get_text + * 获取控件的文本。只是对widget_get_prop的包装，文本的意义由子类控件决定。 + * @param {widget_t*} widget 控件对象。 + * + * @return {wchar_t*} 返回文本。 + */ const wchar_t* widget_get_text(widget_t* widget); +/** + * @method widget_to_local + * 将全局坐标转换成控件内的本地坐标，即相对于控件左上角的坐标。 + * @param {widget_t*} widget 控件对象。 + * @param {point_t*} p 坐标点。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_to_local(widget_t* widget, point_t* p); + +/** + * @method widget_to_global + * 将控件内的本地坐标转换成全局坐标。 + * @param {widget_t*} widget 控件对象。 + * @param {point_t*} p 坐标点。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_to_global(widget_t* widget, point_t* p); +/** + * @method widget_set_name + * 设置控件的名称。 + * @param {widget_t*} widget 控件对象。 + * @param {char*} name 名称。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_set_name(widget_t* widget, const char* name); + +/** + * @method widget_set_enable + * 设置控件的可用性。 + * @param {widget_t*} widget 控件对象。 + * @param {bool_t} enable 是否启动。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_set_enable(widget_t* widget, bool_t enable); -ret_t widget_set_selected(widget_t* widget, bool_t selected); + +/** + * @method widget_set_focused + * 设置控件的是否聚焦。 + * @param {widget_t*} widget 控件对象。 + * @param {bool_t} focused 是否聚焦。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t widget_set_focused(widget_t* widget, bool_t focused); + +/** + * @method widget_set_state + * 设置控件的状态。 + * @param {widget_t*} widget 控件对象。 + * @param {widget_state_t} state 状态。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_set_state(widget_t* widget, widget_state_t state); -ret_t widget_remove_children(widget_t* widget); +/** + * @method widget_destroy_children + * 销毁全部子控件。 + * @param {widget_t*} widget 控件对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t widget_destroy_children(widget_t* widget); + +/** + * @method widget_add_child + * 加入一个子控件。 + * @param {widget_t*} widget 控件对象。 + * @param {widget_t*} child 子控件对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_add_child(widget_t* widget, widget_t* child); + +/** + * @method widget_remove_child + * 移出指定的子控件(并不销毁)。 + * @param {widget_t*} widget 控件对象。 + * @param {widget_t*} child 子控件对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_remove_child(widget_t* widget, widget_t* child); +/** + * @method widget_find_target + * 查找x/y坐标对应的子控件。 + * @private + * @param {widget_t*} widget 控件对象。 + * @param {xy_t} x x坐标。 + * @param {xy_t} y y坐标。 + * + * @return {widget*} 子控件或NULL。 + */ widget_t* widget_find_target(widget_t* widget, xy_t x, xy_t y); -widget_t* widget_lookup(widget_t* widget, const char* name); -widget_t* widget_lookup_child(widget_t* widget, const char* name); -ret_t widget_set_visible(widget_t* widget, bool_t visible); -ret_t widget_set_visible_recursive(widget_t* widget, bool_t visible); +/** + * @method widget_lookup + * 查找指定名称的子控件。 + * @param {widget_t*} widget 控件对象。 + * @param {char*} name 子控件的名称。 + * @param {bool_t} recursive 是否递归查找全部子控件。 + * + * @return {widget_t*} 子控件或NULL。 + */ +widget_t* widget_lookup(widget_t* widget, const char* name, bool_t recursive); -ret_t widget_dispatch(widget_t* widget, event_t* e); -ret_t widget_on(widget_t* widget, event_type_t type, event_handler on_event, void* ctx); -ret_t widget_off(widget_t* widget, event_type_t type, event_handler on_event, void* ctx); +/** + * @method widget_set_visible + * 设置控件的可见性。 + * @param {widget_t*} widget 控件对象。 + * @param {bool_t} visible 是否可见。 + * @param {bool_t} recursive 是否递归设置全部子控件。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t widget_set_visible(widget_t* widget, bool_t visible, bool_t recursive); -ret_t widget_paint(widget_t* widget, canvas_t* c); +/** + * @method widget_on + * 注册指定事件的处理函数。 + * @scriptable custom + * @param {widget_t*} widget 控件对象。 + * @param {event_type_t} type 事件类型。 + * @param {event_func_t} on_event 事件处理函数。 + * @param {void*} ctx 事件处理函数上下文。 + * + * @return {uint32_t} 返回id，用于widget_off。 + */ +uint32_t widget_on(widget_t* widget, event_type_t type, event_func_t on_event, void* ctx); + +/** + * @method widget_off + * 注销指定事件的处理函数。 + * @scriptable custom + * @param {widget_t*} widget 控件对象。 + * @param {uint32_t} id widget_on返回的ID。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t widget_off(widget_t* widget, uint32_t id); + +/** + * @method widget_off_by_func + * 注销指定事件的处理函数。 + * @scriptable no + * @param {widget_t*} widget 控件对象。 + * @param {event_type_t} type 事件类型。 + * @param {event_func_t} on_event 事件处理函数。 + * @param {void*} ctx 事件处理函数上下文。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t widget_off_by_func(widget_t* widget, event_type_t type, event_func_t on_event, void* ctx); + +/** + * @method widget_invalidate + * 请求重绘指定的区域。 + * @param {widget_t*} widget 控件对象。 + * @param {rect_t*} r 矩形对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_invalidate(widget_t* widget, rect_t* r); -/*virtual functions wrapper*/ +/** + * @method widget_paint + * 绘制控件到一个canvas上。 + * @private + * @param {widget_t*} widget 控件对象。 + * @param {canvas_t*} c 画布对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t widget_paint(widget_t* widget, canvas_t* c); + +/** + * @method widget_dispatch + * 分发一个事件。 + * @private + * @param {widget_t*} widget 控件对象。 + * @param {event_t*} e 事件。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ +ret_t widget_dispatch(widget_t* widget, event_t* e); + ret_t widget_on_paint_self(widget_t* widget, canvas_t* c); ret_t widget_on_paint_children(widget_t* widget, canvas_t* c); + +/** + * @method widget_get_prop + * 通用的获取控件属性的函数。 + * @param {widget_t*} widget 控件对象。 + * @param {char*} name 属性的名称。 + * @param {value_t*} v 属性的值。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_get_prop(widget_t* widget, const char* name, value_t* v); + +/** + * @method widget_set_prop + * 通用的设置控件属性的函数。 + * @param {widget_t*} widget 控件对象。 + * @param {char*} name 属性的名称。 + * @param {value_t*} v 属性的值。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_set_prop(widget_t* widget, const char* name, const value_t* v); + ret_t widget_on_paint(widget_t* widget, canvas_t* c); ret_t widget_on_keydown(widget_t* widget, key_event_t* e); ret_t widget_on_keyup(widget_t* widget, key_event_t* e); @@ -176,8 +653,34 @@ ret_t widget_on_click(widget_t* widget, pointer_event_t* e); ret_t widget_on_pointer_down(widget_t* widget, pointer_event_t* e); ret_t widget_on_pointer_move(widget_t* widget, pointer_event_t* e); ret_t widget_on_pointer_up(widget_t* widget, pointer_event_t* e); + +/** + * @method widget_grab + * 让指定子控件抓住事件。抓住之后，事件由窗口直接分发给该控件。 + * @param {widget_t*} widget 控件对象。 + * @param {widget_t*} child 子控件对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_grab(widget_t* widget, widget_t* child); + +/** + * @method widget_ungrab + * 让指定子控件放弃抓住事件。 + * @param {widget_t*} widget 控件对象。 + * @param {widget_t*} child 子控件对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_ungrab(widget_t* widget, widget_t* child); + +/** + * @method widget_destroy + * 销毁控件。 + * @param {widget_t*} widget 控件对象。 + * + * @return {ret_t} 返回RET_OK表示成功，否则表示失败。 + */ ret_t widget_destroy(widget_t* widget); #define WIDGET(w) (&(w.widget)) diff --git a/src/base/window.c b/src/base/window.c index 91de49442..7b3eca8c3 100644 --- a/src/base/window.c +++ b/src/base/window.c @@ -27,7 +27,7 @@ static ret_t window_on_paint_self(widget_t* widget, canvas_t* c) { style_t* style = &(widget->style); color_t color = color_init(0xe9, 0xe9, 0xe9, 0xff); - canvas_set_fill_color(c, style_get_color(style, E_BG_COLOR, color)); + canvas_set_fill_color(c, style_get_color(style, STYLE_ID_BG_COLOR, color)); canvas_fill_rect(c, widget->x, widget->y, widget->w, widget->h); return RET_OK; diff --git a/src/base/window.h b/src/base/window.h index dde0656a4..2049aa6fa 100755 --- a/src/base/window.h +++ b/src/base/window.h @@ -26,10 +26,28 @@ BEGIN_C_DECLS +/** + * @class window_t + * @parent widget_t + * @scriptable + * 窗口。 + */ typedef struct _window_t { widget_t widget; }window_t; +/** + * @method window_create + * @constructor + * 创建window对象 + * @param {widget_t*} parent 父控件 + * @param {xy_t} x x坐标 + * @param {xy_t} y y坐标 + * @param {wh_t} w 宽度 + * @param {wh_t} h 高度 + * + * @return {widget_t*} 对象。 + */ widget_t* window_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h); END_C_DECLS diff --git a/src/base/window_manager.h b/src/base/window_manager.h index d7537177e..e65c820f0 100755 --- a/src/base/window_manager.h +++ b/src/base/window_manager.h @@ -26,6 +26,11 @@ BEGIN_C_DECLS +/** + * @class window_manager_t + * @parent widget_t + * 窗口管理器。 + */ typedef struct _window_manager_t { widget_t widget; diff --git a/src/main_loop/main_loop_rtthread.c b/src/main_loop/main_loop_rtthread.c index 3acaacff8..aec04632b 100644 --- a/src/main_loop/main_loop_rtthread.c +++ b/src/main_loop/main_loop_rtthread.c @@ -163,7 +163,7 @@ rt_bool_t on_event(struct rtgui_object* object, rtgui_event_t* event) { return FALSE; } -main_loop_t* main_loop_rtthread_init(int w, int h) { +main_loop_t* main_loop_init(int w, int h) { lcd_t* lcd = NULL; widget_t* wm = default_wm(); main_loop_t* base = &(loop.base); @@ -194,4 +194,4 @@ main_loop_t* main_loop_rtthread_init(int w, int h) { return base; } -main_loop_t* default_main_loop() { return &loop.base; } +main_loop_t* main_loop_get_default() { return &loop.base; } diff --git a/src/main_loop/main_loop_rtthread.h b/src/main_loop/main_loop_rtthread.h index f636b032b..2713a7731 100755 --- a/src/main_loop/main_loop_rtthread.h +++ b/src/main_loop/main_loop_rtthread.h @@ -26,7 +26,7 @@ BEGIN_C_DECLS -main_loop_t* main_loop_rtthread_init(int w, int h); +main_loop_t* main_loop_init(int w, int h); END_C_DECLS diff --git a/src/main_loop/main_loop_sdl2.c b/src/main_loop/main_loop_sdl2.c index 6d05e2a78..7d451de3e 100644 --- a/src/main_loop/main_loop_sdl2.c +++ b/src/main_loop/main_loop_sdl2.c @@ -197,7 +197,7 @@ static ret_t main_loop_sdl2_create_window(main_loop_sdl2_t* l, font_manager_t* f } static main_loop_sdl2_t loop; -main_loop_t* main_loop_sdl2_init(int w, int h) { +main_loop_t* main_loop_init(int w, int h) { widget_t* wm = default_wm(); font_manager_t* fm = default_fm(); main_loop_t* base = &(loop.base); @@ -215,4 +215,4 @@ main_loop_t* main_loop_sdl2_init(int w, int h) { return base; } -main_loop_t* default_main_loop() { return &loop.base; } +main_loop_t* main_loop_get_default() { return &loop.base; } diff --git a/src/main_loop/main_loop_sdl2.h b/src/main_loop/main_loop_sdl2.h index 552402f87..71b90af62 100755 --- a/src/main_loop/main_loop_sdl2.h +++ b/src/main_loop/main_loop_sdl2.h @@ -26,7 +26,7 @@ BEGIN_C_DECLS -main_loop_t* main_loop_sdl2_init(int w, int h); +main_loop_t* main_loop_init(int w, int h); END_C_DECLS diff --git a/src/main_loop/main_loop_stm32_raw.c b/src/main_loop/main_loop_stm32_raw.c index 681436181..f8c1a5715 100644 --- a/src/main_loop/main_loop_stm32_raw.c +++ b/src/main_loop/main_loop_stm32_raw.c @@ -132,7 +132,7 @@ static ret_t main_loop_stm32_raw_destroy(main_loop_t* l) { return RET_OK; } -main_loop_t* main_loop_stm32_raw_init(int w, int h) { +main_loop_t* main_loop_init(int w, int h) { lcd_t* lcd = NULL; widget_t* wm = default_wm(); main_loop_t* base = &(loop.base); @@ -152,4 +152,4 @@ main_loop_t* main_loop_stm32_raw_init(int w, int h) { return base; } -main_loop_t* default_main_loop() { return &loop.base; } +main_loop_t* main_loop_get_default() { return &loop.base; } diff --git a/src/main_loop/main_loop_stm32_raw.h b/src/main_loop/main_loop_stm32_raw.h index 250f8fb9c..5f3fdaba8 100755 --- a/src/main_loop/main_loop_stm32_raw.h +++ b/src/main_loop/main_loop_stm32_raw.h @@ -26,7 +26,7 @@ BEGIN_C_DECLS -main_loop_t* main_loop_stm32_raw_init(int w, int h); +main_loop_t* main_loop_init(int w, int h); END_C_DECLS diff --git a/src/ui_loader/ui_builder_default.c b/src/ui_loader/ui_builder_default.c index 753390cf0..a1ce0a09e 100644 --- a/src/ui_loader/ui_builder_default.c +++ b/src/ui_loader/ui_builder_default.c @@ -68,7 +68,7 @@ static ret_t ui_builder_default_on_widget_start(ui_builder_t* b, uint16_t type, widget = check_button_create(parent, x, y, w, h); break; case WIDGET_RADIO_BUTTON: - widget = radio_button_create(parent, x, y, w, h); + widget = check_button_create_radio(parent, x, y, w, h); break; default: log_debug("%s: not supported type %d\n", __func__, type); diff --git a/tests/button_test.cc b/tests/button_test.cc index 2630811fc..77a606517 100644 --- a/tests/button_test.cc +++ b/tests/button_test.cc @@ -11,9 +11,9 @@ TEST(Button, basic) { value_t v2; widget_t* b = button_create(NULL, 10, 20, 30, 40); - ASSERT_EQ(button_set_text(b, L"OK"), RET_OK); + ASSERT_EQ(widget_set_text(b, L"OK"), RET_OK); ASSERT_EQ(wcscmp(BUTTON(b)->text.str, L"OK"), 0); - ASSERT_EQ(button_set_text(b, L"Cancel"), RET_OK); + ASSERT_EQ(widget_set_text(b, L"Cancel"), RET_OK); ASSERT_EQ(wcscmp(BUTTON(b)->text.str, L"Cancel"), 0); value_set_wstr(&v1, L"button"); diff --git a/tests/common.cc b/tests/common.cc index b86727bd0..4da457a5b 100644 --- a/tests/common.cc +++ b/tests/common.cc @@ -1,3 +1,3 @@ #include "base/main_loop.h" -main_loop_t* default_main_loop() { return NULL; } +main_loop_t* main_loop_get_default() { return NULL; } diff --git a/tests/emitter_test.cc b/tests/emitter_test.cc index 62539147a..937f4a5be 100644 --- a/tests/emitter_test.cc +++ b/tests/emitter_test.cc @@ -29,7 +29,7 @@ TEST(Emitter, basic) { ASSERT_EQ(emitter_dispatch(&emitter, &e), RET_OK); ASSERT_EQ(n, 1); - ASSERT_EQ(emitter_off(&emitter, type, on_event, &n), RET_OK); + ASSERT_EQ(emitter_off_by_func(&emitter, type, on_event, &n), RET_OK); ASSERT_EQ(emitter_dispatch(&emitter, &e), RET_OK); ASSERT_EQ(n, 1); diff --git a/tests/theme_gen_test.cc b/tests/theme_gen_test.cc index c06253783..e411bec5c 100644 --- a/tests/theme_gen_test.cc +++ b/tests/theme_gen_test.cc @@ -22,15 +22,15 @@ TEST(ThemeGen, basic) { style.data = theme_find_style(&theme, WIDGET_NONE, 0, WIDGET_STATE_NORMAL); ASSERT_EQ(style.data != NULL, true); - ASSERT_EQ(style_get_int(&style, E_FONT_SIZE, 0), 12); - ASSERT_EQ(style_get_int(&style, E_BG_COLOR, 0), 0xff00ffff); - ASSERT_EQ(style_get_int(&style, E_FG_COLOR, 0), 0xfffcfbfa); - ASSERT_EQ(style_get_str(&style, E_FONT_NAME, ""), string("sans")); + ASSERT_EQ(style_get_int(&style, STYLE_ID_FONT_SIZE, 0), 12); + ASSERT_EQ(style_get_int(&style, STYLE_ID_BG_COLOR, 0), 0xff00ffff); + ASSERT_EQ(style_get_int(&style, STYLE_ID_FG_COLOR, 0), 0xfffcfbfa); + ASSERT_EQ(style_get_str(&style, STYLE_ID_FONT_NAME, ""), string("sans")); style.data = theme_find_style(&theme, WIDGET_PROGRESS_BAR, 0, WIDGET_STATE_NORMAL); ASSERT_EQ(style.data != NULL, true); - ASSERT_EQ(style_get_int(&style, E_BG_COLOR, 0), 0xff00ffff); - ASSERT_EQ(style_get_int(&style, E_FG_COLOR, 0), 0x7f00ffff); + ASSERT_EQ(style_get_int(&style, STYLE_ID_BG_COLOR, 0), 0xff00ffff); + ASSERT_EQ(style_get_int(&style, STYLE_ID_FG_COLOR, 0), 0x7f00ffff); } TEST(ThemeGen, state) { @@ -46,13 +46,13 @@ TEST(ThemeGen, state) { style.data = theme_find_style(&theme, WIDGET_BUTTON, 0, WIDGET_STATE_OVER); ASSERT_EQ(style.data != NULL, true); - ASSERT_EQ(style_get_int(&style, E_FONT_SIZE, 0), 12); - ASSERT_EQ(style_get_int(&style, E_BG_COLOR, 0), 0xff00ffff); - ASSERT_EQ(style_get_int(&style, E_FG_COLOR, 0), 0xfffcfbfa); - ASSERT_EQ(style_get_str(&style, E_FONT_NAME, ""), string("sans")); + ASSERT_EQ(style_get_int(&style, STYLE_ID_FONT_SIZE, 0), 12); + ASSERT_EQ(style_get_int(&style, STYLE_ID_BG_COLOR, 0), 0xff00ffff); + ASSERT_EQ(style_get_int(&style, STYLE_ID_FG_COLOR, 0), 0xfffcfbfa); + ASSERT_EQ(style_get_str(&style, STYLE_ID_FONT_NAME, ""), string("sans")); style.data = theme_find_style(&theme, WIDGET_BUTTON, 0, WIDGET_STATE_PRESSED); ASSERT_EQ(style.data != NULL, true); - ASSERT_EQ(style_get_int(&style, E_BG_COLOR, 0), 0xff00ffff); - ASSERT_EQ(style_get_int(&style, E_FG_COLOR, 0), 0x7f00ffff); + ASSERT_EQ(style_get_int(&style, STYLE_ID_BG_COLOR, 0), 0xff00ffff); + ASSERT_EQ(style_get_int(&style, STYLE_ID_FG_COLOR, 0), 0x7f00ffff); } diff --git a/tests/ui_loader_default_test.cc b/tests/ui_loader_default_test.cc index 2e420ffdb..0c8ecdd0b 100644 --- a/tests/ui_loader_default_test.cc +++ b/tests/ui_loader_default_test.cc @@ -35,8 +35,8 @@ TEST(UILoader, basic) { ASSERT_EQ(builder->root->type == WIDGET_DIALOG, TRUE); ASSERT_EQ(widget_count_children(builder->root), 1); - ok = widget_lookup(builder->root, "ok"); - cancel = widget_lookup(builder->root, "cancel"); + ok = widget_lookup(builder->root, "ok", TRUE); + cancel = widget_lookup(builder->root, "cancel", TRUE); ASSERT_EQ(ok != NULL, true); ASSERT_EQ(ok->type == WIDGET_BUTTON, true); diff --git a/tests/ui_loader_xml_test.cc b/tests/ui_loader_xml_test.cc index 966d364f6..e3d5d716e 100644 --- a/tests/ui_loader_xml_test.cc +++ b/tests/ui_loader_xml_test.cc @@ -20,8 +20,8 @@ TEST(UILoaderXML, basic) { ASSERT_EQ(builder->root->type == WIDGET_DIALOG, TRUE); ASSERT_EQ(widget_count_children(builder->root), 1); - ok = widget_lookup(builder->root, "ok"); - cancel = widget_lookup(builder->root, "cancel"); + ok = widget_lookup(builder->root, "ok", TRUE); + cancel = widget_lookup(builder->root, "cancel", TRUE); ASSERT_EQ(ok != NULL, true); ASSERT_EQ(ok->type == WIDGET_BUTTON, true); diff --git a/tests/widget_test.cc b/tests/widget_test.cc index ed6c37bd8..6b8c7be25 100644 --- a/tests/widget_test.cc +++ b/tests/widget_test.cc @@ -29,17 +29,14 @@ TEST(Widget, moveresize) { ASSERT_EQ(widget_set_enable(&w, FALSE), RET_OK); ASSERT_EQ(w.enable, FALSE); - ASSERT_EQ(widget_set_visible(&w, TRUE), RET_OK); + ASSERT_EQ(widget_set_visible(&w, TRUE, TRUE), RET_OK); ASSERT_EQ(w.visible, TRUE); - ASSERT_EQ(widget_set_visible(&w, FALSE), RET_OK); + ASSERT_EQ(widget_set_visible(&w, FALSE, TRUE), RET_OK); ASSERT_EQ(w.visible, FALSE); - ASSERT_EQ(widget_set_selected(&w, TRUE), RET_OK); - ASSERT_EQ(w.selected, TRUE); - - ASSERT_EQ(widget_set_selected(&w, FALSE), RET_OK); - ASSERT_EQ(w.selected, FALSE); + ASSERT_EQ(widget_set_focused(&w, FALSE), RET_OK); + ASSERT_EQ(w.focused, FALSE); } TEST(Widget, props) { @@ -121,17 +118,17 @@ TEST(Widget, children) { ASSERT_EQ(widget_set_name(&c6, "c6"), RET_OK); ASSERT_EQ(widget_set_name(&group, "group"), RET_OK); - ASSERT_EQ(widget_lookup_child(&w, "c1"), &c1); - ASSERT_EQ(widget_lookup_child(&w, "c2"), &c2); - ASSERT_EQ(widget_lookup_child(&w, "c3"), &c3); + ASSERT_EQ(widget_lookup(&w, "c1", FALSE), &c1); + ASSERT_EQ(widget_lookup(&w, "c2", FALSE), &c2); + ASSERT_EQ(widget_lookup(&w, "c3", FALSE), &c3); - ASSERT_EQ(widget_lookup(&w, "c1"), &c1); - ASSERT_EQ(widget_lookup(&w, "c2"), &c2); - ASSERT_EQ(widget_lookup(&w, "c3"), &c3); + ASSERT_EQ(widget_lookup(&w, "c1", TRUE), &c1); + ASSERT_EQ(widget_lookup(&w, "c2", TRUE), &c2); + ASSERT_EQ(widget_lookup(&w, "c3", TRUE), &c3); - ASSERT_EQ(widget_lookup(&w, "c4"), &c4); - ASSERT_EQ(widget_lookup(&w, "c5"), &c5); - ASSERT_EQ(widget_lookup(&w, "c6"), &c6); + ASSERT_EQ(widget_lookup(&w, "c4", TRUE), &c4); + ASSERT_EQ(widget_lookup(&w, "c5", TRUE), &c5); + ASSERT_EQ(widget_lookup(&w, "c6", TRUE), &c6); widget_move_resize(&c1, 10, 10, 20, 20); ASSERT_EQ(widget_find_target(&w, 11, 11), &c1); diff --git a/tools/idl_gen/.vscode/launch.json b/tools/idl_gen/.vscode/launch.json new file mode 100644 index 000000000..54d5ff911 --- /dev/null +++ b/tools/idl_gen/.vscode/launch.json @@ -0,0 +1,20 @@ +{ + // 使用 IntelliSense 了解相关属性。 + // 悬停以查看现有属性的描述。 + // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch gen_lua", + "program": "${workspaceFolder}/gen_lua.js" + }, + { + "type": "node", + "request": "launch", + "name": "Launch gen_idl", + "program": "${workspaceFolder}/gen_idl.js" + } + ] +} \ No newline at end of file diff --git a/tools/idl_gen/gen_idl.js b/tools/idl_gen/gen_idl.js index db7b16334..6ce339d16 100644 --- a/tools/idl_gen/gen_idl.js +++ b/tools/idl_gen/gen_idl.js @@ -50,6 +50,10 @@ function parseProperty(comment) { property.name = arr[3]; } else if (iter.indexOf('@readonly') >= 0) { property.readonly = true; + } else if (iter.indexOf(' @private') >= 0) { + property.isPrivate = true; + } else if (iter.indexOf(' @scriptable') >= 0 && iter.indexOf('no') >= 0) { + property.isPrivate = true; } }); @@ -68,6 +72,14 @@ function parseMethod(comment) { method.isDeconstructor = true; } else if (iter.indexOf(' @constructor') >= 0) { method.isConstructor = true; + } else if (iter.indexOf(' @global') >= 0) { + method.isGlobal = true; + } else if (iter.indexOf(' @private') >= 0) { + method.isPrivate = true; + } else if (iter.indexOf(' @scriptable') >= 0 && iter.indexOf('no') >= 0) { + method.isPrivate = true; + } else if (iter.indexOf(' @scriptable') >= 0 && iter.indexOf('custom') >= 0) { + method.isCustom = true; } else if (iter.indexOf(' @param') >= 0) { const param = {}; const arr = parseTokens(iter); @@ -105,9 +117,21 @@ function extractIDL(result, filename, content) { cls.properties = []; cls.header = filename; } else if (comment.indexOf(' @method') >= 0) { - cls.methods.push(parseMethod(comment)); + const m = parseMethod(comment); + if (m && !m.isPrivate) { + if (m.isGlobal) { + m.type = 'method'; + m.header = filename; + result.push(m); + } else { + cls.methods.push(m); + } + } } else if (comment.indexOf(' @property') >= 0) { - cls.properties.push(parseProperty(comment)); + const p = parseProperty(comment); + if (p && !p.isPrivate) { + cls.properties.push(p); + } } else if (comment.indexOf(' @const') >= 0) { cls.consts.push(parseConst(comment)); } else if (comment.indexOf(' @enum') >= 0) { @@ -129,13 +153,14 @@ function extractIDL(result, filename, content) { function genOneFile(result, filename) { const content = fs.readFileSync(filename).toString(); - const name = filename.match(/[a-z|_\d|\.|A-Z]*\/[a-z|_\d|\.|A-Z]*$/); + const name = filename.match(/[a-z|_\d|\.|A-Z]*\/[a-z|_\d|\.|A-Z]*$/)[0]; + console.log(filename); extractIDL(result, name, content); } function genAll() { const result = []; - glob('../../src/**/value.h', null, function (er, files) { + glob('../../src/**/*.h', null, function (er, files) { files.forEach(iter => { genOneFile(result, iter); }); @@ -144,4 +169,4 @@ function genAll() { }) } -genAll(); \ No newline at end of file +genAll(); diff --git a/tools/idl_gen/gen_lua.js b/tools/idl_gen/gen_lua.js index ae1d3c12e..282f2bb7d 100644 --- a/tools/idl_gen/gen_lua.js +++ b/tools/idl_gen/gen_lua.js @@ -1,7 +1,27 @@ const fs = require('fs'); -/*https://www.codingnow.com/2000/download/lua_manual.html*/ -/*http://book.luaer.cn/_3.htm*/ +/** + * Ref: + * https://www.codingnow.com/2000/download/lua_manual.html + * http://book.luaer.cn/_3.htm + * http://www.cnblogs.com/luweimy/p/3972353.html + */ + +const builtin = `#include "custom.c"\n\n`; + +function toLuaClassName(name) { + name = name.replace(/_t$/, ''); + name = name.replace(/(^|_)[a-z]/g, r => { + if(r.length > 1) { + r = r.substr(1); + } + + return r.toUpperCase(); + }); + + return name; +} + function genDecl(index, type, name) { let str = ''; str += ` ${type} ${name} = `; @@ -13,18 +33,27 @@ function genDecl(index, type, name) { } } else { if (type.indexOf('char*') >= 0) { - str += `(${type})luaL_checkstring(L,${index+1});\n`; + str += `(${type})luaL_checkstring(L, ${index+1});\n`; + } else if (type.indexOf('wchar_t*') >= 0) { + str += `(${type})lua_touserdata(L, ${index+1});\n`; + } else if (type.indexOf('void*') >= 0) { + if(name !== 'ctx') { + str += `(${type})lua_touserdata(L, ${index+1});\n`; + } else { + str += ' NULL;\n'; + } } else if (type.indexOf('*') >= 0) { const type_name = type.replace(/\*/g, ''); - str += `(${type})luaL_checkudata(L, ${index+1}, "lftk.${type_name}");\n`; - } else if (type.indexOf('int') >= 0) { - str += `(${type})luaL_checkinteger(L,${index+1});\n`; + str += `(${type})lftk_checkudata(L, ${index+1}, "lftk.${type_name}");\n`; + } else if (type.indexOf('float') >= 0 || type.indexOf('double') >= 0) { + str += `(${type})luaL_checknumber(L, ${index+1});\n`; } else if (type.indexOf('bool_t') >= 0) { str += `(${type})lua_toboolean(L, ${index+1});\n`; + } else if (type.indexOf('func_t') >= 0) { + str += `(${type})lua_tocfunction(L, ${index+1});\n`; } else { - str += `(${type})luaL_checknumber(L,${index+1});\n`; + str += `(${type})luaL_checkinteger(L, ${index+1});\n`; } - } return str; @@ -47,6 +76,8 @@ function genReturnData(type, name) { let str = ''; if (type.indexOf('char*') >= 0) { str = ` lua_pushstring(L,(char*)(${name}));\n`; + } else if (type.indexOf('wchar_t*') >= 0) { + str = ` lua_pushlightuserdata(L,(void*)(${name}));\n`; } else if (type.indexOf('*') >= 0) { str = ` lua_pushlightuserdata(L,(void*)(${name}));\n`; } else if (type.indexOf('int') >= 0) { @@ -60,10 +91,10 @@ function genReturnData(type, name) { return str; } -function genMethodCall(cls, m) { +function genCallMethod(cls, m) { const ret_type = m.return; let str = ret_type == 'void' ? ' ' : ' ret = ' - str += `${m.name}(`; + str += `(${ret_type})${m.name}(`; m.params.forEach((iter, index) => { if (index > 0) { str += ', ' + iter.name; @@ -79,13 +110,14 @@ function genMethodCall(cls, m) { str += ' return 0;\n'; } else { str += genReturnData(ret_type, 'ret'); - if (m.constructor) { + if (m.isConstructor) { str += ` luaL_getmetatable(L, "lftk.${cls.name}");\n`; str += ` lua_setmetatable(L, -2);\n`; } str += '\n'; str += ' return 1;\n'; } + return str; } @@ -93,7 +125,7 @@ function genMethod(cls, m) { const args_nr = m.params.length; let str = `static int wrap_${m.name}(lua_State* L) {\n`; str += genParamsDecl(m); - str += genMethodCall(cls, m); + str += genCallMethod(cls, m); str += '}\n\n'; return str; @@ -109,6 +141,7 @@ function genSetProperty(index, cls, p) { str += ' '; if (p.readonly) { str += ` printf("${p.name} is readonly\\n");\n`; + str += ` return 0;\n`; } else { str += genDecl(2, p.type, p.name); str += ` obj->${p.name} = ${p.name};\n`; @@ -127,6 +160,7 @@ function genGetProperty(index, cls, p) { } str += ' '; str += genReturnData(p.type, `obj->${p.name}`); + str += ' return 1;\n'; str += ' }\n'; return str; @@ -136,43 +170,80 @@ function methodToShortName(clsName, methodName) { return methodName.replace(clsName.replace(/_t$/, '') + "_", '') } -function genClass(cls) { +function genSetProp(cls) { let str = ''; const clsName = cls.name; - cls.methods.forEach(m => { - str += genMethod(cls, m); + str += `static int wrap_${clsName}_set_prop(lua_State* L) {\n`; + str += genDecl(0, cls.name + '*', "obj"); + str += genDecl(1, "const char*", "name"); + str += '(void)obj;\n'; + str += '(void)name;\n'; + + let hasSetProps = false; + cls.properties.forEach((m, index) => { + str += genSetProperty(index, cls, m); + hasSetProps = true; }); - if (cls.properties.length > 0) { - str += `static int wrap_${clsName}_set_prop(lua_State* L) {\n`; - str += genDecl(0, cls.name + '*', "obj"); - str += genDecl(1, "const char*", "name"); - - cls.properties.forEach((m, index) => { - str += genSetProperty(index, cls, m); - }); - str += ` else {\n`; - str += ` printf("not supported %s\\n", name);\n`; - str += ` }\n`; - - str += ` return 0;\n`; - str += `}\n`; - - str += `static int wrap_${clsName}_get_prop(lua_State* L) {\n`; - str += genDecl(0, cls.name + '*', "obj"); - str += genDecl(1, "const char*", "name"); - - cls.properties.forEach((m, index) => { - str += genGetProperty(index, cls, m); - }); - - str += ` else {\n`; - str += ` printf("not supported %s\\n", name);\n`; - str += ` }\n`; - str += ` return 1;\n`; - str += `}\n`; + if (hasSetProps) { + str += ` else {\n `; } + if (cls.parent) { + str += ` return wrap_${cls.parent}_set_prop(L);\n`; + } else if (hasSetProps) { + str += ` printf("%s: not supported %s\\n", __func__, name);\n`; + str += ` return 0;\n`; + } + if (hasSetProps) { + str += ` }\n`; + } else { + str += ` printf("%s: not supported %s\\n", __func__, name);\n`; + str += ` return 0;\n`; + } + + str += `}\n\n`; + + return str; +} + +function genGetProp(cls) { + let str = ''; + const clsName = cls.name; + + str += `static int wrap_${clsName}_get_prop(lua_State* L) {\n`; + str += genDecl(0, cls.name + '*', "obj"); + str += genDecl(1, "const char*", "name"); + str += ` const luaL_Reg* ret = find_member(${cls.name}_member_funcs, name);\n\n`; + + str += ' (void)obj;\n'; + str += ' (void)name;\n'; + str += ' if(ret) {\n'; + str += ' lua_pushcfunction(L, ret->func);\n'; + str += ' return 1;\n'; + str += ' }\n'; + + cls.properties.forEach((m, index) => { + str += genGetProperty(index, cls, m); + }); + + str += ` else {\n`; + if (cls.parent) { + str += ` return wrap_${cls.parent}_get_prop(L);\n`; + } else { + str += ` printf("%s: not supported %s\\n", __func__, name);\n`; + str += ` return 1;\n`; + } + str += ` }\n`; + + str += `}\n\n`; + + return str; +} + +function genClassInit(cls) { + let str = ''; + const clsName = cls.name; str += `static void ${cls.name}_init(lua_State* L) {\n`; str += ' static const struct luaL_Reg static_funcs[] = {\n' @@ -184,42 +255,77 @@ function genClass(cls) { }); str += ` {NULL, NULL}\n`; - str += ' };\n' - - str += ' static const struct luaL_Reg member_funcs[] = {\n' - cls.methods.forEach(m => { - const name = methodToShortName(cls.name, m.name); - if (!m.isConstructor) { - str += ` {"${name}", wrap_${m.name}},\n`; - } - }); - if (cls.properties.length > 0) { - str += ` {"_set", wrap_${clsName}_set_prop},\n`; - str += ` {"_get", wrap_${clsName}_get_prop},\n`; - } + str += ' };\n\n' + str += ' static const struct luaL_Reg index_funcs[] = {\n' + str += ` {"__index", wrap_${clsName}_get_prop},\n`; + str += ` {"__newindex", wrap_${clsName}_set_prop},\n`; str += ` {NULL, NULL}\n`; - str += ' };\n' + str += ' };\n\n' str += ` luaL_newmetatable(L, "lftk.${cls.name}");\n`; str += ` lua_pushstring(L, "__index");\n`; str += ' lua_pushvalue(L, -2);\n'; str += ' lua_settable(L, -3);\n'; - str += ` luaL_openlib(L, NULL, member_funcs, 0);\n`; - str += ` luaL_openlib(L, "${cls.name}", static_funcs, 0);\n`; + str += ` luaL_openlib(L, NULL, index_funcs, 0);\n`; + str += ` luaL_openlib(L, "${toLuaClassName(cls.name)}", static_funcs, 0);\n`; - str += '}\n\n'; + str += ' lua_settop(L, 0);\n'; + str += '}\n'; + + return str; +} + +function genMethods(cls) { + let str = ''; + const clsName = cls.name; + + cls.methods.forEach(m => { + if(!m.isPrivate && !m.isCustom) { + str += genMethod(cls, m); + } + }); + + str += `\nstatic const struct luaL_Reg ${cls.name}_member_funcs[] = {\n` + cls.methods.forEach(m => { + const name = methodToShortName(cls.name, m.name); + if (!m.isConstructor) { + str += ` {"${name}", wrap_${m.name}},\n`; + } + }); + str += ` {NULL, NULL}\n`; + str += '};\n\n' + + return str; +} + +function genClass(cls) { + let str = ''; + + str += genMethods(cls); + str += genSetProp(cls); + str += genGetProp(cls); + str += genClassInit(cls); return str; } function genEnum(cls) { let str = `static void ${cls.name}_init(lua_State* L) {\n`; + + str += ' lua_newtable(L);\n'; + str += ` lua_setglobal(L, "${toLuaClassName(cls.name)}");\n`; + str += ` lua_getglobal(L, "${toLuaClassName(cls.name)}");\n\n`; + + const clsNamePrefix = cls.name.toUpperCase().replace(/_T$/, "_"); cls.consts.forEach(iter => { - const name = iter.name; - str += ` lua_pushinteger(L, ${name});\n`; - str += ` lua_setglobal(L, "${name}");\n`; + const name = iter.name.replace(clsNamePrefix, ""); + + str += ` lua_pushstring(L, "${name}");\n` + str += ` lua_pushinteger(L, ${iter.name});\n`; + str += ` lua_settable(L, -3); \n\n`; }); + str += '}\n\n'; return str; @@ -235,14 +341,13 @@ function genOne(cls) { } } -function genAll() { - let result = '#define LUA_COMPAT_MODULE\n'; +function genIncludes(json) { + let result = '/*XXX: generated by lua_gen. dont edit it.*/\n'; + result += '#include "lua.h"\n'; + result += '#include "lualib.h"\n'; result += '#include "lauxlib.h"\n'; - - const content = fs.readFileSync('idl.json').toString(); - const json = JSON.parse(content); - + result += '#include "base/utf8.h"\n'; json.forEach(iter => { if (result.indexOf(iter.header) <= 0) { result += `#include "${iter.header}"\n`; @@ -250,17 +355,88 @@ function genAll() { }); result += "\n"; + return result; +} + +function genFuncDecls(json) { + let result = ''; + + json.forEach(iter => { + if (iter.type == 'class') { + const clsName = iter.name; + result += `static int wrap_${clsName}_get_prop(lua_State* L);\n`; + result += `static int wrap_${clsName}_set_prop(lua_State* L);\n`; + } + }); + result += '\n'; + + return result; +} + +function genInit(json) { + let result = ''; + + result += `\nvoid luaL_openlftk(lua_State* L) {\n`; + result += ` globals_init(L);\n`; + json.forEach(iter => { + if(iter.type === 'class' || iter.type === 'enum') { + result += ` ${iter.name}_init(L);\n`; + } + }); + result += ' s_current_L = L;\n'; + result += '}\n'; + + return result; +} + +function genGlobals(json) { + let str = ''; + + json.forEach(iter => { + if (iter.type == 'method') { + str += genMethod({}, iter); + } + }); + + str += 'static void globals_init(lua_State* L) {\n'; + + json.forEach(iter => { + if (iter.type == 'method') { + str += ` lua_pushcfunction(L, wrap_${iter.name});\n`; + str += ` lua_setglobal(L, "${iter.name}");\n`; + } else if (iter.type == 'const') { + str += ` lua_pushinteger(L, ${iter.name});\n`; + str += ` lua_setglobal(L, "${iter.name}");\n`; + } + }); + + str += ' lua_pushcfunction(L, to_str);\n'; + str += ' lua_setglobal(L, "to_str");\n'; + str += ' lua_pushcfunction(L, to_wstr);\n'; + str += ' lua_setglobal(L, "to_wstr");\n'; + + str += '}\n\n'; + + return str; +} + +function genAll(json) { + let result = genIncludes(json); + + result += builtin; + result += genFuncDecls(json); + result += genGlobals(json); json.forEach(iter => { result += genOne(iter); }); - result += `\nvoid luaL_openlftk(lua_State* L) {\n`; - json.forEach(iter => { - result += ` ${iter.name}_init(L);\n`; - }); - result += '}\n'; + result += genInit(json); - fs.writeFileSync('../../lua/lftk_lua.c', result); + return result; } -genAll(); \ No newline at end of file +function run() { + fs.writeFileSync('../../lua/lftk_lua.c', genAll(JSON.parse(fs.readFileSync('idl.json').toString()))); +} + +run(); diff --git a/tools/idl_gen/idl.json b/tools/idl_gen/idl.json index ef0ff1bf5..7fffee0d5 100644 --- a/tools/idl_gen/idl.json +++ b/tools/idl_gen/idl.json @@ -1,9 +1,867 @@ [ { - "type": "enum", - "header": [ - "base/value.h" + "type": "class", + "name": "button_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "button_create", + "isConstructor": true, + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "wchar_t*", + "name": "text" + } + ], + "name": "button_set_text", + "return": "ret_t" + } ], + "properties": [], + "header": "base/button.h" + }, + { + "type": "class", + "name": "check_button_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "check_button_create", + "isConstructor": true, + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "check_button_create_radio", + "isConstructor": true, + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "wchar_t*", + "name": "text" + } + ], + "name": "check_button_set_text", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint32_t", + "name": "value" + } + ], + "name": "check_button_set_value", + "return": "ret_t" + } + ], + "properties": [ + { + "type": "bool_t", + "name": "value", + "readonly": true + } + ], + "header": "base/check_button.h" + }, + { + "type": "class", + "name": "dialog_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "dialog_create", + "isConstructor": true, + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "char*", + "name": "name" + } + ], + "name": "dialog_set_icon", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "wchar_t*", + "name": "title" + } + ], + "name": "dialog_set_title", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + } + ], + "name": "dialog_modal", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint32_t", + "name": "code" + } + ], + "name": "dialog_quit", + "return": "ret_t" + } + ], + "properties": [], + "header": "base/dialog.h" + }, + { + "type": "enum", + "header": "base/events.h", + "name": "event_type_t", + "scriptable": true, + "consts": [ + { + "name": "EVT_NONE" + }, + { + "name": "EVT_POINTER_DOWN" + }, + { + "name": "EVT_POINTER_MOVE" + }, + { + "name": "EVT_POINTER_UP" + }, + { + "name": "EVT_POINTER_ENTER" + }, + { + "name": "EVT_POINTER_LEAVE" + }, + { + "name": "EVT_CLICK" + }, + { + "name": "EVT_KEY_DOWN" + }, + { + "name": "EVT_KEY_UP" + }, + { + "name": "EVT_MOVE" + }, + { + "name": "EVT_RESIZE" + }, + { + "name": "EVT_DESTROY" + }, + { + "name": "EVT_MOVE_RESIZE" + }, + { + "name": "EVT_PROP_CHANGED" + } + ] + }, + { + "type": "class", + "name": "event_t", + "scriptable": true, + "methods": [], + "properties": [ + { + "type": "int16_t", + "name": "type", + "readonly": true + } + ], + "header": "base/events.h" + }, + { + "type": "class", + "name": "pointer_event_t", + "scriptable": true, + "parent": "event_t", + "methods": [ + { + "params": [ + { + "type": "event_t*", + "name": "event" + } + ], + "name": "pointer_event_cast", + "isConstructor": true, + "return": "pointer_event_t*" + } + ], + "properties": [ + { + "type": "xy_t", + "name": "x", + "readonly": true + }, + { + "type": "xy_t", + "name": "y", + "readonly": true + }, + { + "type": "uint8_t", + "name": "button", + "readonly": true + }, + { + "type": "bool_t", + "name": "pressed", + "readonly": true + } + ], + "header": "base/events.h" + }, + { + "type": "class", + "name": "key_event_t", + "scriptable": true, + "parent": "event_t", + "methods": [ + { + "params": [ + { + "type": "event_t*", + "name": "event" + } + ], + "name": "key_event_cast", + "isConstructor": true, + "return": "key_event_t*" + } + ], + "properties": [ + { + "type": "uint8_t", + "name": "key", + "readonly": true + }, + { + "type": "bool_t", + "name": "alt", + "readonly": true + }, + { + "type": "bool_t", + "name": "ctrl", + "readonly": true + }, + { + "type": "bool_t", + "name": "shift", + "readonly": true + } + ], + "header": "base/events.h" + }, + { + "type": "class", + "name": "group_box_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "group_box_create", + "isConstructor": true, + "return": "widget_t*" + } + ], + "properties": [], + "header": "base/group_box.h" + }, + { + "type": "class", + "name": "image_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "image_create", + "isConstructor": true, + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "char*", + "name": "name" + } + ], + "name": "image_set_image_name", + "return": "ret_t" + } + ], + "properties": [], + "header": "base/image.h" + }, + { + "type": "class", + "name": "label_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "label_create", + "isConstructor": true, + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint8_t", + "name": "border" + } + ], + "name": "label_set_border", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint8_t", + "name": "text_align_h" + } + ], + "name": "label_set_text_align_h", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint8_t", + "name": "text_align_v" + } + ], + "name": "label_set_text_align_v", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "wchar_t*", + "name": "text" + } + ], + "name": "label_set_text", + "return": "ret_t" + } + ], + "properties": [ + { + "type": "uint8_t", + "name": "border", + "readonly": true + }, + { + "type": "uint8_t", + "name": "text_align_v", + "readonly": true + }, + { + "type": "uint8_t", + "name": "text_align_h", + "readonly": true + } + ], + "header": "base/label.h" + }, + { + "params": [], + "name": "lftk_quit", + "isGlobal": true, + "return": "ret_t", + "type": "method", + "header": "base/lftk.h" + }, + { + "type": "class", + "name": "progress_bar_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "progress_bar_create", + "isConstructor": true, + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint8_t", + "name": "value" + } + ], + "name": "progress_bar_set_value", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "bool_t", + "name": "vertical" + } + ], + "name": "progress_bar_set_vertical", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "bool_t", + "name": "show_text" + } + ], + "name": "progress_bar_set_show_text", + "return": "ret_t" + } + ], + "properties": [ + { + "type": "uint8_t", + "name": "value", + "readonly": true + }, + { + "type": "bool_t", + "name": "vertical", + "readonly": true + }, + { + "type": "bool_t", + "name": "show_text", + "readonly": true + } + ], + "header": "base/progress_bar.h" + }, + { + "type": "class", + "name": "point_t", + "scriptable": true, + "methods": [], + "properties": [ + { + "type": "xy_t", + "name": "x", + "readonly": true + }, + { + "type": "xy_t", + "name": "y", + "readonly": true + } + ], + "header": "base/rect.h" + }, + { + "type": "class", + "name": "rect_t", + "scriptable": true, + "methods": [], + "properties": [ + { + "type": "xy_t", + "name": "x", + "readonly": true + }, + { + "type": "xy_t", + "name": "y", + "readonly": true + }, + { + "type": "wh_t", + "name": "w", + "readonly": true + }, + { + "type": "wh_t", + "name": "h", + "readonly": true + } + ], + "header": "base/rect.h" + }, + { + "type": "class", + "name": "style_t", + "methods": [], + "properties": [], + "header": "base/theme.h" + }, + { + "type": "class", + "name": "theme_t", + "methods": [], + "properties": [], + "header": "base/theme.h" + }, + { + "type": "enum", + "header": "base/theme.h", + "name": "style_type_t", + "consts": [ + { + "name": "STYLE_ID_BG_COLOR" + }, + { + "name": "STYLE_ID_BG_COLOR" + }, + { + "name": "STYLE_ID_FONT_NAME" + }, + { + "name": "STYLE_ID_FONT_SIZE" + }, + { + "name": "STYLE_ID_FONT_STYLE" + }, + { + "name": "STYLE_ID_TEXT_COLOR" + }, + { + "name": "STYLE_ID_TEXT_ALIGN_H" + }, + { + "name": "STYLE_ID_TEXT_ALIGN_V" + }, + { + "name": "STYLE_ID_BORDER_COLOR" + }, + { + "name": "STYLE_ID_ICON" + } + ] + }, + { + "type": "enum", + "header": "base/theme.h", + "name": "align_v_t", + "scriptable": true, + "consts": [ + { + "name": "ALIGN_V_NONE" + }, + { + "name": "ALIGN_V_MIDDLE" + }, + { + "name": "ALIGN_V_TOP" + }, + { + "name": "ALIGN_V_BOTTOM" + } + ] + }, + { + "type": "enum", + "header": "base/theme.h", + "name": "align_h_t", + "scriptable": true, + "consts": [ + { + "name": "ALIGN_H_NONE" + }, + { + "name": "ALIGN_H_CENTER" + }, + { + "name": "ALIGN_H_LEFT" + }, + { + "name": "ALIGN_H_RIGHT" + } + ] + }, + { + "type": "enum", + "header": "base/types_def.h", + "name": "ret_t", + "scriptable": true, + "consts": [ + { + "name": "RET_OK" + }, + { + "name": "RET_OOM" + }, + { + "name": "RET_FAIL" + }, + { + "name": "RET_QUIT" + }, + { + "name": "RET_FOUND" + }, + { + "name": "RET_REMOVE" + }, + { + "name": "RET_REPEAT" + }, + { + "name": "RET_NOT_FOUND" + }, + { + "name": "RET_BAD_PARAMS" + } + ] + }, + { + "type": "enum", + "header": "base/value.h", "name": "value_type_t", "scriptable": true, "consts": [ @@ -41,10 +899,10 @@ "name": "VALUE_TYPE_POINTER" }, { - "name": "VALUE_TYPE_FLOAT32" + "name": "VALUE_TYPE_FLOAT" }, { - "name": "VALUE_TYPE_FLOAT64" + "name": "VALUE_TYPE_DOUBLE" }, { "name": "VALUE_TYPE_STRING" @@ -275,30 +1133,6 @@ "name": "value_uint64", "return": "uint64_t" }, - { - "params": [ - { - "type": "value_t*", - "name": "v" - }, - { - "type": "pointer_t", - "name": "value" - } - ], - "name": "value_set_pointer", - "return": "value_t*" - }, - { - "params": [ - { - "type": "value_t*", - "name": "v" - } - ], - "name": "value_pointer", - "return": "void*" - }, { "params": [ { @@ -430,8 +1264,621 @@ "readonly": true } ], - "header": [ - "base/value.h" + "header": "base/value.h" + }, + { + "type": "enum", + "header": "base/widget.h", + "name": "widget_state_t", + "scriptable": true, + "consts": [ + { + "name": "WIDGET_STATE_NONE" + }, + { + "name": "WIDGET_STATE_NORMAL" + }, + { + "name": "WIDGET_STATE_PRESSED" + }, + { + "name": "WIDGET_STATE_OVER" + }, + { + "name": "WIDGET_STATE_DISABLE" + }, + { + "name": "WIDGET_STATE_FOCUSED" + }, + { + "name": "WIDGET_STATE_CHECKED" + }, + { + "name": "WIDGET_STATE_UNCHECKED" + } ] + }, + { + "type": "enum", + "header": "base/widget.h", + "name": "widget_type_t", + "scriptable": true, + "consts": [ + { + "name": "WIDGET_NONE" + }, + { + "name": "WIDGET_WINDOW_MANAGER" + }, + { + "name": "WIDGET_NORMAL_WINDOW" + }, + { + "name": "WIDGET_TOOLBAR" + }, + { + "name": "WIDGET_DIALOG" + }, + { + "name": "WIDGET_POPUP" + }, + { + "name": "WIDGET_LABEL" + }, + { + "name": "WIDGET_BUTTON" + }, + { + "name": "WIDGET_IMAGE" + }, + { + "name": "WIDGET_EDIT" + }, + { + "name": "WIDGET_PROGRESS_BAR" + }, + { + "name": "WIDGET_GROUP_BOX" + }, + { + "name": "WIDGET_CHECK_BUTTON" + }, + { + "name": "WIDGET_RADIO_BUTTON" + } + ] + }, + { + "type": "class", + "name": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + } + ], + "name": "widget_count_children", + "return": "uint32_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint32_t", + "name": "index" + } + ], + "name": "widget_get_child", + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + } + ], + "name": "widget_move", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "widget_resize", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "widget_move_resize", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint32_t", + "name": "value" + } + ], + "name": "widget_set_value", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "wchar_t*", + "name": "text" + } + ], + "name": "widget_set_text", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + } + ], + "name": "widget_get_value", + "return": "uint32_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + } + ], + "name": "widget_get_text", + "return": "wchar_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "point_t*", + "name": "p" + } + ], + "name": "widget_to_local", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "point_t*", + "name": "p" + } + ], + "name": "widget_to_global", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "char*", + "name": "name" + } + ], + "name": "widget_set_name", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "bool_t", + "name": "enable" + } + ], + "name": "widget_set_enable", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "bool_t", + "name": "focused" + } + ], + "name": "widget_set_focused", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "widget_state_t", + "name": "state" + } + ], + "name": "widget_set_state", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + } + ], + "name": "widget_destroy_children", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "widget_t*", + "name": "child" + } + ], + "name": "widget_add_child", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "widget_t*", + "name": "child" + } + ], + "name": "widget_remove_child", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "char*", + "name": "name" + }, + { + "type": "bool_t", + "name": "recursive" + } + ], + "name": "widget_lookup", + "return": "widget_t*" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "bool_t", + "name": "visible" + }, + { + "type": "bool_t", + "name": "recursive" + } + ], + "name": "widget_set_visible", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "event_type_t", + "name": "type" + }, + { + "type": "event_func_t", + "name": "on_event" + }, + { + "type": "void*", + "name": "ctx" + } + ], + "name": "widget_on", + "isCustom": true, + "return": "uint32_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "uint32_t", + "name": "id" + } + ], + "name": "widget_off", + "isCustom": true, + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "rect_t*", + "name": "r" + } + ], + "name": "widget_invalidate", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "char*", + "name": "name" + }, + { + "type": "value_t*", + "name": "v" + } + ], + "name": "widget_get_prop", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "char*", + "name": "name" + }, + { + "type": "value_t*", + "name": "v" + } + ], + "name": "widget_set_prop", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "widget_t*", + "name": "child" + } + ], + "name": "widget_grab", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + }, + { + "type": "widget_t*", + "name": "child" + } + ], + "name": "widget_ungrab", + "return": "ret_t" + }, + { + "params": [ + { + "type": "widget_t*", + "name": "widget" + } + ], + "name": "widget_destroy", + "return": "ret_t" + } + ], + "properties": [ + { + "type": "xy_t", + "name": "x", + "readonly": true + }, + { + "type": "xy_t", + "name": "y", + "readonly": true + }, + { + "type": "wh_t", + "name": "w", + "readonly": true + }, + { + "type": "wh_t", + "name": "h", + "readonly": true + }, + { + "type": "uint8_t", + "name": "type", + "readonly": true + }, + { + "type": "uint8_t", + "name": "subtype", + "readonly": true + }, + { + "type": "uint8_t", + "name": "state", + "readonly": true + }, + { + "type": "bool_t", + "name": "enable", + "readonly": true + }, + { + "type": "bool_t", + "name": "visible", + "readonly": true + }, + { + "type": "bool_t", + "name": "focused", + "readonly": true + }, + { + "type": "char*", + "name": "name", + "readonly": true + }, + { + "type": "widget_t*", + "name": "parent", + "readonly": true + } + ], + "header": "base/widget.h" + }, + { + "type": "class", + "name": "window_manager_t", + "parent": "widget_t", + "methods": [], + "properties": [], + "header": "base/window_manager.h" + }, + { + "type": "class", + "name": "window_t", + "parent": "widget_t", + "scriptable": true, + "methods": [ + { + "params": [ + { + "type": "widget_t*", + "name": "parent" + }, + { + "type": "xy_t", + "name": "x" + }, + { + "type": "xy_t", + "name": "y" + }, + { + "type": "wh_t", + "name": "w" + }, + { + "type": "wh_t", + "name": "h" + } + ], + "name": "window_create", + "isConstructor": true, + "return": "widget_t*" + } + ], + "properties": [], + "header": "base/window.h" } -] \ No newline at end of file +]