SDLRuby 0.2.1 → 0.3.1

data/lib/SDLRuby/rw_ops.rb

@@ -1,216 +1,91 @@
-require_relative 'rw_ops/rw_object'
-
-module SDLRuby
-  class RWOps
-    include Fiddle, SDL
-
-    class << self
-      def [](src, autoclose: nil, readonly: nil)
-        case src
-        when RWOps
-          return src
-        when String
-          size = src.bytesize
-          ptr = if readonly
-                  SDL.SDL_RWFromConstMem(src, size)
-                else
-                  SDL.SDL_RWFromMem(src, size)
-                end
-          raise SDLError if ptr.null?
-        when Fiddle::Pointer
-          size = src.size
-          ptr = if readonly
-                  SDL.SDL_RWFromConstMem(src, size)
-                else
-                  SDL.SDL_RWFromMem(src, size)
-                end
-          raise SDLError if ptr.null?
-        else
-          src = RWObject.new(src)
-          ptr = src.to_ptr
-        end
-
-        obj = allocate
-        obj.__send__(:initialize, ptr, src)
-        obj
-      end
-
-      def new(file, mode = "rb")
-        ptr = SDL.SDL_RWFromFile(file, mode)
-        raise SDLError if ptr.null?
-
-        rw = super(ptr)
-
-        if block_given?
-          obj = yield(rw)
-          rw.close
-          obj
-        else
-          rw
-        end
-      end
-
-      alias open new
-    end
-
-    def initialize(ptr, obj = nil)
-      @st = SDL_RWops.new(ptr)
-      @obj = obj
-
-      # ポインターへC実装のfree関数を与えるため、終了時のGC処理でコアダンプしない。
-      #
-      @st.to_ptr.free = @st.close
-
-      # close関数の差し替えをすることで、SDLがcloseを行ってもRuby側に伝達できる。
-      # int (*close) (SDL_RWops *context)
-      #
-      st = @st
-      @st.close = @close = Closure::BlockCaller.new(
-        TYPE_INT, [TYPE_VOIDP]
-      ) do |context|
-        # call_free はclose関数の戻り値が渡されないためcloseの失敗は分からない。
-        st.to_ptr.call_free
-
-        if $DEBUG
-          warn "SDL_RWops(0x#{st.to_i.to_s(16)}) closed."
-        end
-
-        0
-      end
-    end
-
-    def close
-      unless closed?
-        err = SDL.SDL_RWclose(self)
-
-        raise SDLError if err != 0
-      end
-    end
-
-    def closed? = @st.to_ptr.freed?
-
-    def eof?
-      raise IOError, "closed" if closed?
-
-      s = SDL.SDL_RWsize(self)
-      raise SDLError if s < 0
-
-      t = SDL.SDL_RWtell(self)
-      raise SDLError if t < 0
-
-      s == t
-    end
-
-    def read(length = nil, buffer = nil)
-      raise IOError, "closed" if closed?
-
-      len = if length.nil?
-              size - tell
-            else
-              length.to_i
-            end
-
-      if len < 0
-        raise ArgumentError, "length"
-      elsif len > 0 && eof?
-        return nil
-      end
-
-      case buffer
-      when nil
-        return "" if len == 0
-
-        buffer = "\x00" * len
-        buf_size = len
-      when String
-        return buffer.clear if len == 0
-
-        buffer = buffer
-        buf_size = buffer.bytesize
-      when Fiddle::Pointer
-        if len == 0
-          buffer.size = 0
-          return buffer
-        end
-
-        buffer = buffer
-        buf_size = buffer.size
-      else
-        raise TypeError, "buffer"
-      end
-
-      if len > buf_size
-        raise ArgumentError, "length is greater than buffer size."
-      end
-
-      n = SDL.SDL_RWread(self, buffer, 1, len)
-      raise SDLError if n == 0
-
-      if String === buffer
-        buffer.slice!(n, buffer.bytesize)
-      else
-        buffer.size = n
-      end
-
-      buffer
-    end
-
-    def seek(offset, whence = IO::SEEK_SET)
-      raise IOError, "closed" if closed?
-
-      n = SDL.SDL_RWseek(self, offset, whence)
-      raise SDLError if n < 0
-      n
-    end
-
-    alias pos= seek
-
-    def size
-      raise IOError, "closed" if closed?
-
-      n = SDL.SDL_RWsize(self)
-      raise SDLError if n < 0
-      n
-    end
-
-    def tell
-      raise IOError, "closed" if closed?
-
-      n = SDL.SDL_RWtell(self)
-      raise SDLError if n < 0
-      n
-    end
-
-    alias pos tell
-
-    def to_ptr
-      raise SDLError, "released" if closed?
-      @st.to_ptr
-    end
-
-    def type
-      raise SDLError, "released" if closed?
-      @st.type
-    end
-
-    def write(obj)
-      raise IOError, "closed" if closed?
-
-      case obj
-      when String
-        ptr = obj
-        len = obj.bytesize
-      when Fiddle::Pointer
-        ptr = obj
-        len = obj.size
-      else
-        ptr = obj.to_s
-        len = ptr.bytesize
-      end
-
-      n = SDL.SDL_RWwrite(self, ptr, 1, len)
-      raise SDLError if n < len
-      n
-    end
-  end
-end
+require 'stringio'
+require_relative 'rw/operational'
+require_relative 'rw_ops/rw_object'
+
+module SDLRuby
+  class RWOps
+    include Fiddle, RW::Operational, SDL
+
+    class << self
+      def [](obj)
+        return obj if obj.kind_of?(RWOps)
+
+        case obj
+        in Fiddle::Pointer
+          ptr = if obj.frozen?
+                  SDL.SDL_RWFromConstMem(obj, obj.size)
+                else
+                  SDL.SDL_RWFromMem(obj, obj.size)
+                end
+          raise SDLError if ptr.null?
+        in String
+          obj = RWObject.new(StringIO.new(obj))
+          ptr = obj.to_ptr
+        else
+          obj = RWObject.new(obj)
+          ptr = obj.to_ptr
+        end
+
+        rw = allocate
+        rw.__send__(:initialize, ptr, obj)
+        rw
+      end
+
+      def new(file, mode = "rb")
+        path = if file.instance_of?(String)
+                 file
+               elsif file.respond_to?(:to_path)
+                 file.to_path
+               end
+        ptr = SDL.SDL_RWFromFile(path, mode)
+        raise SDLError if ptr.null?
+
+        rw = super(ptr)
+
+        if block_given?
+          begin
+            yield(rw)
+          ensure
+            rw.close
+          end
+        else
+          rw
+        end
+      end
+
+      alias open new
+    end
+
+    def initialize(ptr, obj = nil)
+      @obj = obj
+
+      @st = SDL_RWops.new(ptr)
+
+      # ポインターへC実装のfree関数を与えるため、終了時のGC処理でコアダンプしない。
+      #
+      @st.to_ptr.free = @st["close"]
+
+      # close関数の差し替えをすることで、SDLがcloseを行ってもRuby側に伝達できる。
+      # int (*close) (SDL_RWops *context)
+      #
+      @st["close"] = @close = Closure::BlockCaller.new(TYPE_INT, [TYPE_VOIDP]) do |_|
+        # call_free はclose関数の戻り値が渡されないためcloseの失敗は分からない。
+        to_ptr.call_free
+
+        if $DEBUG
+          warn format("SDL_RWops(0x%016x) closed", to_ptr.to_int)
+        end
+
+        0
+      end
+    end
+
+    def initialize_copy(other)
+      raise SDLError, "closed stream" if closed?
+
+      super
+    end
+
+    def to_ptr = @st.to_ptr
+  end
+end

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

