Commit Graph

60 Commits

Author SHA1 Message Date
Stefan Seyfried
c45ccf6a0d luainstance: do not export machine specific stuff
It's an exported API, so it should be somewhat useful/stable,
not change for every machine...
2014-01-23 14:16:45 +01:00
Stefan Seyfried
614474d439 Revert "CLuaInstance: Fix compiler warnings"
This reverts commit 87031add94.

This is wrong in so many aspects... just look up the definition
of lua_integer...
2014-01-23 14:12:15 +01:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
2014-01-23 14:08:37 +01:00
svenhoefer
53f5801d6f - adapt ShowMsg handling from martii's neutrino-mp 2014-01-22 12:37:21 +01:00
M. Liebmann
87031add94 CLuaInstance: Fix compiler warnings 2014-01-21 22:35:49 +01:00
M. Liebmann
1f7e8b41d7 CLuaInstance: Add parameter 'vertical' to CLuaSignalBox 2014-01-21 18:09:46 +01:00
M. Liebmann
9a346f8d25 CLuaInstance: fix format strings 2014-01-21 18:09:46 +01:00
M. Liebmann
ad206dbbc1 CLuaInstance: Multiple functions made from CComponents in CLuaInstance available
- CComponentsWindow: new(), paint(), hide()
- CSignalBox: new(), paint()
2014-01-20 21:35:39 +01:00
M. Liebmann
ab00bb11b2 Adaptation of CLuaInstance 2014-01-19 20:57:40 +01:00
martii
b59141d1f5 gui/luainstance: recognize menu hints 2014-01-19 20:57:39 +01:00
martii
60dbf9194e gui/luainstance: rename menue => menu 2014-01-19 20:57:39 +01:00
martii
007d700d53 lua: pictureviewer support 2014-01-19 20:57:39 +01:00
martii
1bdd23676a lua menues: add directkey forwarder 2014-01-19 20:57:39 +01:00
martii
d2e5a703c3 lua: update menue callback api to include an id parameter
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2014-01-19 20:57:39 +01:00
martii
82be6f8e66 lua: msgbox fix 2014-01-19 20:57:39 +01:00
martii
7b9adbe65b lua: msgbox fix 2014-01-19 20:57:39 +01:00
martii
c6912180ee lua related fixes
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2014-01-19 20:57:39 +01:00
martii
a568f3004e lua: remove debugging output 2014-01-19 20:57:39 +01:00
martii
df1ec23980 LUA fixes
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2014-01-19 20:57:38 +01:00
martii
920e475526 LUA: change stringinput valid chars 2014-01-19 20:57:38 +01:00
martii
098c205b57 LUA: messagebox support
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2014-01-19 20:57:38 +01:00
martii
0b38475439 LUA: add hintbox; bugfixes
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2014-01-19 20:57:38 +01:00
martii
2a41749eb5 LUA: experimental support for native neutrino menues
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2014-01-19 20:57:38 +01:00
martii
c0a720bd8b luainstance: support new text coloring scheme
Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
2014-01-19 20:57:37 +01:00
Christian Ege
53ed75f66d handling of luaposix for dynamic environment 2014-01-19 20:57:37 +01:00
Stefan Seyfried
a61dbcee0b luainstance: return render width from RenderString
Return the string's renderwidth from RenderString. If boxh is < 0
then the string is not rendered and only the width is determined.
2014-01-19 20:57:37 +01:00
Stefan Seyfried
7c7c7e55a4 luainstance: remove utf8 parameter from RenderString, add center
Everybody should always be using utf8 anyway, so remove the "utf8"
parameter from RenderString and replace it with a "center" parameter
which centers the string horizontally in its box.

new usage:
   RenderString(font, text, x, y, color, boxwidth, boxheight, center)
defaults:
   color = COL_MENUCONTENT, boxwidth = window's width minus x
   boxheight = 0, center = 0
