сделал нормальные имена полей таблиц, возвращаемых некоторыми функциями(и получаемых в аргументах) && create and use macro LUA_PUSH_INTEGER_FILED for push enums

This commit is contained in:
2025-04-16 20:23:27 +05:00
committed by Егор
parent 8c155bbe09
commit 563259355d
6 changed files with 214 additions and 369 deletions

View File

@@ -45,53 +45,37 @@ inline void syscalls_push_textSizes(lua_State* L)
{
lua_newtable(L);
lua_pushinteger(L, TextScale_SIZE_6x9);
lua_setfield(L, -2, "6x9");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_6x9, "6x9");
lua_pushinteger(L, TextScale_SIZE_8x16);
lua_setfield(L, -2, "8x16");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_8x16, "8x16");
lua_pushinteger(L, TextScale_SIZE_12x18);
lua_setfield(L, -2, "12x18");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_12x18, "12x18");
lua_pushinteger(L, TextScale_SIZE_16x32);
lua_setfield(L, -2, "16x32");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_16x32, "16x32");
lua_pushinteger(L, TextScale_SIZE_18x27);
lua_setfield(L, -2, "18x27");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_18x27, "18x27");
lua_pushinteger(L, TextScale_SIZE_24x36);
lua_setfield(L, -2, "24x36");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_24x36, "24x36");
lua_pushinteger(L, TextScale_SIZE_24x48);
lua_setfield(L, -2, "24x48");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_24x48, "24x48");
lua_pushinteger(L, TextScale_SIZE_30x45);
lua_setfield(L, -2, "30x45");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_30x45, "30x45");
lua_pushinteger(L, TextScale_SIZE_32x64);
lua_setfield(L, -2, "32x64");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_32x64, "32x64");
lua_pushinteger(L, TextScale_SIZE_36x54);
lua_setfield(L, -2, "36x54");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_36x54, "36x54");
lua_pushinteger(L, TextScale_SIZE_40x80);
lua_setfield(L, -2, "40x80");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_40x80, "40x80");
lua_pushinteger(L, TextScale_SIZE_42x63);
lua_setfield(L, -2, "42x63");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_42x63, "42x63");
lua_pushinteger(L, TextScale_SIZE_48x72);
lua_setfield(L, -2, "48x72");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_48x72, "48x72");
lua_pushinteger(L, TextScale_SIZE_48x96);
lua_setfield(L, -2, "48x96");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_48x96, "48x96");
lua_pushinteger(L, TextScale_SIZE_56x112);
lua_setfield(L, -2, "56x112");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_56x112, "56x112");
lua_pushinteger(L, TextScale_SIZE_64x128);
lua_setfield(L, -2, "64x128");
LUA_PUSH_INTEGER_FIELD(L, TextScale_SIZE_64x128, "64x128");
lua_setfield(L, -2, "textSize");
}
@@ -100,21 +84,17 @@ inline void syscalls_push_Encoding(lua_State* L)
{
lua_newtable(L);
lua_pushinteger(L, cp866);
lua_setfield(L, -2, "cp866");
LUA_PUSH_INTEGER_FIELD(L, cp866, "cp866");
lua_pushinteger(L, cp866_8x16);
lua_setfield(L, -2, "cp866_8x16");
LUA_PUSH_INTEGER_FIELD(L, cp866_8x16, "cp866_8x16");
lua_pushinteger(L, utf8);
lua_setfield(L, -2, "utf8");
LUA_PUSH_INTEGER_FIELD(L, utf8, "utf8");
lua_pushinteger(L, utf16);
lua_setfield(L, -2, "utf16");
LUA_PUSH_INTEGER_FIELD(L, utf16, "utf16");
lua_setfield(L, -2, "Encoding");
}
#define syscalls_push_graphic(L) syscalls_push_textSizes(L); syscalls_push_Encoding(L);
#endif // __GRAPHIC_H__
#endif // __GRAPHIC_H_