sdl2_ffi 0.0.4 → 0.0.5

data/lib/sdl2/gamecontroller.rb

@@ -31,7 +31,7 @@ module SDL2
   end#GameController
   
   api :SDL_GameControllerAddMapping, [:string], :int
-  api :SDL_GameControllerMappingForGUID, [JoystickGUID], :string
+  api :SDL_GameControllerMappingForGUID, [JoystickGUID.by_value], :string
   api :SDL_GameControllerMapping, [GameController.by_ref], :string
   api :SDL_IsGameController, [:joystick_index], :bool
   api :SDL_GameControllerNameForIndex, [:joystick_index], :string

data/lib/sdl2/gem_version.rb

@@ -1,4 +1,4 @@
 
 module SDL2
-  GEM_VERSION = "0.0.4"
+  GEM_VERSION = "0.0.5"
 end

data/lib/sdl2/joystick.rb

@@ -28,7 +28,7 @@ module SDL2
   api :SDL_JoystickName, [Joystick.by_ref], :string
   api :SDL_JoystickGetDeviceGUID, [:int], JoystickGUID
   api :SDL_JoystickGetGUID, [Joystick.by_ref], JoystickGUID
-  api :SDL_JoystickGetGUIDString, [JoystickGUID, :pointer, :int], :void
+  api :SDL_JoystickGetGUIDString, [JoystickGUID.by_value, :pointer, :int], :void
   api :SDL_JoystickGetGUIDFromString, [:string], JoystickGUID
   api :SDL_JoystickGetAttached, [Joystick.by_ref], :bool
   api :SDL_JoystickInstanceID, [Joystick.by_ref], :joystick_id

data/lib/sdl2/keyboard.rb

@@ -13,6 +13,9 @@ module SDL2
       :sym, :keycode,
       :mod, :uint16,
       :unused, :uint32
+      
+    member_readers *members
+    member_writers *members
   end
   
   api :SDL_GetKeyboardFocus, [], Window.by_ref

data/lib/sdl2/mouse.rb

@@ -35,11 +35,11 @@ module SDL2
     
     module BUTTON
       include EnumerableConstants
-      LEFT = next_const_value
-      MIDDLE  = next_const_value
-      RIGHT  = next_const_value
-      X1  = next_const_value
-      X2  = next_const_value
+      LEFT
+      MIDDLE 
+      RIGHT 
+      X1 
+      X2 
     end
     
     module BUTTONMASK

data/lib/sdl2/pixel_format.rb

@@ -5,9 +5,9 @@ module SDL2
 
   # SDL_pixels.h:272~293:typdef struct SDL_PixelFormat
   # \note Everything in the pixel format structure is read-only.
-  class PixelFormat < FFI::Struct
+  class PixelFormat < Struct
 
-    private :[] # see note
+    protected :[] # see note
 
     layout :format, :pixel_format,
     :palette, Palette.by_ref,
@@ -79,6 +79,13 @@ module SDL2
     
     alias_method :palette=, :set_palette
     
+    # Maps a color struct to a pixel value.
+    def map(color)
+      #binding.pry
+      c = Color.cast(color)
+      map_rgba(c.to_a)
+    end
+    
     # Maps an RGB triple (array) to an opaque pixel value    
     def map_rgb(rgb)
       r, g, b = *rgb
@@ -87,7 +94,8 @@ module SDL2
 
     # Maps an RGBA quadruple (array) to a pixel value
     def map_rgba(rgba)
-      r, g, b, a = *rgba
+      r, g, b, a = rgba
+      a = 0 if a.nil?
       SDL2.map_rgba(self, r, g, b, a)
     end
     

data/lib/sdl2/pixels.rb

@@ -10,27 +10,27 @@ module SDL2
   # Predefined pixel types.
   module PIXELTYPE
     include EnumerableConstants
-    UNKNOWN = next_const_value
-    INDEX1 = next_const_value
-    INDEX4 = next_const_value
-    INDEX8 = next_const_value
-    PACKED8 = next_const_value
-    PACKED16 = next_const_value
-    PACKED32 = next_const_value
-    ARRAYU8 = next_const_value
-    ARRAYU16 = next_const_value
-    ARRAYU32 = next_const_value
-    ARRAYF16 = next_const_value
-    ARRAYF32 = next_const_value
+    UNKNOWN
+    INDEX1
+    INDEX4
+    INDEX8
+    PACKED8
+    PACKED16
+    PACKED32
+    ARRAYU8
+    ARRAYU16
+    ARRAYU32
+    ARRAYF16
+    ARRAYF32
   end
   enum :pixeltype, PIXELTYPE.flatten_consts
 
   # Bitmap pixel order, high bit -> low bit
   module BITMAPORDER
     include EnumerableConstants