@@ -12,76 +12,76 @@ module SDLRuby::SDL
   end
 
   SDLK_UNKNOWN = 0
-  SDLK_RETURN = "\r"
-  SDLK_ESCAPE = "\x1B"
-  SDLK_BACKSPACE = "\b"
-  SDLK_TAB = "\t"
-  SDLK_SPACE = ' '
-  SDLK_EXCLAIM = '!'
-  SDLK_QUOTEDBL = '"'
-  SDLK_HASH = '#'
-  SDLK_PERCENT = '%'
-  SDLK_DOLLAR = '$'
-  SDLK_AMPERSAND = '&'
-  SDLK_QUOTE = '\''
-  SDLK_LEFTPAREN = '('
-  SDLK_RIGHTPAREN = ')'
-  SDLK_ASTERISK = '*'
-  SDLK_PLUS = '+'
-  SDLK_COMMA = ','
-  SDLK_MINUS = '-'
-  SDLK_PERIOD = '.'
-  SDLK_SLASH = '/'
-  SDLK_0 = '0'
-  SDLK_1 = '1'
-  SDLK_2 = '2'
-  SDLK_3 = '3'
-  SDLK_4 = '4'
-  SDLK_5 = '5'
-  SDLK_6 = '6'
-  SDLK_7 = '7'
-  SDLK_8 = '8'
-  SDLK_9 = '9'
-  SDLK_COLON = ':'
-  SDLK_SEMICOLON = ';'
-  SDLK_LESS = '<'
-  SDLK_EQUALS = '='
-  SDLK_GREATER = '>'
-  SDLK_QUESTION = '?'
-  SDLK_AT = '@'
+  SDLK_RETURN = "\r".unpack1("C")
+  SDLK_ESCAPE = "\x1B".unpack1("C")
+  SDLK_BACKSPACE = "\b".unpack1("C")
+  SDLK_TAB = "\t".unpack1("C")
+  SDLK_SPACE = ' '.unpack1("C")
+  SDLK_EXCLAIM = '!'.unpack1("C")
+  SDLK_QUOTEDBL = '"'.unpack1("C")
+  SDLK_HASH = '#'.unpack1("C")
+  SDLK_PERCENT = '%'.unpack1("C")
+  SDLK_DOLLAR = '$'.unpack1("C")
+  SDLK_AMPERSAND = '&'.unpack1("C")
+  SDLK_QUOTE = '\''.unpack1("C")
+  SDLK_LEFTPAREN = '('.unpack1("C")
+  SDLK_RIGHTPAREN = ')'.unpack1("C")
+  SDLK_ASTERISK = '*'.unpack1("C")
+  SDLK_PLUS = '+'.unpack1("C")
+  SDLK_COMMA = ','.unpack1("C")
+  SDLK_MINUS = '-'.unpack1("C")
+  SDLK_PERIOD = '.'.unpack1("C")
+  SDLK_SLASH = '/'.unpack1("C")
+  SDLK_0 = '0'.unpack1("C")
+  SDLK_1 = '1'.unpack1("C")
+  SDLK_2 = '2'.unpack1("C")
+  SDLK_3 = '3'.unpack1("C")
+  SDLK_4 = '4'.unpack1("C")
+  SDLK_5 = '5'.unpack1("C")
+  SDLK_6 = '6'.unpack1("C")
+  SDLK_7 = '7'.unpack1("C")
+  SDLK_8 = '8'.unpack1("C")
+  SDLK_9 = '9'.unpack1("C")
+  SDLK_COLON = ':'.unpack1("C")
+  SDLK_SEMICOLON = ';'.unpack1("C")
+  SDLK_LESS = '<'.unpack1("C")
+  SDLK_EQUALS = '='.unpack1("C")
+  SDLK_GREATER = '>'.unpack1("C")
+  SDLK_QUESTION = '?'.unpack1("C")
+  SDLK_AT = '@'.unpack1("C")
 
