sdl2_ffi 0.0.3 → 0.0.4

data/lib/sdl2/stdinc.rb

@@ -0,0 +1,213 @@
+# TODO: Review stdinc stub.
+
+require 'enumerable_constants'
+require 'sdl2/library'
+
+module SDL2
+
+  # Define a four character code as a Uint32
+  #MACRO: SDL_FOURCC(A, B, C, D) \
+  #    ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \
+  #     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \
+  #     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \
+  #     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24))
+  def self.fourcc(*args)
+    bit_cnt = 0
+    result = 0
+    args.each do |arg|
+      arg = arg.codepoints[0] if arg.kind_of? String
+      result = result | (arg << bit_cnt)
+      bit_cnt += 8
+    end
+    return result
+  end
+  
+    
+  # These are for internal use mostly, they test the return result
+  # of a function that can return an error.  They are designed to
+  # return TRUE if there is NOT_AN_ERROR
+    
+  #Filter Proc, True when arg equals zero
+  TRUE_WHEN_ZERO = Proc.new do |result|
+    # Handles both Negative and Positive error values.
+    result == 0
+  end
+  
+  TRUE_WHEN_NOT_ZERO = Proc.new do |result|
+    result != 0
+  end
+  
+  # Filter Proc, True when arg not null?
+  TRUE_WHEN_NOT_NULL = Proc.new do |result|
+    # Anything but nil/null is considered valid.
+    (!result.null?)
+  end
+  
+  TRUE_WHEN_TRUE = Proc.new do |result|
+    result == true
+  end
+    
+  # NOTE: None of the SDL Memory Macros/Externals
+    
+  # TODO: Review importing SDL's Memory management and ICONV routines?
+  #  #define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
+  #  #define SDL_stack_free(data)            SDL_free(data)
+  #  #endif
+  #  
+  #  extern DECLSPEC void *SDLCALL SDL_malloc(size_t size);
+  #  extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size);
+  #  extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size);
+  #  extern DECLSPEC void SDLCALL SDL_free(void *mem);
+  #  
+  #  extern DECLSPEC char *SDLCALL SDL_getenv(const char *name);
+  #  extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, int overwrite);
+  #  
+  #  extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *));
+  #  
+  #  extern DECLSPEC int SDLCALL SDL_abs(int x);
+  #  
+  #  /* !!! F!IXME: these have side effects. You probably shouldn't use them. */
+  #  /* !!! F!IXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */
+  #  #define SDL_min(x, y) (((x) < (y)) ? (x) : (y))
+  #  #define SDL_max(x, y) (((x) > (y)) ? (x) : (y))
+  #  
+  #  extern DECLSPEC int SDLCALL SDL_isdigit(int x);
+  #  extern DECLSPEC int SDLCALL SDL_isspace(int x);
+  #  extern DECLSPEC int SDLCALL SDL_toupper(int x);
+  #  extern DECLSPEC int SDLCALL SDL_tolower(int x);
+  #  
+  #  extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len);
+  #  
+  #  #define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x)))
+  #  #define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x)))
+  #  
+  #  /* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */
+  #  SDL_FORCE_INLINE void SDL_memset4(void *dst, int val, size_t dwords)
+  #  {
+  #  #if defined(__GNUC__) && defined(i386)
+  #      int u0, u1, u2;
+  #      __asm__ __volatile__ (
+  #          "cld \n\t"
+  #          "rep ; stosl \n\t"
+  #          : "=&D" (u0), "=&a" (u1), "=&c" (u2)
+  #          : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, dwords))
+  #          : "memory"
+  #      );
+  #  #else
+  #      size_t _n = (dwords + 3) / 4;
+  #      Uint32 *_p = SDL_static_cast(Uint32 *, dst);
+  #      Uint32 _val = (val);
+  #      if (dwords == 0)
+  #          return;
+  #      switch (dwords % 4)
+  #      {
+  #          case 0: do {    *_p++ = _val;
+  #          case 3:         *_p++ = _val;
+  #          case 2:         *_p++ = _val;
+  #          case 1:         *_p++ = _val;
+  #          } while ( --_n );
+  #      }
+  #  #endif
+  #  }
+  #  
+  #  
+  #  extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, size_t len);
+  #  
+  #  SDL_FORCE_INLINE void *SDL_memcpy4(void *dst, const void *src, size_t dwords)
+  #  {
+  #      return SDL_memcpy(dst, src, dwords * 4);
+  #  }
+  #  
+  #  extern DECLSPEC void *SDLCALL SDL_memmove(void *dst, const void *src, size_t len);
+  #  extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len);
+  #  
+  #  extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr);
+  #  extern DECLSPEC size_t SDLCALL SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen);
+  #  extern DECLSPEC size_t SDLCALL SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen);
+  #  
+  #  extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str);
+  #  extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
+  #  extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes);
+  #  extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
+  #  extern DECLSPEC char *SDLCALL SDL_strdup(const char *str);
+  #  extern DECLSPEC char *SDLCALL SDL_strrev(char *str);
+  #  extern DECLSPEC char *SDLCALL SDL_strupr(char *str);
+  #  extern DECLSPEC char *SDLCALL SDL_strlwr(char *str);
+  #  extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c);
+  #  extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c);
+  #  extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle);
+  #  
+  #  extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix);
+  #  extern DECLSPEC char *SDLCALL SDL_uitoa(unsigned int value, char *str, int radix);
+  #  extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *str, int radix);
+  #  extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *str, int radix);
+  #  extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *str, int radix);
+  #  extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *str, int radix);
+  #  
+  #  extern DECLSPEC int SDLCALL SDL_atoi(const char *str);
+  #  extern DECLSPEC double SDLCALL SDL_atof(const char *str);
+  #  extern DECLSPEC long SDLCALL SDL_strtol(const char *str, char **endp, int base);
+  #  extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *str, char **endp, int base);
+  #  extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *str, char **endp, int base);
+  #  extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *str, char **endp, int base);
+  #  extern DECLSPEC double SDLCALL SDL_strtod(const char *str, char **endp);
+  #  
+  #  extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
+  #  extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
+  #  extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
+  #  extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t len);
+  #  
+  #  extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
+  #  extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
+  #  extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
+  #  
+  #  #ifndef HAVE_M_PI
+  #  #ifndef M_PI
+  #  #define M_PI    3.14159265358979323846264338327950288   /* pi */
+  #  #endif
+  #  #endif
+  #  
+  #  extern DECLSPEC double SDLCALL SDL_atan(double x);
+  #  extern DECLSPEC double SDLCALL SDL_atan2(double x, double y);
+  #  extern DECLSPEC double SDLCALL SDL_ceil(double x);
+  #  extern DECLSPEC double SDLCALL SDL_copysign(double x, double y);
+  #  extern DECLSPEC double SDLCALL SDL_cos(double x);
+  #  extern DECLSPEC float SDLCALL SDL_cosf(float x);
+  #  extern DECLSPEC double SDLCALL SDL_fabs(double x);
+  #  extern DECLSPEC double SDLCALL SDL_floor(double x);
+  #  extern DECLSPEC double SDLCALL SDL_log(double x);
+  #  extern DECLSPEC double SDLCALL SDL_pow(double x, double y);
+  #  extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n);
+  #  extern DECLSPEC double SDLCALL SDL_sin(double x);
+  #  extern DECLSPEC float SDLCALL SDL_sinf(float x);
+  #  extern DECLSPEC double SDLCALL SDL_sqrt(double x);
+  #  
+  #  /* The SDL implementation of iconv() returns these error codes */
+  #  #define SDL_ICONV_ERROR     (size_t)-1
+  #  #define SDL_ICONV_E2BIG     (size_t)-2
+  #  #define SDL_ICONV_EILSEQ    (size_t)-3
+  #  #define SDL_ICONV_EINVAL    (size_t)-4
+  #  
+  #  /* SDL_iconv_* are now always real symbols/types, not macros or inlined. */
+  #  typedef struct _SDL_iconv_t *SDL_iconv_t;
+  #  extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode,
+  #                                                     const char *fromcode);
+  #  extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
+  #  extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
+  #                                           size_t * inbytesleft, char **outbuf,
+  #                                           size_t * outbytesleft);
+  #  /**
+  #   *  This function converts a string between encodings in one pass, returning a
+  #   *  string that must be freed with SDL_free() or NULL on error.
+  #   */
+  #  extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode,
+  #                                                 const char *fromcode,
+  #                                                 const char *inbuf,
+  #                                                 size_t inbytesleft);
+  #  #define SDL_iconv_utf8_locale(S)    SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
+  #  #define SDL_iconv_utf8_ucs2(S)      (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
+  #  #define SDL_iconv_utf8_ucs4(S)      (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
+    
+  
+    
+end

