add-listbox!

diff --git a/Makefile.am b/Makefile.am
index ca146c89111d8d7bd8fd7de39ac544839d5dc40f..f74cf9afeaaa96c4a1f325592548ebfc602845a1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ libguile_irrlicht_la_SOURCES = \
   src/gui-font.cpp \
   src/gui-image.cpp \
   src/gui-in-out-fader.cpp \
+  src/gui-listbox.cpp \
   src/gui-scrollbar.cpp \
   src/gui-skin.cpp \
   src/gui-static-text.cpp \

diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp
index 3f85f8b8cbb31e04d6e7fff7337454854052e9ef..cc5e0c51a1cfff898169c98a642a85ca7e83014b 100644 (file)
--- a/src/gui-environment.cpp
+++ b/src/gui-environment.cpp
@@ -29,6 +29,7 @@
 #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"
@@ -45,6 +46,7 @@ extern "C" {
   {
     init_gui_environment_type ();
     DEFINE_GSUBR ("add-image!", 3, 0, 1, irr_gui_addImage);
+    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 ("get-built-in-font", 1, 0, 0, irr_gui_getBuiltInFont);
@@ -101,6 +103,30 @@ extern "C" {
     return wrap_gui_image (guiImage);
   }
 
+  SCM
+  irr_gui_addListBox (SCM wrapped_gui_environment,
+                      SCM rectangle,
+                      SCM rest)
+  {
+    SCM parent = SCM_BOOL_F;
+    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),
+                          scm_is_false (parent) ? 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,

diff --git a/src/gui-environment.h b/src/gui-environment.h
index 6267e5d45f84eb373b3fb80d4b98716027170335..a52233a24cba3894d7926f2c804fdda9b0f2c962 100644 (file)
--- a/src/gui-environment.h
+++ b/src/gui-environment.h
@@ -43,6 +43,11 @@ extern "C" {
                     SCM position,
                     SCM rest);
 
+  SCM
+  irr_gui_addListBox (SCM wrapped_gui_environment,
+                      SCM rectangle,
+                      SCM rest);
+
   SCM
   irr_gui_addScrollBar (SCM wrapped_gui_environment,
                         SCM horizontal,

diff --git a/src/gui-listbox.cpp b/src/gui-listbox.cpp
new file mode 100644 (file)
index 0000000..1c81998
--- /dev/null
+++ b/src/gui-listbox.cpp
@@ -0,0 +1,40 @@
+/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine
+
+   Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
+
+   This file is part of guile-irrlicht.
+
+   guile-irrlicht is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   guile-irrlicht is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with guile-irrlicht. If not, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#include <irrlicht/irrlicht.h>
+#include <libguile.h>
+
+#include "gui-listbox.h"
+#include "wrapped.h"
+
+extern "C" {
+
+  void
+  init_gui_listbox (void)
+  {
+    init_gui_listbox_type ();
+  }
+
+  DEFINE_WRAPPED_TYPE (irr::gui::IGUIListBox*, "gui-listbox",
+                       init_gui_listbox_type, gui_listbox_p,
+                       wrap_gui_listbox, unwrap_gui_listbox);
+
+}

diff --git a/src/gui-listbox.h b/src/gui-listbox.h
new file mode 100644 (file)
index 0000000..9e2baf3
--- /dev/null
+++ b/src/gui-listbox.h
@@ -0,0 +1,39 @@
+/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine
+
+   Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
+
+   This file is part of guile-irrlicht.
+
+   guile-irrlicht is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   guile-irrlicht is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with guile-irrlicht. If not, see
+   <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __GUILE_IRRLICHT_GUI_LISTBOX_H_INCLUDED__
+#define __GUILE_IRRLICHT_GUI_LISTBOX_H_INCLUDED__
+
+#include <irrlicht/irrlicht.h>
+#include <libguile.h>
+#include "wrapped.h"
+
+extern "C" {
+
+  void
+  init_gui_listbox (void);
+
+  DECLARE_WRAPPED_TYPE (irr::gui::IGUIListBox*, init_gui_listbox_type,
+                        gui_listbox_p, wrap_gui_listbox, unwrap_gui_listbox);
+
+}
+
+#endif

diff --git a/src/gui.cpp b/src/gui.cpp
index c507f1d73f73c49f1bb836e1fa5603bf369f896c..5291537e5f2f0e4b5ecc05b2b8ba726a8a1619f4 100644 (file)
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -32,6 +32,7 @@
 #include "gui-font.h"
 #include "gui-image.h"
 #include "gui-in-out-fader.h"
+#include "gui-listbox.h"
 #include "gui-scrollbar.h"
 #include "gui-skin.h"
 #include "gui-static-text.h"
@@ -50,6 +51,7 @@ extern "C" {
     init_gui_font ();
     init_gui_image ();
     init_gui_in_out_fader ();
+    init_gui_listbox ();
     init_gui_scrollbar ();
     init_gui_skin ();
     init_gui_static_text ();