rb_sdl2 0.1.2 → 0.2.0

data/lib/rb_sdl2/event/event_queue.rb

@@ -1,137 +1,114 @@
 module RbSDL2
-  class Event
-    module EventQueue
-      class << self
-        require_relative 'event_type'
-
-        def clear
-          # type が ::SDL2::SDL_DROPFILE, ::SDL2::SDL_DROPTEXT の場合に
-          # イベントに含まれる file メンバーのポインターが開放されない。そのため Ruby 側で開放処理を行う。
-          event = Event.new
-          while peep(event, ::SDL2::SDL_GETEVENT,
-                     type: ::SDL2::SDL_DROPFILE..::SDL2::SDL_DROPTEXT) > 0
-            event.clear
-          end
-          ::SDL2.SDL_FlushEvents(*EventType.minmax)
-        end
-
-        def count(type: nil) = peep(nil, ::SDL2::SDL_PEEKEVENT, type: type)
-        alias length count
-        alias size count
-
-        def deq(non_block = false, type: nil)
-          event = Event.new
-          while peep(event, ::SDL2::SDL_GETEVENT, type: type) == 0
-            raise ThreadError, Error.message if non_block
-          end
-          event
-        end
-
-        # ブロックにはイベントキューにあるイベントが渡される。
-        # ブロックへ渡されるイベントはコピーされたものでありブロックの外へ持ち出すことができる。
-        # このメソッドは SDL のイベントキューをロックする。
-        def each = block_given? ? reject! { |event| yield(event.dup); true } : to_enum
-
-        def empty? = length == 0
-
-        # イベントキューが一杯の時に 例外
-        def enq(event, non_block = false)
-          event_copy(event) do |copy|
-            while peep(copy, ::SDL2::SDL_ADDEVENT) == 0
-              raise ThreadError, Error.message if non_block
-            end
-            event
-          end
+  class EventQueue
+    require_relative 'event'
+    require_relative 'event_pointer'
+    require_relative 'event_type'
+
+    class << self
+      def clear
+        # SDL_FlushEvents() は SDL_DROPFILE, SDL_DROPTEXT の場合に file メンバーのポインターは開放しない。
+        # そのため Ruby 側でポインターの開放を行う。
+        ptr = EventPointer.malloc
+        ref_ptr = ptr + ::SDL::DropEvent.offset_of(:file)
+        while ::SDL.PeepEvents(ptr, 1, ::SDL::GETEVENT, ::SDL::DROPFILE, ::SDL::DROPTEXT) > 0
+          ::SDL.free(ref_ptr)
         end
-
-        private def event_copy(event)
-          copy = event.dup
-          yield(copy).tap do
-            # 成功した場合はメンバーポインターはキューにコピーされた。
-            # ブロックの実行が成功したらメンバーポインターの開放を防ぐ。
-            if event.drop_file? || event.drop_text?
-              copy.to_ptr.autorelease = false
-              ::SDL2.SDL_free(copy)
-            end
-          end
+        # SDL_FlushEvents() は SDL_TEXTEDITING_EXT の場合に text メンバーのポインターは開放しない。
+        # そのため Ruby 側でポインターの開放を行う。
+        ref_ptr = ptr + ::SDL::TextEditingExtEvent.offset_of(:text)
+        while ::SDL.PeepEvents(ptr, 1, ::SDL::GETEVENT, ::SDL::TEXTEDITING_EXT, ::SDL::TEXTEDITING_EXT) > 0
+          ::SDL.free(ref_ptr)
         end
+        ::SDL.FlushEvents(::SDL::FIRSTEVENT, ::SDL::LASTEVENT)
+      end
 
-        private def main_thread!
-          if Thread.main != Thread.current
-            raise ThreadError, "the current thread is not the main thread"
-          end
-        end
+      def count
+        num = ::SDL.PeepEvents(nil, 0, ::SDL::PEEKEVENT, ::SDL::FIRSTEVENT, ::SDL::LASTEVENT)
+        raise RbSDL2Error if num < 0
+        num
+      end
 
-        private def peep(event, action, type: nil)
-          min_type, max_type = case type
-                               when nil
-                                 EventType.minmax
-                               when Range
-                                 type.minmax
-                               else
-                                 [type, type]
-                               end
-          num = ::SDL2.SDL_PeepEvents(event, event ? 1 : 0, action, min_type, max_type)
-          raise RbSDL2Error if num < 0
-          num
-        end
+      def exist?(type = nil)
+        ::SDL.HasEvents(*EventType.to_types(type)) == ::SDL::TRUE
+      end
 
-        def poll
-          main_thread!
-          event = Event.new
-          ::SDL2::SDL_PollEvent(event).nonzero? && event
-        end
-        alias get poll
+      def poll
+        ptr = EventPointer.malloc
+        ::SDL.PollEvent(ptr).nonzero? && Event.to_ptr(ptr)
+      end
 
