X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=431216af070c0b2fffd432109d56263d04539c17;hb=8c5c5f5fc4aef51c5dfa515b3a8eee67de3b8e9b;hp=3f85f8b8cbb31e04d6e7fff7337454854052e9ef;hpb=272a4db4154e3970be1f0c619fa592d7b6b89f74;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 3f85f8b..431216a 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -25,30 +25,38 @@
 #include "device.h"
 #include "gsubr.h"
 #include "gui-button.h"
+#include "gui-editbox.h"
 #include "gui-element.h"
 #include "gui-environment.h"
 #include "gui-font.h"
 #include "gui-image.h"
+#include "gui-listbox.h"
 #include "gui-scrollbar.h"
 #include "gui-skin.h"
 #include "gui-static-text.h"
+#include "gui-window.h"
 #include "position2d.h"
 #include "rect.h"
 #include "texture.h"
 #include "wchar.h"
 #include "wrapped.h"
 
+using namespace irr;
+
 extern "C" {
 
   void
   init_gui_environment (void)
   {
     init_gui_environment_type ();
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addStaticText", 8, 0, 0,
+                  irr_gui_IGUIEnvironment_addStaticText);
     DEFINE_GSUBR ("add-image!", 3, 0, 1, irr_gui_addImage);
+    DEFINE_GSUBR ("add-editbox!", 3, 0, 1, irr_gui_addEditBox);
+    DEFINE_GSUBR ("add-listbox!", 2, 0, 1, irr_gui_addListBox);
     DEFINE_GSUBR ("add-scrollbar!", 3, 0, 1, irr_gui_addScrollBar);
-    DEFINE_GSUBR ("add-static-text!", 3, 0, 1, irr_gui_addStaticText);
+    DEFINE_GSUBR ("add-window!", 2, 0, 1, irr_gui_addWindow);
     DEFINE_GSUBR ("get-built-in-font", 1, 0, 0, irr_gui_getBuiltInFont);
-    DEFINE_GSUBR ("get-gui-environment", 1, 0, 0, irr_getGUIEnvironment);
     DEFINE_GSUBR ("get-skin", 1, 0, 0, irr_gui_getSkin);
   }
 
@@ -57,19 +65,25 @@ extern "C" {
                        wrap_gui_environment, unwrap_gui_environment);
 
   SCM
-  irr_getGUIEnvironment (SCM wrapped_obj)
+  irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment,
+                                         SCM text,
+                                         SCM rectangle,
+                                         SCM border,
+                                         SCM word_wrap,
+                                         SCM parent,
+                                         SCM id,
+                                         SCM fill_background)
   {
-    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);
+    gui::IGUIStaticText* static_text =
+      ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+      addStaticText (scm_to_wide_char_string (text),
+                     scm_to_rect_s32 (rectangle),
+                     scm_to_bool (border),
+                     scm_to_bool (word_wrap),
+                     (gui::IGUIElement*)scm_to_pointer (parent),
+                     scm_to_int32 (id),
+                     scm_to_bool (fill_background));
+    return scm_from_pointer ((void*)static_text, NULL);
   }
 
   SCM
