From: Javier Sancho <jsf@jsancho.org>
Date: Thu, 7 May 2020 08:59:31 +0000 (+0200)
Subject: gui-environment for GOOPS
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=e7b77e0297a276d9cbfc3953b79bfad85ece4edf;p=guile-irrlicht.git

gui-environment for GOOPS
---

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 431216a..828a61a 100644
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -22,249 +22,212 @@
 #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"
+
 
 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-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);
-  }
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addButton (SCM gui_environment,
+                                   SCM rectangle,
+                                   SCM parent,
+                                   SCM id,
+                                   SCM text,
+                                   SCM tooltiptext)
+{
+  gui::IGUIButton* button =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addButton (scm_to_rect_s32 (rectangle),
+               (TParent)scm_to_pointer (parent),
+               scm_to_int32 (id),
+               scm_to_wide_char_string (text),
+               scm_to_wide_char_string (tooltiptext));
+  return scm_from_pointer ((void*)button, NULL);
+}
 
-  DEFINE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, "gui-environment",
-                       init_gui_environment_type, gui_environment_p,
-                       wrap_gui_environment, unwrap_gui_environment);
-
-  SCM
-  irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment,
-                                         SCM text,
-                                         SCM rectangle,
-                                         SCM border,
-                                         SCM word_wrap,
-                                         SCM parent,
-                                         SCM id,
-                                         SCM fill_background)
-  {
-    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
-  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);
-  }
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addEditBox (SCM gui_environment,
+                                    SCM text,
+                                    SCM rectangle,
+                                    SCM border,
+                                    SCM parent,
+                                    SCM id)
+{
+  gui::IGUIEditBox* editbox =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addEditBox (scm_to_wide_char_string (text),
+                scm_to_rect_s32 (rectangle),
+                scm_to_bool (border),
+                (TParent)scm_to_pointer (parent),
+                scm_to_int32 (id));
+  return scm_from_pointer ((void*)editbox, NULL);
+}
 
-  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);
-  }
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addImage (SCM gui_environment,
+                                  SCM image,
+                                  SCM position,
+                                  SCM use_alpha_channel,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM text)
+{
+  gui::IGUIImage* image =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addImage ((video::ITexture*)scm_to_pointer (image),
+              scm_to_position2d_s32 (position),
+              scm_to_bool (use_alpha_channel),
+              (TParent)scm_to_pointer (parent),
+              scm_to_int32 (id),
+              scm_to_wide_char_string (text));
+  return scm_from_pointer ((void*)image, NULL);
+}
 
-  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_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);
-  }
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addListBox (SCM gui_environment,
+                                    SCM rectangle,
+                                    SCM parent,
+                                    SCM id,
+                                    SCM draw_background)
+{
+  gui::IGUIListBox* listbox =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addListBox (scm_to_rect_s32 (rectangle),
+                (TParent)scm_to_pointer (parent),
+                scm_to_int32 (id),
+                scm_to_bool (draw_background));
+  return scm_from_pointer ((void*)listbox, NULL);
+}
 
-  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);
-  }
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
+                                      SCM horizontal,
+                                      SCM rectangle,
+                                      SCM parent,
+                                      SCM id)
+{
+  gui::IGUIScrollBar* scrollbar =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addScrollBar (scm_to_bool (horizontal),
+                  scm_to_rect_s32 (rectangle),
+                  (TParent)scm_to_pointer (parent),
+                  scm_to_int32 (id));
+  return scm_from_pointer ((void*)scrollbar, NULL);
+}
 
-  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)
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment,
+                                       SCM text,
+                                       SCM rectangle,
+                                       SCM border,
+                                       SCM word_wrap,
+                                       SCM parent,
+                                       SCM id,
+                                       SCM fill_background)
+{
+  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),
+                   (TParent)scm_to_pointer (parent),
+                   scm_to_int32 (id),
+                   scm_to_bool (fill_background));
+  return scm_from_pointer ((void*)static_text, NULL);
+}
+
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addWindow (SCM gui_environment,
+                                   SCM rectangle,
+                                   SCM modal,
+                                   SCM text,
+                                   SCM parent,
+                                   SCM id)
+{
+  gui::IGUIWindow* window =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    addWindow (scm_to_rect_s32 (rectangle),
+               scm_to_bool (modal),
+               scm_to_wide_char_string (text),
+               (TParent)scm_to_pointer (parent),
+               scm_to_int32 (id));
+  return scm_from_pointer ((void*)window, NULL);
+}
+
+
+SCM
+irr_gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment)
+{
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getBuiltInFont ();
+  return scm_from_pointer ((void*)font, NULL);
+}
+
+
+SCM
+irr_gui_IGUIEnvironment_getFont (SCM gui_environment,
+                                 SCM filename)
+{
+  gui::IGUIFont* font =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->
+    getFont (scm_to_utf8_stringn (filename, NULL));
+  return scm_from_pointer ((void*)font, NULL);
+}
+
+
+SCM
+irr_gui_IGUIEnvironment_getSkin (SCM gui_environment)
+{
+  gui::IGUISkin* skin =
+    ((gui::IGUIEnvironment*)scm_to_pointer (gui_environment))->getSkin ();
+  return scm_from_pointer ((void*)skin, NULL);
+}
+
+
+extern "C" {
+
+  void
+  init_gui_environment (void)
   {
-    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);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addButton_IGUIElement", 6, 0, 0,
+                  irr_gui_IGUIEnvironment_addButton<gui::IGUIElement*>);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addEditBox_IGUIElement", 6, 0, 0,
+                  irr_gui_IGUIEnvironment_addEditBox<gui::IGUIElement*>);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addImage_IGUIElement", 7, 0, 0,
+                  irr_gui_IGUIEnvironment_addImage<gui::IGUIElement*>);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addListBox_IGUIElement", 5, 0, 0,
+                  irr_gui_IGUIEnvironment_addListBox<gui::IGUIElement*>);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addScrollBar_IGUIElement", 5, 0, 0,
+                  irr_gui_IGUIEnvironment_addScrollBar<gui::IGUIElement*>);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addStaticText_IGUIElement", 8, 0, 0,
+                  irr_gui_IGUIEnvironment_addStaticText<gui::IGUIElement*>);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_addWindow_IGUIElement", 6, 0, 0,
+                  irr_gui_IGUIEnvironment_addWindow<gui::IGUIElement*>);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_getBuiltInFont", 1, 0, 0,
+                  irr_gui_IGUIEnvironment_getBuiltInFont);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_getFont", 2, 0, 0,
+                  irr_gui_IGUIEnvironment_getFont);
+    DEFINE_GSUBR ("irr_gui_IGUIEnvironment_getSkin", 1, 0, 0,
+                  irr_gui_IGUIEnvironment_getSkin);
   }
 
 }
