X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=dfe3a0a2fe710ce414bf332fb9c2c7c3f0baecd3;hb=69ed7f57e6295034fa64ab2bf6d10da6882860ef;hp=76dc57ce75a60c6bd9dba229d6e37e9205101424;hpb=2806f03eafc48ec9ef02a3dc2d74133eaf11ccc1;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 76dc57c..dfe3a0a 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -22,6 +22,8 @@
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
 
+#include "device.h"
+#include "gsubr.h"
 #include "gui-element.h"
 #include "gui-environment.h"
 #include "gui-static-text.h"
@@ -35,7 +37,8 @@ extern "C" {
   init_gui_environment (void)
   {
     init_gui_environment_type ();
-    scm_c_define_gsubr ("add-static-text!", 8, 0, 0, (scm_t_subr)irr_gui_addStaticText);
+    DEFINE_GSUBR ("add-static-text!", 3, 0, 1, irr_gui_addStaticText);
+    DEFINE_GSUBR ("get-gui-environment", 1, 0, 0, irr_getGUIEnvironment);
   }
 
   DEFINE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, "gui-environment",
@@ -43,24 +46,50 @@ extern "C" {
                        wrap_gui_environment, unwrap_gui_environment);
 
   SCM
-  irr_gui_addStaticText (SCM wrappedGUIEnvironment,
+  irr_getGUIEnvironment (SCM wrapped_obj)
+  {
+    irr::gui::IGUIEnvironment* gui_environment;
+    if (device_p (wrapped_obj))
+      {
+        gui_environment = unwrap_device (wrapped_obj)->getGUIEnvironment ();
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot get GUI environment from object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+    return wrap_gui_environment (gui_environment);
+  }
+
+  SCM
+  irr_gui_addStaticText (SCM wrapped_gui_environment,
                          SCM text,
                          SCM rectangle,
-                         SCM border,
-                         SCM wordWrap,
-                         SCM parent,
-                         SCM id,
-                         SCM fillBackground)
+                         SCM rest)
   {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrappedGUIEnvironment);
+    SCM border = scm_from_bool (0);
+    SCM word_wrap = scm_from_bool (1);
+    SCM parent = scm_from_bool (0);
+    SCM id = scm_from_int32 (-1);
+    SCM fill_background = scm_from_bool (0);
+
+    scm_c_bind_keyword_arguments ("add-static-text!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("border"), &border,
+                                  scm_from_utf8_keyword ("word-wrap"), &word_wrap,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("fill-background"), &fill_background,
+                                  SCM_UNDEFINED);
+
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
     irr::gui::IGUIStaticText* staticText =
       guienv->addStaticText (scm_to_wide_char_string (text),
                              scm_to_rect_s32 (rectangle),
                              scm_to_bool (border),
-                             scm_to_bool (wordWrap),
+                             scm_to_bool (word_wrap),
                              scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
                              scm_to_int32 (id),
-                             scm_to_bool (fillBackground));
+                             scm_to_bool (fill_background));
     return wrap_gui_static_text (staticText);
   }