2014-01-19 20:57:36 +01:00
Stefan Seyfried
3f57d7c528 luainstance: export customcolor.h colors, too 2014-01-19 20:57:36 +01:00
Stefan Seyfried
8af79e1152 luainstance: work around a signed/unsigned problem on ppc 2014-01-19 20:57:36 +01:00
Stefan Seyfried
ef512f897a luainstance: allow any color for PaintBox, disable debug 2014-01-19 20:57:36 +01:00
Stefan Seyfried
a73dfbb2c5 luainstance: allow rounded corners in PaintBox 2014-01-19 20:57:36 +01:00
Stefan Seyfried
56db064368 luainstance: dynamic values are not static 2014-01-19 20:57:36 +01:00
Stefan Seyfried
f7fc13becd luainstance: export FontHeight to Lua scripts 2014-01-19 20:57:36 +01:00
Stefan Seyfried
f43585cbe3 luainstance: also export RCInput constants 2014-01-19 20:57:36 +01:00
Stefan Seyfried
fee8c10f42 luainstance: export variables as tables
This exports arrays FONT_TYPE_foo as FONT['foo'], COL_bar als COL['bar']
and SCREEN_OFF_a as SCREEN['OFF_a'] instead of lots of single variables.

Later these could also be made dynamic if the need arises.
2014-01-19 20:57:36 +01:00
Stefan Seyfried
9bdc0309a7 luainstance: show errors from loadfile() 2014-01-19 20:57:36 +01:00
Stefan Seyfried
8dfa4c9bf8 luainstance: add minimal error reporting 2014-01-19 20:57:35 +01:00
Stefan Seyfried
eefd75537e luainstance: add simple GetInput() method
use like this in the lua script:
--
RC_home = 174
local n = neutrino()
repeat msg, data = m:GetInput(1000) until msg == RC_home
2014-01-19 20:57:35 +01:00
Stefan Seyfried
4d7e07f81f luainstance: the name is "Lua", not "LUA" 2014-01-19 20:57:35 +01:00
Stefan Seyfried
f26357e887 neutrino: add a prototype of a lua plugin interface
this is just for preliminary tests, not yet really usable
for anything useful
2014-01-19 20:57:35 +01:00
martii
45028b116c luainstance: support new text coloring scheme
Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
2013-12-08 21:28:38 +01:00
Christian Ege
e92afd2b42 handling of luaposix for dynamic environment 2013-04-30 13:41:20 +02:00
Stefan Seyfried
8c88dfdc20 Revert "handling of luaposix for dynamic environments"
This reverts commit 8381f1a8cf.

sorry, it breaks the build (the trivial #endif -> #else and
additional "error: 'report' was not declared in this scope)"
2013-04-27 22:22:54 +02:00
Christian Ege
8381f1a8cf handling of luaposix for dynamic environments
added loading of luaposix in case of none static linking of lua
2013-04-27 21:56:50 +02:00
Stefan Seyfried
ee3580214f auto-enumerate FONT_TYPE_COUNT instead of defining it 2013-04-13 17:27:21 +02:00
Stefan Seyfried
d2463705f4 luainstance: return render width from RenderString
Return the string's renderwidth from RenderString. If boxh is < 0
then the string is not rendered and only the width is determined.
2013-04-07 18:54:57 +02:00
Stefan Seyfried
53c6e48d40 luainstance: remove utf8 parameter from RenderString, add center
Everybody should always be using utf8 anyway, so remove the "utf8"
parameter from RenderString and replace it with a "center" parameter
which centers the string horizontally in its box.

new usage:
   RenderString(font, text, x, y, color, boxwidth, boxheight, center)
defaults:
   color = COL_MENUCONTENT, boxwidth = window's width minus x
   boxheight = 0, center = 0
2013-04-07 18:18:38 +02:00
Stefan Seyfried
e2061907da luainstance: export customcolor.h colors, too 2013-04-07 18:18:02 +02:00
Stefan Seyfried
28890886fc luainstance: work around a signed/unsigned problem on ppc 2013-04-06 19:06:46 +02:00
Stefan Seyfried
a6cf7313d5 luainstance: allow any color for PaintBox, disable debug 2013-04-06 12:26:24 +02:00