data/lib/sdl2/surface.rb

@@ -3,7 +3,6 @@ require 'sdl2/rwops'
 require 'sdl2/pixels'
 require 'sdl2/rect'
 require 'sdl2/palette'
-require 'yinum'
 
 #require 'sdl2/pixel_format'
 
@@ -14,7 +13,7 @@ module SDL2
   #
   #\note  This structure should be treated as read-only, except for \c pixels,
   #       which, if not NULL, contains the raw pixel data for the surface.
-  class Surface < FFI::Struct
+  class Surface < Struct
 
     private :[]
 
@@ -29,6 +28,8 @@ module SDL2
     :clip_rect, Rect,
     :map, :pointer,
     :refcount, :int
+    
+    member_readers(*members)
 
     [:flags, :format, :w, :h, :pixels, :userdata, :locked, :lock_data, :clip_rect, :map, :refcount].each do |field|
       define_method field do
@@ -103,12 +104,14 @@ module SDL2
       self[:flags] & RLEACCEL != 0
     end
 
-    def blit_from(src, src_rect, dst_rect)
-      SDL2.blit!(src, src_rect, self, dst_rect)
+    # Blit from source to this surface 
+    def blit_in(src, src_rect = nil, dst_rect = nil)
+      SDL2.blit_surface!(src, src_rect, self, dst_rect)
     end
 
