X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgui.cpp;h=cd8eef34773c48e998138635f6c8eea99cf7399a;hb=e793a98b7a84ae3a5ff2ededb0625e55cf991f0f;hp=532a78645f05c821d463c6d1b671468ce10400f3;hpb=c29f09b112d14ca0a37ee6733dc9748eb4e599c2;p=guile-irrlicht.git

diff --git a/src/gui.cpp b/src/gui.cpp
index 532a786..cd8eef3 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -26,11 +26,13 @@
 #include "gsubr.h"
 #include "gui.h"
 #include "gui-button.h"
-#include "gui-edit-box.h"
+#include "gui-editbox.h"
 #include "gui-element.h"
 #include "gui-environment.h"
 #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"
@@ -43,11 +45,13 @@ extern "C" {
   {
     // Init objects
     init_gui_button ();
-    init_gui_edit_box ();
+    init_gui_editbox ();
     init_gui_element ();
     init_gui_environment ();
     init_gui_font ();
     init_gui_image ();
+    init_gui_in_out_fader ();
+    init_gui_listbox ();
     init_gui_scrollbar ();
     init_gui_skin ();
     init_gui_static_text ();
@@ -55,7 +59,9 @@ extern "C" {
 
     // Shared procedures (used by two or more objects)
     DEFINE_GSUBR ("add-button!", 1, 1, 1, irr_gui_addButton);
+    DEFINE_GSUBR ("get-color", 1, 1, 0, irr_gui_getColor);
     DEFINE_GSUBR ("get-font", 1, 1, 1, irr_gui_getFont);
+    DEFINE_GSUBR ("set-color!", 2, 1, 0, irr_gui_setColor);
     DEFINE_GSUBR ("set-max!", 2, 0, 0, irr_gui_setMax);
     DEFINE_GSUBR ("set-override-color!", 2, 0, 0, irr_gui_setOverrideColor);
   }
@@ -80,6 +86,31 @@ extern "C" {
       }
   }
 
+  SCM
+  irr_gui_getColor (SCM wrapped_obj,
+                    SCM color)
+  {
+#define GET_COLOR(OBJ) scm_from_color (OBJ->getColor ());
+
+    if (gui_image_p (wrapped_obj))
+      {
+        return GET_COLOR (unwrap_gui_image (wrapped_obj));
+      }
+    else if (gui_in_out_fader_p (wrapped_obj))
+      {
+        return GET_COLOR (unwrap_gui_in_out_fader (wrapped_obj));
+      }
+    else if (gui_skin_p (wrapped_obj))
+      {
+        return irr_gui_IGUISkin_getColor (wrapped_obj, color);
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot get color from object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+  }
+
   SCM
   irr_gui_getFont (SCM wrapped_obj,
                    SCM filename,
@@ -100,15 +131,43 @@ extern "C" {
       }
   }
 
+  SCM
+  irr_gui_setColor (SCM wrapped_obj,
+                    SCM color,
+                    SCM dest_color)
+  {
+    if (gui_image_p (wrapped_obj))
+      {
+        // Params: color
+        unwrap_gui_image (wrapped_obj)->setColor (scm_to_color (color));
+        return SCM_UNSPECIFIED;
+      }
+    else if (gui_in_out_fader_p (wrapped_obj))
+      {
+        // Params: color and dest_color (optional)
+        return irr_gui_IGUIInOutFader_setColor (wrapped_obj, color, dest_color);
+      }
+    else if (gui_skin_p (wrapped_obj) && dest_color != SCM_UNDEFINED)
+      {
+        // Params: which and new_color
+        return irr_gui_IGUISkin_setColor (wrapped_obj, color, dest_color);
+      }
+    else
+      {
+        scm_error (scm_arg_type_key, NULL, "Cannot set color to object: ~S",
+                   scm_list_1 (wrapped_obj), scm_list_1 (wrapped_obj));
+      }
+  }
+
   SCM
   irr_gui_setMax (SCM wrapped_obj,
                   SCM max)
   {
 #define SET_MAX(OBJ) OBJ->setMax (scm_to_int32 (max));
 
-    if (gui_edit_box_p (wrapped_obj))
+    if (gui_editbox_p (wrapped_obj))
       {
-        SET_MAX (unwrap_gui_edit_box (wrapped_obj));
+        SET_MAX (unwrap_gui_editbox (wrapped_obj));
       }
     else if (gui_scrollbar_p (wrapped_obj))
       {
@@ -128,9 +187,9 @@ extern "C" {
   {
 #define SET_OVERRIDE_COLOR(OBJ) OBJ->setOverrideColor (scm_to_color (color));
 
-    if (gui_edit_box_p (wrapped_obj))
+    if (gui_editbox_p (wrapped_obj))
       {
-        SET_OVERRIDE_COLOR (unwrap_gui_edit_box (wrapped_obj));
+        SET_OVERRIDE_COLOR (unwrap_gui_editbox (wrapped_obj));
       }
     else if (gui_static_text_p (wrapped_obj))
       {