summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-31 19:32:14 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-31 19:32:14 (GMT)
commite8628274ada57b6a526e7cdb261875ac95f05db5 (patch)
tree4ff364c1099cba6ebca1c3a5eb9829367251ba8a /src
parent493a32a1b28f15cf02bb69c3735b9a411448c523 (diff)
downloadpowder-e8628274ada57b6a526e7cdb261875ac95f05db5.zip
powder-e8628274ada57b6a526e7cdb261875ac95f05db5.tar.gz
Events for Window object (Lua)
Diffstat (limited to 'src')
-rw-r--r--src/cat/LuaButton.cpp2
-rw-r--r--src/cat/LuaWindow.cpp452
-rw-r--r--src/cat/LuaWindow.h48
3 files changed, 498 insertions, 4 deletions
diff --git a/src/cat/LuaButton.cpp b/src/cat/LuaButton.cpp
index 8a3c92d..9ba5bd1 100644
--- a/src/cat/LuaButton.cpp
+++ b/src/cat/LuaButton.cpp
@@ -119,7 +119,7 @@ void LuaButton::triggerAction()
std::cout << actionFunction << std::endl;
lua_rawgeti(l, LUA_REGISTRYINDEX, actionFunction);
lua_pushinteger(l, 1);
- if (lua_pcall(l, 1, 1, 0))
+ if (lua_pcall(l, 1, 0, 0))
{
//Log error somewhere
}
diff --git a/src/cat/LuaWindow.cpp b/src/cat/LuaWindow.cpp
index cedfcdc..f14d0b9 100644
--- a/src/cat/LuaWindow.cpp
+++ b/src/cat/LuaWindow.cpp
@@ -18,10 +18,38 @@ Luna<LuaWindow>::RegType LuaWindow::methods[] = {
method(LuaWindow, position),
method(LuaWindow, size),
method(LuaWindow, addComponent),
+ method(LuaWindow, onInitialized),
+ method(LuaWindow, onExit),
+ method(LuaWindow, onTick),
+ method(LuaWindow, onDraw),
+ method(LuaWindow, onFocus),
+ method(LuaWindow, onBlur),
+ method(LuaWindow, onTryExit),
+ method(LuaWindow, onTryOkay),
+ method(LuaWindow, onMouseMove),
+ method(LuaWindow, onMouseDown),
+ method(LuaWindow, onMouseUp),
+ method(LuaWindow, onMouseWheel),
+ method(LuaWindow, onKeyPress),
+ method(LuaWindow, onKeyRelease),
{0, 0}
};
-LuaWindow::LuaWindow(lua_State * l)
+LuaWindow::LuaWindow(lua_State * l) :
+ onInitializedFunction(0),
+ onExitFunction(0),
+ onTickFunction(0),
+ onDrawFunction(0),
+ onFocusFunction(0),
+ onBlurFunction(0),
+ onTryExitFunction(0),
+ onTryOkayFunction(0),
+ onMouseMoveFunction(0),
+ onMouseDownFunction(0),
+ onMouseUpFunction(0),
+ onMouseWheelFunction(0),
+ onKeyPressFunction(0),
+ onKeyReleaseFunction(0)
{
this->l = l;
int posX = luaL_optinteger(l, 1, 0);
@@ -31,17 +59,32 @@ LuaWindow::LuaWindow(lua_State * l)
class DrawnWindow : public ui::Window
{
+ LuaWindow * luaWindow;
public:
- DrawnWindow(ui::Point position, ui::Point size) : ui::Window(position, size) {}
+ DrawnWindow(ui::Point position, ui::Point size, LuaWindow * luaWindow) : ui::Window(position, size), luaWindow(luaWindow) {}
virtual void OnDraw()
{
Graphics * g = ui::Engine::Ref().g;
g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
+ luaWindow->triggerOnDraw();
}
+ virtual void OnInitialized() { luaWindow->triggerOnInitialized(); }
+ virtual void OnExit() { luaWindow->triggerOnExit(); }
+ virtual void OnTick(float dt) { luaWindow->triggerOnTick( dt); }
+ virtual void OnFocus() { luaWindow->triggerOnFocus(); }
+ virtual void OnBlur() { luaWindow->triggerOnBlur(); }
+ virtual void OnTryExit(ExitMethod) { luaWindow->triggerOnTryExit(); }
+ virtual void OnTryOkay(OkayMethod) { luaWindow->triggerOnTryOkay(); }
+ virtual void OnMouseMove(int x, int y, int dx, int dy) { luaWindow->triggerOnMouseMove(x, y, dx, dy); }
+ virtual void OnMouseDown(int x, int y, unsigned button) { luaWindow->triggerOnMouseDown(x, y, button); }
+ virtual void OnMouseUp(int x, int y, unsigned button) { luaWindow->triggerOnMouseUp(x, y, button); }
+ virtual void OnMouseWheel(int x, int y, int d) { luaWindow->triggerOnMouseWheel(x, y, d); }
+ virtual void OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt) { luaWindow->triggerOnKeyPress(key, character, shift, ctrl, alt); }
+ virtual void OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt) { luaWindow->triggerOnKeyRelease(key, character, shift, ctrl, alt); }
};
- window = new DrawnWindow(ui::Point(posX, posY), ui::Point(sizeX, sizeY));
+ window = new DrawnWindow(ui::Point(posX, posY), ui::Point(sizeX, sizeY), this);
}
int LuaWindow::addComponent(lua_State * l)
@@ -93,6 +136,409 @@ int LuaWindow::size(lua_State * l)
}
}
+void LuaWindow::triggerOnInitialized()
+{
+ if(onInitializedFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onInitializedFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ if(lua_pcall(l, 1, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnExit()
+{
+ if(onExitFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onExitFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ if(lua_pcall(l, 1, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnTick(float dt)
+{
+ if(onTickFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onTickFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ lua_pushnumber(l, dt);
+ if(lua_pcall(l, 2, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnDraw()
+{
+ if(onDrawFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onDrawFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ if(lua_pcall(l, 1, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnFocus()
+{
+ if(onFocusFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onFocusFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ if(lua_pcall(l, 1, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnBlur()
+{
+ if(onBlurFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onBlurFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ if(lua_pcall(l, 1, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnTryExit()
+{
+ if(onTryExitFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onTryExitFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ if(lua_pcall(l, 1, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnTryOkay()
+{
+ if(onTryOkayFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onTryOkayFunction);
+ lua_pushinteger(l, 1); //Self placeholder
+ if(lua_pcall(l, 1, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnMouseMove(int x, int y, int dx, int dy)
+{
+ if(onMouseMoveFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onMouseMoveFunction);
+ lua_pushinteger(l, 0); //Self placeholder
+ lua_pushinteger(l, x);
+ lua_pushinteger(l, y);
+ lua_pushinteger(l, dx);
+ lua_pushinteger(l, dy);
+ if(lua_pcall(l, 5, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnMouseDown(int x, int y, unsigned button)
+{
+ if(onMouseDownFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onMouseDownFunction);
+ lua_pushinteger(l, 0); //Self placeholder
+ lua_pushinteger(l, x);
+ lua_pushinteger(l, y);
+ lua_pushinteger(l, button);
+ if(lua_pcall(l, 4, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnMouseUp(int x, int y, unsigned button)
+{
+ if(onMouseUpFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onMouseUpFunction);
+ lua_pushinteger(l, 0); //Self placeholder
+ lua_pushinteger(l, x);
+ lua_pushinteger(l, y);
+ lua_pushinteger(l, button);
+ if(lua_pcall(l, 4, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnMouseWheel(int x, int y, int d)
+{
+ if(onMouseWheelFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onMouseWheelFunction);
+ lua_pushinteger(l, 0); //Self placeholder
+ lua_pushinteger(l, x);
+ lua_pushinteger(l, y);
+ lua_pushinteger(l, d);
+ if(lua_pcall(l, 4, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
+{
+ if(onKeyPressFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onKeyPressFunction);
+ lua_pushinteger(l, 0); //Self placeholder
+ lua_pushinteger(l, key);
+ lua_pushinteger(l, character);
+ lua_pushboolean(l, shift);
+ lua_pushboolean(l, ctrl);
+ lua_pushboolean(l, alt);
+ if(lua_pcall(l, 6, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+void LuaWindow::triggerOnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)
+{
+ if(onKeyReleaseFunction)
+ {
+ lua_rawgeti(l, LUA_REGISTRYINDEX, onKeyReleaseFunction);
+ lua_pushinteger(l, 0); //Self placeholder
+ lua_pushinteger(l, key);
+ lua_pushinteger(l, character);
+ lua_pushboolean(l, shift);
+ lua_pushboolean(l, ctrl);
+ lua_pushboolean(l, alt);
+ if(lua_pcall(l, 6, 0, 0))
+ {
+ //Log error somwhere
+ }
+ }
+}
+
+int LuaWindow::onInitialized(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onInitializedFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onInitializedFunction = 0;
+ }
+}
+
+int LuaWindow::onExit(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onExitFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onExitFunction = 0;
+ }
+}
+
+int LuaWindow::onTick(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onTickFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onTickFunction = 0;
+ }
+}
+
+int LuaWindow::onDraw(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onDrawFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onDrawFunction = 0;
+ }
+}
+
+int LuaWindow::onFocus(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onFocusFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onFocusFunction = 0;
+ }
+}
+
+int LuaWindow::onBlur(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onBlurFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onBlurFunction = 0;
+ }
+}
+
+int LuaWindow::onTryExit(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onTryExitFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onTryExitFunction = 0;
+ }
+}
+
+int LuaWindow::onTryOkay(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onTryOkayFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onTryOkayFunction = 0;
+ }
+}
+
+int LuaWindow::onMouseMove(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onMouseMoveFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onMouseMoveFunction = 0;
+ }
+}
+
+int LuaWindow::onMouseDown(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onMouseDownFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onMouseDownFunction = 0;
+ }
+}
+
+int LuaWindow::onMouseUp(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onMouseUpFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onMouseUpFunction = 0;
+ }
+}
+
+int LuaWindow::onMouseWheel(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onMouseWheelFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onMouseWheelFunction = 0;
+ }
+}
+
+int LuaWindow::onKeyPress(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onKeyPressFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onKeyPressFunction = 0;
+ }
+}
+
+int LuaWindow::onKeyRelease(lua_State * l)
+{
+ if(lua_type(l, 1) != LUA_TNIL)
+ {
+ luaL_checktype(l, 1, LUA_TFUNCTION);
+ lua_pushvalue(l, 1);
+ onKeyReleaseFunction = luaL_ref(l, LUA_REGISTRYINDEX);
+ }
+ else
+ {
+ onKeyReleaseFunction = 0;
+ }
+}
+
+
LuaWindow::~LuaWindow()
{
if(ui::Engine::Ref().GetWindow() == window)
diff --git a/src/cat/LuaWindow.h b/src/cat/LuaWindow.h
index ea7b98f..0c4a305 100644
--- a/src/cat/LuaWindow.h
+++ b/src/cat/LuaWindow.h
@@ -8,6 +8,7 @@ extern "C" {
#include "LuaLuna.h"
+#include "interface/Platform.h"
namespace ui
{
class Window;
@@ -15,11 +16,58 @@ namespace ui
class LuaWindow
{
+ int onInitializedFunction;
+ int onExitFunction;
+ int onTickFunction;
+ int onDrawFunction;
+ int onFocusFunction;
+ int onBlurFunction;
+ int onTryExitFunction;
+ int onTryOkayFunction;
+ int onMouseMoveFunction;
+ int onMouseDownFunction;
+ int onMouseUpFunction;
+ int onMouseWheelFunction;
+ int onKeyPressFunction;
+ int onKeyReleaseFunction;
+
ui::Window * window;
lua_State * l;
int position(lua_State * l);
int size(lua_State * l);
int addComponent(lua_State * l);
+
+ //Set event handlers
+ int onInitialized(lua_State * l);
+ int onExit(lua_State * l);
+ int onTick(lua_State * l);
+ int onDraw(lua_State * l);
+ int onFocus(lua_State * l);
+ int onBlur(lua_State * l);
+ int onTryExit(lua_State * l);
+ int onTryOkay(lua_State * l);
+ int onMouseMove(lua_State * l);
+ int onMouseDown(lua_State * l);
+ int onMouseUp(lua_State * l);
+ int onMouseWheel(lua_State * l);
+ int onKeyPress(lua_State * l);
+ int onKeyRelease(lua_State * l);
+
+ void triggerOnInitialized();
+ void triggerOnExit();
+ void triggerOnTick(float deltaTime);
+ void triggerOnDraw();
+ void triggerOnFocus();
+ void triggerOnBlur();
+ void triggerOnTryExit();
+ void triggerOnTryOkay();
+ void triggerOnMouseMove(int x, int y, int dx, int dy);
+ void triggerOnMouseDown(int x, int y, unsigned button);
+ void triggerOnMouseUp(int x, int y, unsigned button);
+ void triggerOnMouseWheel(int x, int y, int d);
+ void triggerOnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt);
+ void triggerOnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt);
+
public:
static const char className[];
static Luna<LuaWindow>::RegType methods[];