-        def pump
-          main_thread!
-          ::SDL2.SDL_PumpEvents
-        end
+      # メインスレッドから呼び出した方が良い。
+      def pump = ::SDL.PumpEvents
+
+      # イベントをキューに入れる。enq との違いは push ではイベントコールバックを起動する。
+      # 成功した場合は引数のイベントを戻す。フィルターされた場合は nil を戻す。
+      # キューに入れることが失敗したら例外が発生する。
+      def push!(event)
+        ptr = EventPointer.copy(event.to_ptr)
+        num = ::SDL.PushEvent(ptr)
+        raise RbSDL2Error if num < 0
+        num > 0 ? event : nil
+      end
 
-        # イベントをキューに入れる。enq との違いは push ではイベントコールバックを起動する。
-        # イベントがキューに入った場合は引数のイベントを戻す。フィルターされた場合は nil を戻す。
-        # キューに入れることを失敗したら例外が発生する。
-        def push(event)
-          event_copy(event) do |copy|
-            num = ::SDL2.SDL_PushEvent(copy)
-            if num > 0
-              event
-            elsif num == 0
-              nil
-            else
-              raise RbSDL2Error
-            end
-          end
+      def wait(sec = nil)
+        ptr = EventPointer.malloc
+        if sec.nil?
+          ::SDL.WaitEvent(ptr).nonzero? && Event.to_ptr(ptr)
+        elsif sec >= 0
+          ::SDL.WaitEventTimeout(ptr, sec * 1000).nonzero? && Event.to_ptr(ptr)
+        else
+          raise ArgumentError
         end
+      end
+    end
 
-        def quit?
-          pump
-          ::SDL2.SDL_HasEvent(::SDL2::SDL_QUIT) == ::SDL2::SDL_TRUE
-        end
+    # Thread::SizedQueue のように振る舞う。
 
-        require_relative 'event_filter'
+    def initialize(type = nil)
+      @min_type, @max_type = EventType.to_types(type)
+    end
 
-        # ブロックへ与えられたイベントは外に持ち出すことはできない。
-        # このメソッドは SDL のイベントキューをロックする。
-        # ブロックの戻り値が false の場合、イベントはキューから取り除かれる。
-        # userdata に渡されたオブジェクトはポインターに変換可能なものである必要がある。
-        def reject!(userdata = nil)
-          func = EventFilter.new { |event| yield(event) || (event.clear; nil) }
-          ::SDL2.SDL_FilterEvents(func, userdata)
-        end
+    attr_reader :min_type, :max_type
 
-        def wait(sec = nil)
-          main_thread!
-          event = Event.new
-          if sec.nil?
-            ::SDL2::SDL_WaitEvent(event).nonzero? && event
-          elsif sec >= 0
-            ::SDL2::SDL_WaitEventTimeout(event, sec * 1000).nonzero? && event
-          else
-            raise ArgumentError
-          end
-        end
+    def length
+      # SDL_PeepEvents に SDL_PEEKEVENT を与えた時のエラー条件
+      # - イベントシステムがシャットダウンしている場合。
+      # - イベントキューのロックが取得できない場合。
+      num = ::SDL.PeepEvents(nil, 0, ::SDL::PEEKEVENT, min_type, max_type)
+      raise RbSDL2Error if num < 0
+      num
+    end
+    alias size length
+
+    def empty? = length == 0
+
+    # 戻り値は不定（定義なし）
+    def push(event, non_block = false)
+      # SDL_PeepEvents に SDL_ADDEVENT を与えた時ののエラー条件
+      # - イベントシステムがシャットダウンしている場合。
+      # - イベントキューのロックが取得できない場合。
+      # 以下の条件の場合はエラーではなく 0 が戻る。
+      # - イベントキューのイベント数が上限に達した場合。
+      # - イベントキューが追加のメモリーが確保できない場合。
+      ptr = EventPointer.copy(event.to_ptr)
+      while ::SDL.PeepEvents(ptr, 1, ::SDL::ADDEVENT, min_type, max_type) <= 0
+        raise RbSDL2Error if non_block
+      end
+    end
+    alias << push
+    alias enq push
+
+    def pop(non_block = false)
+      ptr = EventPointer.malloc
+      # SDL_PeepEvents に SDL_GETEVENT を与えた時ののエラー条件
+      # - イベントシステムがシャットダウンしている場合。
+      # - イベントキューのロックが取得できない場合。
+      while ::SDL.PeepEvents(ptr, 1, ::SDL::GETEVENT, min_type, max_type) <= 0
+        raise RbSDL2Error if non_block
       end
+      Event.to_ptr(ptr)
     end
+    alias deq pop
+    alias shift pop
   end
 end

data/lib/rb_sdl2/event/event_type.rb

@@ -1,271 +1,213 @@
-# frozen_string_literal: true
 module RbSDL2
