SDLRuby 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7516a8b356b287a6f985881964b1a44f76922354a13d70000b9990dd2a67badd
-  data.tar.gz: 358b7f4a6b40bd7a31e7249beaac18f77d3d7a08b21c9802f30203fce36628ed
+  metadata.gz: 20bdcc86d9ea3a4670b1f0ac86689d0cae12f51417d9ba92cc710be1ecab8614
+  data.tar.gz: 3869b91b982b18fe37c5dc97a4b7e99b9f42e2266b42957fa31632ce79bb3447
 SHA512:
-  metadata.gz: b5f6c08130fa89f6aa74009a02a5d4a7ada123839f0a2eef2894347ac358e0e75b188bbfd0a657004be3d54207166484b8b842b43edb5ee5dbf6340c4f13f095
-  data.tar.gz: 26017bbb155bb41c032396b13e9981ee62c72954b66501b2ab818356a9cedcbb295a74f810f742ecaf83b1ba52dd6c69b658e39859b35443a59f575fe0d72423
+  metadata.gz: e0c6372d9db1be4ffaa5ff4af4aba575d74d3c36682da3df5423c30fcde44c6986ebcd1b3c8d8e37a909148308922a98436cfba53ad75fcd91d6e84407d275bf
+  data.tar.gz: fa71f7889d06990aed6fd43d8bd09573ca6900a7d7223ce513d0a47830610cc95f49a0883854d5d4670ccd7a67ca2e72576cf026298ad6bc94b08e70aecd2e6e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.2.0] - 2023-09-13
+
+- Memory leak fix on event retrieval failure. 
+
+## [0.2.0] - 2023-09-13
+
+- Implementation of the Event Object. SDL event queue is now available.
+
 ## [0.1.0] - 2023-08-30
 
 - Initial release

data/lib/SDLRuby/event/accessor.rb

@@ -3,37 +3,21 @@ module SDLRuby
     module Accessor
       include SDL
 
-      union_members = SDL_Event.members.inject([]) do |result, (name, members)|
-        if members
-          # ネストした構造体の場合は親のみを選択する。
-          result << [name, members.flatten(1).select { |a| !(Array === a) }]
-        end
-
-        result
-      end
+      @modules = Hash.new
 
-      @modules = Hash.new do |_, key|
-        raise KeyError, "undefined SDL_Event member(#{key})"
-      end
-
-      union_members.each do |name, members|
+      (SDL_Event.members - %w[type padding]).each do |name, members|
         @modules[name.to_sym] = Module.new do
           extend Forwardable
-
-          def_delegators :entity, *members
+          # ネストした構造体の場合は親のみを選択する。
+          #
+          def_delegators :entity, *members.flatten(1).select { |a| !(Array === a) }
         end
       end
 
       class << self
-        def [](sym) = @modules[sym]
-      end
-
-      self[:adevice].module_eval do
-        def capture? = entity.iscapture != 0
-      end
-
-      self[:cbutton].module_eval do
-        def pressed? = state == SDL_PRESSED
+        def [](sym)
+          @modules[sym] || raise(KeyError, "undefined member(#{sym})")
+        end
       end
 
       self[:drop].module_eval do
@@ -41,14 +25,14 @@ module SDLRuby
 
         def file = char_ptr_to_str(entity.file)
 
-        alias_method :text, :file
+        alias text file
 
         def self.extended(obj)
-          @_ptr ||= entity.file.tap { |ptr| ptr.free = SDL_FREE unless ptr.null? }
+          obj.__send__(:keep_member_pointer, :file)
         end
       end
 
-      self[:edit].module_eval  do
+      self[:edit].module_eval do
         undef text
 
         def text = char_ary_to_str(entity.text)
@@ -60,68 +44,83 @@ module SDLRuby
         def text = char_ptr_to_str(entity.text)
 
         def self.extended(obj)
-          @_ptr ||= entity.text.tap { |ptr| ptr.free = SDL_FREE }
+          obj.__send__(:keep_member_pointer, :text)
         end
       end
 
