SDLRuby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9420fbe6427d0cc1c72c97f9da2ff735959cc6233c53df296a2fa75330c5ae8b
-  data.tar.gz: 7ea49cbccc75f54cc54cc105f8662270b671c182abec10f3bba8ba01868113be
+  metadata.gz: 808c30b69ff9a14dd61fae1fa5c6812a1be91e6313affb2a46ff136cbffcfeac
+  data.tar.gz: 42794a0310f8329168a8237897d62dddf14cb14922d1db1d631570308708c8da
 SHA512:
-  metadata.gz: 59ac04bd9bade02f0865dc35e1977926b907bc535629d412a0c801b7913c10a886641b29cb706e905a8eacac23983dc10971d36009f2daa9d71b0c820e92b880
-  data.tar.gz: 518572826202fab87596afd4241b87fe743fb3b1055d75d6825a54fe91db9604d965cf074b300941fb84a3f89af47e790c6b9de74c420e352b6af57feabf9824
+  metadata.gz: c840b525923d6e083094d5783ad70057f758dbd4be86f1660d16f7873eeb9e12bf5bdfdfb739c0664287eda2bde514926bc8e0fffd25f1822001482b024b3820
+  data.tar.gz: 1bec511a45a3786d35c407d51c66b3e75fb0b339835b2d00e492cce65d73c98873a9433043b8faa43f3ac6117988746c4178c14b7468d68a8873fd99a0d45785

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.3.0] - 2023-09-19
+- Implemented Mouse Module.
+- Implementation of the Timer Module.
+- Implemented Keyboard Module.
+- Specification and implementation of SDL.init, SDL.init?, and SDL.quit.
+
+## [0.2.1] - 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.

data/lib/SDLRuby/event.rb

@@ -6,9 +6,9 @@ module SDLRuby
     include Accessor, Fiddle, SDL
 
     class << self
-      include SDL
+      include Fiddle, SDL
 
-      private def __malloc__ = Fiddle.malloc(SDL_Event.size)
+      private def __malloc__ = Pointer.malloc(SDL_Event.size, RUBY_FREE)
 
       def clear = SDL.SDL_FlushEvents(SDL_FIRSTEVENT, SDL_LASTEVENT)
 
@@ -43,8 +43,11 @@ module SDLRuby
         end
 
         e = __malloc__
-        SDL.SDL_WaitEvent(e)
-        new(e)
+        if SDL.SDL_WaitEvent(e) == 1
+          new(e)
+        else
+          raise SDLError
+        end
       end
 
       def length = SDL.SDL_PeepEvents(nil, 0, SDL_PEEKEVENT, 0, -1)
@@ -84,15 +87,15 @@ module SDLRuby
     end
 
     def initialize(ptr)
+      @ptr = ptr
       st = SDL_Event.new(ptr)
       sym = Type[st.type]
       @entity = st.__send__(sym)
-      @entity.to_ptr.free = RUBY_FREE
       extend(Accessor[sym])
     end
 
     private attr_reader :entity
 
-    def to_ptr = @entity.to_ptr
+    def to_ptr = @ptr
   end
 end

data/lib/SDLRuby/keyboard.rb

@@ -3,56 +3,67 @@ module SDLRuby
     module_eval do
       num_keys = SDL.tmp_value("int")
 
-      # SDL_GetKeyboardState() が戻すポインターはSDLがロードされた時点で作成されている。
-      # この関数は SDL_Init() より前に呼ぶことができる。
+      # The SDL_GetKeyboardState function can be called before SDL_Init.
+      #
       ptr = SDL.SDL_GetKeyboardState(num_keys)
 
-      # エラーになるのはnum_keysにNULLを渡したとき。
+      # SDL_GetKeyboardState returns an error when num_keys is NULL.
+      #
       raise SDLError if ptr.null?
 
       ptr.size = num_keys.value
-      @state = ptr
+      @ptr = ptr.freeze
     end
 
     class << self
