X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalCanvas.cxx;h=32aa4f84dba6dade91338c2f1c303bfff366777a;hb=7f43a09fc57f542a33480bc995f2c78c7c971a6a;hp=b5b181e6f72c71e42b11a11c30a8873af1b8734c;hpb=91bc5e522a5feda140dac257022c0eb250b4950e;p=flightgear.git

diff --git a/src/Scripting/NasalCanvas.cxx b/src/Scripting/NasalCanvas.cxx
index b5b181e6f..32aa4f84d 100644
--- a/src/Scripting/NasalCanvas.cxx
+++ b/src/Scripting/NasalCanvas.cxx
@@ -24,6 +24,8 @@
 
 #include "NasalCanvas.hxx"
 #include <Canvas/canvas_mgr.hxx>
+#include <Canvas/gui_mgr.hxx>
+#include <Canvas/window.hxx>
 #include <Main/globals.hxx>
 #include <Scripting/NasalSys.hxx>
 
@@ -33,6 +35,7 @@
 
 #include <simgear/canvas/Canvas.hxx>
 #include <simgear/canvas/elements/CanvasElement.hxx>
+#include <simgear/canvas/elements/CanvasText.hxx>
 #include <simgear/canvas/MouseEvent.hxx>
 
 #include <simgear/nasal/cppbind/from_nasal.hxx>
@@ -55,6 +58,19 @@ typedef nasal::Ghost<sc::MouseEventPtr> NasalMouseEvent;
 typedef nasal::Ghost<sc::CanvasPtr> NasalCanvas;
 typedef nasal::Ghost<sc::ElementPtr> NasalElement;
 typedef nasal::Ghost<sc::GroupPtr> NasalGroup;
+typedef nasal::Ghost<sc::TextPtr> NasalText;
+typedef nasal::Ghost<canvas::WindowWeakPtr> NasalWindow;
+
+naRef to_nasal_helper(naContext c, const osg::BoundingBox& bb)
+{
+  std::vector<float> bb_vec(4);
+  bb_vec[0] = bb._min.x();
+  bb_vec[1] = bb._min.y();
+  bb_vec[2] = bb._max.x();
+  bb_vec[3] = bb._max.y();
+
+  return nasal::to_nasal(c, bb_vec);
+}
 
 SGPropertyNode* from_nasal_helper(naContext c, naRef ref, SGPropertyNode**)
 {
@@ -75,12 +91,34 @@ CanvasMgr& requireCanvasMgr(naContext c)
   return *canvas_mgr;
 }
 
+GUIMgr& requireGUIMgr(naContext c)
+{
+  GUIMgr* mgr =
+    static_cast<GUIMgr*>(globals->get_subsystem("CanvasGUI"));
+  if( !mgr )
+    naRuntimeError(c, "Failed to get CanvasGUI subsystem");
+
+  return *mgr;
+}
+
 /**
  * Create new Canvas and get ghost for it.
  */
-static naRef f_createCanvas(naContext c, naRef me, int argc, naRef* args)
+static naRef f_createCanvas(const nasal::CallContext& ctx)
+{
+  return NasalCanvas::create(ctx.c, requireCanvasMgr(ctx.c).createCanvas());
+}
+
+/**
+ * Create new Window and get ghost for it.
+ */
+static naRef f_createWindow(const nasal::CallContext& ctx)
 {
-  return NasalCanvas::create(c, requireCanvasMgr(c).createCanvas());
+  return NasalWindow::create
+  (
+    ctx.c,
+    requireGUIMgr(ctx.c).createWindow( ctx.getArg<std::string>(0) )
+  );
 }
 
 /**
@@ -121,17 +159,12 @@ naRef f_canvasCreateGroup(sc::Canvas& canvas, const nasal::CallContext& ctx)
   );
 }
 
-naRef f_elementGetTransformedBounds(sc::Element& el, const nasal::CallContext& ctx)
+/**
+ * Get group containing all gui windows
+ */
+naRef f_getDesktop(naContext c, naRef me, int argc, naRef* args)
 {
-  osg::BoundingBox bb = el.getTransformedBounds( osg::Matrix::identity() );
-
-  std::vector<float> bb_vec(4);
-  bb_vec[0] = bb._min.x();
-  bb_vec[1] = bb._min.y();
-  bb_vec[2] = bb._max.x();
-  bb_vec[3] = bb._max.y();
-
-  return nasal::to_nasal(ctx.c, bb_vec);
+  return NasalGroup::create(c, requireGUIMgr(c).getDesktop());
 }
 
 naRef f_groupCreateChild(sc::Group& group, const nasal::CallContext& ctx)
@@ -162,48 +195,77 @@ naRef f_groupGetElementById(sc::Group& group, const nasal::CallContext& ctx)
   );
 }
 