-      self[:jbutton].module_eval do
-        def pressed? = state == SDL_PRESSED
-      end
-
       self[:key].module_eval do
         undef keysym
 
         def keysym = entity.keysym.to_h
       end
 
-      self[:syswm].module_eval do
-        undef msg
-
-        def msg = entity.msg
-      end
-
       self[:text].module_eval do
         undef text
 
         def text = char_ary_to_str(entity.text)
       end
 
-      self[:user].module_eval do
-        undef data1, data2
+      # イベント構造体へのアクセスをSTIとして実装する。
+      # メンバー全てのゲッターに応答できるようにする。（NoMethodErrorを出さない）
+      # ※これはKernel#yメソッドにオブジェクトが応答してしまうため、
+      # 事前にattr_readerでオーバーライドする。
+      #
+      attr_reader *%w[
+        axis ball button clicks code dDist dTheta data data1 data2 direction
+        display dx dy error event file finger fingerId gestureId hat iscapture
+        keysym length level mouseX mouseY msg numFingers
+        padding padding1 padding2 padding3 padding4
+        preciseX preciseY pressure repeat sensor start state text timestamp
+        timestamp_us touchId touchpad type value which windowID x xrel y yrel
+      ]
 
-        def data1 = entity.data1
+      # Ruby like accessor
+      #
+      alias d_dist dDist
+      alias d_theta dTheta
+      alias finger_id fingerId
+      alias gesture_id gestureId
+      alias mouse_x mouseX
+      alias mouse_y mouseY
+      alias num_fingers numFingers
+      alias precise_x preciseX
+      alias precise_y preciseY
+      alias touch_id touchId
+      alias window_id windowID
+
+      # for adevice
+      #
+      # iscapture = nil => false
+      # iscapture = 0   => false
+      # iscapture = 1   => true
+      #
+      def capture? = iscapture&.nonzero? ? true : false
 
-        def data2 = entity.data2
-      end
+      # for button, cbutton, jbutton
+      #
+      def pressed? = state == SDL_PRESSED
 
-      # STIの実装としてメンバー全てのゲッターに例外を出さず応答するようにする。
-      # これは"y"メソッドにRubyが応答してしまうため。事前にオーバーライドしておく。
+      # for key
       #
-      all_members = union_members.map { |a| a.last }.flatten.uniq
+      def scancode = keysym&.[]("scancode")
 
-      attr_reader(*all_members)
+      def sym = keysym&.[]("sym")
 
-      # Ruby like accessor
-      #
-      alias_method :d_dist, :dDist
-      alias_method :d_theta, :dTheta
-      alias_method :finger_id, :fingerId
-      alias_method :gesture_id, :gestureId
-      alias_method :mouse_x, :mouseX
-      alias_method :mouse_y, :mouseY
-      alias_method :num_fingers, :numFingers
-      alias_method :precise_x, :preciseX
-      alias_method :precise_y, :preciseY
-      alias_method :touch_id, :touchId
-      alias_method :window_id, :windowID
-
-      private def char_ary_to_str(a)
+      def mod = keysym&.[]("mod")
+
+      private
+
+      def char_ary_to_str(a)
         a[0, a.find_index(0)].pack("C*").force_encoding("UTF-8")
       end
 
-      private def char_ptr_to_str(ptr)
+      def char_ptr_to_str(ptr)
         ptr.null? ? "" : ptr.to_s.force_encoding("UTF-8")
       end
+
+      def keep_member_pointer(attr)
+        @_ptr ||= entity.__send__(attr).tap { |ptr| ptr.free = SDL_FREE }
+      end
     end
   end
 end

data/lib/SDLRuby/event/type.rb

@@ -34,7 +34,7 @@ module SDLRuby
       USER_EVENT = SDL_USEREVENT...SDL_LASTEVENT
 
       class << self
-        def to_sym(type)
+        def [](type)
           case type
           when DISPLAY_EVENT   then :display
           when WINDOW_EVENT    then :window

data/lib/SDLRuby/event.rb