-      def [](idx)
-        raise IndexError if idx < 0 || @state.size <= idx
-        @state[idx] != 0
-      end
-
-      def any? = to_a.any?
-
-      def clear = SDL.SDL_ResetKeyboard
-
-      # キー名からキーコードを得る
-      def keycode(s) = SDL.GetKeyFromName(s).nonzero?
+      include SDL
 
-      # キーコードからキー名を得る
-      def keycode_name(num)
-        (s = SDL.GetKeyName(num).to_s).empty? ? nil : s
+      # This method specifies the ability to check for a match with
+      # the characters appearing in the 'when' clause of a 'case' statement.
+      #
+      # see also: String#===
+      #
+      def ==(other)
+        case other
+        when Integer
+          0 <= other && other < @ptr.size && @ptr[other] != 0
+        when String, Symbol
+          (idx = scancode(other)) != 0 && @ptr[idx] != 0
+        else
+          super
+        end
       end
 
-      # 修飾キーの状態を得る
-      def mod
-        SDL.SDL_GetModState #=> integer
+      def any?
+        # SDL sets a byte to either 0x00 or 0x01 for each scancode.
+        # It does not fill the byte sequence with 0x80, so this should work.
+        #
+        to_str.sum != 0
       end
 
-      # 修飾キーを設定する
-      def mod=(modstate)
-        SDL.SDL_SetModState(modstate)
+      def clear
+        # SDL_ResetKeyboard should be preceded by initializing SDL events since
+        # it sends SDLK_KEYUP events for pressed keys.
+        #
+        # Calling SDL_ResetKeyboard when the SDL event subsystem is not initialized
+        # results in a core dump.
+        #
+        SDL.SDL_ResetKeyboard if SDL.init?(SDL_INIT_EVENTS)
       end
 
-      # キー名からスキャンコードを得る
-      def scancode(s) = SDL.GetScancodeFromName(s).nonzero?
+      def mod = SDL.SDL_GetModState
 
-      # スキャンコードからキー名を得る
-      def scancode_name(num)
-        (s = SDL.GetScancodeName(num).to_s).empty? ? nil : s
-      end
+      def scancode(s) = SDL.SDL_GetScancodeFromName(s.to_s)
+
+      def scancode_name(num) = SDL.SDL_GetScancodeName(num).to_s
+
+      def size = @ptr.size
+
+      alias length size
 
-      def to_a = to_str.unpack("C*").map(&:nonzero?)
+      def to_a = size.times.select { |i| @ptr[i] != 0 }
 
-      def to_str = @state.to_str
+      def to_str = @ptr.to_str
     end
   end
 end

data/lib/SDLRuby/mouse.rb

@@ -1,52 +1,130 @@
 module SDLRuby
   module Mouse
-    @global_x, @global_y = *SDL.tmp_value("int", "int")
-    @relative_x, @relative_y = *SDL.tmp_value("int", "int")
-    @x, @y = *SDL.tmp_value("int", "int")
-
     class << self
       include SDL
 
-      def to_button_ary(num)
-        [
-          num & SDL_BUTTON_LMASK  != 0,
-          num & SDL_BUTTON_MMASK  != 0,
-          num & SDL_BUTTON_RMASK  != 0,
-          num & SDL_BUTTON_X1MASK != 0,
-          num & SDL_BUTTON_X2MASK != 0
-        ]
-      end
+      def button = button_to_ary(WindowMouse.button)
 
+      # If called without initializing the SDL video subsystem,
+      # even if a mouse is present in the system, it will return an error.
+      #
+      # This method must be called from the main thread.
+      #
       def capture=(b)
         err = SDL.SDL_CaptureMouse(b ? 1 : 0)
         raise SDLError if err < 0
       end
 
+      def global_button = button_to_ary(GlobalMouse.button)
+
+      def global_pos = GlobalMouse.pos
+
+      # If called without initializing the SDL video subsystem,
+      # even if a mouse is present in the system, it will return an error.
+      #
       def global_pos=(xy)
