X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui-environment.cpp;h=c2e52726d5d516c589d45bcb6fb65d6375512690;hb=3bb58c2b45af12c0f9c9eac648e67ac6fa90e104;hp=df43fc63d5359ef1b4ca5aef614cf8fbc2886a9f;hpb=37aba303eccc24a407f1b5b0af81623e47b89a22;p=guile-irrlicht.git

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index df43fc6..c2e5272 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -21,257 +21,256 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-
-#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"
 
-extern "C" {
-
-  void
-  init_gui_environment (void)
-  {
-    init_gui_environment_type ();
-    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-skin", 1, 0, 0, irr_gui_getSkin);
-  }
-
-  DEFINE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, "gui-environment",
-                       init_gui_environment_type, gui_environment_p,
-                       wrap_gui_environment, unwrap_gui_environment);
-
-  SCM
-  irr_gui_addImage (SCM wrapped_gui_environment,
-                    SCM image,
-                    SCM position,
-                    SCM rest)
-  {
-    SCM use_alpha_channel = SCM_BOOL_T;
-    SCM parent = SCM_UNDEFINED;
-    SCM id = scm_from_int32 (-1);
-    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,
-                                  scm_from_utf8_keyword ("parent"), &parent,
-                                  scm_from_utf8_keyword ("id"), &id,
-                                  scm_from_utf8_keyword ("text"), &text,
-                                  SCM_UNDEFINED);
-
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIImage* guiImage =
-      guienv->addImage (unwrap_texture (image),
-                        scm_to_position2d_s32 (position),
-                        scm_to_bool (use_alpha_channel),
-                        parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
-                        scm_to_int32 (id),
-                        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_UNDEFINED;
-    SCM id = scm_from_int32 (-1);
-
-    scm_c_bind_keyword_arguments ("add-scrollbar!", rest, (scm_t_keyword_arguments_flags)0,
-                                  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::IGUIScrollBar* scrollbar =
-      guienv->addScrollBar (scm_to_bool (horizontal),
-                            scm_to_rect_s32 (rectangle),
-                            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)
-  {
-    SCM border = SCM_BOOL_F;
-    SCM word_wrap = SCM_BOOL_T;
-    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_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),
-                             parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
-                             scm_to_int32 (id),
-                             scm_to_bool (fill_background));
-    return wrap_gui_static_text (staticText);
-  }
-
-  SCM
-  irr_gui_addWindow (SCM wrapped_gui_environment,
-                     SCM rectangle,
-                     SCM rest)
-  {
-    SCM modal = SCM_BOOL_F;
-    SCM text = SCM_UNDEFINED;
-    SCM parent = SCM_UNDEFINED;
-    SCM id = scm_from_int32 (-1);
-
-    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_UNDEFINED);
-
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    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
-  irr_gui_getBuiltInFont (SCM wrapped_gui_environment)
-  {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIFont* font = guienv->getBuiltInFont ();
-    return wrap_gui_font (font);
-  }
-
-  SCM
-  irr_gui_getSkin (SCM wrapped_gui_environment)
-  {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUISkin* skin = guienv->getSkin ();
-    return wrap_gui_skin (skin);
-  }
-
-  SCM
-  irr_gui_IGUIEnvironment_addButton (SCM wrapped_gui_environment,
-                                     SCM rectangle,
-                                     SCM rest)
-  {
-    SCM parent = SCM_UNDEFINED;
-    SCM id = scm_from_int32 (-1);
-    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,
-                                  scm_from_utf8_keyword ("id"), &id,
-                                  scm_from_utf8_keyword ("text"), &text,
-                                  scm_from_utf8_keyword ("tooltiptext"), &tooltiptext,
-                                  SCM_UNDEFINED);
-
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIButton* button =
-      guienv->addButton (scm_to_rect_s32 (rectangle),
-                         parent == SCM_UNDEFINED ? 0 : unwrap_gui_element (parent),
-                         scm_to_int32 (id),
-                         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);
-  }
-
-  SCM
-  irr_gui_IGUIEnvironment_getFont (SCM wrapped_gui_environment,
-                                   SCM filename)
-  {
-    irr::gui::IGUIEnvironment* guienv = unwrap_gui_environment (wrapped_gui_environment);
-    irr::gui::IGUIFont* font = guienv->getFont (scm_to_utf8_stringn (filename, NULL));
-    return wrap_gui_font (font);
-  }
+using namespace irr;
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addButton (SCM gui_environment,
+                           SCM rectangle,
+                           SCM parent,
+                           SCM id,
+                           SCM text,
+                           SCM tooltiptext)
+{
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+  wchar_t* wtooltiptext = (wchar_t*) scm_to_utf32_string (tooltiptext);
+
+  gui::IGUIButton* button =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addButton (scm_to_rect_s32 (rectangle),
+               (TParent)scm_to_irr_pointer (parent),
+               scm_to_int32 (id),
+               wtext,
+               wtooltiptext);
+
+  free (wtext);
+  free (wtooltiptext);
+  return scm_from_irr_pointer ("<gui-button>", (void*) button);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addEditBox (SCM gui_environment,
+                            SCM text,
+                            SCM rectangle,
+                            SCM border,
+                            SCM parent,
+                            SCM id)
+{
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
+  gui::IGUIEditBox* editbox =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addEditBox (wtext,
+                scm_to_rect_s32 (rectangle),
+                scm_to_bool (border),
+                (TParent)scm_to_irr_pointer (parent),
+                scm_to_int32 (id));
+
+  free (wtext);
+  return scm_from_irr_pointer ("<gui-editbox>", (void*) editbox);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addFileOpenDialog (SCM gui_environment,
+                                   SCM title,
+                                   SCM modal,
+                                   SCM parent,
+                                   SCM id,
+                                   SCM restore_cwd,
+                                   SCM start_dir)
+{
+  gui::IGUIEnvironment* guienv = (gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment);
+  wchar_t* wtitle = (wchar_t*) scm_to_utf32_string (title);
+  io::path::char_type* cstartDir = scm_to_utf8_string (start_dir);
+
+  gui::IGUIFileOpenDialog* dialog =
+    guienv->addFileOpenDialog (wtitle,
+                               scm_to_bool (modal),
+                               (TParent)scm_to_irr_pointer (parent),
+                               scm_to_int32 (id),
+                               scm_to_bool (restore_cwd),
+                               cstartDir);
+
+  free (wtitle);
+  free (cstartDir);
+  return scm_from_irr_pointer ("<gui-file-open-dialog>", (void*) dialog);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addImage (SCM gui_environment,
+                          SCM image,
+                          SCM position,
+                          SCM use_alpha_channel,
+                          SCM parent,
+                          SCM id,
+                          SCM text)
+{
+  gui::IGUIEnvironment* guienv = (gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment);
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
+  gui::IGUIImage* new_image =
+    guienv->addImage ((video::ITexture*)scm_to_irr_pointer (image),
+                      scm_to_position2d_s32 (position),
+                      scm_to_bool (use_alpha_channel),
+                      (TParent)scm_to_irr_pointer (parent),
+                      scm_to_int32 (id),
+                      wtext);
+
+  free (wtext);
+  return scm_from_irr_pointer ("<gui-image>", (void*) new_image);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addListBox (SCM gui_environment,
+                            SCM rectangle,
+                            SCM parent,
+                            SCM id,
+                            SCM draw_background)
+{
+  gui::IGUIListBox* listbox =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addListBox (scm_to_rect_s32 (rectangle),
+                (TParent)scm_to_irr_pointer (parent),
+                scm_to_int32 (id),
+                scm_to_bool (draw_background));
+  return scm_from_irr_pointer ("<gui-listbox>", (void*) listbox);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addScrollBar (SCM gui_environment,
+                              SCM horizontal,
+                              SCM rectangle,
+                              SCM parent,
+                              SCM id)
+{
+  gui::IGUIScrollBar* scrollbar =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addScrollBar (scm_to_bool (horizontal),
+                  scm_to_rect_s32 (rectangle),
+                  (TParent)scm_to_irr_pointer (parent),
+                  scm_to_int32 (id));
+  return scm_from_irr_pointer ("<gui-scrollbar>", (void*) scrollbar);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addStaticText (SCM gui_environment,
+                               SCM text,
+                               SCM rectangle,
+                               SCM border,
+                               SCM word_wrap,
+                               SCM parent,
+                               SCM id,
+                               SCM fill_background)
+{
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
+  gui::IGUIStaticText* static_text =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addStaticText (wtext,
+                   scm_to_rect_s32 (rectangle),
+                   scm_to_bool (border),
+                   scm_to_bool (word_wrap),
+                   (TParent)scm_to_irr_pointer (parent),
+                   scm_to_int32 (id),
+                   scm_to_bool (fill_background));
+
+  free (wtext);
+  return scm_from_irr_pointer ("<gui-static-text>", (void*) static_text);
+}
+
+template <typename TParent>
+SCM
+IGUIEnvironment_addWindow (SCM gui_environment,
+                           SCM rectangle,
+                           SCM modal,
+                           SCM text,
+                           SCM parent,
+                           SCM id)
+{
+  wchar_t* wtext = (wchar_t*) scm_to_utf32_string (text);
+
+  gui::IGUIWindow* window =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->
+    addWindow (scm_to_rect_s32 (rectangle),
+               scm_to_bool (modal),
+               wtext,
+               (TParent)scm_to_irr_pointer (parent),
+               scm_to_int32 (id));
+
+  free (wtext);
+  return scm_from_irr_pointer ("<gui-window>", (void*) window);
+}
+
+SCM
+IGUIEnvironment_drawAll (SCM gui_environment)
+{
+  ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->drawAll ();
+  return SCM_UNSPECIFIED;
+}
+
+SCM
+IGUIEnvironment_getBuiltInFont (SCM gui_environment)
+{
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getBuiltInFont ();
+  return scm_from_irr_pointer ("<gui-font>", (void*) font);
+}
+
+SCM
+IGUIEnvironment_getFont (SCM gui_environment,
+                         SCM filename)
+{
+  char* cfilename = scm_to_utf8_string (filename);
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getFont (cfilename);
+  free (cfilename);
+  return scm_from_irr_pointer ("<gui-font>", (void*) font);
+}
+
+SCM
+IGUIEnvironment_getSkin (SCM gui_environment)
+{
+  gui::IGUISkin* skin =
+    ((gui::IGUIEnvironment*)scm_to_irr_pointer (gui_environment))->getSkin ();
+  return scm_from_irr_pointer ("<gui-skin>", (void*) skin);
+}
 
+void
+init_gui_environment (void)
+{
+  DEFINE_GSUBR ("IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addButton<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addEditBox<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addFileOpenDialog_IGUIElement", 7, 0, 0,
+                IGUIEnvironment_addFileOpenDialog<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
+                IGUIEnvironment_addImage<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
+                IGUIEnvironment_addListBox<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
+                IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
+                IGUIEnvironment_addStaticText<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addStaticText_IGUIWindow", 8, 0, 0,
+                IGUIEnvironment_addStaticText<gui::IGUIWindow*>);
+  DEFINE_GSUBR ("IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
+                IGUIEnvironment_addWindow<gui::IGUIElement*>);
+  DEFINE_GSUBR ("IGUIEnvironment_drawAll", 1, 0, 0, IGUIEnvironment_drawAll);
+  DEFINE_GSUBR ("IGUIEnvironment_getBuiltInFont", 1, 0, 0, IGUIEnvironment_getBuiltInFont);
+  DEFINE_GSUBR ("IGUIEnvironment_getFont", 2, 0, 0, IGUIEnvironment_getFont);
+  DEFINE_GSUBR ("IGUIEnvironment_getSkin", 1, 0, 0, IGUIEnvironment_getSkin);
 }