@@ -1,80 +1,101 @@
-require_relative 'event/accessor'
-require_relative 'event/type'
-
-module SDLRuby
-  class Event
-    include Accessor, Fiddle, SDL
-
-    class << self
-      include SDL
-
-      # SDL_WaitEvent, SDL_WaitEventTimeoutはRubyのスレッドを停止させるため実装しない。
-      #   ※C関数呼び出し時にGVLを外せれば可能か？
-      # SDL_RegisterEventsはSDLに対応するゲッターがないため実装しない。
-      # SDL_PushEventは必要ならば実装する。ただしEventコンストラクターを含むため規模が大きい。
-      #
-      # SDL_AddEventWatch, SDL_SetEventFilterおよびSDL_FilterEventsは実装しない。
-      #   イベントにポインターを含む場合、RubyのGCの管理下に置く方法が複雑なため。
-      #   ※現実装ではイベントを取り込んだ時点でポインターをRubyの管理下に置いている。
-      #   メンバーのポインター管理をファイナライザーに移行できれば可能だろう。
-      #   ※そしてファイナライザーを設定するかどうか選択する。
-      #   いずれもSDL_EventPumpを呼び出さなければ動作しない。
-      #   非同期にイベントを取得できるわけではない。
-      # SDL_PeepEventsは実装しない。
-      #   SDL_ADDEVENT:
-      #     イベントのメンバーにポインターを含む場合、それのSDL側へのコピーが必要になる。
-      #     SDL_PushEventが実装されれば、それが同等の機能を持つ。
-      #   SDL_PEEKEVENT:
-      #     SDL_FilterEventsが実装できれば、それが同等の機能を持つ。
-      #   SDL_GETEVENT:
-      #     キューの削除が目的だと思う。それを行うならSDL_PollEventを利用して欲しい。
-      #     イベントキューはコレクションではない。
-      #
-      #   SDL_PeepEventsは実行中にキューをロックすることに注意。
-      #   また、SDL_SYSWMEVENTのmsgメンバーにコピーが必要か分からない。（要調査）
-      #   ※このポインターだけSDLが管理しているようだ。
-
-      def clear = (pump or flash)
-
-      def count = SDL.SDL_PeepEvents(nil, 0, SDL_PEEKEVENT, 0, -1)
-
-      def disable(type) = SDL.SDL_EventState(type, 0)
-
-      def enable(type) = SDL.SDL_EventState(type, 1)
-
-      def flash = SDL.SDL_FlushEvents(SDL_FIRSTEVENT, SDL_LASTEVENT)
-
-      def get = poll(e = new)
-
-      private :new
-
-      private def poll(e) = (SDL.SDL_PollEvent(e).nonzero? and e.update)
-
-      def pump = SDL.SDL_PumpEvents
-
-      alias update pump
-
-      def quit? = (pump or SDL.SDL_HasEvent(SDL_QUIT) != 0)
-    end
-
-    def initialize
-      @st = SDL_Event.malloc(RUBY_FREE)
-    end
-
-    private attr_reader :entity
-
-    def to_ptr = @st.to_ptr
-
-    def to_sym = Type.to_sym(@st.type)
-
-    def update
-      unless @entity
-        sym = to_sym
-        @entity = @st.__send__(sym)
-        extend(Accessor[sym])
-      end
-
-      self
-    end
-  end
-end
+require_relative 'event/accessor'
+require_relative 'event/type'
+
+module SDLRuby
+  class Event
+    include Accessor, Fiddle, SDL
+
+    class << self
+      include Fiddle, SDL
+
+      private def __malloc__ = Pointer.malloc(SDL_Event.size, RUBY_FREE)
+
+      def clear = SDL.SDL_FlushEvents(SDL_FIRSTEVENT, SDL_LASTEVENT)
+
+      # The deq method can be called from any thread.
+      #
+      def deq(non_block = false)
+        if non_block && empty?
+          raise SDLError, "event queue empty"
+        end
+
+        e = __malloc__
+
+        case SDL.SDL_PeepEvents(e, 1, SDL_GETEVENT, 0, -1)
+        when 1
+          return new(e)
+        when 0
+          sleep(0.001)
+        else # -1 "The event system has been shut down"
+          return
+        end while true
+      end
+
+      def disable(type) = SDL.SDL_EventState(type, 0)
+
+      def empty? = SDL.SDL_PeepEvents(nil, 1, SDL_PEEKEVENT, 0, -1) != 1
+
+      def enable(type) = SDL.SDL_EventState(type, 1)
+
+      def get
+        unless Thread.current == Thread.main
+          raise SDLError, "called from a non-main thread"
+        end
+
+        e = __malloc__
+        if SDL.SDL_WaitEvent(e) == 1
+          new(e)
+        else
+          raise SDLError
+        end
+      end
+
+      def length = SDL.SDL_PeepEvents(nil, 0, SDL_PEEKEVENT, 0, -1)
+      alias size length
+
+      def quit? = (update or SDL.SDL_HasEvent(SDL_QUIT) == 1)
+
+      def reserve(num)
+        base = SDL.SDL_RegisterEvents(num)
+
+        if base == 0xFFFF_FFFF
+          raise SDLError, "cannot register any more user events"
+        end
+
+        base
+      end
+
+      def update
+        unless Thread.current == Thread.main
+          raise SDLError, "called from a non-main thread"
+        end
+
+        SDL.SDL_PumpEvents
+      end
+
+      def wait(timeout = nil)
+        return self unless empty?
+
+        return nil  unless Thread.current == Thread.main
+
+        if timeout
+          SDL.SDL_WaitEventTimeout(nil, timeout * 1000)
+        else
+          SDL.SDL_WaitEvent(nil)
+        end == 1 ? self : nil
+      end
+    end
+
+    def initialize(ptr)
+      @ptr = ptr
+      st = SDL_Event.new(ptr)
+      sym = Type[st.type]
+      @entity = st.__send__(sym)
+      extend(Accessor[sym])
+    end
+
+    private attr_reader :entity
+
+    def to_ptr = @ptr
+  end
+end