-        err = SDL.SDL_WarpMouseGlobal(*xy)
-        raise SDLError if err < 0
+        GlobalMouse.pos=(xy)
       end
 
-      def global_state = [
-        SDL.SDL_GetGlobalMouseState(@global_x, @global_y),
-        @global_x.value, @global_y.value
-      ]
+      def global_state
+        a = GlobalMouse.state
+        a[0] = button_to_ary(a[0])
+        a
+      end
 
+      def pos = WindowMouse.pos
+
+      def pos=(xy)
+        SDL.SDL_WarpMouseInWindow(nil, *xy)
+      end
+
+      # If called without initializing the SDL video subsystem,
+      # even if a mouse is present in the system, it will return an error.
+      #
       def relative=(b)
         err = SDL.SDL_SetRelativeMouseMode(b ? 1 : 0)
         raise SDLError if err < 0
       end
 
-      def relative? = SDL.SDL_GetRelativeMouseMode == 1
+      def relative? = SDL.SDL_GetRelativeMouseMode != 0
+
+      def relative_pos = RelativeMouse.pos
+
+      def relative_state
+        a = RelativeMouse.state
+        a[0] = button_to_ary(a[0])
+        a
+      end
+
+      def state
+        a = WindowMouse.state
+        a[0] = button_to_ary(a[0])
+        a
+      end
+
+      private
+
+      def button_to_ary(num)
+        [
+          num & SDL_BUTTON_LMASK  != 0,
+          num & SDL_BUTTON_MMASK  != 0,
+          num & SDL_BUTTON_RMASK  != 0,
+          num & SDL_BUTTON_X1MASK != 0,
+          num & SDL_BUTTON_X2MASK != 0,
+        ]
+      end
+    end
+
+    module GlobalMouse
+      @x, @y = SDL.tmp_value("int", "int")
+
+      class << self
+        def button = SDL.SDL_GetGlobalMouseState(nil, nil)
 
-      def relative_state = [
-        SDL.SDL_GetRelativeMouseState(@relative_x, @relative_y),
-        @relative_x.value, @relative_y.value
-      ]
+        def pos
+          SDL.SDL_GetGlobalMouseState(@x, @y)
+          [@x.value, @y.value]
+        end
 
-      def state = [
-        SDL.SDL_GetMouseState(@x, @y), @x.value, @y.value
-      ]
+        def pos=(xy)
+          err = SDL.SDL_WarpMouseGlobal(*xy)
+          raise SDLError if err < 0
+        end
+
+        def state = [SDL.SDL_GetGlobalMouseState(@x, @y), @x.value, @y.value]
+      end
+    end
+
+    module RelativeMouse
+      @x, @y = SDL.tmp_value("int", "int")
+
+      class << self
+        def pos
+          SDL.SDL_GetRelativeMouseState(@x, @y)
+          [@x.value, @y.value]
+        end
+
+        def state = [SDL.SDL_GetRelativeMouseState(@x, @y), @x.value, @y.value]
+      end
+    end
+
+    module WindowMouse
+      @x, @y = SDL.tmp_value("int", "int")
+
+      class << self
+        def button = SDL.SDL_GetMouseState(nil, nil)
+
+        def pos
+          SDL.SDL_GetMouseState(@x, @y)
+          [@x.value, @y.value]
+        end
+
+        def pos=(xy)
+          SDL.SDL_WarpMouseInWindow(nil, *xy)
+        end
+
+        def state = [SDL.SDL_GetMouseState(@x, @y), @x.value, @y.value]
+      end
     end
   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)

data/lib/SDLRuby/sdl.rb

@@ -50,6 +50,7 @@ module SDLRuby
     require_relative 'surface'
     require_relative 'text_input'
     require_relative 'texture'
+    require_relative 'timer'
     require_relative 'window'
 
     class << self
