your-land/minetest-formspec_ast
19
0
Fork 0
forked from your-land-mirror/minetest-formspec_ast
Code Pull Requests Activity

Add button_url support

Browse Source
This commit is contained in:
luk3yx 2024-08-08 08:24:44 +12:00
parent fc663cb7c7
commit 2ac09aa32d
3 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
elements.lua
View File

@ -47,21 +47,22 @@ a[40] = {{a[4], a[3], a[26], a[39]}}
a[41] = {"default", "string"}
a[42] = {a[4], a[3], a[26], a[39], a[41]}
a[43] = {{a[4], a[39]}}
a[44] = {"noclip", "boolean"}
a[45] = {"drawborder", "boolean"}
a[46] = {{a[4], a[3], a[19], a[26], a[39], a[44], a[45], {"pressed_texture_name", "string"}}, {a[4], a[3], a[19], a[26], a[39], a[44], a[45]}, {a[4], a[3], a[19], a[26], a[39]}}
a[47] = {{{"listelems", "string"}, "..."}}
a[48] = {"selected_idx", "number"}
a[49] = {"transparent", "boolean"}
a[50] = {{{"captions", "string"}, "..."}}
a[51] = {"current_tab", "number"}
a[52] = {"draw_border", "boolean"}
a[53] = {{{"items", "string"}, "..."}}
a[54] = {"index_event", "boolean"}
a[55] = {"value", "number"}
a[56] = {{"opts", "table"}, "..."}
a[57] = {{a[56]}}
a[58] = {{"props", "table"}, "..."}
a[59] = {a[26]}
a[60] = {{{{{"selectors", "string"}, "..."}}, a[58]}, {a[59], a[58]}}
return {["formspec_version"] = {{{"version", "number"}}}, ["size"] = {{a[3]}, {{a[1], a[2], {"fixed_size", "boolean"}}}}, ["position"] = a[5], ["anchor"] = a[5], ["padding"] = a[5], ["no_prepend"] = a[7], ["real_coordinates"] = {{{"bool", "boolean"}}}, ["container"] = a[5], ["container_end"] = a[7], ["scroll_container"] = {{a[4], a[3], a[8], a[9], {"scroll_factor", "number"}}, {a[4], a[3], a[8], a[9]}}, ["scroll_container_end"] = a[7], ["list"] = {{a[10], a[11], a[4], a[3], {"starting_item_index", "number"}}, {a[10], a[11], a[4], a[3]}}, ["listring"] = {{a[10], a[11]}, a[6]}, ["listcolors"] = {{a[12], a[13], a[14], {"tooltip_bgcolor", "string"}, {"tooltip_fontcolor", "string"}}, {a[12], a[13], a[14]}, {a[12], a[13]}}, ["tooltip"] = {{a[4], a[3], a[15], a[16], a[17]}, {a[4], a[3], a[15], a[16]}, {a[18], a[15], a[16], a[17]}, {a[4], a[3], a[15]}, {a[18], a[15], a[16]}, {a[18], a[15]}}, ["image"] = {{a[4], a[3], a[19], a[22]}, {a[4], a[3], a[19], a[23]}, {a[4], a[3], a[19], a[24]}, a[25]}, ["animated_image"] = {{a[4], a[3], a[26], a[19], a[27], a[28], a[29], a[22]}, {a[4], a[3], a[26], a[19], a[27], a[28], a[29], a[23]}, {a[4], a[3], a[26], a[19], a[27], a[28], a[29], a[24]}, {a[4], a[3], a[26], a[19], a[27], a[28], a[29]}, {a[4], a[3], a[26], a[19], a[27], a[28]}}, ["model"] = {{a[4], a[3], a[26], a[30], a[31], a[32], a[33], a[34], a[35], {"animation_speed", "number"}}, {a[4], a[3], a[26], a[30], a[31], a[32], a[33], a[34], a[35]}, {a[4], a[3], a[26], a[30], a[31], a[32], a[33], a[34]}, {a[4], a[3], a[26], a[30], a[31], a[32], a[33]}, {a[4], a[3], a[26], a[30], a[31], a[32]}, {a[4], a[3], a[26], a[30], a[31]}}, ["item_image"] = {{a[4], a[3], a[36]}}, ["bgcolor"] = {{a[16], a[37], {"fbgcolor", "string"}}, {a[16], a[37]}, {a[16]}}, ["background"] = {{a[4], a[3], a[19], a[38]}, a[25]}, ["background9"] = {{a[4], a[3], a[19], a[38], a[22]}, {a[4], a[3], a[19], a[38], a[23]}, {a[4], a[3], a[19], a[38], a[24]}}, ["pwdfield"] = a[40], ["field"] = {a[42], {a[26], a[39], a[41]}}, ["field_enter_after_edit"] = {{a[26], {"enter_after_edit", "boolean"}}}, ["field_close_on_enter"] = {{a[26], {"close_on_enter", "boolean"}}}, ["textarea"] = {a[42]}, ["label"] = a[43], ["hypertext"] = {{a[4], a[3], a[26], {"text", "string"}}}, ["vertlabel"] = a[43], ["button"] = a[40], ["image_button"] = a[46], ["item_image_button"] = {{a[4], a[3], a[36], a[26], a[39]}}, ["button_exit"] = a[40], ["image_button_exit"] = a[46], ["textlist"] = {{a[4], a[3], a[26], a[47], a[48], a[49]}, {a[4], a[3], a[26], a[47], a[48]}, {a[4], a[3], a[26], a[47]}}, ["tabheader"] = {{a[4], a[2], a[26], a[50], a[51], a[49], a[52]}, {a[4], a[3], a[26], a[50], a[51], a[49], a[52]}, {a[4], a[26], a[50], a[51], a[49], a[52]}, {a[4], a[26], a[50], a[51]}}, ["box"] = {{a[4], a[3], {"color", "string"}}}, ["dropdown"] = {{a[4], a[3], a[26], a[53], a[48], a[54]}, {a[4], a[1], a[26], a[53], a[48], a[54]}, {a[4], a[3], a[26], a[53], a[48]}, {a[4], a[1], a[26], a[53], a[48]}}, ["checkbox"] = {{a[4], a[26], a[39], {"selected", "boolean"}}, {a[4], a[26], a[39]}}, ["scrollbar"] = {{a[4], a[3], a[9], a[26], a[55], {{"scrollbar_bg", "string"}, {"slider", "string"}, {"arrow_up", "string"}, {"arrow_down", "string"}}}, {a[4], a[3], a[9], a[26], a[55]}}, ["scrollbaroptions"] = a[57], ["table"] = {{a[4], a[3], a[26], {{{"cells", "string"}, "..."}}, a[48]}}, ["tableoptions"] = a[57], ["tablecolumns"] = {{{{{"type", "string"}, a[56]}, "..."}}}, ["style"] = a[60], ["style_type"] = a[60], ["set_focus"] = {{a[26], {"force", "boolean"}}, a[59]}}
a[44] = {{a[4], a[3], a[26], a[39], {"url", "string"}}}
a[45] = {"noclip", "boolean"}
a[46] = {"drawborder", "boolean"}
a[47] = {{a[4], a[3], a[19], a[26], a[39], a[45], a[46], {"pressed_texture_name", "string"}}, {a[4], a[3], a[19], a[26], a[39], a[45], a[46]}, {a[4], a[3], a[19], a[26], a[39]}}
a[48] = {{{"listelems", "string"}, "..."}}
a[49] = {"selected_idx", "number"}
a[50] = {"transparent", "boolean"}
a[51] = {{{"captions", "string"}, "..."}}
a[52] = {"current_tab", "number"}
a[53] = {"draw_border", "boolean"}
a[54] = {{{"items", "string"}, "..."}}
a[55] = {"index_event", "boolean"}
a[56] = {"value", "number"}
a[57] = {{"opts", "table"}, "..."}
a[58] = {{a[57]}}
a[59] = {{"props", "table"}, "..."}
a[60] = {a[26]}
a[61] = {{{{{"selectors", "string"}, "..."}}, a[59]}, {a[60], a[59]}}
return {["formspec_version"] = {{{"version", "number"}}}, ["size"] = {{a[3]}, {{a[1], a[2], {"fixed_size", "boolean"}}}}, ["position"] = a[5], ["anchor"] = a[5], ["padding"] = a[5], ["no_prepend"] = a[7], ["real_coordinates"] = {{{"bool", "boolean"}}}, ["container"] = a[5], ["container_end"] = a[7], ["scroll_container"] = {{a[4], a[3], a[8], a[9], {"scroll_factor", "number"}}, {a[4], a[3], a[8], a[9]}}, ["scroll_container_end"] = a[7], ["list"] = {{a[10], a[11], a[4], a[3], {"starting_item_index", "number"}}, {a[10], a[11], a[4], a[3]}}, ["listring"] = {{a[10], a[11]}, a[6]}, ["listcolors"] = {{a[12], a[13], a[14], {"tooltip_bgcolor", "string"}, {"tooltip_fontcolor", "string"}}, {a[12], a[13], a[14]}, {a[12], a[13]}}, ["tooltip"] = {{a[4], a[3], a[15], a[16], a[17]}, {a[4], a[3], a[15], a[16]}, {a[18], a[15], a[16], a[17]}, {a[4], a[3], a[15]}, {a[18], a[15], a[16]}, {a[18], a[15]}}, ["image"] = {{a[4], a[3], a[19], a[22]}, {a[4], a[3], a[19], a[23]}, {a[4], a[3], a[19], a[24]}, a[25]}, ["animated_image"] = {{a[4], a[3], a[26], a[19], a[27], a[28], a[29], a[22]}, {a[4], a[3], a[26], a[19], a[27], a[28], a[29], a[23]}, {a[4], a[3], a[26], a[19], a[27], a[28], a[29], a[24]}, {a[4], a[3], a[26], a[19], a[27], a[28], a[29]}, {a[4], a[3], a[26], a[19], a[27], a[28]}}, ["model"] = {{a[4], a[3], a[26], a[30], a[31], a[32], a[33], a[34], a[35], {"animation_speed", "number"}}, {a[4], a[3], a[26], a[30], a[31], a[32], a[33], a[34], a[35]}, {a[4], a[3], a[26], a[30], a[31], a[32], a[33], a[34]}, {a[4], a[3], a[26], a[30], a[31], a[32], a[33]}, {a[4], a[3], a[26], a[30], a[31], a[32]}, {a[4], a[3], a[26], a[30], a[31]}}, ["item_image"] = {{a[4], a[3], a[36]}}, ["bgcolor"] = {{a[16], a[37], {"fbgcolor", "string"}}, {a[16], a[37]}, {a[16]}}, ["background"] = {{a[4], a[3], a[19], a[38]}, a[25]}, ["background9"] = {{a[4], a[3], a[19], a[38], a[22]}, {a[4], a[3], a[19], a[38], a[23]}, {a[4], a[3], a[19], a[38], a[24]}}, ["pwdfield"] = a[40], ["field"] = {a[42], {a[26], a[39], a[41]}}, ["field_enter_after_edit"] = {{a[26], {"enter_after_edit", "boolean"}}}, ["field_close_on_enter"] = {{a[26], {"close_on_enter", "boolean"}}}, ["textarea"] = {a[42]}, ["label"] = a[43], ["hypertext"] = {{a[4], a[3], a[26], {"text", "string"}}}, ["vertlabel"] = a[43], ["button"] = a[40], ["button_url"] = a[44], ["image_button"] = a[47], ["item_image_button"] = {{a[4], a[3], a[36], a[26], a[39]}}, ["button_exit"] = a[40], ["button_url_exit"] = a[44], ["image_button_exit"] = a[47], ["textlist"] = {{a[4], a[3], a[26], a[48], a[49], a[50]}, {a[4], a[3], a[26], a[48], a[49]}, {a[4], a[3], a[26], a[48]}}, ["tabheader"] = {{a[4], a[2], a[26], a[51], a[52], a[50], a[53]}, {a[4], a[3], a[26], a[51], a[52], a[50], a[53]}, {a[4], a[26], a[51], a[52], a[50], a[53]}, {a[4], a[26], a[51], a[52]}}, ["box"] = {{a[4], a[3], {"color", "string"}}}, ["dropdown"] = {{a[4], a[3], a[26], a[54], a[49], a[55]}, {a[4], a[1], a[26], a[54], a[49], a[55]}, {a[4], a[3], a[26], a[54], a[49]}, {a[4], a[1], a[26], a[54], a[49]}}, ["checkbox"] = {{a[4], a[26], a[39], {"selected", "boolean"}}, {a[4], a[26], a[39]}}, ["scrollbar"] = {{a[4], a[3], a[9], a[26], a[56], {{"scrollbar_bg", "string"}, {"slider", "string"}, {"arrow_up", "string"}, {"arrow_down", "string"}}}, {a[4], a[3], a[9], a[26], a[56]}}, ["scrollbaroptions"] = a[58], ["table"] = {{a[4], a[3], a[26], {{{"cells", "string"}, "..."}}, a[49]}}, ["tableoptions"] = a[58], ["tablecolumns"] = {{{{{"type", "string"}, a[57]}, "..."}}}, ["style"] = a[61], ["style_type"] = a[61], ["set_focus"] = {{a[26], {"force", "boolean"}}, a[60]}}