data/lib/SDLRuby/sdl/include/SDL.h.rb

@@ -25,6 +25,17 @@ module SDLRuby::SDL
   require_relative 'SDL_locale.h.rb'
   require_relative 'SDL_misc.h.rb'
 
+  SDL_INIT_TIMER = 0x00000001
+  SDL_INIT_AUDIO = 0x00000010
+  SDL_INIT_VIDEO = 0x00000020
+  SDL_INIT_JOYSTICK = 0x00000200
+  SDL_INIT_HAPTIC = 0x00001000
+  SDL_INIT_GAMECONTROLLER = 0x00002000
+  SDL_INIT_EVENTS = 0x00004000
+  SDL_INIT_SENSOR = 0x00008000
+  SDL_INIT_NOPARACHUTE = 0x00100000
+  SDL_INIT_EVERYTHING = ( SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER | SDL_INIT_SENSOR )
+
   extern "int SDL_Init(Uint32 flags)"
   extern "int SDL_InitSubSystem(Uint32 flags)"
   extern "void SDL_QuitSubSystem(Uint32 flags)"

data/lib/SDLRuby/sdl/include/SDL_audio.h.rb

@@ -1,32 +1,140 @@
 module SDLRuby::SDL
-  require_relative 'SDL_stdinc.h.rb'
-  require_relative 'SDL_error.h.rb'
-  require_relative 'SDL_endian.h.rb'
-  require_relative 'SDL_rwops.h.rb'
+  require_relative "SDL_stdinc.h"
+  require_relative "SDL_error.h"
+  require_relative "SDL_endian.h"
+  require_relative "SDL_rwops.h"
 
   typealias "SDL_AudioFormat", "Uint16"