-  class Event
-    module EventType
-      RANGE = ::SDL2::SDL_FIRSTEVENT..::SDL2::SDL_LASTEVENT
-      EVENT_TYPES = RANGE.first.succ...::SDL2::SDL_LASTEVENT
-      COMMON_EVENT_TYPES = EVENT_TYPES.first...::SDL2::SDL_USEREVENT
-      USER_EVENT_TYPES = ::SDL2::SDL_USEREVENT...EVENT_TYPES.last
-
-      default_type = -> (_, key) do
-        case key
-        when 0 then :common
-        when COMMON_EVENT_TYPES then :common
-        when USER_EVENT_TYPES then :user
-        else raise KeyError, "(#{key})"
+  module EventType
+    COMMON_EVENT_TYPES = ::SDL::FIRSTEVENT.succ...::SDL::USEREVENT
+    USER_EVENT_TYPES = ::SDL::USEREVENT...::SDL::LASTEVENT
+
+    table = [
+      [::SDL::QUIT, ::SDL::QuitEvent, "SDL_QUIT"],
+      [::SDL::APP_TERMINATING, ::SDL::CommonEvent, "SDL_APP_TERMINATING"],
+      [::SDL::APP_LOWMEMORY, ::SDL::CommonEvent, "SDL_APP_LOWMEMORY"],
+      [::SDL::APP_WILLENTERBACKGROUND, ::SDL::CommonEvent, "SDL_APP_WILLENTERBACKGROUND"],
+      [::SDL::APP_DIDENTERBACKGROUND, ::SDL::CommonEvent, "SDL_APP_DIDENTERBACKGROUND"],
+      [::SDL::APP_WILLENTERFOREGROUND, ::SDL::CommonEvent, "SDL_APP_WILLENTERFOREGROUND"],
+      [::SDL::APP_DIDENTERFOREGROUND, ::SDL::CommonEvent, "SDL_APP_DIDENTERFOREGROUND"],
+      [::SDL::LOCALECHANGED, ::SDL::CommonEvent, "SDL_LOCALECHANGED"],
+      [::SDL::DISPLAYEVENT, ::SDL::DisplayEvent, "SDL_DISPLAYEVENT"],
+      [::SDL::WINDOWEVENT, ::SDL::WindowEvent, "SDL_WINDOWEVENT"],
+      [::SDL::SYSWMEVENT, ::SDL::SysWMEvent, "SDL_SYSWMEVENT"],
+      [::SDL::KEYDOWN, ::SDL::KeyboardEvent, "SDL_KEYDOWN"],
+      [::SDL::KEYUP, ::SDL::KeyboardEvent, "SDL_KEYUP"],
+      [::SDL::TEXTEDITING, ::SDL::TextEditingEvent, "SDL_TEXTEDITING"],
+      [::SDL::TEXTINPUT, ::SDL::TextInputEvent, "SDL_TEXTINPUT"],
+      [::SDL::KEYMAPCHANGED, ::SDL::CommonEvent, "SDL_KEYMAPCHANGED"],
+      [::SDL::TEXTEDITING_EXT, ::SDL::TextEditingExtEvent, "SDL_TEXTEDITING_EXT"],
+      [::SDL::MOUSEMOTION, ::SDL::MouseMotionEvent, "SDL_MOUSEMOTION"],
+      [::SDL::MOUSEBUTTONDOWN, ::SDL::MouseButtonEvent, "SDL_MOUSEBUTTONDOWN"],
+      [::SDL::MOUSEBUTTONUP, ::SDL::MouseButtonEvent, "SDL_MOUSEBUTTONUP"],
+      [::SDL::MOUSEWHEEL, ::SDL::MouseWheelEvent, "SDL_MOUSEWHEEL"],
+      [::SDL::JOYAXISMOTION, ::SDL::JoyAxisEvent, "SDL_JOYAXISMOTION"],
+      [::SDL::JOYBALLMOTION, ::SDL::JoyBallEvent, "SDL_JOYBALLMOTION"],
+      [::SDL::JOYHATMOTION, ::SDL::JoyHatEvent, "SDL_JOYHATMOTION"],
+      [::SDL::JOYBUTTONDOWN, ::SDL::JoyButtonEvent, "SDL_JOYBUTTONDOWN"],
+      [::SDL::JOYBUTTONUP, ::SDL::JoyButtonEvent, "SDL_JOYBUTTONUP"],
+      [::SDL::JOYDEVICEADDED, ::SDL::JoyDeviceEvent, "SDL_JOYDEVICEADDED"],
+      [::SDL::JOYDEVICEREMOVED, ::SDL::JoyDeviceEvent, "SDL_JOYDEVICEREMOVED"],
+      [::SDL::CONTROLLERAXISMOTION, ::SDL::ControllerAxisEvent, "SDL_CONTROLLERAXISMOTION"],
+      [::SDL::CONTROLLERBUTTONDOWN, ::SDL::ControllerButtonEvent, "SDL_CONTROLLERBUTTONDOWN"],
+      [::SDL::CONTROLLERBUTTONUP, ::SDL::ControllerButtonEvent, "SDL_CONTROLLERBUTTONUP"],
+      [::SDL::CONTROLLERDEVICEADDED, ::SDL::ControllerDeviceEvent, "SDL_CONTROLLERDEVICEADDED"],
+      [::SDL::CONTROLLERDEVICEREMOVED, ::SDL::ControllerDeviceEvent, "SDL_CONTROLLERDEVICEREMOVED"],
+      [::SDL::CONTROLLERDEVICEREMAPPED, ::SDL::ControllerDeviceEvent, "SDL_CONTROLLERDEVICEREMAPPED"],
+      [::SDL::CONTROLLERTOUCHPADDOWN, ::SDL::ControllerTouchpadEvent, "SDL_CONTROLLERTOUCHPADDOWN"],
+      [::SDL::CONTROLLERTOUCHPADMOTION, ::SDL::ControllerTouchpadEvent, "SDL_CONTROLLERTOUCHPADMOTION"],
+      [::SDL::CONTROLLERTOUCHPADUP, ::SDL::ControllerTouchpadEvent, "SDL_CONTROLLERTOUCHPADUP"],
+      [::SDL::CONTROLLERSENSORUPDATE, ::SDL::ControllerSensorEvent, "SDL_CONTROLLERSENSORUPDATE"],
+      [::SDL::FINGERDOWN, ::SDL::TouchFingerEvent, "SDL_FINGERDOWN"],
+      [::SDL::FINGERUP, ::SDL::TouchFingerEvent, "SDL_FINGERUP"],
+      [::SDL::FINGERMOTION, ::SDL::TouchFingerEvent, "SDL_FINGERMOTION"],
+      [::SDL::DOLLARGESTURE, ::SDL::DollarGestureEvent, "SDL_DOLLARGESTURE"],
+      [::SDL::DOLLARRECORD, ::SDL::DollarGestureEvent, "SDL_DOLLARRECORD"],
+      [::SDL::MULTIGESTURE, ::SDL::MultiGestureEvent, "SDL_MULTIGESTURE"],
+      [::SDL::CLIPBOARDUPDATE, ::SDL::CommonEvent, "SDL_CLIPBOARDUPDATE"],
+      [::SDL::DROPFILE, ::SDL::DropEvent, "SDL_DROPFILE"],
+      [::SDL::DROPTEXT, ::SDL::DropEvent, "SDL_DROPTEXT"],
+      [::SDL::DROPBEGIN, ::SDL::DropEvent, "SDL_DROPBEGIN"],
+      [::SDL::DROPCOMPLETE, ::SDL::DropEvent, "SDL_DROPCOMPLETE"],
+      [::SDL::AUDIODEVICEADDED, ::SDL::AudioDeviceEvent, "SDL_AUDIODEVICEADDED"],
+      [::SDL::AUDIODEVICEREMOVED, ::SDL::AudioDeviceEvent, "SDL_AUDIODEVICEREMOVED"],
+      [::SDL::SENSORUPDATE, ::SDL::SensorEvent, "SDL_SENSORUPDATE"],
+      [::SDL::RENDER_TARGETS_RESET, ::SDL::CommonEvent, "SDL_RENDER_TARGETS_RESET"],
+      [::SDL::RENDER_DEVICE_RESET, ::SDL::CommonEvent, "SDL_RENDER_DEVICE_RESET"],
+      [::SDL::POLLSENTINEL, ::SDL::CommonEvent, "SDL_POLLSENTINEL"],
+    ]
+
+    default_klass = -> (_, key) { USER_EVENT_TYPES === key ? ::SDL::UserEvent : ::SDL::CommonEvent }
+
+    ENTITY_MAP = Hash.new(&default_klass).merge!(table.map { |a| a.first(2) }.to_h).freeze
+
+    NAME_MAP = Hash.new.merge!(table.map { |c, _, s| [c, s.freeze] }.to_h).freeze
+
+    class << self
+      def disable(num) = ::SDL.EventState(num, ::SDL::DISABLE) == ::SDL::ENABLE
+
+      def enable(num) = ::SDL.EventState(num, ::SDL::ENABLE) == ::SDL::DISABLE
+
+      def ignore?(num) = ::SDL.EventState(num, ::SDL::QUERY) == ::SDL::IGNORE
+
+      def register_events(num)
+        if ::SDL.RegisterEvents(num) == 0xFFFFFFFF
+          raise RbSDL2Error, "unable to register user events because too many requests"
         end
       end
 