-    NONE =  next_const_value
-    N4321 = next_const_value
-    N1234 = next_const_value
+    NONE 
+    N4321
+    N1234
   end
 
   enum :bitmaporder, BITMAPORDER.flatten_consts
@@ -38,15 +38,15 @@ module SDL2
   # Packed component order, high bit -> low bit
   module PACKEDORDER
     include EnumerableConstants
-    NONE = next_const_value
-    XRGB = next_const_value
-    RGBX = next_const_value
-    ARGB = next_const_value
-    RGBA = next_const_value
-    XBGR = next_const_value
-    BGRX = next_const_value
-    ABGR = next_const_value
-    BGRA = next_const_value
+    NONE
+    XRGB
+    RGBX
+    ARGB
+    RGBA
+    XBGR
+    BGRX
+    ABGR
+    BGRA
   end
 
   enum :packedorder, PACKEDORDER.flatten_consts
@@ -54,13 +54,13 @@ module SDL2
   # Array component order, low byte -> hight byte
   module ARRAYORDER
     include EnumerableConstants
-    NONE = next_const_value
-    RGB = next_const_value
-    RGBA = next_const_value
-    ARGB = next_const_value
-    BGR = next_const_value
-    BGRA = next_const_value
-    ABGR = next_const_value
+    NONE
+    RGB
+    RGBA
+    ARGB
+    BGR
+    BGRA
+    ABGR
   end
 
   enum :arrayorder, ARRAYORDER.flatten_consts
@@ -68,15 +68,15 @@ module SDL2
   # Packed component layout
   module PACKEDLAYOUT
     include EnumerableConstants
-    NONE = next_const_value
-    N332 = next_const_value
-    N4444 = next_const_value
-    N1555 = next_const_value
-    N5551 = next_const_value
-    N565 = next_const_value
-    N8888 = next_const_value
-    N2101010 = next_const_value
-    N1010102 = next_const_value
+    NONE
+    N332
+    N4444
+    N1555
+    N5551
+    N565
+    N8888
+    N2101010
+    N1010102
   end
 
   enum :packedlayout, PACKEDLAYOUT.flatten_consts

data/lib/sdl2/point.rb

@@ -1,7 +1,23 @@
 require 'sdl2'
 
 module SDL2
-  class Point < FFI::Struct
+  class Point < Struct
     layout :x, :int, :y, :int
+    
+    member_readers *members
+    member_writers *members
+    
+    def self.cast(something)
+      if something.kind_of?(Array) and something.count == 2
+        something.map!(&:to_i) 
+        result = Point.new
+        result.x, result.y = something
+        return result
+      else      
+        return super
+      end
+    end
+    
+    
   end
 end

data/lib/sdl2/power.rb

@@ -1,9 +1,18 @@
 require 'sdl2'
 
 module SDL2
-  
-  Powerstate = enum :powerstate, [:UNKOWN, :ON_BATTERY, :NO_BATTERY, :CHARGING, :CHARGED]
+
+  module POWERSTATE
+    include EnumerableConstants
+    UNKOWN
+    ON_BATTERY
+    NO_BATTERY
+    CHARGING
+    CHARGED
+  end
+  enum :powerstate, POWERSTATE.flatten_consts
+
   
   api :SDL_GetPowerInfo, [IntStruct.by_ref, IntStruct.by_ref], :powerstate
-  
+
 end

data/lib/sdl2/rect.rb

@@ -11,6 +11,25 @@ module SDL2
     member_readers *members
     member_writers *members
     
+    def self.cast(something)
+      
+      if something.kind_of?(Array) 
+        something.map!(&:to_i)
+        result = Rect.new
+        case something.count
+        when 4
+          result.x, result.y, result.w, result.h = something
+        when 2
+          result.x, result.y = something
+        else
+          raise "#{self}#cast cannot convert array length #{something.count} of: #{something.inspect}"
+        end
+        return result
+      else
+        return super
+      end
+    end
+    
     def empty
       return ((!self.null?) || (self[:w] <= 0) || (self[:h] <= 0))
     end

data/lib/sdl2/render.rb

