diff options
| author | sfan5 <sfan5@live.de> | 2020-05-15 16:38:19 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2020-05-17 21:37:01 +0200 |
| commit | 11723cffe011e99c1092388958fb1a047ab1c09c (patch) | |
| tree | 0a38f434c15893ba01bfa5ca80708780bcfead60 /builtin/mainmenu | |
| parent | 52430d34d33f0ae3ff188a009307bf0a86048dfe (diff) | |
| download | minetest-11723cffe011e99c1092388958fb1a047ab1c09c.tar.gz minetest-11723cffe011e99c1092388958fb1a047ab1c09c.tar.bz2 minetest-11723cffe011e99c1092388958fb1a047ab1c09c.zip | |
builtin: Move common/async_event.lua to mainmenu/async_event.lua
It only works in the context of the mainmenu.
Diffstat (limited to 'builtin/mainmenu')
| -rw-r--r-- | builtin/mainmenu/async_event.lua | 32 | ||||
| -rw-r--r-- | builtin/mainmenu/init.lua | 4 |
2 files changed, 33 insertions, 3 deletions
diff --git a/builtin/mainmenu/async_event.lua b/builtin/mainmenu/async_event.lua new file mode 100644 index 000000000..04bfb78d6 --- /dev/null +++ b/builtin/mainmenu/async_event.lua @@ -0,0 +1,32 @@ + +core.async_jobs = {} + +local function handle_job(jobid, serialized_retval) + local retval = core.deserialize(serialized_retval) + assert(type(core.async_jobs[jobid]) == "function") + core.async_jobs[jobid](retval) + core.async_jobs[jobid] = nil +end + +core.async_event_handler = handle_job + +function core.handle_async(func, parameter, callback) + -- Serialize function + local serialized_func = string.dump(func) + + assert(serialized_func ~= nil) + + -- Serialize parameters + local serialized_param = core.serialize(parameter) + + if serialized_param == nil then + return false + end + + local jobid = core.do_async_callback(serialized_func, serialized_param) + + core.async_jobs[jobid] = callback + + return true +end + diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 130c3e73c..c17e79270 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -20,20 +20,18 @@ mt_color_blue = "#6389FF" mt_color_green = "#72FF63" mt_color_dark_green = "#25C191" ---for all other colors ask sfan5 to complete his work! - local menupath = core.get_mainmenu_path() local basepath = core.get_builtin_path() local menustyle = core.settings:get("main_menu_style") defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" .. DIR_DELIM .. "pack" .. DIR_DELIM -dofile(basepath .. "common" .. DIR_DELIM .. "async_event.lua") dofile(basepath .. "common" .. DIR_DELIM .. "filterlist.lua") dofile(basepath .. "fstk" .. DIR_DELIM .. "buttonbar.lua") dofile(basepath .. "fstk" .. DIR_DELIM .. "dialog.lua") dofile(basepath .. "fstk" .. DIR_DELIM .. "tabview.lua") dofile(basepath .. "fstk" .. DIR_DELIM .. "ui.lua") +dofile(menupath .. DIR_DELIM .. "async_event.lua") dofile(menupath .. DIR_DELIM .. "common.lua") dofile(menupath .. DIR_DELIM .. "pkgmgr.lua") dofile(menupath .. DIR_DELIM .. "textures.lua") |