make-event-receiver event-type

[guile-irrlicht.git] / src / device.cpp

diff --git a/src/device.cpp b/src/device.cpp
index e578e057a9b04ac2f3857ca545f3a1ec54443636..0a4d2c686560e1814719291e6246701aec0fbd44 100644 (file)
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -25,6 +25,7 @@
 #include "device.h"
 #include "dimension2d.h"
 #include "driver-types.h"
+#include "event-receiver.h"
 #include "wchar.h"
 #include "wrapped.h"
 
@@ -34,8 +35,13 @@ extern "C" {
   init_device (void)
   {
     init_device_type ();
-    scm_c_define_gsubr ("create-device", 7, 0, 0, (scm_t_subr)irr_createDevice);
+    scm_c_define_gsubr ("create-device", 0, 0, 1, (scm_t_subr)irr_createDevice);
+    scm_c_define_gsubr ("is-window-active?", 1, 0, 0, (scm_t_subr)irr_isWindowActive);
+    scm_c_define_gsubr ("run", 1, 0, 0, (scm_t_subr)irr_run);
     scm_c_define_gsubr ("set-window-caption!", 2, 0, 0, (scm_t_subr)irr_setWindowCaption);
+    scm_c_define_gsubr ("yield", 1, 0, 0, (scm_t_subr)irr_yield);
+    scm_c_export ("create-device", "is-window-active?", "run",
+                  "set-window-caption!", "yield", NULL);
   }
 
   DEFINE_WRAPPED_TYPE (irr::IrrlichtDevice*, "device",
@@ -43,24 +49,52 @@ extern "C" {
                        wrap_device, unwrap_device);
 
   SCM
-  irr_createDevice (SCM deviceType,
-                    SCM windowSize,
-                    SCM bits,
-                    SCM fullscreen,
-                    SCM stencilbuffer,
-                    SCM vsync,
-                    SCM receiver)
+  irr_createDevice (SCM rest)
   {
+    SCM device_type = scm_from_utf8_symbol ("software");
+    SCM window_size = scm_list_2 (scm_from_uint32 (640),
+                                  scm_from_uint32 (480));
+    SCM bits = scm_from_uint32 (16);
+    SCM fullscreen = scm_from_bool (0);
+    SCM stencilbuffer = scm_from_bool (0);
+    SCM vsync = scm_from_bool (0);
+    SCM receiver = scm_from_bool (0);
+
+    scm_c_bind_keyword_arguments ("create-device", rest, (scm_t_keyword_arguments_flags)0,
+                                  scm_from_utf8_keyword ("device-type"), &device_type,
+                                  scm_from_utf8_keyword ("window-size"), &window_size,
+                                  scm_from_utf8_keyword ("bits"), &bits,
+                                  scm_from_utf8_keyword ("fullscreen"), &fullscreen,
+                                  scm_from_utf8_keyword ("stencilbuffer"), &stencilbuffer,
+                                  scm_from_utf8_keyword ("vsync"), &vsync,
+                                  scm_from_utf8_keyword ("receiver"), &receiver,
+                                  SCM_UNDEFINED);
+
     irr::IrrlichtDevice* device =
-      irr::createDevice (scm_to_driver_type (deviceType),
-                         scm_to_dimension2d_u32 (windowSize),
+      irr::createDevice (scm_to_driver_type (device_type),
+                         scm_to_dimension2d_u32 (window_size),
                          scm_to_uint32 (bits),
                          scm_to_bool (fullscreen),
                          scm_to_bool (stencilbuffer),
-                         scm_to_bool (vsync));
+                         scm_to_bool (vsync),
+                         scm_is_false (receiver) ? 0 : unwrap_event_receiver (receiver));
     return wrap_device (device);
   }
 
+  SCM
+  irr_isWindowActive (SCM wrapped_device)
+  {
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    return scm_from_bool (device->isWindowActive ());
+  }
+
+  SCM
+  irr_run (SCM wrapped_device)
+  {
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    return scm_from_bool (device->run ());
+  }
+
   SCM
   irr_setWindowCaption (SCM wrapped_device,
                         SCM text)
@@ -70,4 +104,12 @@ extern "C" {
     return SCM_UNSPECIFIED;
   }
 
+  SCM
+  irr_yield (SCM wrapped_device)
+  {
+    irr::IrrlichtDevice* device = unwrap_device (wrapped_device);
+    device->yield ();
+    return SCM_UNSPECIFIED;
+  }
+
 }