-      MEMBER_MAP = Hash.new(&default_type).merge!(
-        ::SDL2::SDL_AUDIODEVICEADDED => :adevice,
-        ::SDL2::SDL_AUDIODEVICEREMOVED => :adevice,
-        ::SDL2::SDL_DISPLAYEVENT => :display,
-        ::SDL2::SDL_KEYDOWN => :key,
-        ::SDL2::SDL_KEYUP => :key,
-        ::SDL2::SDL_CONTROLLERAXISMOTION => :caxis,
-        ::SDL2::SDL_CONTROLLERBUTTONDOWN => :cbutton,
-        ::SDL2::SDL_CONTROLLERBUTTONUP => :cbutton,
-        ::SDL2::SDL_CONTROLLERDEVICEADDED => :cdevice,
-        ::SDL2::SDL_CONTROLLERDEVICEREMAPPED => :cdevice,
-        ::SDL2::SDL_CONTROLLERDEVICEREMOVED => :cdevice,
-        ::SDL2::SDL_CONTROLLERSENSORUPDATE => :csensor,
-        ::SDL2::SDL_CONTROLLERTOUCHPADDOWN => :ctouchpad,
-        ::SDL2::SDL_CONTROLLERTOUCHPADMOTION => :ctouchpad,
-        ::SDL2::SDL_CONTROLLERTOUCHPADUP => :ctouchpad,
-        ::SDL2::SDL_DOLLARGESTURE => :dgesture,
-        ::SDL2::SDL_DOLLARRECORD => :dgesture,
-        ::SDL2::SDL_DROPBEGIN => :drop,
-        ::SDL2::SDL_DROPCOMPLETE => :drop,
-        ::SDL2::SDL_DROPFILE => :drop,
-        ::SDL2::SDL_DROPTEXT => :drop,
-        ::SDL2::SDL_FINGERDOWN => :tfinger,
-        ::SDL2::SDL_FINGERMOTION => :tfinger,
-        ::SDL2::SDL_FINGERUP => :tfinger,
-        ::SDL2::SDL_JOYAXISMOTION => :jaxis,
-        ::SDL2::SDL_JOYBALLMOTION => :jball,
-        ::SDL2::SDL_JOYBUTTONDOWN => :jbutton,
-        ::SDL2::SDL_JOYBUTTONUP => :jbutton,
-        ::SDL2::SDL_JOYDEVICEADDED => :jdevice,
-        ::SDL2::SDL_JOYDEVICEREMOVED => :jdevice,
-        ::SDL2::SDL_JOYHATMOTION => :jhat,
-        ::SDL2::SDL_MOUSEBUTTONDOWN => :button,
-        ::SDL2::SDL_MOUSEBUTTONUP => :button,
-        ::SDL2::SDL_MOUSEMOTION => :motion,
-        ::SDL2::SDL_MOUSEWHEEL => :wheel,
-        ::SDL2::SDL_MULTIGESTURE => :mgesture,
-        ::SDL2::SDL_QUIT => :quit,
-        ::SDL2::SDL_SENSORUPDATE => :sensor,
-        ::SDL2::SDL_SYSWMEVENT => :syswm,
-        ::SDL2::SDL_TEXTEDITING => :edit,
-        ::SDL2::SDL_TEXTINPUT => :text,
-        ::SDL2::SDL_WINDOWEVENT => :window,
-      ).freeze
-
-      default_name = -> (_, key) do
-        case key
-        when 0 then ""
-        when COMMON_EVENT_TYPES then "common_event"
-        when USER_EVENT_TYPES then "user_event"
-        else raise KeyError, "(#{key})"
+      def to_name(num)
+        case num
+        when COMMON_EVENT_TYPES then NAME_MAP[num]
+        when USER_EVENT_TYPES then "SDL_USEREVENT".freeze
+        else nil
         end
       end
 