diff --git a/src/gui-environment.h b/src/gui-environment.h
index bf896c8..46f9178 100644
--- a/src/gui-environment.h
+++ b/src/gui-environment.h
@@ -26,67 +26,96 @@
 #include <libguile.h>
 #include "wrapped.h"
 
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addButton (SCM gui_environment,
+                                   SCM rectangle,
+                                   SCM parent,
+                                   SCM id,
+                                   SCM text,
+                                   SCM tooltiptext);
+
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addEditBox (SCM gui_environment,
+                                    SCM text,
+                                    SCM rectangle,
+                                    SCM border,
+                                    SCM parent,
+                                    SCM id);
+
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addImage (SCM gui_environment,
+                                  SCM image,
+                                  SCM position,
+                                  SCM use_alpha_channel,
+                                  SCM parent,
+                                  SCM id,
+                                  SCM text);
+
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addListBox (SCM gui_environment,
+                                    SCM rectangle,
+                                    SCM parent,
+                                    SCM id,
+                                    SCM draw_background);
+
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addScrollBar (SCM gui_environment,
+                                      SCM horizontal,
+                                      SCM rectangle,
+                                      SCM parent,
+                                      SCM id);
+
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment,
+                                       SCM text,
+                                       SCM rectangle,
+                                       SCM border,
+                                       SCM word_wrap,
+                                       SCM parent,
+                                       SCM id,
+                                       SCM fill_background);
+
+
+template <typename TParent>
+SCM
+irr_gui_IGUIEnvironment_addWindow (SCM gui_environment,
+                                   SCM rectangle,
+                                   SCM modal,
+                                   SCM text,
+                                   SCM parent,
+                                   SCM id);
+
+
+SCM
+irr_gui_IGUIEnvironment_getBuiltInFont (SCM gui_environment);
+
+
+SCM
+irr_gui_IGUIEnvironment_getFont (SCM gui_environment,
+                                 SCM filename);
+
+
+SCM
+irr_gui_IGUIEnvironment_getSkin (SCM gui_environment);
+
+
 extern "C" {
 
   void
   init_gui_environment (void);
 
-  DECLARE_WRAPPED_TYPE (irr::gui::IGUIEnvironment*, init_gui_environment_type,
-                        gui_environment_p, wrap_gui_environment, unwrap_gui_environment);
-
-  SCM
-  irr_gui_IGUIEnvironment_addStaticText (SCM gui_environment,
-                                         SCM text,
-                                         SCM rectangle,
-                                         SCM border,
-                                         SCM word_wrap,
-                                         SCM parent,
-                                         SCM id,
-                                         SCM fill_background);
-
-  SCM
-  irr_gui_addImage (SCM wrapped_gui_environment,
-                    SCM image,
-                    SCM position,
-                    SCM rest);
-
-  SCM
-  irr_gui_addEditBox (SCM wrapped_gui_environment,
-                      SCM text,
-                      SCM rectangle,
-                      SCM rest);
-
-  SCM
-  irr_gui_addListBox (SCM wrapped_gui_environment,
-                      SCM rectangle,
-                      SCM rest);
-
-  SCM
-  irr_gui_addScrollBar (SCM wrapped_gui_environment,
-                        SCM horizontal,
-                        SCM rectangle,
-                        SCM rest);
-
-  SCM
-  irr_gui_addWindow (SCM wrapped_gui_environment,
-                     SCM rectangle,
-                     SCM rest);
-
-  SCM
-  irr_gui_getBuiltInFont (SCM wrapped_gui_environment);
-
-  SCM
-  irr_gui_getSkin (SCM wrapped_gui_environment);
-
-  SCM
-  irr_gui_IGUIEnvironment_addButton (SCM wrapped_gui_environment,
-                                     SCM rectangle,
-                                     SCM rest);
-
-  SCM
-  irr_gui_IGUIEnvironment_getFont (SCM wrapped_gui_environment,
-                                   SCM filename);
-
-  }
+}
 
 #endif