-    def blit_to(src_rect, dst, dst_rect)
-      SDL2.blit!(self, src_rect, dst, dst_rect)
+    # Blit from this surface to dest
+    def blit_out(dest, dest_rect = nil, src_rect = nil)
+      SDL2.blit_surface!(self, src_rect, dest, dest_rect)
     end
 
     def set_rle(flag)
@@ -126,6 +129,11 @@ module SDL2
       SDL2.get_color_key!(self, key_s)
       return key_s[:value]
     end
+
+    # Convert existing surface into this surface's format
+    def convert(surface, flags = 0)
+      SDL2.convert_surface!(surface, self.format, flags)
+    end
   end
 
   callback :blit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
@@ -142,6 +150,8 @@ module SDL2
     SDL2.load_bmp_rw(RWops.from_file(file, 'rb'), 1)
   end
 
+  returns_error(:load_bmp,TRUE_WHEN_NOT_NULL)
+
   api :SDL_SaveBMP_RW, [Surface.by_ref, RWops.by_ref, :int], :int
 
   def self.save_bmp(file)
@@ -159,25 +169,31 @@ module SDL2
   api :SDL_GetSurfaceBlendMode, [Surface.by_ref, BlendModeStruct.by_ref], :int, {error: true}
   api :SDL_SetClipRect, [Surface.by_ref, Rect.by_ref], :int, {error: true}
   api :SDL_GetClipRect, [Surface.by_ref, Rect.by_ref], :int, {error: true}
-  api :SDL_ConvertSurface, [Surface.by_ref, PixelFormat.by_ref, :surface_flags], Surface.auto_ptr
+  api :SDL_ConvertSurface, [Surface.by_ref, PixelFormat.by_ref, :surface_flags], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
   api :SDL_ConvertSurfaceFormat, [Surface.by_ref, :pixel_format, :surface_flags], Surface.auto_ptr
   api :SDL_ConvertPixels, [:int, :int, :pixel_format, :pointer, :int, :pixel_format, :pointer, :int], :int, {error: true}
   api :SDL_FillRect, [Surface.by_ref, Rect.by_ref, :uint32], :int, {error: true}
   api :SDL_FillRects, [Surface.by_ref, Rect.by_ref, :count, :uint32], :int, {error: true}
   api :SDL_UpperBlit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int, {error: true}
 
+  # using upper_blit
   def self.blit_surface(src, srcrect, dst, dstrect)
     upper_blit(src, srcrect, dst, dstrect)
   end
 