@@ -10,9 +10,9 @@ module SDL2
   # The access pattern allowed for a texture
   module TEXTUREACCESS
     include EnumerableConstants
-    STATIC = next_const_value
-    STREAMING = next_const_value
-    TARGET = next_const_value
+    STATIC
+    STREAMING
+    TARGET
   end
   enum :texture_access, TEXTUREACCESS.flatten_consts  
        

data/lib/sdl2/scancode.rb

@@ -2,10 +2,17 @@ require 'sdl2'
 
 
 module SDL2
+  # Not a key, just marks the number of scancodes for array bounds
   NUM_SCANCODES = 512
   
+  # The SDL keyboard scancode representation.
+  #
+  # Values of this type are used to represent keyboard keys, among other places
+  # in the Keysym#scancode field of the Event structure.
   module SCANCODE
     include EnumerableConstants
+    UNKOWN = 0
+    
     A  =  4
     B  =  5
     C  =  6

data/lib/sdl2/stdinc.rb

@@ -33,6 +33,8 @@ module SDL2
     result == 0
   end
   
+  TRUE_WHEN_ONE = Proc.new{|result| result == 1}
+  
   TRUE_WHEN_NOT_ZERO = Proc.new do |result|
     result != 0
   end

data/lib/sdl2/surface.rb

@@ -28,7 +28,7 @@ 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|
@@ -104,14 +104,21 @@ module SDL2
       self[:flags] & RLEACCEL != 0
     end
 
-    # Blit from source to this surface 
+    # Blit from source to this surface
     def blit_in(src, src_rect = nil, dst_rect = nil)
+      
+      
+      src_rect = Rect.cast(src_rect)
+      dst_rect = Rect.cast(dst_rect)
+      
       SDL2.blit_surface!(src, src_rect, self, dst_rect)
     end
 
     # 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)
+    def blit_out(dest, dst_rect = nil, src_rect = nil)
+      src_rect = Rect.cast(src_rect)
+      dst_rect = Rect.cast(dst_rect)
+      SDL2.blit_surface!(self, src_rect, dest, dst_rect)
     end
 
     def set_rle(flag)
@@ -120,20 +127,62 @@ module SDL2
 
     alias_method :rle=, :set_rle
 
-    def set_color_key(flag, key)
-      SDL2.set_color_key(self, flag, key)
+    # Sets the color key for this surface.
+    # @param key may be 1) A pixel value encoded for this surface's format
+    # 2) Anything that Color::cast can handle.
+    # 3) Nil, which will disable the color key for this surface.
+    def set_color_key(key)
+      if key.kind_of? Integer
+        pixel_value = key
+      else
+        pixel_value = format.map_rgb(Color.cast(key))
+      end
+
+      if key.nil?#then disable color keying
+        SDL2.set_color_key(self, false, 0)
+      else# Enable color key by value
+        SDL2.set_color_key(self, true, pixel_value)
+      end
     end
 
+    # Gets the color key for this surface.
+    # @returns Nil, indicating no color keying, or the encoded pixel value used.
     def get_color_key()
       key_s = UInt32Struct.new
-      SDL2.get_color_key!(self, key_s)
-      return key_s[:value]
+      if SDL2.get_color_key?(self, key_s)
+        result = key_s[:value]
+      else
+        result = nil
+      end
+      key_s.free
+      return result
     end
 
+    alias_method :color_key, :get_color_key
+    alias_method :color_key=, :set_color_key
+
     # Convert existing surface into this surface's format
     def convert(surface, flags = 0)
       SDL2.convert_surface!(surface, self.format, flags)
     end
+    
+    def fill_rect(rect, color)
+      
+      if color.kind_of? Integer
+        pixel_value = color
+      else
+        
+        pixel_value = format.map(Color.cast(color))
+      end
+      rect = Rect.cast(rect)
+      SDL2.fill_rect!(self, rect, pixel_value)
+    end
+    
+    # Returns a RECT for the whole surface:
+    def rect
+      Rect.cast(x: 0, y: 0, w: self.w, h: self.h)
+    end
+    
   end
 
   callback :blit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
@@ -154,13 +203,15 @@ module SDL2
 
   api :SDL_SaveBMP_RW, [Surface.by_ref, RWops.by_ref, :int], :int
 
-  def self.save_bmp(file)
-    SDL2.save_bmp_rw(RWops.from_file(file, 'wb'), 1)
+  def self.save_bmp(surface, file)
+    SDL2.save_bmp_rw(surface, RWops.from_file(file, 'wb'), 1)
   end
 
   api :SDL_SetSurfaceRLE, [Surface.by_ref, :int], :int
-  api :SDL_SetColorKey, [Surface.by_ref, :int, :uint32], :int
-  api :SDL_GetColorKey, [Surface.by_ref, UInt32Struct.by_ref], :int
+  api :SDL_SetColorKey, [Surface.by_ref, :bool, :int], :int, {error: true}
+  api :SDL_GetColorKey, [Surface.by_ref, UInt32Struct.by_ref], :int, {error: true}
+  # Could mean an SDL error... or maybe not?
+  boolean? :get_color_key, TRUE_WHEN_ZERO
   api :SDL_SetSurfaceColorMod, [Surface.by_ref, :uint8, :uint8, :uint8], :int
   api :SDL_GetSurfaceColorMod, [Surface.by_ref, UInt8Struct.by_ref,UInt8Struct.by_ref,UInt8Struct.by_ref], :int
   api :SDL_SetSurfaceAlphaMod, [Surface.by_ref, :uint8], :int, {error: true}
@@ -178,6 +229,7 @@ module SDL2
 
   # using upper_blit
   def self.blit_surface(src, srcrect, dst, dstrect)
+    
     upper_blit(src, srcrect, dst, dstrect)
   end
 

data/lib/sdl2/ttf.rb

@@ -3,44 +3,31 @@ require 'sdl2/version'
 require 'sdl2/rwops'
 require 'sdl2/color'
 require 'sdl2/ttf/sdl_ttf_module'
+require 'sdl2/ttf/font'
 require 'active_support/inflector'
 
-
 module SDL2
+
   # The SDL_ttf interface.  API prototypes are linked to this module.
   module TTF
-    
+
     extend FFI::Library
+    extend SDL2::Library
     ffi_lib SDL_TTF_MODULE
-    
-    def self.api(func_name, args, type)
-      camelCaseName = func_name.to_s.gsub('TTF_','')
-      methodName = ActiveSupport::Inflector.underscore(camelCaseName).to_sym
-      self.attach_function methodName, func_name, args, type
-      return methodName
-    end      
-    
+
     api :TTF_Linked_Version, [], Version.auto_ptr
-    
+
     UNICODE_BOM_NATIVE = 0xFEFF
     UNICODE_BOM_SWAPPED = 0xFFFE
-    
+
     api :TTF_ByteSwappedUNICODE, [:int], :void
-    
-    class Font < Struct
-      
-      def self.release(pointer)
-        close_font(pointer)
-      end
-      
-    end
-    
-    api :TTF_Init, [], :int
-    api :TTF_OpenFont, [:string, :int], Font.auto_ptr
+
+    api :TTF_Init, [], :int, {error: true, filter: TRUE_WHEN_ZERO}
+    api :TTF_OpenFont, [:string, :int], Font.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
     api :TTF_OpenFontIndex, [:string, :int, :long], Font.auto_ptr
     api :TTF_OpenFontRW, [RWops.by_ref, :int, :int], Font.auto_ptr
     api :TTF_OpenFontIndexRW, [RWops.by_ref, :int, :int, :long], Font.auto_ptr
-    
+
     module STYLE
       include EnumerableConstants
       NORMAL = 0x00
@@ -49,15 +36,15 @@ module SDL2
       UNDERLINE = 0x04
       STRIKETHROUGH = 0x08
     end
-    
+
     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
-    
-    module HINTING 
+
+    module HINTING
       include EnumerableConstants
       NORMAL = 0
       LIGHT = 1
@@ -65,10 +52,10 @@ module SDL2
       NONE = 3
     end
     enum :hinting, HINTING.flatten_consts
-   
+
     api :TTF_GetFontHinting, [Font.by_ref], :hinting
     api :TTF_SetFontHinting, [Font.by_ref, :int], :void
-    
+
     api :TTF_FontHeight, [Font.by_ref], :int
     api :TTF_FontAscent, [Font.by_ref], :int
     api :TTF_FontDescent, [Font.by_ref], :int
@@ -79,51 +66,50 @@ module SDL2
     api :TTF_FontFaceIsFixedWidth, [Font.by_ref], :int
     api :TTF_FontFaceFamilyName, [Font.by_ref], :string
     api :TTF_FontFaceStyleName, [Font.by_ref], :string
-    
+
     api :TTF_GlyphIsProvided, [Font.by_ref, :uint16], :int
