mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- lua_hourglass: formatting code using astyle

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-11-20 18:53:31 +01:00
committed by Thilo Graf
parent e52eb3d144
commit 597a6e3854
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gui/lua/lua_hourglass.cpp
View File

@@ -30,23 +30,24 @@
#include "lua_hourglass.h" #include "lua_hourglass.h"
#include "lua_cc_window.h" #include "lua_cc_window.h"
CLuaInstHourGlass* CLuaInstHourGlass::getInstance() CLuaInstHourGlass *CLuaInstHourGlass::getInstance()
{ {
static CLuaInstHourGlass* LuaInstHourGlass = NULL; static CLuaInstHourGlass *LuaInstHourGlass = NULL;
if(!LuaInstHourGlass) if (!LuaInstHourGlass)
LuaInstHourGlass = new CLuaInstHourGlass(); LuaInstHourGlass = new CLuaInstHourGlass();
return LuaInstHourGlass; return LuaInstHourGlass;
} }
void CLuaInstHourGlass::HourGlassRegister(lua_State *L) void CLuaInstHourGlass::HourGlassRegister(lua_State *L)
{ {
luaL_Reg meth[] = { luaL_Reg meth[] =
{ "new", CLuaInstHourGlass::HourGlassNew }, {
{ "paint", CLuaInstHourGlass::HourGlassPaint }, { "new", CLuaInstHourGlass::HourGlassNew },
{ "hide", CLuaInstHourGlass::HourGlassHide }, { "paint", CLuaInstHourGlass::HourGlassPaint },
{ "__gc", CLuaInstHourGlass::HourGlassDelete }, { "hide", CLuaInstHourGlass::HourGlassHide },
{ NULL, NULL } { "__gc", CLuaInstHourGlass::HourGlassDelete },
{ NULL, NULL }
}; };
luaL_newmetatable(L, "hourglass"); luaL_newmetatable(L, "hourglass");
@@ -58,7 +59,7 @@ void CLuaInstHourGlass::HourGlassRegister(lua_State *L)
int CLuaInstHourGlass::HourGlassNew(lua_State *L) int CLuaInstHourGlass::HourGlassNew(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L, 1));
lua_Integer x = 20, y = 20, dx = 48, dy = 48; lua_Integer x = 20, y = 20, dx = 48, dy = 48;
tableLookup(L, "x", x); tableLookup(L, "x", x);
@@ -72,8 +73,8 @@ int CLuaInstHourGlass::HourGlassNew(lua_State *L)
lua_Integer interval = HG_AUTO_PAINT_INTERVAL; lua_Integer interval = HG_AUTO_PAINT_INTERVAL;
tableLookup(L, "interval", interval); tableLookup(L, "interval", interval);
CLuaCCWindow* parent = NULL; CLuaCCWindow *parent = NULL;
tableLookup(L, "parent", (void**)&parent); tableLookup(L, "parent", (void **)&parent);
lua_Integer shadow_mode = CC_SHADOW_OFF; lua_Integer shadow_mode = CC_SHADOW_OFF;
tableLookup(L, "shadow_mode", shadow_mode); tableLookup(L, "shadow_mode", shadow_mode);
@@ -85,12 +86,12 @@ int CLuaInstHourGlass::HourGlassNew(lua_State *L)
tableLookup(L, "color_background", color_background); tableLookup(L, "color_background", color_background);
tableLookup(L, "color_shadow", color_shadow); tableLookup(L, "color_shadow", color_shadow);
CComponentsForm* parent_container = (parent && parent->w) ? parent->w->getBodyObject() : NULL; CComponentsForm *parent_container = (parent && parent->w) ? parent->w->getBodyObject() : NULL;
CLuaHourGlass **udata = (CLuaHourGlass **) lua_newuserdata(L, sizeof(CLuaHourGlass *)); CLuaHourGlass **udata = (CLuaHourGlass **) lua_newuserdata(L, sizeof(CLuaHourGlass *));
*udata = new CLuaHourGlass(); *udata = new CLuaHourGlass();
(*udata)->h = new CHourGlass(x, y, dx, dy, image_basename, (int64_t)interval, parent_container, shadow_mode, (fb_pixel_t)color_frame, (fb_pixel_t)color_background, (fb_pixel_t)color_shadow); (*udata)->h = new CHourGlass(x, y, dx, dy, image_basename, (int64_t)interval, parent_container, shadow_mode, (fb_pixel_t)color_frame, (fb_pixel_t)color_background, (fb_pixel_t)color_shadow);
luaL_getmetatable(L, "hourglass"); luaL_getmetatable(L, "hourglass");
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
@@ -104,12 +105,14 @@ CLuaHourGlass *CLuaInstHourGlass::HourGlassCheck(lua_State *L, int n)
int CLuaInstHourGlass::HourGlassPaint(lua_State *L) int CLuaInstHourGlass::HourGlassPaint(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L, 1));
CLuaHourGlass *D = HourGlassCheck(L, 1); CLuaHourGlass *D = HourGlassCheck(L, 1);
if (!D) return 0; if (!D)
return 0;
bool do_save_bg = true; bool do_save_bg = true;
if (!tableLookup(L, "do_save_bg", do_save_bg)) { if (!tableLookup(L, "do_save_bg", do_save_bg))
{
std::string tmp = "true"; std::string tmp = "true";
if (tableLookup(L, "do_save_bg", tmp)) if (tableLookup(L, "do_save_bg", tmp))
paramBoolDeprecated(L, tmp.c_str()); paramBoolDeprecated(L, tmp.c_str());
@@ -121,9 +124,10 @@ int CLuaInstHourGlass::HourGlassPaint(lua_State *L)
int CLuaInstHourGlass::HourGlassHide(lua_State *L) int CLuaInstHourGlass::HourGlassHide(lua_State *L)
{ {
lua_assert(lua_istable(L,1)); lua_assert(lua_istable(L, 1));
CLuaHourGlass *D = HourGlassCheck(L, 1); CLuaHourGlass *D = HourGlassCheck(L, 1);
if (!D) return 0; if (!D)
return 0;
bool tmp1 = false; bool tmp1 = false;
std::string tmp2 = "false"; std::string tmp2 = "false";
@@ -138,7 +142,8 @@ int CLuaInstHourGlass::HourGlassDelete(lua_State *L)
{ {
LUA_DEBUG("CLuaInstHourGlass::%s %d\n", __func__, lua_gettop(L)); LUA_DEBUG("CLuaInstHourGlass::%s %d\n", __func__, lua_gettop(L));
CLuaHourGlass *D = HourGlassCheck(L, 1); CLuaHourGlass *D = HourGlassCheck(L, 1);
if (!D) return 0; if (!D)
return 0;
D->h->kill(); D->h->kill();
delete D; delete D;
return 0; return 0;

2
src/gui/lua/lua_hourglass.h
View File

@@ -33,7 +33,7 @@ class CLuaInstHourGlass
public: public:
CLuaInstHourGlass() {}; CLuaInstHourGlass() {};
~CLuaInstHourGlass() {}; ~CLuaInstHourGlass() {};
static CLuaInstHourGlass* getInstance(); static CLuaInstHourGlass *getInstance();
static void HourGlassRegister(lua_State *L); static void HourGlassRegister(lua_State *L);
private: private: