X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_SDL.c;h=920f11eabbb4d8214fc03dbe2f37ca7f8421b88d;hb=b4686262caf3875963b6b0c7d8363d11318d36a3;hp=d75af2c1c94301e3631cb64218b3a5c98ccbdbed;hpb=da624386221f12fd6a500c10b8c5f8152c0dcd0e;p=gacela.git

diff --git a/src/gacela_SDL.c b/src/gacela_SDL.c
index d75af2c..920f11e 100644
--- a/src/gacela_SDL.c
+++ b/src/gacela_SDL.c
@@ -1,11 +1,13 @@
 #include <libguile.h>
 #include <SDL/SDL.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_mixer.h>
 #include "gacela_SDL.h"
 
 SCM
 gacela_SDL_Init (SCM flags)
 {
-  return scm_int2num (SDL_Init (scm_num2int (flags, 0, "SDL_Init")));
+  return scm_from_int (SDL_Init (scm_to_int (flags)));
 }
 
 SCM
@@ -18,33 +20,59 @@ gacela_SDL_Quit ()
 SCM
 gacela_SDL_SetVideoMode (SCM width, SCM height, SCM bpp, SCM flags)
 {
+  return scm_from_int ((int)SDL_SetVideoMode (scm_to_int (width), scm_to_int (height), \
+					      scm_to_int (bpp), scm_to_int (flags)));
+}
+
+SCM
+gacela_SDL_WM_SetCaption (SCM title, SCM icon)
+{
+  SDL_WM_SetCaption (scm_to_locale_string(title), scm_to_locale_string(icon));
+  return SCM_UNSPECIFIED;
 }
 
 void*
 SDL_register_functions (void* data)
 {
-  scm_c_define ("SDL_INIT_TIMER", scm_int2num(SDL_INIT_TIMER));
-  scm_c_define ("SDL_INIT_AUDIO", scm_int2num(SDL_INIT_AUDIO));
-  scm_c_define ("SDL_INIT_VIDEO", scm_int2num(SDL_INIT_VIDEO));
-  scm_c_define ("SDL_INIT_CDROM", scm_int2num(SDL_INIT_CDROM));
-  scm_c_define ("SDL_INIT_JOYSTICK", scm_int2num(SDL_INIT_JOYSTICK));
-  scm_c_define ("SDL_INIT_NOPARACHUTE", scm_int2num(SDL_INIT_NOPARACHUTE));
-  scm_c_define ("SDL_INIT_EVENTTHREAD", scm_int2num(SDL_INIT_EVENTTHREAD));
-  scm_c_define ("SDL_INIT_EVERYTHING", scm_int2num(SDL_INIT_EVERYTHING));
-
-  scm_c_define ("SDL_SWSURFACE", scm_int2num(SDL_SWSURFACE));
-  scm_c_define ("SDL_HWSURFACE", scm_int2num(SDL_HWSURFACE));
-  scm_c_define ("SDL_ASYNCBLIT", scm_int2num(SDL_ASYNCBLIT));
-
-  scm_c_define ("SDL_ANYFORMAT", scm_int2num(SDL_ANYFORMAT));
-  scm_c_define ("SDL_HWPALETTE", scm_int2num(SDL_HWPALETTE));
-  scm_c_define ("SDL_DOUBLEBUF", scm_int2num(SDL_DOUBLEBUF));
-  scm_c_define ("SDL_FULLSCREEN", scm_int2num(SDL_FULLSCREEN));
-  scm_c_define ("SDL_OPENGL", scm_int2num(SDL_OPENGL));
-  scm_c_define ("SDL_OPENGLBLIT", scm_int2num(SDL_OPENGLBLIT));
-  scm_c_define ("SDL_RESIZABLE", scm_int2num(SDL_RESIZABLE));
+  scm_c_define ("SDL_INIT_TIMER", scm_from_int(SDL_INIT_TIMER));
+  scm_c_define ("SDL_INIT_AUDIO", scm_from_int(SDL_INIT_AUDIO));
+  scm_c_define ("SDL_INIT_VIDEO", scm_from_int(SDL_INIT_VIDEO));
+  scm_c_define ("SDL_INIT_CDROM", scm_from_int(SDL_INIT_CDROM));
+  scm_c_define ("SDL_INIT_JOYSTICK", scm_from_int(SDL_INIT_JOYSTICK));
+  scm_c_define ("SDL_INIT_NOPARACHUTE", scm_from_int(SDL_INIT_NOPARACHUTE));
+  scm_c_define ("SDL_INIT_EVENTTHREAD", scm_from_int(SDL_INIT_EVENTTHREAD));
+  scm_c_define ("SDL_INIT_EVERYTHING", scm_from_int(SDL_INIT_EVERYTHING));
+
+  scm_c_define ("SDL_SWSURFACE", scm_from_int(SDL_SWSURFACE));
+  scm_c_define ("SDL_HWSURFACE", scm_from_int(SDL_HWSURFACE));
+  scm_c_define ("SDL_ASYNCBLIT", scm_from_int(SDL_ASYNCBLIT));
+
+  scm_c_define ("SDL_ANYFORMAT", scm_from_int(SDL_ANYFORMAT));
+  scm_c_define ("SDL_HWPALETTE", scm_from_int(SDL_HWPALETTE));
+  scm_c_define ("SDL_DOUBLEBUF", scm_from_int(SDL_DOUBLEBUF));
+  scm_c_define ("SDL_FULLSCREEN", scm_from_int(SDL_FULLSCREEN));
+  scm_c_define ("SDL_OPENGL", scm_from_int(SDL_OPENGL));
+  scm_c_define ("SDL_OPENGLBLIT", scm_from_int(SDL_OPENGLBLIT));
+  scm_c_define ("SDL_RESIZABLE", scm_from_int(SDL_RESIZABLE));
+  scm_c_define ("SDL_NOFRAME", scm_from_int(SDL_NOFRAME));
+
+  scm_c_define ("SDL_HWACCEL", scm_from_int(SDL_HWACCEL));
+  scm_c_define ("SDL_SRCCOLORKEY", scm_from_int(SDL_SRCCOLORKEY));
+
+  scm_c_define ("SDL_GL_DOUBLEBUFFER", scm_from_int(SDL_GL_DOUBLEBUFFER));
+
+  scm_c_define ("SDL_DEFAULT_REPEAT_DELAY", scm_from_int(SDL_DEFAULT_REPEAT_DELAY));
+  scm_c_define ("SDL_DEFAULT_REPEAT_INTERVAL", scm_from_int(SDL_DEFAULT_REPEAT_INTERVAL));
+
+  scm_c_define ("SDL_LIL_ENDIAN", scm_from_int(SDL_LIL_ENDIAN));
+  scm_c_define ("SDL_BIG_ENDIAN", scm_from_int(SDL_BIG_ENDIAN));
+
+  scm_c_define ("MIX_DEFAULT_FORMAT", scm_from_int(MIX_DEFAULT_FORMAT));
 
   scm_c_define_gsubr ("SDL_Init", 1, 0, 0, gacela_SDL_Init);
   scm_c_define_gsubr ("SDL_Quit", 0, 0, 0, gacela_SDL_Quit);
+  scm_c_define_gsubr ("SDL_SetVideoMode", 4, 0, 0, gacela_SDL_SetVideoMode);
+  scm_c_define_gsubr ("SDL_WM_SetCaption", 2, 0, 0, gacela_SDL_WM_SetCaption);
+
   return NULL;
 }