-  typealias "SDL_AudioDeviceID", "Uint32"
-  typealias "SDL_AudioStream", "struct _SDL_AudioStream"
-  typealias "SDL_AudioStatus", "int"
+
+  SDL_AUDIO_MASK_BITSIZE = (0xFF)
+  SDL_AUDIO_MASK_DATATYPE = (1<<8)
+  SDL_AUDIO_MASK_ENDIAN = (1<<12)
+  SDL_AUDIO_MASK_SIGNED = (1<<15)
+
+  def self.SDL_AUDIO_BITSIZE(x)
+    (x & SDL_AUDIO_MASK_BITSIZE)
+  end
+  def self.SDL_AUDIO_ISFLOAT(x)
+    (x & SDL_AUDIO_MASK_DATATYPE)
+  end
+  def self.SDL_AUDIO_ISBIGENDIAN(x)
+    (x & SDL_AUDIO_MASK_ENDIAN)
+  end
+  def self.SDL_AUDIO_ISSIGNED(x)
+    (x & SDL_AUDIO_MASK_SIGNED)
+  end
+  def self.SDL_AUDIO_ISINT(x)
+    (!SDL_AUDIO_ISFLOAT(x))
+  end
+  def self.SDL_AUDIO_ISLITTLEENDIAN(x)
+    (!SDL_AUDIO_ISBIGENDIAN(x))
+  end
+  def self.SDL_AUDIO_ISUNSIGNED(x)
+    (!SDL_AUDIO_ISSIGNED(x))
+  end
+
+  AUDIO_U8 = 0x0008
+  AUDIO_S8 = 0x8008
+  AUDIO_U16LSB = 0x0010
+  AUDIO_S16LSB = 0x8010
+  AUDIO_U16MSB = 0x1010
+  AUDIO_S16MSB = 0x9010
+  AUDIO_U16 = AUDIO_U16LSB
+  AUDIO_S16 = AUDIO_S16LSB
+  AUDIO_S32LSB = 0x8020
+  AUDIO_S32MSB = 0x9020
+  AUDIO_S32 = AUDIO_S32LSB
+  AUDIO_F32LSB = 0x8120
+  AUDIO_F32MSB = 0x9120
+  AUDIO_F32 = AUDIO_F32LSB
+
+  if SDL_BYTEORDER == SDL_LIL_ENDIAN
+    AUDIO_U16SYS = AUDIO_U16LSB
+    AUDIO_S16SYS = AUDIO_S16LSB
+    AUDIO_S32SYS = AUDIO_S32LSB
+    AUDIO_F32SYS = AUDIO_F32LSB
+  else
+    AUDIO_U16SYS = AUDIO_U16MSB
+    AUDIO_S16SYS = AUDIO_S16MSB
+    AUDIO_S32SYS = AUDIO_S32MSB
+    AUDIO_F32SYS = AUDIO_F32MSB
+  end
+
+  SDL_AUDIO_ALLOW_FREQUENCY_CHANGE = 0x00000001
+  SDL_AUDIO_ALLOW_FORMAT_CHANGE = 0x00000002
+  SDL_AUDIO_ALLOW_CHANNELS_CHANGE = 0x00000004
+  SDL_AUDIO_ALLOW_SAMPLES_CHANGE = 0x00000008
+  SDL_AUDIO_ALLOW_ANY_CHANGE = (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE|SDL_AUDIO_ALLOW_SAMPLES_CHANGE)
+
+  typealias "SDL_AudioCallback", "void*"
+
+  SDL_AudioSpec = struct(
+    [
+      "int freq",
+      "SDL_AudioFormat format",
+      "Uint8 channels",
+      "Uint8 silence",
+      "Uint16 samples",
+      "Uint16 padding",
+      "Uint32 size",
+      "SDL_AudioCallback callback",
+      "void *userdata",
+    ]
+  )
+
+  typealias "SDL_AudioFilter", "void*"
+
+  SDL_AUDIOCVT_MAX_FILTERS = 9
+
+  SDL_AudioCVT = struct(
+    [
+      "int needed",
+      "SDL_AudioFormat src_format",
+      "SDL_AudioFormat dst_format",
+      "double rate_incr",
+      "Uint8 *buf",
+      "int len",
+      "int len_cvt",
+      "int len_mult",
+      "double len_ratio",
+      "SDL_AudioFilter filters[#{SDL_AUDIOCVT_MAX_FILTERS + 1}]",
+      "int filter_index",
+    ]
+  )
+
   extern "int SDL_GetNumAudioDrivers(void)"
   extern "const char * SDL_GetAudioDriver(int index)"
   extern "int SDL_AudioInit(const char *driver_name)"
   extern "void SDL_AudioQuit(void)"
   extern "const char * SDL_GetCurrentAudioDriver(void)"