+  returns_error(:blit_surface, TRUE_WHEN_ZERO)
+
   api :SDL_LowerBlit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
   api :SDL_SoftStretch, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
   api :SDL_UpperBlitScaled, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
 
+  # using upper_blit_scaled
   def self.blit_scaled(src, srcrect, dst, dstrect)
     upper_blit_scaled(src, srcrect, dst, dstrect)
   end
 
+  returns_error(:blit_scaled, TRUE_WHEN_ZERO)
+
   api :SDL_LowerBlitScaled, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
 
 end

data/lib/sdl2/ttf.rb

@@ -1,11 +1,13 @@
 require 'sdl2'
 require 'sdl2/version'
+require 'sdl2/rwops'
+require 'sdl2/color'
 require 'sdl2/ttf/sdl_ttf_module'
 require 'active_support/inflector'
-require 'yinum'
+
 
 module SDL2
-  
+  # The SDL_ttf interface.  API prototypes are linked to this module.
   module TTF
     
     extend FFI::Library
@@ -16,7 +18,7 @@ module SDL2
       methodName = ActiveSupport::Inflector.underscore(camelCaseName).to_sym
       self.attach_function methodName, func_name, args, type
       return methodName
-    end
+    end      
     
     api :TTF_Linked_Version, [], Version.auto_ptr
     
@@ -39,30 +41,32 @@ module SDL2
     api :TTF_OpenFontRW, [RWops.by_ref, :int, :int], Font.auto_ptr
     api :TTF_OpenFontIndexRW, [RWops.by_ref, :int, :int, :long], Font.auto_ptr
     
-    STYLE = Enum.new(:STYLE, {
-      NORMAL: 0x00,
-      BOLD: 0x01,
-      ITALIC: 0x02,
-      UNDERLINE: 0x04,
-      STRIKETHROUGH: 0x08
-    })
+    module STYLE
+      include EnumerableConstants
+      NORMAL = 0x00
+      BOLD = 0x01
+      ITALIC = 0x02
+      UNDERLINE = 0x04
+      STRIKETHROUGH = 0x08
+    end
     
-    enum :font_style, STYLE.by_name
+    enum :font_style, STYLE.flatten_consts
     
     api :TTF_GetFontStyle, [Font.by_ref], :int
     api :TTF_SetFontStyle, [Font.by_ref, :int], :void
     api :TTF_GetFontOutline, [Font.by_ref], :int
     api :TTF_SetFontOutline, [Font.by_ref, :int], :void
     
-    HINTING = Enum.new(:HINTING, {
-      NORMAL: 0,
-      LIGHT: 1,
-      MONO: 2,
-      NONE: 3
-    })
-    enum :hinting, HINTING.by_name
+    module HINTING 
+      include EnumerableConstants
+      NORMAL = 0
+      LIGHT = 1
+      MONO = 2
+      NONE = 3
+    end
+    enum :hinting, HINTING.flatten_consts
    
-    api :TTF_GetFontHinting, [Font.by_ref], :int
+    api :TTF_GetFontHinting, [Font.by_ref], :hinting
     api :TTF_SetFontHinting, [Font.by_ref, :int], :void
     
     api :TTF_FontHeight, [Font.by_ref], :int

data/lib/sdl2/version.rb

@@ -2,32 +2,38 @@ require 'sdl2'
 
 module SDL2  
   
+  # Used to identify linked versions of libraries.
+  # Used by SDL2, SDL_Image, SDL_ttf, and etc.
   class Version < FFI::Struct
     layout :major, :uint8,
       :minor, :uint8,
       :patch, :uint8
       
+    # Release memory held by a Version struct
     def self.release(pointer)
       pointer.free
     end
       
+    # The major X.0.0 part
     def major
       self[:major]
     end
     
+    # The minor 0.X.0 part
     def minor
       self[:minor]
     end
     
+    # the patch 0.0.X part
     def patch
       self[:patch]
     end
     
+    # Human-readable version string
     def to_s
-      "SDL v#{major}.#{minor}.#{patch}"
+      "v#{major}.#{minor}.#{patch}"
     end
     
-    
   end
   
   api :SDL_GetRevision, [], :string

data/lib/sdl2/video.rb