-      @name_map = Hash.new(&default_name).merge!(
-        ::SDL2::SDL_APP_DIDENTERBACKGROUND => "app_did_enter_background",
-        ::SDL2::SDL_APP_DIDENTERFOREGROUND => "app_did_enter_foreground",
-        ::SDL2::SDL_APP_LOWMEMORY => "app_low_memory",
-        ::SDL2::SDL_APP_TERMINATING => "app_terminating",
-        ::SDL2::SDL_APP_WILLENTERBACKGROUND => "app_will_enter_background",
-        ::SDL2::SDL_APP_WILLENTERFOREGROUND => "app_will_enter_foreground",
-        ::SDL2::SDL_AUDIODEVICEADDED => "audio_device_added",
-        ::SDL2::SDL_AUDIODEVICEREMOVED => "audio_device_removed",
-        ::SDL2::SDL_CLIPBOARDUPDATE => "clipboard_update",
-        ::SDL2::SDL_CONTROLLERAXISMOTION => "controller_axis_motion",
-        ::SDL2::SDL_CONTROLLERBUTTONDOWN => "controller_button_down",
-        ::SDL2::SDL_CONTROLLERBUTTONUP => "controller_button_up",
-        ::SDL2::SDL_CONTROLLERDEVICEADDED => "controller_device_added",
-        ::SDL2::SDL_CONTROLLERDEVICEREMAPPED => "controller_device_remapped",
-        ::SDL2::SDL_CONTROLLERDEVICEREMOVED => "controller_device_removed",
-        ::SDL2::SDL_CONTROLLERSENSORUPDATE => "controller_sensor_update",
-        ::SDL2::SDL_CONTROLLERTOUCHPADDOWN => "controller_touchpad_down",
-        ::SDL2::SDL_CONTROLLERTOUCHPADMOTION => "controller_touchpad_motion",
-        ::SDL2::SDL_CONTROLLERTOUCHPADUP => "controller_touchpad_up",
-        ::SDL2::SDL_DISPLAYEVENT => "display_event",
-        ::SDL2::SDL_DOLLARGESTURE => "dollar_gesture",
-        ::SDL2::SDL_DOLLARRECORD => "dollar_record",
-        ::SDL2::SDL_DROPBEGIN => "drop_begin",
-        ::SDL2::SDL_DROPCOMPLETE => "drop_complete",
-        ::SDL2::SDL_DROPFILE => "drop_file",
-        ::SDL2::SDL_DROPTEXT => "drop_text",
-        ::SDL2::SDL_FINGERDOWN => "finger_down",
-        ::SDL2::SDL_FINGERUP => "finger_up",
-        ::SDL2::SDL_FINGERMOTION => "finger_motion",
-        ::SDL2::SDL_JOYAXISMOTION => "joy_axis_motion",
-        ::SDL2::SDL_JOYBALLMOTION => "joy_ball_motion",
-        ::SDL2::SDL_JOYBUTTONDOWN => "joy_button_down",
-        ::SDL2::SDL_JOYBUTTONUP => "joy_button_up",
-        ::SDL2::SDL_JOYDEVICEADDED => "joy_device_added",
-        ::SDL2::SDL_JOYDEVICEREMOVED => "joy_device_removed",
-        ::SDL2::SDL_JOYHATMOTION => "joy_hat_motion",
-        ::SDL2::SDL_KEYDOWN => "key_down",
-        ::SDL2::SDL_KEYUP => "key_up",
-        ::SDL2::SDL_KEYMAPCHANGED => "keymap_changed",
-        ::SDL2::SDL_LOCALECHANGED => "locale_changed",
-        ::SDL2::SDL_MULTIGESTURE => "multi_gesture",
-        ::SDL2::SDL_MOUSEBUTTONDOWN => "mouse_button_down",
-        ::SDL2::SDL_MOUSEBUTTONUP => "mouse_button_up",
-        ::SDL2::SDL_MOUSEMOTION => "mouse_motion",
-        ::SDL2::SDL_MOUSEWHEEL =>  "mouse_wheel",
-        ::SDL2::SDL_QUIT => "quit",
-        ::SDL2::SDL_RENDER_DEVICE_RESET => "render_device_reset",
-        ::SDL2::SDL_RENDER_TARGETS_RESET => "render_targets_reset",
-        ::SDL2::SDL_SENSORUPDATE => "sensor_update",
-        ::SDL2::SDL_SYSWMEVENT => "sys_wm_event",
-        ::SDL2::SDL_TEXTEDITING => "text_editing",
-        ::SDL2::SDL_TEXTINPUT => "text_input",
-        ::SDL2::SDL_WINDOWEVENT => "window_event",
-      )
-
-      @mutex = Mutex.new
-
-      class << self
-        def define_user_event(name = "user_event")
-          @mutex.synchronize do
-            num = ::SDL2::SDL_RegisterEvents(1)
-            if num == 0xFFFFFFFF
-              raise RbSDL2Error, "unable to register user events because too many requests"
-            end
-            @name_map[num] = name
-            num
-          end
+      def to_types(obj)
+        case obj
+        when nil then [::SDL::FIRSTEVENT, ::SDL::LASTEVENT]
+        when Integer then [obj, obj]
+        when Range then obj.minmax
+        else raise ArgumentError
         end
+      end
+    end
 
-        def disable(type) = ::SDL2.SDL_EventState(type, ::SDL2::SDL_DISABLE) == ::SDL2::SDL_ENABLE
-
-        def enable(type) = ::SDL2.SDL_EventState(type, ::SDL2::SDL_ENABLE) == ::SDL2::SDL_DISABLE
-
-        def ignore?(type) = ::SDL2.SDL_EventState(type, ::SDL2::SDL_QUERY) == ::SDL2::SDL_IGNORE
-
-        def minmax = RANGE.minmax
-
-        def to_name(num) = @name_map[num]
-
-        def to_num(obj)
-          num =  @name_map.key(obj.to_s)
-          raise ArgumentError unless num
-          num
-        end
+    def app_did_enter_background? = ::SDL::APP_DIDENTERBACKGROUND == type
 
-        def to_type(num) = MEMBER_MAP[num]
-      end
+    def app_did_enter_foreground? = ::SDL::APP_DIDENTERFOREGROUND == type
 
-      def app_did_enter_background? = ::SDL2::SDL_APP_DIDENTERBACKGROUND == type
+    def app_low_memory? = ::SDL::APP_LOWMEMORY == type
 
-      def app_did_enter_foreground? = ::SDL2::SDL_APP_DIDENTERFOREGROUND == type
+    def app_terminating? = ::SDL::APP_TERMINATING == type
 
-      def app_low_memory? = ::SDL2::SDL_APP_LOWMEMORY == type
+    def app_will_enter_background? = ::SDL::APP_WILLENTERBACKGROUND == type
 
-      def app_terminating? = ::SDL2::SDL_APP_TERMINATING == type
+    def app_will_enter_foreground? = ::SDL::APP_WILLENTERFOREGROUND == type
 
-      def app_will_enter_background? = ::SDL2::SDL_APP_WILLENTERBACKGROUND == type
+    def audio_device_added? = ::SDL::AUDIODEVICEADDED == type
 
-      def app_will_enter_foreground? = ::SDL2::SDL_APP_WILLENTERFOREGROUND == type
+    def audio_device_removed? = ::SDL::AUDIODEVICEREMOVED == type
 
-      def audio_device_added? = ::SDL2::SDL_AUDIODEVICEADDED == type
+    def clipboard_update? = ::SDL::CLIPBOARDUPDATE == type
 
-      def audio_device_removed? = ::SDL2::SDL_AUDIODEVICEREMOVED == type
+    def controller_axis_motion? = ::SDL::CONTROLLERAXISMOTION == type
 
-      def clipboard_update? = ::SDL2::SDL_CLIPBOARDUPDATE == type
+    def controller_button_down? = ::SDL::CONTROLLERBUTTONDOWN == type
 
-      def controller_axis_motion? = ::SDL2::SDL_CONTROLLERAXISMOTION == type
+    def controller_button_up? = ::SDL::CONTROLLERBUTTONUP == type
 
-      def controller_button_down? = ::SDL2::SDL_CONTROLLERBUTTONDOWN == type
+    def controller_device_added? = ::SDL::CONTROLLERDEVICEADDED == type
 
-      def controller_button_up? = ::SDL2::SDL_CONTROLLERBUTTONUP == type
+    def controller_device_remapped? = ::SDL::CONTROLLERDEVICEREMAPPED == type
 
-      def controller_device_added? = ::SDL2::SDL_CONTROLLERDEVICEADDED == type
+    def controller_device_removed? = ::SDL::CONTROLLERDEVICEREMOVED == type
 
-      def controller_device_remapped? = ::SDL2::SDL_CONTROLLERDEVICEREMAPPED == type
+    def controller_sensor_update? = ::SDL::CONTROLLERSENSORUPDATE == type
 
-      def controller_device_removed? = ::SDL2::SDL_CONTROLLERDEVICEREMOVED == type
+    def controller_touchpad_down? = ::SDL::CONTROLLERTOUCHPADDOWN == type
 
-      def controller_sensor_update? = ::SDL2::SDL_CONTROLLERSENSORUPDATE == type
+    def controller_touchpad_motion? = ::SDL::CONTROLLERTOUCHPADMOTION == type
 
-      def controller_touchpad_down? = ::SDL2::SDL_CONTROLLERTOUCHPADDOWN == type
+    def controller_touchpad_up? = ::SDL::CONTROLLERTOUCHPADUP == type
 
-      def controller_touchpad_motion? = ::SDL2::SDL_CONTROLLERTOUCHPADMOTION == type
+    def display_event? = ::SDL::DISPLAYEVENT == type
 
-      def controller_touchpad_up? = ::SDL2::SDL_CONTROLLERTOUCHPADUP == type
+    def dollar_gesture? = ::SDL::DOLLARGESTURE == type
 
-      def display_event? = ::SDL2::SDL_DISPLAYEVENT == type
+    def dollar_record? = ::SDL::DOLLARRECORD == type
 
-      def dollar_gesture? = ::SDL2::SDL_DOLLARGESTURE == type
+    def drop_begin? = ::SDL::DROPBEGIN == type
 
-      def dollar_record? = ::SDL2::SDL_DOLLARRECORD == type
+    def drop_complete? = ::SDL::DROPCOMPLETE == type
 
-      def drop_begin? = ::SDL2::SDL_DROPBEGIN == type
+    def drop_file? = ::SDL::DROPFILE == type
 
-      def drop_complete? = ::SDL2::SDL_DROPCOMPLETE == type
+    def drop_text? = ::SDL::DROPTEXT == type
 