-  extern "int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained)"
+  extern "int SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)"
+
+  typealias "SDL_AudioDeviceID", "Uint32"
+
   extern "int SDL_GetNumAudioDevices(int iscapture)"
   extern "const char * SDL_GetAudioDeviceName(int index, int iscapture)"
   extern "int SDL_GetAudioDeviceSpec(int index, int iscapture, SDL_AudioSpec *spec)"
   extern "int SDL_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)"
   extern "SDL_AudioDeviceID SDL_OpenAudioDevice( const char *device, int iscapture, const SDL_AudioSpec *desired, SDL_AudioSpec *obtained, int allowed_changes)"
+
+  SDL_AUDIO_STOPPED = 0
+  SDL_AUDIO_PLAYING = 1
+  SDL_AUDIO_PAUSED = 2
+  typealias "SDL_AudioStatus", "int"
+
   extern "SDL_AudioStatus SDL_GetAudioStatus(void)"
   extern "SDL_AudioStatus SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev)"
   extern "void SDL_PauseAudio(int pause_on)"
   extern "void SDL_PauseAudioDevice(SDL_AudioDeviceID dev, int pause_on)"
-  extern "SDL_AudioSpec * SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)"
-  extern "void SDL_FreeWAV(Uint8 *audio_buf)"
-  extern "int SDL_BuildAudioCVT(SDL_AudioCVT *cvt, SDL_AudioFormat src_format, Uint8 src_channels, int src_rate, SDL_AudioFormat dst_format, Uint8 dst_channels, int dst_rate)"
-  extern "int SDL_ConvertAudio(SDL_AudioCVT *cvt)"
+  extern "SDL_AudioSpec * SDL_LoadWAV_RW(SDL_RWops * src, int freesrc, SDL_AudioSpec * spec, Uint8 ** audio_buf, Uint32 * audio_len)"
+
+  def self.SDL_LoadWAV(file, spec, audio_buf, audio_len)
+    SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
+  end
+
+  extern "void SDL_FreeWAV(Uint8 * audio_buf)"
+  extern "int SDL_BuildAudioCVT(SDL_AudioCVT * cvt, SDL_AudioFormat src_format, Uint8 src_channels, int src_rate, SDL_AudioFormat dst_format, Uint8 dst_channels, int dst_rate)"
+  extern "int SDL_ConvertAudio(SDL_AudioCVT * cvt)"
   extern "SDL_AudioStream * SDL_NewAudioStream(const SDL_AudioFormat src_format, const Uint8 src_channels, const int src_rate, const SDL_AudioFormat dst_format, const Uint8 dst_channels, const int dst_rate)"
   extern "int SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len)"
   extern "int SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len)"
@@ -34,8 +142,11 @@ module SDLRuby::SDL
   extern "int SDL_AudioStreamFlush(SDL_AudioStream *stream)"
   extern "void SDL_AudioStreamClear(SDL_AudioStream *stream)"
   extern "void SDL_FreeAudioStream(SDL_AudioStream *stream)"
-  extern "void SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume)"
-  extern "void SDL_MixAudioFormat(Uint8 *dst, const Uint8 *src, SDL_AudioFormat format, Uint32 len, int volume)"
+
+  SDL_MIX_MAXVOLUME = 128
+
+  extern "void SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume)"
+  extern "void SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, Uint32 len, int volume)"
   extern "int SDL_QueueAudio(SDL_AudioDeviceID dev, const void *data, Uint32 len)"
   extern "Uint32 SDL_DequeueAudio(SDL_AudioDeviceID dev, void *data, Uint32 len)"
   extern "Uint32 SDL_GetQueuedAudioSize(SDL_AudioDeviceID dev)"