@@ -1,4 +1,4 @@
-require 'sdl2'
+require 'sdl2/stdinc'
 require 'sdl2/rect'
 require 'sdl2/window'
 require 'sdl2/display'
@@ -8,80 +8,71 @@ require 'sdl2/surface'
 #require 'sdl2/texture'
 require 'sdl2/syswm/info'
 
-#
 module SDL2
   typedef :int, :display_index
-  
 
-  enum :window_flags, [
-    :fullscreen, Window::FULLSCREEN,
-    :opengl, Window::OPENGL,
-    :shown, Window::SHOWN,
-    :hidden, Window::HIDDEN,
-    :borderless, Window::BORDERLESS,
-    :minimized, Window::MINIMIZED,
-    :maximized, Window::MAXIMIZED,
-    :input_grabbed, Window::INPUT_GRABBED,
-    :input_focus, Window::INPUT_FOCUS,
-    :mouse_focus, Window::MOUSE_FOCUS,
-    :fullscreen_desktop, Window::FULLSCREEN_DESKTOP,
-    :foreign, Window::FOREIGN
-  ]
+  enum :window_flags, WINDOW.flatten_consts
   # TODO: SDL_video.h lines 113~129
-
-  # line: 134~155
-  enum :window_event_id, [
-    :none,
-    :shown,
-    :hidden,
-    :exposed,
-    :moved,
-    :resized,
-    :size_changed,
-    :minimized,
-    :maximized,
-    :restored,
-    :enter,
-    :leave,
-    :focus_gained,
-    :focus_lost,
-    :close
-  ]
-  # line 160
+  enum :window_event_id, WINDOWEVENT.flatten_consts
+  
+  enum :windowpos, WINDOWPOS.flatten_consts
+  
   typedef :pointer, :gl_context
+
+  # OpenGL configuration attributes
+  module GLattr
+    include EnumerableConstants
+    RED_SIZE			     = next_const_value
+    GREEN_SIZE			   = next_const_value
+    BLUE_SIZE			     = next_const_value
+    ALPHA_SIZE			   = next_const_value
+    BUFFER_SIZE			   = next_const_value
+    DOUBLEBUFFER			 = next_const_value
+    DEPTH_SIZE			   = next_const_value
+    STENCIL_SIZE			 = next_const_value
+    ACCUM_RED_SIZE		 = next_const_value
+    ACCUM_GREEN_SIZE	 = next_const_value
+    ACCUM_BLUE_SIZE		 = next_const_value
+    ACCUM_ALPHA_SIZE	 = next_const_value
+    STEREO			       = next_const_value
+    MULTISAMPLEBUFFERS = next_const_value
+    MULTISAMPLESAMPLES = next_const_value
+    ACCELERATED_VISUAL = next_const_value
+    RETAINED_BACKING	 = next_const_value
+    CONTEXT_MAJOR_VERSION	= next_const_value
+    CONTEXT_MINOR_VERSION	= next_const_value
+    CONTEXT_EGL = next_const_value
+    CONTEXT_FLAGS = next_const_value
+    CONTEXT_PROFILE_MASK			= next_const_value
+    SHARE_WITH_CURRENT_CONTEXT = next_const_value
+  end
+  
   # lines 165~190
-  enum :gl_attr, [
-    :red_size,
-    :green_size,
-    :blue_size,
-    :alpha_size,
-    :buffer_size,
-    :doublebuffer,
-    :depth_size,
-    :stencil_size,
-    :accum_red_size,
-    :accum_green_size,
-    :accum_blue_size,
-    :accum_alpha_size,
-    :stereo,
-    :multisamplebuffers,
-    :multisamplesamples,
-    :accelerated_visual,
-    :retained_backing,
-    :context_major_version,
-    :context_minor_version,
-    :context_egl,
-    :context_flags,
-    :context_profile_mask,
-    :share_with_current_context
-  ]
-  # lines 192~197
-  enum :gl_profile, [:core, 0x0001, :compatibility, 0x0002, :es, 0x0004]
+  enum :gl_attr, GLattr.flatten_consts
+  
+  # OpenGL Profile Values
+  module GLprofile
+    include EnumerableConstants
+    CORE = 0x0001
+    COMPATIBILITY = 0x0002
+    ES = 0x0004
+  end
+  enum :gl_profile, GLprofile.flatten_consts
+  
+  # OpenGL Context Values
+  module GLcontextFlag
+    include EnumerableConstants
+    DEBUG = 0x001
+    FORWARD_COMPATIBLE = 0x0002
+    ROBUST_ACCESS = 0x0004
+    RESET_ISOLATION = 0x0008
+  end
   # lines 199~205
