X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_SDL.lisp;h=47a8a27f01570fe2075788ffcc9967207fafb248;hb=b6c766a1beef2b891c87400f37e2e7470208424a;hp=adcef190979560d01d963b716212f2aea28858f6;hpb=678a1561ca858c34fecf04792831caf68559c2ac;p=gacela.git
diff --git a/gacela_SDL.lisp b/gacela_SDL.lisp
index adcef19..47a8a27 100644
--- a/gacela_SDL.lisp
+++ b/gacela_SDL.lisp
@@ -15,53 +15,58 @@
;;; along with this program. If not, see .
-(in-package :gacela)
+(eval-when (compile load eval)
+ (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+ (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+
+
+(defmacro mapcconst (type c-type name)
+ (let ((c-header (concatenate 'string c-type " gacela_" name " (void)"))
+ (c-body (concatenate 'string "return " name ";"))
+ (c-name (concatenate 'string "gacela_" name))
+ (lisp-name (intern (string-upcase name))))
+ `(progn
+ (defcfun ,c-header 0 ,c-body)
+ (defentry ,lisp-name () (,type ,c-name))
+ (eval-when (load) (defconstant ,lisp-name (,lisp-name))))))
(clines "#include ")
(clines "#include ")
-(clines "#include ")
(clines "#include ")
-(clines "#include ")
-
-;;; These are the flags which may be passed to SDL_Init()
-(defconstant SDL_INIT_TIMER #x00000001)
-(defconstant SDL_INIT_AUDIO #x00000010)
-(defconstant SDL_INIT_VIDEO #x00000020)
-(defconstant SDL_INIT_CDROM #x00000100)
-(defconstant SDL_INIT_JOYSTICK #x00000200)
-(defconstant SDL_INIT_NOPARACHUTE #x00100000)
-(defconstant SDL_INIT_EVENTTHREAD #x01000000)
-(defconstant SDL_INIT_EVERYTHING #x0000FFFF)
-
-;;; These are the currently supported flags for the SDL_surface
-;;; Available for SDL_CreateRGBSurface() or SDL_SetVideoMode()
-(defconstant SDL_SWSURFACE #x00000000)
-(defconstant SDL_HWSURFACE #x00000001)
-(defconstant SDL_ASYNCBLIT #x00000004)
+;;; SDL constants as functions
+(mapcconst int "int" "SDL_INIT_TIMER")
+(mapcconst int "int" "SDL_INIT_AUDIO")
+(mapcconst int "int" "SDL_INIT_VIDEO")
+(mapcconst int "int" "SDL_INIT_CDROM")
+(mapcconst int "int" "SDL_INIT_JOYSTICK")
+(mapcconst int "int" "SDL_INIT_NOPARACHUTE")
+(mapcconst int "int" "SDL_INIT_EVENTTHREAD")
+(mapcconst int "int" "SDL_INIT_EVERYTHING")
+(mapcconst int "int" "SDL_SWSURFACE")
+(mapcconst int "int" "SDL_HWSURFACE")
+(mapcconst int "int" "SDL_ASYNCBLIT")
-;;; Available for SDL_SetVideoMode()
-(defconstant SDL_ANYFORMAT #x10000000)
-(defconstant SDL_HWPALETTE #x20000000)
-(defconstant SDL_DOUBLEBUF #x40000000)
-(defconstant SDL_FULLSCREEN #x80000000)
-(defconstant SDL_OPENGL #x00000002)
-(defconstant SDL_OPENGLBLIT #x0000000A)
-(defconstant SDL_RESIZABLE #x00000010)
-(defconstant SDL_NOFRAME #x00000020)
+(mapcconst int "int" "SDL_ANYFORMAT")
+(mapcconst int "int" "SDL_HWPALETTE")
+(mapcconst int "int" "SDL_DOUBLEBUF")
+(mapcconst int "int" "SDL_FULLSCREEN")
+(mapcconst int "int" "SDL_OPENGL")
+(mapcconst int "int" "SDL_OPENGLBLIT")
+(mapcconst int "int" "SDL_RESIZABLE")
+(mapcconst int "int" "SDL_NOFRAME")
-;;; Used internally (read-only)
-(defconstant SDL_HWACCEL #x00000100)
-(defconstant SDL_SRCCOLORKEY #x00001000)
+(mapcconst int "int" "SDL_HWACCEL")
+(mapcconst int "int" "SDL_SRCCOLORKEY")
-;;; For setting the OpenGL window attributes
-(defconstant SDL_GL_DOUBLEBUFFER 5)
+(mapcconst int "int" "SDL_GL_DOUBLEBUFFER")
-;;; Keyboard
-(defconstant SDL_DEFAULT_REPEAT_DELAY 500)
-(defconstant SDL_DEFAULT_REPEAT_INTERVAL 30)
+(mapcconst int "int" "SDL_DEFAULT_REPEAT_DELAY")
+(mapcconst int "int" "SDL_DEFAULT_REPEAT_INTERVAL")
+(mapcconst int "int" "SDL_LIL_ENDIAN")
+(mapcconst int "int" "SDL_BIG_ENDIAN")
;;; SDL Functions
(defcfun "int gacela_SDL_Init (int flags)" 0
@@ -136,6 +141,9 @@
(defcfun "int gacela_SDL_EnableKeyRepeat (int delay, int interval)" 0
"return SDL_EnableKeyRepeat (delay, interval);")
+(defcfun "int gacela_SDL_ByteOrder (void)" 0
+ "return SDL_BYTEORDER;")
+
(defentry SDL_Init (int) (int "gacela_SDL_Init"))
(defentry SDL_Quit () (void "gacela_SDL_Quit"))
(defentry SDL_SetVideoMode (int int int int) (int "gacela_SDL_SetVideoMode"))
@@ -172,11 +180,10 @@
;(defentry Mix_FreeMusic (int) (void "gacela_Mix_FreeMusic"))
;(defentry Mix_FreeChunk (int) (void "gacela_Mix_FreeChunk"))
;(defentry Mix_CloseAudio () (void "gacela_Mix_CloseAudio"))
-;(defentry sge_FilledCircle (int int int int int int int) (void "gacela_sge_FilledCircle"))
-;(defentry sge_FilledRect (int int int int int int int int) (void "gacela_sge_FilledRect"))
;(defentry free (int) (void "gacela_free"))
(defentry SDL_GL_SwapBuffers () (void "gacela_SDL_GL_SwapBuffers"))
(defentry SDL_EnableKeyRepeat (int int) (int "gacela_SDL_EnableKeyRepeat"))
+(defentry SDL_ByteOrder () (int "gacela_SDL_ByteOrder"))
;;; C-Gacela Functions
(defcfun "int gacela_surface_format (int surface)" 0
@@ -195,9 +202,12 @@
"const SDL_Surface *s = surface;"
"return s->pixels;")
+(defcfun "int gacela_surface_format_BytesPerPixel (int surface)" 0
+ "const SDL_Surface *s = surface;"
+ "return s->format->BytesPerPixel;")
+
;(defentry apply-surface2 (int int int int int int int int int) (void "apply_surface"))
;(defentry render-text2 (int string int int int) (int "render_text"))
-;(defentry fill-surface (int int int int) (void "fill_surface"))
;(defentry box-collision (int int int int int int) (int "box_collision"))
;(defentry create-SDL_Surface (int int int int int int) (int "create_SDL_Surface"))
;(defentry copy-SDL_Surface (int) (int "copy_SDL_Surface"))
@@ -205,3 +215,4 @@
(defentry surface-w (int) (int "gacela_surface_w"))
(defentry surface-h (int) (int "gacela_surface_h"))
(defentry surface-pixels (int) (int "gacela_surface_pixels"))
+(defentry surface-format-BytesPerPixel (int) (int "gacela_surface_format_BytesPerPixel"))