@@ -79,9 +93,9 @@ extern "C" {
                     SCM rest)
   {
     SCM use_alpha_channel = SCM_BOOL_T;
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
-    SCM text = SCM_BOOL_F;
+    SCM text = SCM_UNDEFINED;
 
     scm_c_bind_keyword_arguments ("add-image!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("use_alpha_channel"), &use_alpha_channel,
@@ -95,19 +109,69 @@ extern "C" {
       guienv->addImage (unwrap_texture (image),
                         scm_to_position2d_s32 (position),
                         scm_to_bool (use_alpha_channel),
-                        scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                        parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                         scm_to_int32 (id),
-                        scm_is_false (text) ? 0 : scm_to_wide_char_string (text));
+                        text == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (text));
     return wrap_gui_image (guiImage);
   }
 
+  SCM
+  irr_gui_addEditBox (SCM wrapped_gui_environment,
+                      SCM text,
+                      SCM rectangle,
+                      SCM rest)
+  {
+    SCM border = SCM_BOOL_T;
+    SCM parent = SCM_UNDEFINED;
+    SCM id = scm_from_int32 (-1);
+
+    scm_c_bind_keyword_arguments ("add-editbox!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("border"), &border,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  SCM_UNDEFINED);
+
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
+    irr::gui::IGUIEditBox* editbox =
+      guienv->addEditBox (scm_to_wide_char_string (text),
+                          scm_to_rect_s32 (rectangle),
+                          scm_to_bool (border),
+                          parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
+                          scm_to_int32 (id));
+    return wrap_gui_editbox (editbox);
+  }
+
+  SCM
+  irr_gui_addListBox (SCM wrapped_gui_environment,
+                      SCM rectangle,
+                      SCM rest)
+  {
+    SCM parent = SCM_UNDEFINED;
+    SCM id = scm_from_int32 (-1);
+    SCM draw_background = SCM_BOOL_F;
+
+    scm_c_bind_keyword_arguments ("add-listbox!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("parent"), &parent,
+                                  scm_from_utf8_keyword ("id"), &id,
+                                  scm_from_utf8_keyword ("draw-background"), &draw_background,
+                                  SCM_UNDEFINED);
+
+    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
+    irr::gui::IGUIListBox* listbox =
+      guienv->addListBox (scm_to_rect_s32 (rectangle),
+                          parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
+                          scm_to_int32 (id),
+                          scm_to_bool (draw_background));
+    return wrap_gui_listbox (listbox);
+  }
+
   SCM
   irr_gui_addScrollBar (SCM wrapped_gui_environment,
                         SCM horizontal,
                         SCM rectangle,
                         SCM rest)
   {
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
 
     scm_c_bind_keyword_arguments ("add-scrollbar!", rest, (scm_t_keyword_arguments_flags)0,
@@ -119,41 +183,36 @@ extern "C" {
     irr::gui::IGUIScrollBar* scrollbar =
       guienv->addScrollBar (scm_to_bool (horizontal),
                             scm_to_rect_s32 (rectangle),
-                            scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                            parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                             scm_to_int32 (id));
     return wrap_gui_scrollbar (scrollbar);
   }
 
   SCM
-  irr_gui_addStaticText (SCM wrapped_gui_environment,
-                         SCM text,
-                         SCM rectangle,
-                         SCM rest)
+  irr_gui_addWindow (SCM wrapped_gui_environment,
+                     SCM rectangle,
+                     SCM rest)
   {
-    SCM border = SCM_BOOL_F;
-    SCM word_wrap = SCM_BOOL_T;
-    SCM parent = SCM_BOOL_F;
+    SCM modal = SCM_BOOL_F;
+    SCM text = SCM_UNDEFINED;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
-    SCM fill_background = SCM_BOOL_F;
 
-    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_c_bind_keyword_arguments ("add-window!", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("modal"), &modal,
+                                  scm_from_utf8_keyword ("text"), &text,
                                   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 (word_wrap),
-                             scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
-                             scm_to_int32 (id),
-                             scm_to_bool (fill_background));
-    return wrap_gui_static_text (staticText);
+    irr::gui::IGUIWindow* window =
+      guienv->addWindow (scm_to_rect_s32 (rectangle),
+                         scm_to_bool (modal),
+                         text == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (text),
+                         parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
+                         scm_to_int32 (id));
+    return wrap_gui_window (window);
   }
 
   SCM
@@ -177,10 +236,10 @@ extern "C" {
                                      SCM rectangle,
                                      SCM rest)
   {
-    SCM parent = SCM_BOOL_F;
+    SCM parent = SCM_UNDEFINED;
     SCM id = scm_from_int32 (-1);
-    SCM text = SCM_BOOL_F;
-    SCM tooltiptext = SCM_BOOL_F;
+    SCM text = SCM_UNDEFINED;
+    SCM tooltiptext = SCM_UNDEFINED;
 
     scm_c_bind_keyword_arguments ("add-button!", rest, (scm_t_keyword_arguments_flags)0,
                                   scm_from_utf8_keyword ("parent"), &parent,
@@ -192,10 +251,10 @@ extern "C" {
     irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
     irr::gui::IGUIButton* button =
       guienv->addButton (scm_to_rect_s32 (rectangle),
-                         scm_is_false (parent) ? 0 : unwrap_gui_element (parent),
+                         parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
                          scm_to_int32 (id),
-                         scm_is_false (text) ? 0 : scm_to_wide_char_string (text),
-                         scm_is_false (tooltiptext) ? 0 : scm_to_wide_char_string (tooltiptext));
+                         text == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (text),
+                         tooltiptext == SCM_UNDEFINED ? 0 : scm_to_wide_char_string (tooltiptext));
     return wrap_gui_button (button);
   }