-    
+
     api :TTF_GlyphMetrics, [
-      Font.by_ref, 
-      :uint16, 
-      IntStruct.by_ref, 
-      IntStruct.by_ref, 
-      IntStruct.by_ref, 
-      IntStruct.by_ref, 
+      Font.by_ref,
+      :uint16,
+      IntStruct.by_ref,
+      IntStruct.by_ref,
+      IntStruct.by_ref,
+      IntStruct.by_ref,
       IntStruct.by_ref
-    ], :int 
-    
-    
+    ], :int
+
     api :TTF_SizeText, [Font.by_ref, :string, IntStruct.by_ref, IntStruct.by_ref], :int
     api :TTF_SizeUTF8, [Font.by_ref, :string, IntStruct.by_ref, IntStruct.by_ref], :int
     api :TTF_SizeUNICODE, [Font.by_ref, :string, IntStruct.by_ref, IntStruct.by_ref], :int
-    
-    api :TTF_RenderText_Solid, [Font.by_ref, :string, Color], Surface.auto_ptr
-    api :TTF_RenderUTF8_Solid, [Font.by_ref, :string, Color], Surface.auto_ptr
-    api :TTF_RenderUNICODE_Solid, [Font.by_ref, :string, Color], Surface.auto_ptr
-    
-    api :TTF_RenderGlyph_Solid, [Font.by_ref, :uint16, Color], Surface.auto_ptr
-    
-    api :TTF_RenderText_Shaded, [Font.by_ref, :string, Color, Color], Surface.auto_ptr
-    api :TTF_RenderUTF8_Shaded, [Font.by_ref, :string, Color, Color], Surface.auto_ptr
-    api :TTF_RenderUNICODE_Shaded, [Font.by_ref, :string, Color, Color], Surface.auto_ptr
-    
-    api :TTF_RenderGlyph_Shaded, [Font.by_ref, :uint16, Color, Color], Surface.auto_ptr
-    
-    api :TTF_RenderText_Blended, [Font.by_ref, :string, Color], Surface.auto_ptr
-    api :TTF_RenderUTF8_Blended, [Font.by_ref, :string, Color], Surface.auto_ptr
-    api :TTF_RenderUNICODE_Blended, [Font.by_ref, :string, Color], Surface.auto_ptr
-    
-    api :TTF_RenderText_Blended_Wrapped, [Font.by_ref, :string, Color, :uint32], Surface.auto_ptr
-    api :TTF_RenderUTF8_Blended_Wrapped, [Font.by_ref, :string, Color, :uint32], Surface.auto_ptr
-    api :TTF_RenderUNICODE_Blended_Wrapped, [Font.by_ref, :string, Color, :uint32], Surface.auto_ptr
-    
-    api :TTF_RenderGlyph_Blended, [Font.by_ref, :uint16, Color], Surface.auto_ptr
-    
+
+    api :TTF_RenderText_Solid, [Font.by_ref, :string, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUTF8_Solid, [Font.by_ref, :string, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUNICODE_Solid, [Font.by_ref, :string, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+
+    api :TTF_RenderGlyph_Solid, [Font.by_ref, :uint16, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+
+    api :TTF_RenderText_Shaded, [Font.by_ref, :string, Color.by_value, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUTF8_Shaded, [Font.by_ref, :string, Color.by_value, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUNICODE_Shaded, [Font.by_ref, :string, Color.by_value, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+
+    api :TTF_RenderGlyph_Shaded, [Font.by_ref, :uint16, Color.by_value, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+
+    api :TTF_RenderText_Blended, [Font.by_ref, :string, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUTF8_Blended, [Font.by_ref, :string, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUNICODE_Blended, [Font.by_ref, :string, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+
+    api :TTF_RenderText_Blended_Wrapped, [Font.by_ref, :string, Color.by_value, :uint32], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUTF8_Blended_Wrapped, [Font.by_ref, :string, Color.by_value, :uint32], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+    api :TTF_RenderUNICODE_Blended_Wrapped, [Font.by_ref, :string, Color.by_value, :uint32], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+
+    api :TTF_RenderGlyph_Blended, [Font.by_ref, :uint16, Color.by_value], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+
     api :TTF_CloseFont, [Font.by_ref], :void
     api :TTF_Quit, [], :void
     api :TTF_WasInit, [], :int
     api :TTF_GetFontKerningSize, [Font.by_ref, :int, :int], :int
-    
+
   end
-  
+
 end