-// TODO allow directly exposing functions without parameters and return type
-naRef f_eventStopPropagation(sc::Event& event, const nasal::CallContext& ctx)
+template<int Mask>
+naRef f_eventGetModifier(naContext, sc::MouseEvent& event)
 {
-  if( ctx.argc != 0 )
-    naRuntimeError(ctx.c, "Event::stopPropagation no argument expected");
-  event.stopPropagation();
-  return naNil();
+  return naNum((event.getModifiers() & Mask) != 0);
 }
 
-naRef initNasalCanvas(naRef globals, naContext c, naRef gcSave)
+naRef to_nasal_helper(naContext c, const sc::ElementWeakPtr& el)
 {
+  return NasalElement::create(c, el.lock());
+}
+
+naRef initNasalCanvas(naRef globals, naContext c)
+{
+  using osgGA::GUIEventAdapter;
   NasalEvent::init("canvas.Event")
     .member("type", &sc::Event::getTypeString)
-    .method_func<&f_eventStopPropagation>("stopPropagation");
+    .member("target", &sc::Event::getTarget)
+    .member("currentTarget", &sc::Event::getCurrentTarget)
+    .method("stopPropagation", &sc::Event::stopPropagation);
   NasalMouseEvent::init("canvas.MouseEvent")
     .bases<NasalEvent>()
-    .member("x", &sc::MouseEvent::getPosX)
-    .member("y", &sc::MouseEvent::getPosY)
+    .member("screenX", &sc::MouseEvent::getScreenX)
+    .member("screenY", &sc::MouseEvent::getScreenY)
+    .member("clientX", &sc::MouseEvent::getClientX)
+    .member("clientY", &sc::MouseEvent::getClientY)
+    .member("localX", &sc::MouseEvent::getLocalX)
+    .member("localY", &sc::MouseEvent::getLocalY)
     .member("deltaX", &sc::MouseEvent::getDeltaX)
     .member("deltaY", &sc::MouseEvent::getDeltaY)
+    .member("button", &sc::MouseEvent::getButton)
+    .member("buttons", &sc::MouseEvent::getButtonMask)
+    .member("modifiers", &sc::MouseEvent::getModifiers)
+    .member("ctrlKey", &f_eventGetModifier<GUIEventAdapter::MODKEY_CTRL>)
+    .member("shiftKey", &f_eventGetModifier<GUIEventAdapter::MODKEY_SHIFT>)
+    .member("altKey", &f_eventGetModifier<GUIEventAdapter::MODKEY_ALT>)
+    .member("metaKey", &f_eventGetModifier<GUIEventAdapter::MODKEY_META>)
     .member("click_count", &sc::MouseEvent::getCurrentClickCount);
   NasalCanvas::init("Canvas")
     .member("_node_ghost", &elementGetNode<sc::Canvas>)
     .member("size_x", &sc::Canvas::getSizeX)
     .member("size_y", &sc::Canvas::getSizeY)
-    .method_func<&f_canvasCreateGroup>("_createGroup")
-    .method<&sc::Canvas::addEventListener>("addEventListener");
+    .method("_createGroup", &f_canvasCreateGroup)
+    .method("_getGroup", &sc::Canvas::getGroup)
+    .method("addEventListener", &sc::Canvas::addEventListener);
   NasalElement::init("canvas.Element")
     .member("_node_ghost", &elementGetNode<sc::Element>)
-    .method<&sc::Element::addEventListener>("addEventListener")
-    .method_func<&f_elementGetTransformedBounds>("getTransformedBounds");
+    .method("_getParent", &sc::Element::getParent)
+    .method("addEventListener", &sc::Element::addEventListener)
+    .method("getBoundingBox", &sc::Element::getBoundingBox)
+    .method("getTightBoundingBox", &sc::Element::getTightBoundingBox);
   NasalGroup::init("canvas.Group")
     .bases<NasalElement>()
-    .method_func<&f_groupCreateChild>("_createChild")
-    .method_func<&f_groupGetChild>("_getChild")
-    .method_func<&f_groupGetElementById>("_getElementById");
+    .method("_createChild", &f_groupCreateChild)
+    .method("_getChild", &f_groupGetChild)
+    .method("_getElementById", &f_groupGetElementById);
+  NasalText::init("canvas.Text")
+    .bases<NasalElement>()
+    .method("getNearestCursor", &sc::Text::getNearestCursor);
 
+  NasalWindow::init("canvas.Window")
+    .bases<NasalElement>()
+    .member("_node_ghost", &elementGetNode<canvas::Window>)
+    .method("_getCanvasDecoration", &canvas::Window::getCanvasDecoration);
+    
   nasal::Hash globals_module(globals, c),
               canvas_module = globals_module.createHash("canvas");
 
   canvas_module.set("_newCanvasGhost", f_createCanvas);
+  canvas_module.set("_newWindowGhost", f_createWindow);
   canvas_module.set("_getCanvasGhost", f_getCanvas);
+  canvas_module.set("_getDesktopGhost", f_getDesktop);
 
   return naNil();
 }