-  SDLK_LEFTBRACKET = '['
-  SDLK_BACKSLASH = '\\'
-  SDLK_RIGHTBRACKET = ']'
-  SDLK_CARET = '^'
-  SDLK_UNDERSCORE = '_'
-  SDLK_BACKQUOTE = '`'
-  SDLK_a = 'a'
-  SDLK_b = 'b'
-  SDLK_c = 'c'
-  SDLK_d = 'd'
-  SDLK_e = 'e'
-  SDLK_f = 'f'
-  SDLK_g = 'g'
-  SDLK_h = 'h'
-  SDLK_i = 'i'
-  SDLK_j = 'j'
-  SDLK_k = 'k'
-  SDLK_l = 'l'
-  SDLK_m = 'm'
-  SDLK_n = 'n'
-  SDLK_o = 'o'
-  SDLK_p = 'p'
-  SDLK_q = 'q'
-  SDLK_r = 'r'
-  SDLK_s = 's'
-  SDLK_t = 't'
-  SDLK_u = 'u'
-  SDLK_v = 'v'
-  SDLK_w = 'w'
-  SDLK_x = 'x'
-  SDLK_y = 'y'
-  SDLK_z = 'z'
+  SDLK_LEFTBRACKET = '['.unpack1("C")
+  SDLK_BACKSLASH = '\\'.unpack1("C")
+  SDLK_RIGHTBRACKET = ']'.unpack1("C")
+  SDLK_CARET = '^'.unpack1("C")
+  SDLK_UNDERSCORE = '_'.unpack1("C")
+  SDLK_BACKQUOTE = '`'.unpack1("C")
+  SDLK_a = 'a'.unpack1("C")
+  SDLK_b = 'b'.unpack1("C")
+  SDLK_c = 'c'.unpack1("C")
+  SDLK_d = 'd'.unpack1("C")
+  SDLK_e = 'e'.unpack1("C")
+  SDLK_f = 'f'.unpack1("C")
+  SDLK_g = 'g'.unpack1("C")
+  SDLK_h = 'h'.unpack1("C")
+  SDLK_i = 'i'.unpack1("C")
+  SDLK_j = 'j'.unpack1("C")
+  SDLK_k = 'k'.unpack1("C")
+  SDLK_l = 'l'.unpack1("C")
+  SDLK_m = 'm'.unpack1("C")
+  SDLK_n = 'n'.unpack1("C")
+  SDLK_o = 'o'.unpack1("C")
+  SDLK_p = 'p'.unpack1("C")
+  SDLK_q = 'q'.unpack1("C")
+  SDLK_r = 'r'.unpack1("C")
+  SDLK_s = 's'.unpack1("C")
+  SDLK_t = 't'.unpack1("C")
+  SDLK_u = 'u'.unpack1("C")
+  SDLK_v = 'v'.unpack1("C")
+  SDLK_w = 'w'.unpack1("C")
+  SDLK_x = 'x'.unpack1("C")
+  SDLK_y = 'y'.unpack1("C")
+  SDLK_z = 'z'.unpack1("C")
   SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK)
   SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1)
   SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2)
@@ -101,7 +101,7 @@ module SDLRuby::SDL
   SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT)
   SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME)
   SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP)
-  SDLK_DELETE = '\x7F'
+  SDLK_DELETE = "\x7F".unpack1("C")
   SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END)
   SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN)
   SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT)