rb_sdl2 0.1.2 → 0.2.0

data/lib/rb_sdl2/window/state.rb

@@ -0,0 +1,178 @@
+module RbSDL2
+  class Window
+    SDL_WINDOW_FULLSCREEN         = 0x00000001
+    SDL_WINDOW_OPENGL             = 0x00000002
+    SDL_WINDOW_SHOWN              = 0x00000004
+    SDL_WINDOW_HIDDEN             = 0x00000008
+    SDL_WINDOW_BORDERLESS         = 0x00000010
+    SDL_WINDOW_RESIZABLE          = 0x00000020
+    SDL_WINDOW_MINIMIZED          = 0x00000040
+    SDL_WINDOW_MAXIMIZED          = 0x00000080
+    SDL_WINDOW_MOUSE_GRABBED      = 0x00000100
+    SDL_WINDOW_INPUT_FOCUS        = 0x00000200
+    SDL_WINDOW_MOUSE_FOCUS        = 0x00000400
+    SDL_WINDOW_FULLSCREEN_DESKTOP = SDL_WINDOW_FULLSCREEN | 0x00001000
+    SDL_WINDOW_FOREIGN            = 0x00000800
+    SDL_WINDOW_ALLOW_HIGHDPI      = 0x00002000
+    SDL_WINDOW_MOUSE_CAPTURE      = 0x00004000
+    SDL_WINDOW_ALWAYS_ON_TOP      = 0x00008000
+    SDL_WINDOW_SKIP_TASKBAR       = 0x00010000
+    SDL_WINDOW_UTILITY            = 0x00020000
+    SDL_WINDOW_TOOLTIP            = 0x00040000
+    SDL_WINDOW_POPUP_MENU         = 0x00080000
+    SDL_WINDOW_KEYBOARD_GRABBED   = 0x00100000
+    SDL_WINDOW_VULKAN             = 0x10000000
+    SDL_WINDOW_METAL              = 0x20000000
+
+    SDL_WINDOW_INPUT_GRABBED = SDL_WINDOW_MOUSE_GRABBED
+
+    module State
+      class << self
+        def to_flags(allow_high_dpi: false, always_on_top: false, borderless: false, foreign: false,
+                     fullscreen: false, fullscreen_desktop: false, hidden: false, input_focus: false,
+                     input_grabbed: false, keyboard_grabbed: false, maximized: false, metal: false,
+                     minimized: false, mouse_capture: false, mouse_focus: false, mouse_grabbed: false,
+                     opengl: false, popup_menu: false, resizable: false, shown: false,
+                     skip_taskbar: false, tooltip: false, utility: false, vulkan: false)
+          0 |
+            (allow_high_dpi ? SDL_WINDOW_ALLOW_HIGHDPI : 0) |
+            (always_on_top ? SDL_WINDOW_ALWAYS_ON_TOP : 0) |
+            (borderless ? SDL_WINDOW_BORDERLESS : 0) |
+            (foreign ? SDL_WINDOW_FOREIGN : 0) |
+            (fullscreen ? SDL_WINDOW_FULLSCREEN : 0) |
+            (fullscreen_desktop ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0) |
+            (hidden ? SDL_WINDOW_HIDDEN : 0) |
+            (input_focus ? SDL_WINDOW_INPUT_FOCUS : 0) |
+            (input_grabbed ? SDL_WINDOW_INPUT_GRABBED : 0) |
+            (keyboard_grabbed ? SDL_WINDOW_KEYBOARD_GRABBED : 0) |
+            (maximized ? SDL_WINDOW_MAXIMIZED : 0) |
+            (metal ? SDL_WINDOW_METAL : 0) |
+            (minimized ? SDL_WINDOW_MINIMIZED : 0) |
+            (mouse_capture ? SDL_WINDOW_MOUSE_CAPTURE : 0) |
+            (mouse_focus ? SDL_WINDOW_MOUSE_FOCUS : 0) |
+            (mouse_grabbed ? SDL_WINDOW_MOUSE_GRABBED : 0) |
+            (opengl ? SDL_WINDOW_OPENGL : 0)  |
+            (popup_menu ? SDL_WINDOW_POPUP_MENU : 0) |
+            (resizable ? SDL_WINDOW_RESIZABLE : 0) |
+            (shown ? SDL_WINDOW_SHOWN : 0) |
+            (skip_taskbar ? SDL_WINDOW_SKIP_TASKBAR : 0) |
+            (tooltip ? SDL_WINDOW_TOOLTIP : 0) |
+            (utility ? SDL_WINDOW_UTILITY : 0) |
+            (vulkan ? SDL_WINDOW_VULKAN : 0)
+        end
+      end
+
+      def allow_high_dpi? = flags?(SDL_WINDOW_ALLOW_HIGHDPI)
+
+      def always_on_top=(bool)
+        ::SDL.SetWindowAlwaysOnTop(self, bool ? ::SDL::TRUE : ::SDL::FALSE)
+      end
+
+      def always_on_top? = flags?(SDL_WINDOW_ALWAYS_ON_TOP)
+
+      def bordered=(bool)
+        ::SDL.SetWindowBordered(self, bool ? ::SDL::TRUE : ::SDL::FALSE)
+      end
+
+      def borderless? = flags?(SDL_WINDOW_BORDERLESS)
+
+      def current! = ::SDL.RaiseWindow(self); self
+
+      def flags = ::SDL.GetWindowFlags(self)
+
+      def flags?(num) = flags & num != 0
+
+      def foreign? = flags?(SDL_WINDOW_FOREIGN)
+
+      def fullscreen
+        err = ::SDL.SetWindowFullscreen(self, ::SDL::WINDOW_FULLSCREEN)
+        raise RbSDL2Error if err < 0
+        self
+      end
+
+      def fullscreen? = flags?(SDL_WINDOW_FULLSCREEN)
+
+      def fullscreen_desktop
+        err = ::SDL.SetWindowFullscreen(self, ::SDL::WINDOW_FULLSCREEN_DESKTOP)
+        raise RbSDL2Error if err < 0
+        self
+      end
+
+      def fullscreen_desktop? = flags?(SDL_WINDOW_FULLSCREEN_DESKTOP)
+
+      def grab=(bool)
+        ::SDL.SetWindowGrab(self, bool ? ::SDL::TRUE : ::SDL::FALSE)
+      end
+
+      def grabbed? = ::SDL.GetWindowGrab(self) == ::SDL::TRUE
+
+      def grabbed_keyboard? = ::SDL.GetWindowKeyboardGrab(self) == ::SDL::TRUE
+
+      def grabbed_mouse? = ::SDL.GetWindowMouseGrab(self) == ::SDL::TRUE
+
+      def hide = ::SDL.HideWindow(self); self
+
+      def hidden? = flags?(SDL_WINDOW_HIDDEN)
+
+      def input_focused? = flags?(SDL_WINDOW_INPUT_FOCUS)
+
+      def input_grabbed? = flags?(SDL_WINDOW_INPUT_GRABBED)
+
+      def keyboard_grab=(bool)
+        ::SDL.SetWindowKeyboardGrab(self, bool ? ::SDL::TRUE : ::SDL::FALSE)
+      end
+
+      def keyboard_grabbed? = flags?(SDL_WINDOW_KEYBOARD_GRABBED)
+
+      def maximize = ::SDL.MaximizeWindow(self); self
+
+      def maximized? = flags?(SDL_WINDOW_MAXIMIZED)
+
+      def metal? = flags?(SDL_WINDOW_METAL)
+
+      def minimize = ::SDL.MinimizeWindow(self); self
+
+      def minimized? = flags?(SDL_WINDOW_MINIMIZED)
+
+      def mouse_captured? = flags?(SDL_WINDOW_MOUSE_CAPTURE)
+
+      def mouse_focused? = flags?(SDL_WINDOW_MOUSE_FOCUS)
+
+      def mouse_grab=(bool)
+        ::SDL.SetWindowMouseGrab(self, bool ? ::SDL::TRUE : ::SDL::FALSE)
+      end
+
+      def mouse_grabbed? = flags?(SDL_WINDOW_MOUSE_GRABBED)
+
+      def opengl? = flags?(SDL_WINDOW_OPENGL)
+
+      def popup_menu? = flags?(SDL_WINDOW_POPUP_MENU)
+
+      def resizable=(bool)
+        ::SDL.SetWindowResizable(self, bool ? ::SDL::TRUE : ::SDL::FALSE)
+      end
+
+      def resizable? = flags?(SDL_WINDOW_RESIZABLE)
+
+      def restore = ::SDL.RestoreWindow(self); self
+
+      def show = ::SDL.ShowWindow(self); self
+
+      def shown? = flags?(SDL_WINDOW_SHOWN)
+
+      def skip_taskbar? = flags?(SDL_WINDOW_SKIP_TASKBAR)
+
+      def tooltip? = flags?(SDL_WINDOW_TOOLTIP)
+
+      def utility? = flags?(SDL_WINDOW_UTILITY)
+
+      def vulkan? = flags?(SDL_WINDOW_VULKAN)
+
+      def windowed
+        err = ::SDL.SetWindowFullscreen(self, 0)
+        raise RbSDL2Error if err < 0
+        self
+      end
+    end
+  end
+end

data/lib/rb_sdl2/window/window.rb

@@ -0,0 +1,149 @@
+module RbSDL2
+  class Window
+    SDL_WINDOWPOS_CENTERED_MASK = 0x2FFF0000
+
+    require_relative 'accessor'
+    require_relative 'display'
+    require_relative 'flash'
+    require_relative 'shape'
+    require_relative 'state'
+
+    class << self
+      def keyboard_focused = (ptr = ::SDL.GetKeyboardFocus).null? ? nil : to_ptr(ptr)
+
+      def mouse_focused = (ptr = ::SDL.GetMouseFocus).null? ? nil : to_ptr(ptr)
+
+      def grabbed = (ptr = ::SDL.GetGrabbedWindow).null? ? nil : to_ptr(ptr)
+
+      def new(title = "", x = nil, y = nil, w = 640, h = 480, flags: nil, **opts)
+        ptr = ::SDL.CreateWindow(SDL.str_to_sdl(title),
+                                 x || SDL_WINDOWPOS_CENTERED_MASK, y || SDL_WINDOWPOS_CENTERED_MASK,
+                                 w, h, flags || State.to_flags(**opts))
+        raise RbSDL2Error if ptr.null?
+        to_ptr(ptr)
+      end
+
+      # w, h は nil の場合は shape に与えられたサーフェィスの w, h を使用する。
+      # flags は常に borderless: true, fullscreen: false, resizable: false が設定される。
+      # shape には Surface のインスタンス・オブジェクトを与える。
+      # 作成されたウィンドウは透明である。表示内容は作成後に描画する必要がある。
+      # ウィンドウへの操作を扱いたければ HitTest コールバックを設定しコールバック側で処理を行う必要がある。
+      def shaped(title = "", x = nil, y = nil, w = nil, h = nil, flags: nil,
+                 alpha_test: nil, color_key: nil, shape:, **opts)
+        size = [w || shape.w, h || shape.h]
+        # w, h は形状マスクのサイズに合わせる必要がある。
+        ptr = ::SDL.CreateShapedWindow(SDL.str_to_sdl(title), 0, 0, *size,
+                                       flags || State.to_flags(**opts))
+        raise RbSDL2Error if ptr.null?
+        to_ptr(ptr).tap do |obj|
+          obj.shape_set(shape, alpha_test: alpha_test, color_key: color_key)
+          obj.size = size
+          # CreateShapedWindow は引数 x, y を無視する。そして x = -1000, y = -1000 に強制する。
+          # 位置の再指定を行いアプリケーションの意図した位置に表示する。
+          obj.position = [x || SDL_WINDOWPOS_CENTERED_MASK, y || SDL_WINDOWPOS_CENTERED_MASK]
+        end
+      end
+
+      def to_id(num)
+        ptr = ::SDL.GetWindowFromID(num)
+        raise RbSDL2Error, "invalid window id" if ptr.null?
+        obj = allocate
+        obj.__send__(:initialize, num)
+        obj
+      end
+
+      def to_ptr(ptr)
+        num = ::SDL.GetWindowID(ptr)
+        raise RbSDL2Error if num == 0
+        obj = allocate
+        obj.__send__(:initialize, num)
+        obj
+      end
+    end
+
+    include Accessor, Display, Flash, Shape, State
+
+    def initialize(num)
+      @window_id = num
+    end
+
+    def ==(other)
+      # ウィンドウのポインターアドレスは SDL によって再利用されることがある。
+      # 最初に window_id を比較しなければならない。
+      other.respond_to?(:window_id) && other.window_id == window_id ||
+        other.respond_to?(:to_ptr) && other.to_ptr == to_ptr
+    end
+
+    def destroy = ::SDL.DestroyWindow(::SDL.GetWindowFromID(@window_id))
+
+    def destroyed? = ::SDL.GetWindowFromID(@window_id).null?
+
+    def format = ::SDL.GetWindowPixelFormat(self)
+
+    require_relative "../pixel_format_enum"
+    include PixelFormatEnum
+
+    require_relative 'hit_test'
+
+    def hit_test=(obj)
+      # dup されて片方で無効にした場合、もう一方にコールバックオブジェクトの拘束がおきる。
+      # これはほおっておくことにする。
+      @hit_test_callback = if obj
+                             func = HitTest.new(obj)
+                             err = ::SDL.SetWindowHitTest(self, func, nil)
+                             raise RbSDL2Error if err < 0
+                             func
+                           end
+      @hit_test_object = obj
+    end
+
+    def mouse_position=(x_y)
+      ::SDL.WarpMouseInWindow(self, *x_y)
+    end
+
+    def surface
+      ptr = ::SDL.GetWindowSurface(self)
+      if ptr.null?
+        @surface = nil
+        raise RbSDL2Error
+      end
+      # Surface は参照カウンターで管理されているため Ruby 側でポインターを保持している限り
+      # 同アドレスに違う Surface が作成されることはない。安全にキャッシュできる。
+      ptr == @surface&.to_ptr ? @surface : @surface = Surface.to_ptr(ptr)
+    end
+
+    def to_ptr
+      ptr = ::SDL.GetWindowFromID(@window_id)
+      raise RbSDL2Error, "Invalid window id or window was destroyed" if ptr.null?
+      ptr
+    end
+
+    # ウィンドウのサーフェィスのコピーを戻す。
+    # このメソッドはウィンドウのスクリーンショットが欲しい場合に使う。
+    def to_surface = surface.then { |s| convert(s.format) }
+
+    # surface メソッドを実行後に Window のサイズ変更があった場合、update メソッドを実行するとエラーになる。
+    # このメソッドは self を戻す。
+    def update(rect = nil)
+      yield(surface) if block_given?
+      # UpdateWindowSurface, UpdateWindowSurfaceRects の *初回* 呼び出しの前に
+      # GetWindowSurface が必要になる。
+      surface unless @surface
+
+      err = if rect
+              ::SDL.UpdateWindowSurfaceRects(self, Rect.new(*rect), 1)
+            else
+              ::SDL.UpdateWindowSurface(self)
+            end
+      # GetWindowSurface の後に Window のサイズ変更があった場合はエラーになる。
+      if err < 0
+        @surface = nil
+        raise RbSDL2Error
+      end
+      self
+    end
+
+    attr_reader :window_id
+    alias id window_id
+  end
+end

data/lib/rb_sdl2.rb

@@ -1,53 +1,115 @@
 module RbSDL2
   require 'sdl2'
-  require_relative 'rb_sdl2/audio'
+  require_relative 'rb_sdl2/audio/audio'
   require_relative 'rb_sdl2/clipboard'
   require_relative 'rb_sdl2/cpu_info'
   require_relative 'rb_sdl2/cursor'
   require_relative 'rb_sdl2/display'
   require_relative 'rb_sdl2/display_mode'
   require_relative 'rb_sdl2/error'
-  require_relative 'rb_sdl2/event'
+  require_relative 'rb_sdl2/errors'
+  require_relative 'rb_sdl2/event/event'
   require_relative 'rb_sdl2/filesystem'
   require_relative 'rb_sdl2/hint'
-  require_relative 'rb_sdl2/keyboard'
+  require_relative 'rb_sdl2/keyboard/keyboard'
   require_relative 'rb_sdl2/message_box'
-  require_relative 'rb_sdl2/mouse'
+  require_relative 'rb_sdl2/mouse/mouse'
   require_relative 'rb_sdl2/palette'
   require_relative 'rb_sdl2/pixel_format_enum'
   require_relative 'rb_sdl2/platform'
   require_relative 'rb_sdl2/power_info'
   require_relative 'rb_sdl2/rect'
-  require_relative 'rb_sdl2/rw_ops'
-  require_relative 'rb_sdl2/screen_saver'
+  require_relative 'rb_sdl2/rw_ops/rw_ops'
   require_relative 'rb_sdl2/sdl'
   require_relative 'rb_sdl2/surface'
   require_relative 'rb_sdl2/text_input'
   require_relative 'rb_sdl2/timer'
-  require_relative 'rb_sdl2/window'
   require_relative 'rb_sdl2/video'
   require_relative 'rb_sdl2/version'
+  require_relative 'rb_sdl2/window/window'
 
-  class RbSDL2Error < StandardError
-    def initialize(error_message = Error.message) = super
-  end
+  require 'forwardable'
+  extend SingleForwardable
+  def_single_delegator Clipboard, :text, :clipboard_text
+  def_single_delegator Clipboard, :text=, :clipboard_text=
+  def_single_delegators CPUInfo, *%i(cpu_cache_line_size cpu_count system_ram)
+  def_single_delegators Keyboard, *%i(hit_any_key? pressed_any_key? pressed_key?)
+  def_single_delegators Platform, *%i(platform)
+  def_single_delegators SDL, *%i(init init? quit)
+  def_single_delegators Timer, *%i(delay realtime ticks)
+  def_single_delegators Version, *%i(revision version)
+  def_single_delegators Video, *%i(screen_saver? screen_saver=)
 
   class << self
-    def init = SDL.init
+    def hide_cursor = Cursor.hide
+
+    def show_cursor = Cursor.show
+
+    def confirm(message) = MessageBox.show(0, message, buttons: %w(Cancel OK), default: 1) == 1
+    alias confirm? confirm
+
+    def alert(message) = MessageBox.simple(0, message)
+
+    def error_alert(message) = MessageBox.simple(MessageBox::ERROR, message)
+
+    def info_alert(message) = MessageBox.simple(MessageBox::INFO, message)
+
+    def warn_alert(message) = MessageBox.simple(MessageBox::WARN, message)
 
     def load(path)
-      ::SDL2.load_lib(path)
+      ::SDL.load_lib(path)
       # オーディオデバイスを閉じ忘れるとアプリケーションの終了時にメモリーアクセス違反を起こす。
       # アプリケーションが強制終了した場合を考慮し終了処理を設定する。
-      at_exit { ::SDL2.SDL_Quit }
+      at_exit { ::SDL.Quit }
+      ::SDL.module_exec do
+        attach_function :SDL_AtomicAdd, [:pointer, :int], :int
+        attach_function :SDL_GetPreferredLocales, [], :pointer
+      end
     end
 
     def loop
-      while true
-        Event.pump
-        yield
-        Event.clear
+      Event.clear
+      yield until Event.quit?
+    end
+
+    # => ["ja", "JP", "en", "US"]
+    def locales
+      ptr = SDLPointer.new(::SDL.SDL_GetPreferredLocales)
+      # メモリーが確保できない、もしくは情報が無い。
+      return [] if ptr.null?
+
+      ptr_size = ::FFI::Pointer.size
+      a = []
+      until (c = ptr.read_pointer).null?
+        a << c.read_string
+        ptr += ptr_size
+      end
+      a
+    end
+
+    def open_rw(obj, ...)
+      case obj
+      when String then RWFile.open(obj, ...)
+      when ::FFI::Pointer then RWMemory.open(obj, ...)
+      when RWOps then block_given? ? yield(obj) : obj
+      else RWObject.open(obj, ...)
       end
     end
+
+    # url に与えた URL に応じたアプリケーションが起動します。
+    # URL はローカルファイルを指定することができます。
+    # その場合は "file:///full/path/to/file" の形式の文字列を使います。
+    # Windows 環境では "file:///C:/full/path/to/file" のようにドライブレターも含みます。
+    # (パス区切り文字は '/' でも '\' でも問題はない)
+    # 主な使い方としてユーザに提示したい Web サイトをブラウザーを起動して見せたい場合に使用します。
+    # 成功時にアプリケーションへのフォーカスが失われる場合もあります。
+    # 成功しても何も起きていない場合もある。確実な動作のためには実働テストを行う必要がある。
+    # 未対応の環境ではエラーになる。
+    def open_url(url)
+      err = ::SDL.OpenURL(SDL.str_to_sdl(url))
+      raise RbSDL2Error if err < 0
+    end
+
+    def power_info = PowerInfo.new
   end
 end

data/rb_sdl2.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rb_sdl2"
-  spec.version       = "0.1.2"
+  spec.version       = "0.2.0"
   spec.author        = "shinokaro"
   spec.email         = "shinokaro@hotmail.co.jp"
 
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = "RbSDL2 treats the functions and pointers provided by SDL as Ruby objects."
   spec.homepage      = "https://github.com/shinokaro/rb_sdl2/blob/main/README.md"
   spec.license       = "Zlib"
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.metadata['bug_tracker_uri'] = 'https://github.com/shinokaro/rb_sdl2/issues'
   spec.metadata["changelog_uri"] = "https://github.com/shinokaro/rb_sdl2/blob/main/CHANGELOG.md"
@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
 
-  spec.add_dependency "ffi", ">= 1.15.0"
-  spec.add_dependency "sdl2-bindings", ">= 0.0.7"
+  spec.add_dependency "ffi", "~> 1.15"
+  spec.add_dependency "sdl2-bindings", "~> 0.1.1"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rb_sdl2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - shinokaro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: sdl2-bindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.1
 description: RbSDL2 treats the functions and pointers provided by SDL as Ruby objects.
 email: shinokaro@hotmail.co.jp
 executables: []
@@ -48,50 +48,48 @@ files:
 - LICENSE.txt
 - README.md
 - lib/rb_sdl2.rb
-- lib/rb_sdl2/audio.rb
-- lib/rb_sdl2/audio/audio_allowed_changes.rb
+- lib/rb_sdl2/audio/audio.rb
 - lib/rb_sdl2/audio/audio_buffer.rb
 - lib/rb_sdl2/audio/audio_device.rb
-- lib/rb_sdl2/audio/audio_format.rb
 - lib/rb_sdl2/audio/audio_spec.rb
+- lib/rb_sdl2/audio/audio_spec_reader.rb
 - lib/rb_sdl2/clipboard.rb
 - lib/rb_sdl2/cpu_info.rb
 - lib/rb_sdl2/cursor.rb
-- lib/rb_sdl2/cursor/color_cursor.rb
-- lib/rb_sdl2/cursor/cursor_class.rb
-- lib/rb_sdl2/cursor/cursor_pointer.rb
-- lib/rb_sdl2/cursor/default_cursor.rb
-- lib/rb_sdl2/cursor/system_cursor.rb
 - lib/rb_sdl2/display.rb
 - lib/rb_sdl2/display_mode.rb
 - lib/rb_sdl2/error.rb
-- lib/rb_sdl2/event.rb
+- lib/rb_sdl2/errors.rb
+- lib/rb_sdl2/event/event.rb
 - lib/rb_sdl2/event/event_filter.rb
+- lib/rb_sdl2/event/event_pointer.rb
 - lib/rb_sdl2/event/event_queue.rb
 - lib/rb_sdl2/event/event_type.rb
 - lib/rb_sdl2/filesystem.rb
 - lib/rb_sdl2/hint.rb
-- lib/rb_sdl2/keyboard.rb
-- lib/rb_sdl2/keyboard/key_mod.rb
-- lib/rb_sdl2/keyboard/keyboard_state.rb
+- lib/rb_sdl2/keyboard/keyboard.rb
+- lib/rb_sdl2/keyboard/mod_state.rb
+- lib/rb_sdl2/keyboard/state.rb
 - lib/rb_sdl2/message_box.rb
-- lib/rb_sdl2/mouse.rb
 - lib/rb_sdl2/mouse/global_mouse.rb
+- lib/rb_sdl2/mouse/mouse.rb
 - lib/rb_sdl2/mouse/mouse_button.rb
 - lib/rb_sdl2/mouse/mouse_class.rb
 - lib/rb_sdl2/mouse/mouse_wheel.rb
 - lib/rb_sdl2/mouse/relative_mouse.rb
-- lib/rb_sdl2/mouse/window_mouse.rb
 - lib/rb_sdl2/palette.rb
 - lib/rb_sdl2/pixel_format_enum.rb
 - lib/rb_sdl2/platform.rb
 - lib/rb_sdl2/power_info.rb
 - lib/rb_sdl2/rect.rb
 - lib/rb_sdl2/ref_count_pointer.rb