@@ -60,7 +61,33 @@ module SDLRuby
         raise SDLError if err < 0
       end
 
-      def init?(flags) = SDL.WasInit(flags).nonzero?
+      # Description:
+      #
+      # This method checks the initialization status of SDL subsystems based on
+      # the provided flags. You can specify the SDL subsystems you want to check
+      # by combining the SDL_INIT_* flags using bitwise OR.
+      #
+      # Parameters:
+      #
+      # flags (optional): An integer or a combination of SDL_INIT_* flags
+      # representing the SDL subsystems to check. Default is nil.
+      #
+      # Return Value:
+      #
+      # If all the specified SDL subsystems in flags are initialized,
+      # the method returns true.
+      # If any of the specified SDL subsystems are not initialized,
+      # it returns false.
+      # If flags is given as nil or 0,
+      # the method returns true if any of the SDL subsystems are initialized.
+      #
+      def init?(flags = nil)
+        if flags && flags != 0
+          SDL.SDL_WasInit(flags) == flags
+        else
+          SDL.SDL_WasInit(0) != 0
+        end
+      end
 
       def quit = SDL.SDL_Quit
 
@@ -157,7 +184,7 @@ module SDLRuby
 
       # timer
       #
-      def ticks = SDL.SDL_GetTicks
+      def ticks = Timer.ticks
 
       # version
       #

data/lib/SDLRuby/timer.rb

@@ -0,0 +1,25 @@
+module SDLRuby
+  module Timer
+    class << self
+      def ticks
+        # Use the same Ticks as the one utilized for SDL event timestamps.
+        #
+        SDL.SDL_GetTicks
+      end
+
+      def inspect
+        n = SDL.SDL_GetTicks64
+        epoch_time = n / 1000
+
+        sprintf(
+          "%d %02d:%02d:%02d.%03d0000",
+          epoch_time / 86400,     # days
+          epoch_time / 3600 % 24, # hours
+          epoch_time / 60 % 60,   # minutes
+          epoch_time % 60,        # seconds
+          n % 1000                # fractional seconds
+        )
+      end
+    end
+  end
+end

data/lib/SDLRuby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SDLRuby
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/SDLRuby/window/surfacer.rb

@@ -1,37 +1,37 @@
-module SDLRuby
-  class Window
-    module Surfacer
-      include SDL
-
-      def destroy_surface
-        err = SDL.SDL_DestroyWindowSurface(self)
-        raise SDLError if err < 0
-      end
-
-      def surface
-        ptr = SDL.SDL_GetWindowSurface(self)
-        raise SDLError if ptr.null?
-
-        # ウィンドウからのサーフェスにはSDL_DONTFREEフラグが設定されている。
-        # このためにSDL_FreeSurfaceではリファレンスカウンターを減じる事ができない。
-        # これはRubyのGC管理では問題になる（メモリーリークする）。
-        # そのためSDL_DONTFREEフラグを解除する！
-        #
-        st = SDL_Surface.new(ptr)
-        st.flags &= ~SDL_DONTFREE
-
-        Surface.new(ptr, add_ref: true)
-      end
-
-      # ウィンドウのサーフェスがvalidかどうか確認していない。
-      # リサイズなどで壊れていてもtrueを戻す。
-      #
-      def surface? = SDL.SDL_HasWindowSurface(self) == 1
-
-      def update_surface
-        err = SDL.SDL_UpdateWindowSurface(self)
-        raise SDLError if err < 0
-      end
-    end
-  end
-end
+module SDLRuby
+  class Window
+    module Surfacer
+      include SDL
+
+      def destroy_surface
+        err = SDL.SDL_DestroyWindowSurface(self)
+        raise SDLError if err < 0
+      end
+
+      def surface
+        ptr = SDL.SDL_GetWindowSurface(self)
+        raise SDLError if ptr.null?
+
+        # ウィンドウからのサーフェスにはSDL_DONTFREEフラグが設定されている。
+        # このためにSDL_FreeSurfaceではリファレンスカウンターを減じる事ができない。
+        # これはRubyのGC管理では問題になる（メモリーリークする）。
+        # そのためSDL_DONTFREEフラグを解除する！
+        #
+        st = SDL_Surface.new(ptr)
+        st.flags &= ~SDL_DONTFREE
+
+        Surface.new(ptr, add_ref: true)
+      end
+
+      # ウィンドウのサーフェスがvalidかどうか確認していない。
+      # リサイズなどで壊れていてもtrueを戻す。
+      #
+      def surface? = SDL.SDL_HasWindowSurface(self) == 1
+
+      def update_surface
+        err = SDL.SDL_UpdateWindowSurface(self)
+        raise SDLError if err < 0
+      end
+    end
+  end
+end

