CLuaInstance: Add some CComponentsHeader functions

- Set Lua api version to 1.38


Origin commit data
------------------
Commit: 8a61c3bfcd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)
This commit is contained in:
Michael Liebmann
2016-01-21 09:09:30 +01:00
parent 5dc430b5e6
commit 0200e1dec0
6 changed files with 192 additions and 1 deletions

View File

@@ -25,6 +25,7 @@ noinst_LIBRARIES = libneutrino_gui_lua.a
libneutrino_gui_lua_a_SOURCES = \ libneutrino_gui_lua_a_SOURCES = \
luainstance.cpp \ luainstance.cpp \
luainstance_helpers.cpp \ luainstance_helpers.cpp \
lua_cc_header.cpp \
lua_cc_picture.cpp \ lua_cc_picture.cpp \
lua_cc_signalbox.cpp \ lua_cc_signalbox.cpp \
lua_cc_text.cpp \ lua_cc_text.cpp \

View File

@@ -4,4 +4,4 @@
* to luainstance.h changes * to luainstance.h changes
*/ */
#define LUA_API_VERSION_MAJOR 1 #define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 37 #define LUA_API_VERSION_MINOR 38

View File

@@ -0,0 +1,138 @@
/*
* lua components header
*
* (C) 2016 M. Liebmann (micha-bbg)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* 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
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <unistd.h>
#include <global.h>
#include <system/debug.h>
#include <neutrino.h>
#include "luainstance.h"
#include "lua_cc_window.h"
#include "lua_cc_header.h"
CLuaInstCCHeader* CLuaInstCCHeader::getInstance()
{
static CLuaInstCCHeader* LuaInstCCHeader = NULL;
if(!LuaInstCCHeader)
LuaInstCCHeader = new CLuaInstCCHeader();
return LuaInstCCHeader;
}
CLuaCCHeader *CLuaInstCCHeader::CCHeaderCheck(lua_State *L, int n)
{
return *(CLuaCCHeader **) luaL_checkudata(L, n, LUA_HEADER_CLASSNAME);
}
void CLuaInstCCHeader::CCHeaderRegister(lua_State *L)
{
luaL_Reg meth[] = {
{ "new", CLuaInstCCHeader::CCHeaderNew },
{ "paint", CLuaInstCCHeader::CCHeaderPaint },
{ "hide", CLuaInstCCHeader::CCHeaderHide },
{ "__gc", CLuaInstCCHeader::CCHeaderDelete },
{ NULL, NULL }
};
luaL_newmetatable(L, LUA_HEADER_CLASSNAME);
luaL_setfuncs(L, meth, 0);
lua_pushvalue(L, -1);
lua_setfield(L, -1, "__index");
lua_setglobal(L, LUA_HEADER_CLASSNAME);
}
int CLuaInstCCHeader::CCHeaderNew(lua_State *L)
{
lua_assert(lua_istable(L,1));
CLuaCCWindow* parent = NULL;
lua_Integer x=10, y=10, dx=100, dy=100;
lua_Integer buttons = 0;
lua_Integer shadow_mode = CC_SHADOW_OFF;
std::string caption, icon;
lua_Unsigned color_frame = (lua_Unsigned)COL_MENUCONTENT_PLUS_6;
lua_Unsigned color_body = (lua_Unsigned)COL_MENUCONTENT_PLUS_0;
lua_Unsigned color_shadow = (lua_Unsigned)COL_MENUCONTENTDARK_PLUS_0;
tableLookup(L, "parent", (void**)&parent);
tableLookup(L, "x", x);
tableLookup(L, "y", y);
tableLookup(L, "dx", dx);
tableLookup(L, "dy", dy);
tableLookup(L, "caption", caption);
tableLookup(L, "icon", icon);
tableLookup(L, "shadow_mode", shadow_mode);
tableLookup(L, "color_frame", color_frame);
tableLookup(L, "color_body" , color_body);
tableLookup(L, "color_shadow", color_shadow);
color_frame = checkMagicMask(color_frame);
color_body = checkMagicMask(color_body);
color_shadow = checkMagicMask(color_shadow);
CComponentsForm* pw = (parent && parent->w) ? parent->w->getBodyObject() : NULL;
CLuaCCHeader **udata = (CLuaCCHeader **) lua_newuserdata(L, sizeof(CLuaCCHeader *));
*udata = new CLuaCCHeader();
(*udata)->ch = new CComponentsHeader((const int&)x, (const int&)y, (const int&)dx, (const int&)dy,
caption, (std::string)"", (const int&)buttons,
(CComponentsForm*)parent, (int)shadow_mode,
(fb_pixel_t)color_frame, (fb_pixel_t)color_body, (fb_pixel_t)color_shadow);
(*udata)->parent = pw;
luaL_getmetatable(L, LUA_HEADER_CLASSNAME);
lua_setmetatable(L, -2);
return 1;
}
int CLuaInstCCHeader::CCHeaderPaint(lua_State *L)
{
lua_assert(lua_istable(L,1));
CLuaCCHeader *D = CCHeaderCheck(L, 1);
if (!D) return 0;
bool do_save_bg = true;
tableLookup(L, "do_save_bg", do_save_bg);
D->ch->paint(do_save_bg);
return 0;
}
int CLuaInstCCHeader::CCHeaderHide(lua_State *L)
{
CLuaCCHeader *D = CCHeaderCheck(L, 1);
if (!D) return 0;
D->ch->hide();
return 0;
}
int CLuaInstCCHeader::CCHeaderDelete(lua_State *L)
{
CLuaCCHeader *D = CCHeaderCheck(L, 1);
if (!D) return 0;
delete D;
return 0;
}

View File

@@ -0,0 +1,49 @@
/*
* lua components header
*
* (C) 2016 M. Liebmann (micha-bbg)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* 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
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LUACCHEADER_H
#define _LUACCHEADER_H
class CLuaCCHeader
{
public:
CComponentsHeader *ch;
CComponentsForm *parent;
CLuaCCHeader() { ch = NULL; parent = NULL; }
~CLuaCCHeader() { if (parent == NULL) delete ch; }
};
class CLuaInstCCHeader
{
public:
CLuaInstCCHeader() {};
~CLuaInstCCHeader() {};
static CLuaInstCCHeader* getInstance();
static void CCHeaderRegister(lua_State *L);
private:
static CLuaCCHeader *CCHeaderCheck(lua_State *L, int n);
static int CCHeaderNew(lua_State *L);
static int CCHeaderPaint(lua_State *L);
static int CCHeaderHide(lua_State *L);
static int CCHeaderDelete(lua_State *L);
};
#endif //_LUACCHEADER_H

View File

@@ -37,6 +37,7 @@
#include <video_cs.h> #include <video_cs.h>
#include "luainstance.h" #include "luainstance.h"
#include "lua_cc_header.h"
#include "lua_cc_picture.h" #include "lua_cc_picture.h"
#include "lua_cc_signalbox.h" #include "lua_cc_signalbox.h"
#include "lua_cc_text.h" #include "lua_cc_text.h"
@@ -605,6 +606,7 @@ void LuaInstRegisterFunctions(lua_State *L, bool fromThreads/*=false*/)
lua_settop(L, top); lua_settop(L, top);
// ------------------------------------------ // ------------------------------------------
CLuaInstCCPicture::getInstance()->CCPictureRegister(L); CLuaInstCCPicture::getInstance()->CCPictureRegister(L);
CLuaInstCCHeader::getInstance()->CCHeaderRegister(L);
CLuaInstCCSignalbox::getInstance()->CCSignalBoxRegister(L); CLuaInstCCSignalbox::getInstance()->CCSignalBoxRegister(L);
CLuaInstCCText::getInstance()->CCTextRegister(L); CLuaInstCCText::getInstance()->CCTextRegister(L);
CLuaInstCCWindow::getInstance()->CCWindowRegister(L); CLuaInstCCWindow::getInstance()->CCWindowRegister(L);

View File

@@ -29,6 +29,7 @@
#define LUA_VIDEO_CLASSNAME "video" #define LUA_VIDEO_CLASSNAME "video"
#define LUA_MISC_CLASSNAME "misc" #define LUA_MISC_CLASSNAME "misc"
#define LUA_CURL_CLASSNAME "curl" #define LUA_CURL_CLASSNAME "curl"
#define LUA_HEADER_CLASSNAME "header"
//#define LUA_WIKI "http://wiki.tuxbox.org/....." //#define LUA_WIKI "http://wiki.tuxbox.org/....."
#define LUA_WIKI "https://slknet.de/wiki/w" #define LUA_WIKI "https://slknet.de/wiki/w"