From 5ae44925acf0d6905a62e28a09af184d9db655a1 Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Tue, 28 Apr 2020 08:48:10 +0200 Subject: [PATCH] add-window! --- Makefile.am | 1 + src/gui-environment.cpp | 29 +++++++++++++++++++++++++++++ src/gui-environment.h | 5 +++++ src/gui-window.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ src/gui-window.h | 39 +++++++++++++++++++++++++++++++++++++++ src/gui.cpp | 2 ++ 6 files changed, 116 insertions(+) create mode 100644 src/gui-window.cpp create mode 100644 src/gui-window.h diff --git a/Makefile.am b/Makefile.am index cb1b1a6..4b8303b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ libguile_irrlicht_la_SOURCES = \ src/gui-skin.cpp \ src/gui-static-text.cpp \ src/gui-toolbar.cpp \ + src/gui-window.cpp \ src/guile-irrlicht.cpp \ src/io.cpp \ src/keycodes.cpp \ diff --git a/src/gui-environment.cpp b/src/gui-environment.cpp index 0706539..aa1ccde 100644 --- a/src/gui-environment.cpp +++ b/src/gui-environment.cpp @@ -34,6 +34,7 @@ #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" @@ -51,6 +52,7 @@ extern "C" { 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); @@ -210,6 +212,33 @@ extern "C" { 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_BOOL_F; + SCM parent = SCM_BOOL_F; + 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), + scm_is_false (text) ? 0 : scm_to_wide_char_string (text), + scm_is_false (parent) ? 0 : unwrap_gui_element (parent), + scm_to_int32 (id)); + return wrap_gui_window (window); + } + SCM irr_gui_getBuiltInFont (SCM wrapped_gui_environment) { diff --git a/src/gui-environment.h b/src/gui-environment.h index 9cfec52..5c6da7e 100644 --- a/src/gui-environment.h +++ b/src/gui-environment.h @@ -66,6 +66,11 @@ extern "C" { SCM rectangle, SCM rest); + SCM + irr_gui_addWindow (SCM wrapped_gui_environment, + SCM rectangle, + SCM rest); + SCM irr_gui_getBuiltInFont (SCM wrapped_gui_environment); diff --git a/src/gui-window.cpp b/src/gui-window.cpp new file mode 100644 index 0000000..a2fcf95 --- /dev/null +++ b/src/gui-window.cpp @@ -0,0 +1,40 @@ +/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine + + Copyright (C) 2020 Javier Sancho + + 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 + . +*/ + +#include +#include + +#include "gui-window.h" +#include "wrapped.h" + +extern "C" { + + void + init_gui_window (void) + { + init_gui_window_type (); + } + + DEFINE_WRAPPED_TYPE (irr::gui::IGUIWindow*, "gui-window", + init_gui_window_type, gui_window_p, + wrap_gui_window, unwrap_gui_window); + +} diff --git a/src/gui-window.h b/src/gui-window.h new file mode 100644 index 0000000..df16418 --- /dev/null +++ b/src/gui-window.h @@ -0,0 +1,39 @@ +/* guile-irrlicht --- GNU Guile bindings for Irrlicht Engine + + Copyright (C) 2020 Javier Sancho + + 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 + . +*/ + +#ifndef __GUILE_IRRLICHT_GUI_WINDOW_H_INCLUDED__ +#define __GUILE_IRRLICHT_GUI_WINDOW_H_INCLUDED__ + +#include +#include +#include "wrapped.h" + +extern "C" { + + void + init_gui_window (void); + + DECLARE_WRAPPED_TYPE (irr::gui::IGUIWindow*, init_gui_window_type, + gui_window_p, wrap_gui_window, unwrap_gui_window); + +} + +#endif diff --git a/src/gui.cpp b/src/gui.cpp index cd8eef3..213397e 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -37,6 +37,7 @@ #include "gui-skin.h" #include "gui-static-text.h" #include "gui-toolbar.h" +#include "gui-window.h" extern "C" { @@ -56,6 +57,7 @@ extern "C" { init_gui_skin (); init_gui_static_text (); init_gui_toolbar (); + init_gui_window (); // Shared procedures (used by two or more objects) DEFINE_GSUBR ("add-button!", 1, 1, 1, irr_gui_addButton); -- 2.39.2