data/sig/lib/SDLRuby/keyboard.rbs

@@ -0,0 +1,25 @@
+module SDLRuby
+  module Keyboard
+    include SDL
+
+    def self.==: (untyped other) -> bool
+
+    def self.any?: () -> bool
+
+    def self.clear: () -> void
+
+    def self.mod: () -> Integer
+
+    def self.scancode: (String | Symbol s) -> Integer
+
+    def self.scancode_name: (Integer num) -> String
+
+    def self.size: () -> Integer
+
+    alias self.length self.size
+
+    def self.to_a: () -> Array[Integer]
+
+    def self.to_str: () -> String
+  end
+end

data/sig/lib/SDLRuby/mouse.rbs

@@ -0,0 +1,35 @@
+module SDLRuby
+  module Mouse
+    include SDL
+
+    def self.button: () -> Array[bool]
+
+    def self.capture=: (boolish) -> void
+
+    def self.global_button: () -> Array[bool]
+
+    def self.global_pos: () -> [Integer, Integer]
+
+    def self.global_pos=: ([Integer, Integer] xy) -> void
+
+    def self.global_state: () -> [Array[bool], Integer, Integer]
+
+    def self.pos: () -> [Integer, Integer]
+
+    def self.pos=: ([Integer, Integer] xy) -> void
+
+    def self.relative=: (boolish) -> untyped
+
+    def self.relative?: () -> bool
+
+    def self.relative_pos: () -> [Integer, Integer]
+
+    def self.relative_state: () -> [Array[bool], Integer, Integer]
+
+    def self.state: () -> [Array[bool], Integer, Integer]
+
+    private
+
+    def self.button_to_ary: (Integer num) -> ::Array[bool]
+  end
+end

data/sig/lib/SDLRuby/timer.rbs

@@ -0,0 +1,7 @@
+module SDLRuby
+  module Timer
+    def self.ticks: () -> Integer
+
+    def self.inspect: () -> String
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: SDLRuby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - shinokaro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies: []
 description: SDLRuby is a GEM that allows calling the SDL library from Ruby, enabling
   window creation, image display, audio playback, and more. It easily manages C pointers
@@ -102,6 +102,7 @@ files:
 - lib/SDLRuby/surface/surface_renderer.rb
 - lib/SDLRuby/text_input.rb
 - lib/SDLRuby/texture.rb
+- lib/SDLRuby/timer.rb
 - lib/SDLRuby/ttf.rb
 - lib/SDLRuby/ttf/include/SDL_ttf.h.rb
 - lib/SDLRuby/ttf/ttf.rb
@@ -122,7 +123,10 @@ files:
 - sig/lib/SDLRuby/event.rbs
 - sig/lib/SDLRuby/event/accessor.rbs
 - sig/lib/SDLRuby/event/type.rbs
+- sig/lib/SDLRuby/keyboard.rbs
+- sig/lib/SDLRuby/mouse.rbs
 - sig/lib/SDLRuby/sdl.rbs
+- sig/lib/SDLRuby/timer.rbs
 homepage: https://github.com/shinokaro/SDLRuby
 licenses:
 - MIT