-- lib/rb_sdl2/rw_ops.rb
-- lib/rb_sdl2/rw_ops/rw_operator.rb
-- lib/rb_sdl2/screen_saver.rb
+- lib/rb_sdl2/rw_ops/rw_file.rb
+- lib/rb_sdl2/rw_ops/rw_memory.rb
+- lib/rb_sdl2/rw_ops/rw_object.rb
+- lib/rb_sdl2/rw_ops/rw_ops.rb
+- lib/rb_sdl2/rw_ops/rw_ops_pointer.rb
 - lib/rb_sdl2/sdl.rb
+- lib/rb_sdl2/sdl_pointer.rb
 - lib/rb_sdl2/surface.rb
 - lib/rb_sdl2/surface/blend_mode.rb
 - lib/rb_sdl2/surface/pixel_format.rb
@@ -99,15 +97,13 @@ files:
 - lib/rb_sdl2/timer.rb
 - lib/rb_sdl2/version.rb
 - lib/rb_sdl2/video.rb
-- lib/rb_sdl2/window.rb
-- lib/rb_sdl2/window/dialog.rb
+- lib/rb_sdl2/window/accessor.rb
 - lib/rb_sdl2/window/display.rb
-- lib/rb_sdl2/window/grab.rb
+- lib/rb_sdl2/window/flash.rb
 - lib/rb_sdl2/window/hit_test.rb
-- lib/rb_sdl2/window/position.rb
 - lib/rb_sdl2/window/shape.rb
-- lib/rb_sdl2/window/size.rb
-- lib/rb_sdl2/window/window_flags.rb
+- lib/rb_sdl2/window/state.rb
+- lib/rb_sdl2/window/window.rb
 - rb_sdl2.gemspec
 homepage: https://github.com/shinokaro/rb_sdl2/blob/main/README.md
 licenses:
@@ -126,14 +122,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Multimedia library with SDL.

data/lib/rb_sdl2/audio/audio_allowed_changes.rb

@@ -1,17 +0,0 @@
-module RbSDL2
-  class Audio
-    module AudioAllowedChanges
-      class << self
-        def to_num(any_change: false, channels_change: false, format_change: false,
-                   frequency_change: false, samples_change: false)
-          0 |
-            (any_change ? ::SDL2::SDL_AUDIO_ALLOW_ANY_CHANGE : 0) |
-            (channels_change ? ::SDL2::SDL_AUDIO_ALLOW_CHANNELS_CHANGE : 0) |
-            (format_change ? ::SDL2::SDL_AUDIO_ALLOW_FORMAT_CHANGE : 0) |
-            (frequency_change ? ::SDL2::SDL_AUDIO_ALLOW_FREQUENCY_CHANGE : 0) |
-            (samples_change ? ::SDL2::SDL_AUDIO_ALLOW_SAMPLES_CHANGE : 0)
-        end
-      end
-    end
-  end
-end

data/lib/rb_sdl2/audio/audio_format.rb

@@ -1,23 +0,0 @@
-module RbSDL2
-  class Audio
-    module AudioFormat
-      class << self
-        def to_num(signed: true, big_endian: false, bit_size: 16, float: false)
-          num = 0 |
-            (big_endian ? ::SDL2::SDL_AUDIO_MASK_ENDIAN : 0) |
-            (bit_size & ::SDL2::SDL_AUDIO_MASK_BITSIZE) |
-            (signed ? ::SDL2::SDL_AUDIO_MASK_SIGNED : 0)
-          num | (float ? ::SDL2::SDL_AUDIO_MASK_DATATYPE & ::SDL2::SDL_AUDIO_MASK_SIGNED : 0)
-        end
-      end
-
-      def big_endian? = ::SDL2::SDL_AUDIO_MASK_ENDIAN & format != 0
-
-      def bit_size = ::SDL2::SDL_AUDIO_MASK_BITSIZE & format
-
-      def float? = ::SDL2::SDL_AUDIO_MASK_DATATYPE & format != 0
-
-      def signed? = ::SDL2::SDL_AUDIO_MASK_SIGNED & format != 0
-    end
-  end
-end