-      def drop_file? = ::SDL2::SDL_DROPFILE == type
+    def finger_down? = ::SDL::FINGERDOWN == type
 
-      def drop_text? = ::SDL2::SDL_DROPTEXT == type
+    def finger_motion? = ::SDL::FINGERMOTION == type
 
-      def finger_down? = ::SDL2::SDL_FINGERDOWN == type
+    def finger_up? = ::SDL::FINGERUP == type
 
-      def finger_up? = ::SDL2::SDL_FINGERUP == type
+    def joy_axis_motion? = ::SDL::JOYAXISMOTION == type
 
-      def finger_motion? = ::SDL2::SDL_FINGERMOTION == type
+    def joy_ball_motion? = ::SDL::JOYBALLMOTION == type
 
-      def joy_axis_motion? = ::SDL2::SDL_JOYAXISMOTION == type
+    def joy_button_down? = ::SDL::JOYBUTTONDOWN == type
 
-      def joy_ball_motion? = ::SDL2::SDL_JOYBALLMOTION == type
+    def joy_button_up? = ::SDL::JOYBUTTONUP == type
 
-      def joy_button_down? = ::SDL2::SDL_JOYBUTTONDOWN == type
+    def joy_device_added? = ::SDL::JOYDEVICEADDED == type
 
-      def joy_button_up? = ::SDL2::SDL_JOYBUTTONUP == type
+    def joy_device_removed? = ::SDL::JOYDEVICEREMOVED == type
 
-      def joy_device_added? = ::SDL2::SDL_JOYDEVICEADDED == type
+    def joy_hat_motion? = ::SDL::JOYHATMOTION == type
 
-      def joy_device_removed? = ::SDL2::SDL_JOYDEVICEREMOVED == type
+    def key_down? = ::SDL::KEYDOWN == type
 
-      def joy_hat_motion? = ::SDL2::SDL_JOYHATMOTION == type
+    def key_up? = ::SDL::KEYUP == type
 
-      def key_down? = ::SDL2::SDL_KEYDOWN == type
+    def keymap_changed? = ::SDL::KEYMAPCHANGED == type
 
-      def key_up? = ::SDL2::SDL_KEYUP == type
+    def locale_changed? = ::SDL::LOCALECHANGED == type
 
-      def keymap_changed? = ::SDL2::SDL_KEYMAPCHANGED == type
+    def multi_gesture? = ::SDL::MULTIGESTURE == type
 
-      def locale_changed? = ::SDL2::SDL_LOCALECHANGED == type
+    def mouse_button_down? = ::SDL::MOUSEBUTTONDOWN == type
 
-      def multi_gesture? = ::SDL2::SDL_MULTIGESTURE == type
+    def mouse_button_up? = ::SDL::MOUSEBUTTONUP == type
 
-      def mouse_button_down? = ::SDL2::SDL_MOUSEBUTTONDOWN == type
+    def mouse_motion? = ::SDL::MOUSEMOTION == type
 
-      def mouse_button_up? = ::SDL2::SDL_MOUSEBUTTONUP == type
+    def mouse_wheel? = ::SDL::MOUSEWHEEL == type
 
-      def mouse_motion? = ::SDL2::SDL_MOUSEMOTION == type
+    def poll_sentinel? = ::SDL::POLLSENTINEL == type
 
-      def mouse_wheel? = ::SDL2::SDL_MOUSEWHEEL == type
+    def quit? = ::SDL::QUIT == type
 
-      def quit? = ::SDL2::SDL_QUIT == type
+    def render_device_reset? = ::SDL::RENDER_DEVICE_RESET == type
 
-      def render_device_reset? = ::SDL2::SDL_RENDER_DEVICE_RESET == type
+    def render_targets_reset? = ::SDL::RENDER_TARGETS_RESET == type
 
-      def render_targets_reset? = ::SDL2::SDL_RENDER_TARGETS_RESET == type
+    def sensor_update? = ::SDL::SENSORUPDATE == type
 
-      def sensor_update? = ::SDL2::SDL_SENSORUPDATE == type
+    def sys_wm_event? = ::SDL::SYSWMEVENT == type
 
-      def sys_wm_event? = ::SDL2::SDL_SYSWMEVENT == type
+    def text_editing? = ::SDL::TEXTEDITING == type
 
-      def text_editing? = ::SDL2::SDL_TEXTEDITING == type
+    def text_editing_ext? = ::SDL::TEXTEDITING_EXT == type
 
-      def text_input? = ::SDL2::SDL_TEXTINPUT == type
+    def text_input? = ::SDL::TEXTINPUT == type
 
-      def user_event? = USER_EVENT_TYPES === type
+    def user_event? = USER_EVENT_TYPES === type
 
-      def window_event? = ::SDL2::SDL_WINDOWEVENT == type
-    end
+    def window_event? = ::SDL::WINDOWEVENT == type
   end
 end