data/lib/SDLRuby/sdl/include/SDL_blendmode.h.rb

@@ -1,6 +1,30 @@
 module SDLRuby::SDL
+  SDL_BLENDMODE_NONE = 0x00000000
+  SDL_BLENDMODE_BLEND = 0x00000001
+  SDL_BLENDMODE_ADD = 0x00000002
+  SDL_BLENDMODE_MOD = 0x00000004
+  SDL_BLENDMODE_MUL = 0x00000008
+  SDL_BLENDMODE_INVALID = 0x7FFFFFFF
   typealias "SDL_BlendMode", "int"
+
+  SDL_BLENDOPERATION_ADD = 0x1
+  SDL_BLENDOPERATION_SUBTRACT = 0x2
+  SDL_BLENDOPERATION_REV_SUBTRACT = 0x3
+  SDL_BLENDOPERATION_MINIMUM = 0x4
+  SDL_BLENDOPERATION_MAXIMUM = 0x5
   typealias "SDL_BlendOperation", "int"
+
+  SDL_BLENDFACTOR_ZERO = 0x1
+  SDL_BLENDFACTOR_ONE = 0x2
+  SDL_BLENDFACTOR_SRC_COLOR = 0x3
+  SDL_BLENDFACTOR_ONE_MINUS_SRC_COLOR = 0x4
+  SDL_BLENDFACTOR_SRC_ALPHA = 0x5
+  SDL_BLENDFACTOR_ONE_MINUS_SRC_ALPHA = 0x6
+  SDL_BLENDFACTOR_DST_COLOR = 0x7
+  SDL_BLENDFACTOR_ONE_MINUS_DST_COLOR = 0x8
+  SDL_BLENDFACTOR_DST_ALPHA = 0x9
+  SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA = 0xA
   typealias "SDL_BlendFactor", "int"
+
   extern "SDL_BlendMode SDL_ComposeCustomBlendMode(SDL_BlendFactor srcColorFactor, SDL_BlendFactor dstColorFactor, SDL_BlendOperation colorOperation, SDL_BlendFactor srcAlphaFactor, SDL_BlendFactor dstAlphaFactor, SDL_BlendOperation alphaOperation)"
 end

data/lib/SDLRuby/sdl/include/SDL_endian.h.rb

@@ -1,3 +1,12 @@
 module SDLRuby::SDL
-  require_relative 'SDL_stdinc.h.rb'
+  require_relative "SDL_stdinc.h"
+
+  SDL_LIL_ENDIAN = 1234
+  SDL_BIG_ENDIAN = 4321
+
+  if "\x01\x02\x03\x04".unpack("I") == 0x1020304
+    SDL_BYTEORDER = SDL_BIG_ENDIAN
+  else
+    SDL_BYTEORDER = SDL_LIL_ENDIAN
+  end
 end

data/lib/SDLRuby/sdl/include/SDL_error.h.rb

@@ -1,9 +1,28 @@
 module SDLRuby::SDL
-  require_relative 'SDL_stdinc.h.rb'
+  require_relative "SDL_stdinc.h"
 
-  typealias "SDL_errorcode", "int"
+  extern "int SDL_SetError(const char *fmt, ...)"
   extern "const char * SDL_GetError(void)"
   extern "char * SDL_GetErrorMsg(char *errstr, int maxlen)"
   extern "void SDL_ClearError(void)"
+
+  def self.SDL_OutOfMemory()
+    SDL_Error(SDL_ENOMEM)
+  end
+  def self.SDL_Unsupported()
+    SDL_Error(SDL_UNSUPPORTED)
+  end
+  def self.SDL_InvalidParamError(param)
+    SDL_SetError("Parameter '%s' is invalid", (param))
+  end
+
+  SDL_ENOMEM = 0
+  SDL_EFREAD = 1
+  SDL_EFWRITE = 2
+  SDL_EFSEEK = 3
+  SDL_UNSUPPORTED = 4
+  SDL_LASTERROR = 5
+  typealias "SDL_errorcode", "int"
+
   extern "int SDL_Error(SDL_errorcode code)"
 end