16
elements.yaml
View File

@ -124,6 +124,22 @@ button_exit:
- [h, number]
- [name, string]
- [label, string]
button_url:
- - - [x, number]
- [y, number]
- - [w, number]
- [h, number]
- [name, string]
- [label, string]
- [url, string]
button_url_exit:
- - - [x, number]
- [y, number]
- - [w, number]
- [h, number]
- [name, string]
- [label, string]
- [url, string]
checkbox:
- - - [x, number]
- [y, number]

22
test.lua
View File

@ -75,6 +75,8 @@ it("can round-trip most elements", function()
image[1,2;3,4;air.png;5,6]
image[1,2;3,4;air.png;5,6,7,8]
field_enter_after_edit[test;true]
button_url[1,2;3,4;test;Test;https://example.com]
button_url_exit[1,2;3,4;test2;Test 2;https://example.com]
]]
fs = ('\n' .. fs):gsub('\n[ \n]*', '')
@ -377,6 +379,26 @@ it("can round-trip most elements", function()
name = "test",
enter_after_edit = true,
},
{
type = "button_url",
x = 1,
y = 2,
w = 3,
h = 4,
name = "test",
label = "Test",
url = "https://example.com",
},
{
type = "button_url_exit",
x = 1,
y = 2,
w = 3,
h = 4,
name = "test2",
label = "Test 2",
url = "https://example.com",
},
})
end)