-  enum :gl_context_flag, [:debug, 0x0001, :forward_compatible, 0x0002, :robust_access, 0x0004, :reset_isolation, 0x0008]
+  enum :gl_context_flag, GLcontextFlag.flatten_consts
 
   # This interface represents SDL_video.h function prototypes, lines 208~
-  api :SDL_GetNumVideoDrivers, [], :int
+  
+  api :SDL_GetNumVideoDrivers, [], :int  
   api :SDL_GetVideoDriver, [:int], :string
   api :SDL_VideoInit, [:string], :int
   api :SDL_VideoQuit, [], :void
@@ -98,7 +89,7 @@ module SDL2
   api :SDL_SetWindowDisplayMode, [Window.by_ref, :uint32], :int
   api :SDL_GetWindowDisplayMode, [Window.by_ref, Display::Mode.by_ref], :int
   api :SDL_GetWindowPixelFormat, [Window.by_ref], :uint32
-  api :SDL_CreateWindow, [:string, :int, :int, :int, :int, :uint32], Window.auto_ptr
+  api :SDL_CreateWindow, [:string, :int, :int, :int, :int, :window_flags], Window.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
   api :SDL_CreateWindowFrom, [:pointer], Window.auto_ptr
   api :SDL_GetWindowFromID, [:uint32], Window.by_ref
   api :SDL_GetWindowID, [Window.by_ref], :uint32
@@ -125,8 +116,8 @@ module SDL2
   api :SDL_RestoreWindow, [Window.by_ref], :void
   api :SDL_SetWindowFullscreen, [Window.by_ref, :uint32], :int
   api :SDL_GetWindowSurface, [Window.by_ref], Surface.by_ref
-  api :SDL_UpdateWindowSurface, [Window.by_ref], :int
-  api :SDL_UpdateWindowSurfaceRects, [Window.by_ref, Rect.by_ref, :int], :int
+  api :SDL_UpdateWindowSurface, [Window.by_ref], :int, {error: true}
+  api :SDL_UpdateWindowSurfaceRects, [Window.by_ref, Rect.by_ref, :int], :int, {error: true}
   api :SDL_GetWindowGrab, [Window.by_ref], :bool
   api :SDL_SetWindowGrab, [Window.by_ref, :bool], :void
   api :SDL_GetWindowBrightness, [Window.by_ref], :float
@@ -134,16 +125,16 @@ module SDL2
   api :SDL_GetWindowGammaRamp, [Window.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref], :int
   api :SDL_SetWindowGammaRamp, [Window.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref], :int
   api :SDL_DestroyWindow, [Window.by_ref], :void
-  api :SDL_IsScreenSaverEnabled, [], :bool    
+  api :SDL_IsScreenSaverEnabled, [], :bool
   api :SDL_DisableScreenSaver, [], :void
-  api :SDL_EnableScreenSaver, [], :void    
+  api :SDL_EnableScreenSaver, [], :void
   api :SDL_GL_LoadLibrary, [:string], :int
   api :SDL_GL_GetProcAddress, [:string], :pointer
   api :SDL_GL_UnloadLibrary, [], :void
   api :SDL_GL_ExtensionSupported, [:string], :bool
   api :SDL_GL_SetAttribute, [:gl_attr, IntStruct], :int
-  api :SDL_GL_GetAttribute, [:gl_attr, IntStruct.by_ref], :int  
-  api :SDL_GL_CreateContext, [Window.by_ref], :gl_context  
+  api :SDL_GL_GetAttribute, [:gl_attr, IntStruct.by_ref], :int
+  api :SDL_GL_CreateContext, [Window.by_ref], :gl_context
   api :SDL_GL_MakeCurrent, [Window.by_ref, :gl_context], :int
   api :SDL_GL_GetCurrentWindow, [], Window.by_ref
   api :SDL_GL_GetCurrentContext, [], :gl_context