sdl2-bindings 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc41473b40349f4dfa868a8ad8d9dc898fe0b9f41e4e86f1a0c1b15039722efb
-  data.tar.gz: 41171d056bf4d1ff5c3a7f7bced34e55d7c438644fdfecc4db1295c4ce12f832
+  metadata.gz: 1a7696c9c474d021291dc6b99dd2320cecdb9731ad3d2988a18b7290234d6edf
+  data.tar.gz: aec02f42298c782d35a7e9ca72a5ac4d160b065ac044077fdd414916fb742f62
 SHA512:
-  metadata.gz: 5a9371b3e04d5900aea10ce55689cfcffda6e65f882ccf043be298bf2aea79d18e0539dc0a20189253321490380cb97b25f439621062329ff04dc148b7f7a763
-  data.tar.gz: 3fd4acac367c289f626cd9c92f5746e08f5bf7252e59a71d56a12fb76971b063738b2bd34da9e363200757833a6310ac3eb20fa04c39a46fb770008d49a0a711
+  metadata.gz: 5260b13b50746a68fc01c8a0d84348dd7c659b1d6f42b69a4e0a730259dc7eb262fec1df113d4a5d2c732479125821f658e29fa6e738fe9052af059d1b329eba
+  data.tar.gz: 2244659492a5427f6d744ff58b257bb3dc4f11eaa33a829cd6166065b0f4a85f45ffd808a0d6133de74259dbd7b5d14839563648fe349fead4a3471fef0b5693

data/ChangeLog

@@ -1,6 +1,31 @@
+2021-08-12  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* Added SDL 2.0.14 features (SDL_misc).
+	* Added SDL 2.0.16 features (SDL_sensor).
+
+2021-02-21  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* Added defines from Audio, Mixer and TTF
+
+2020-12-27  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* Added SDL 2.0.14 features.
+	* third_party/sdl2_build_dll.sh: Added to build x64 DLL for Windows
+	* test/util.rb: Added
+
+2020-12-20  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* third_party/sdl2_build_dylib.sh: Added to build x86_64|arm64 Universal Binary
+
+2020-06-08  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* lib/sdl2_syswm.rb: Added
+	* lib/sdl2_hints.rb: Added hint string symboles
+
 2020-03-22  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* Added SDL 2.0.12 features.
+	* Generate callback types correctly.
 
 2019-10-27  vaiorabbit  <http://twitter.com/vaiorabbit>
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 sdl2-bindings : Yet another SDL2 wrapper for Ruby
-Copyright (c) 2015-2020 vaiorabbit <http://twitter.com/vaiorabbit>
+Copyright (c) 2015-2021 vaiorabbit <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/README.md

@@ -5,7 +5,7 @@
 [Notice] Experimental project.
 
 *   Created : 2015-09-19
-*   Last modified : 2020-03-22
+*   Last modified : 2021-08-12
 
 ## Features ##
 
@@ -30,13 +30,17 @@
     *   sdl2_ttf : 2.0.13
 *   [2019-08-31] SDL 2.0.10 (Installed via Homebrew)
 *   [2020-03-22] SDL 2.0.12 (Installed via Homebrew)
+*   [2020-12-27] SDL 2.0.14 (Installed via Homebrew)
+    *   macOS Big Sur (11.0.1), ruby 3.0.0p0 (2020-12-25 revision 95aff21468) [arm64-darwin20]
+*   [2021-08-12] SDL 2.0.16 (Installed via Homebrew)
+    *   macOS Big Sur (11.5), ruby 3.0.1p64 (2021-04-05 revision 0fb782ee38) [arm64-darwin20]
 
 ## License ##
 
 The zlib/libpng License ( http://opensource.org/licenses/Zlib ).
 
     sdl2-bindings : Yet another SDL2 wrapper for Ruby
-    Copyright (c) 2015-2020 vaiorabbit <http://twitter.com/vaiorabbit>
+    Copyright (c) 2015-2021 vaiorabbit <http://twitter.com/vaiorabbit>
 
     This software is provided 'as-is', without any express or implied
     warranty. In no event will the authors be held liable for any damages

data/lib/sdl2.rb

@@ -20,6 +20,7 @@ require_relative 'sdl2_keyboard.rb'
 require_relative 'sdl2_keycode.rb'
 require_relative 'sdl2_log.rb'
 require_relative 'sdl2_messagebox.rb'
+require_relative 'sdl2_misc.rb'
 require_relative 'sdl2_mouse.rb'
 require_relative 'sdl2_pixels.rb'
 require_relative 'sdl2_platform.rb'
@@ -28,9 +29,11 @@ require_relative 'sdl2_rect.rb'
 require_relative 'sdl2_render.rb'
 require_relative 'sdl2_rwops.rb'
 require_relative 'sdl2_scancode.rb'
+require_relative 'sdl2_sensor.rb'
 require_relative 'sdl2_shape.rb'
 require_relative 'sdl2_stdinc.rb'
 require_relative 'sdl2_surface.rb'
+require_relative 'sdl2_syswm.rb'
 require_relative 'sdl2_timer.rb'
 require_relative 'sdl2_touch.rb'
 require_relative 'sdl2_version.rb'
@@ -104,6 +107,7 @@ module SDL2
     setup_keycode_symbols()
     setup_log_symbols()
     setup_messagebox_symbols()
+    setup_misc_symbols()
     setup_mouse_symbols()
     setup_pixels_symbols()
     setup_platform_symbols()
@@ -112,8 +116,10 @@ module SDL2
     setup_render_symbols()
     setup_rwops_symbols()
     setup_scancode_symbols()
+    setup_sensor_symbols()
     setup_shape_symbols()
     setup_surface_symbols()
+    setup_syswm_symbols()
     setup_stdinc_symbols()
     setup_timer_symbols()
     setup_touch_symbols()
@@ -126,12 +132,10 @@ end
 
 
 if __FILE__ == $0
-#  SDL2.load_lib('libSDL2.dylib')
-#  p SDL2.SDL_Init(SDL2::SDL_INIT_EVERYTHING)
   SDL2.load_lib('libSDL2.dylib',
                 gfx_libpath: '/usr/local/lib/libSDL2_gfx.dylib'
                )
-  #SDL2.SDL_SetMainReady()
+
   success = SDL2.SDL_Init(SDL2::SDL_INIT_EVERYTHING)
   exit if success < 0
 

data/lib/sdl2_audio.rb

@@ -14,10 +14,29 @@ module SDL2
   SDL_AUDIO_MASK_DATATYPE = (1 << 8)
   SDL_AUDIO_MASK_ENDIAN = (1 << 12)
   SDL_AUDIO_MASK_SIGNED = (1 << 15)
+  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
+  AUDIO_U16SYS = AUDIO_U16LSB
+  AUDIO_S16SYS = AUDIO_S16LSB
+  AUDIO_S32SYS = AUDIO_S32LSB
+  AUDIO_F32SYS = AUDIO_F32LSB
   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)
   SDL_AUDIOCVT_MAX_FILTERS = 9
   SDL_MIX_MAXVOLUME = 128
 
@@ -80,6 +99,7 @@ module SDL2
       :SDL_OpenAudio,
       :SDL_GetNumAudioDevices,
       :SDL_GetAudioDeviceName,
+      :SDL_GetAudioDeviceSpec,
       :SDL_OpenAudioDevice,
       :SDL_GetAudioStatus,
       :SDL_GetAudioDeviceStatus,
@@ -118,6 +138,7 @@ module SDL2
       :SDL_OpenAudio => [:pointer, :pointer],
       :SDL_GetNumAudioDevices => [:int],
       :SDL_GetAudioDeviceName => [:int, :int],
+      :SDL_GetAudioDeviceSpec => [:int, :int, :pointer],
       :SDL_OpenAudioDevice => [:pointer, :int, :pointer, :pointer, :int],
       :SDL_GetAudioStatus => [],
       :SDL_GetAudioDeviceStatus => [:uint],
@@ -156,6 +177,7 @@ module SDL2
       :SDL_OpenAudio => :int,
       :SDL_GetNumAudioDevices => :int,
       :SDL_GetAudioDeviceName => :pointer,
+      :SDL_GetAudioDeviceSpec => :int,
       :SDL_OpenAudioDevice => :uint,
       :SDL_GetAudioStatus => :int,
       :SDL_GetAudioDeviceStatus => :int,

data/lib/sdl2_cpuinfo.rb

@@ -44,6 +44,7 @@ module SDL2
       :SDL_GetSystemRAM,
       :SDL_SIMDGetAlignment,
       :SDL_SIMDAlloc,
+      :SDL_SIMDRealloc,
       :SDL_SIMDFree,
     ]
     args = {
@@ -66,6 +67,7 @@ module SDL2
       :SDL_GetSystemRAM => [],
       :SDL_SIMDGetAlignment => [],
       :SDL_SIMDAlloc => [:ulong],
+      :SDL_SIMDRealloc => [:pointer, :ulong],
       :SDL_SIMDFree => [:pointer],
     }
     retvals = {
@@ -88,6 +90,7 @@ module SDL2
       :SDL_GetSystemRAM => :int,
       :SDL_SIMDGetAlignment => :size_t,
       :SDL_SIMDAlloc => :pointer,
+      :SDL_SIMDRealloc => :pointer,
       :SDL_SIMDFree => :void,
     }
     symbols.each do |sym|

data/lib/sdl2_error.rb

@@ -33,18 +33,21 @@ module SDL2
     symbols = [
       :SDL_SetError,
       :SDL_GetError,
+      :SDL_GetErrorMsg,
       :SDL_ClearError,
       :SDL_Error,
     ]
     args = {
       :SDL_SetError => [:pointer],
       :SDL_GetError => [],
+      :SDL_GetErrorMsg => [:pointer, :int],
       :SDL_ClearError => [],
       :SDL_Error => [:int],
     }
     retvals = {
       :SDL_SetError => :int,
       :SDL_GetError => :pointer,
+      :SDL_GetErrorMsg => :pointer,
       :SDL_ClearError => :void,
       :SDL_Error => :int,
     }

data/lib/sdl2_events.rb

@@ -14,7 +14,7 @@ module SDL2
   SDL_RELEASED = 0
   SDL_PRESSED = 1
   SDL_TEXTEDITINGEVENT_TEXT_SIZE = 32
-  SDL_TEXTINPUTEVENT_TEXT_SIZE = 2
+  SDL_TEXTINPUTEVENT_TEXT_SIZE = 32
   SDL_QUERY = -1
   SDL_IGNORE = 0
   SDL_DISABLE = 0
@@ -30,6 +30,7 @@ module SDL2
   SDL_APP_DIDENTERBACKGROUND = 260
   SDL_APP_WILLENTERFOREGROUND = 261
   SDL_APP_DIDENTERFOREGROUND = 262
+  SDL_LOCALECHANGED = 263
   SDL_DISPLAYEVENT = 336
   SDL_WINDOWEVENT = 512
   SDL_SYSWMEVENT = 513
@@ -55,6 +56,10 @@ module SDL2
   SDL_CONTROLLERDEVICEADDED = 1619
   SDL_CONTROLLERDEVICEREMOVED = 1620
   SDL_CONTROLLERDEVICEREMAPPED = 1621
+  SDL_CONTROLLERTOUCHPADDOWN = 1622
+  SDL_CONTROLLERTOUCHPADMOTION = 1623
+  SDL_CONTROLLERTOUCHPADUP = 1624
+  SDL_CONTROLLERSENSORUPDATE = 1625
   SDL_FINGERDOWN = 1792
   SDL_FINGERUP = 1793
   SDL_FINGERMOTION = 1794
@@ -288,6 +293,29 @@ module SDL2
     )
   end
 
+  class SDL_ControllerTouchpadEvent < FFI::Struct
+    layout(
+      :type, :uint,
+      :timestamp, :uint,
+      :which, :int,
+      :touchpad, :int,
+      :finger, :int,
+      :x, :float,
+      :y, :float,
+      :pressure, :float,
+    )
+  end
+
+  class SDL_ControllerSensorEvent < FFI::Struct
+    layout(
+      :type, :uint,
+      :timestamp, :uint,
+      :which, :int,
+      :sensor, :int,
+      :data, [:float, 3],
+    )
+  end
+
   class SDL_AudioDeviceEvent < FFI::Struct
     layout(
       :type, :uint,
@@ -413,6 +441,8 @@ module SDL2
       :caxis, SDL_ControllerAxisEvent,
       :cbutton, SDL_ControllerButtonEvent,
       :cdevice, SDL_ControllerDeviceEvent,
+      :ctouchpad, SDL_ControllerTouchpadEvent,
+      :csensor, SDL_ControllerSensorEvent,
       :adevice, SDL_AudioDeviceEvent,
       :sensor, SDL_SensorEvent,
       :quit, SDL_QuitEvent,
@@ -460,11 +490,11 @@ module SDL2
       :SDL_WaitEvent => [:pointer],
       :SDL_WaitEventTimeout => [:pointer, :int],
       :SDL_PushEvent => [:pointer],
-      :SDL_SetEventFilter => [:pointer, :pointer],
+      :SDL_SetEventFilter => [:SDL_EventFilter, :pointer],
       :SDL_GetEventFilter => [:pointer, :pointer],
-      :SDL_AddEventWatch => [:pointer, :pointer],
-      :SDL_DelEventWatch => [:pointer, :pointer],
-      :SDL_FilterEvents => [:pointer, :pointer],
+      :SDL_AddEventWatch => [:SDL_EventFilter, :pointer],
+      :SDL_DelEventWatch => [:SDL_EventFilter, :pointer],
+      :SDL_FilterEvents => [:SDL_EventFilter, :pointer],
       :SDL_EventState => [:uint, :int],
       :SDL_RegisterEvents => [:int],
     }

data/lib/sdl2_gamecontroller.rb

@@ -20,6 +20,10 @@ module SDL2
   SDL_CONTROLLER_TYPE_PS3 = 3
   SDL_CONTROLLER_TYPE_PS4 = 4
   SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO = 5
+  SDL_CONTROLLER_TYPE_VIRTUAL = 6
+  SDL_CONTROLLER_TYPE_PS5 = 7
+  SDL_CONTROLLER_TYPE_AMAZON_LUNA = 8
+  SDL_CONTROLLER_TYPE_GOOGLE_STADIA = 9
   SDL_CONTROLLER_BINDTYPE_NONE = 0
   SDL_CONTROLLER_BINDTYPE_BUTTON = 1
   SDL_CONTROLLER_BINDTYPE_AXIS = 2
@@ -48,7 +52,13 @@ module SDL2
   SDL_CONTROLLER_BUTTON_DPAD_DOWN = 12
   SDL_CONTROLLER_BUTTON_DPAD_LEFT = 13
   SDL_CONTROLLER_BUTTON_DPAD_RIGHT = 14
-  SDL_CONTROLLER_BUTTON_MAX = 15
+  SDL_CONTROLLER_BUTTON_MISC1 = 15
+  SDL_CONTROLLER_BUTTON_PADDLE1 = 16
+  SDL_CONTROLLER_BUTTON_PADDLE2 = 17
+  SDL_CONTROLLER_BUTTON_PADDLE3 = 18
+  SDL_CONTROLLER_BUTTON_PADDLE4 = 19
+  SDL_CONTROLLER_BUTTON_TOUCHPAD = 20
+  SDL_CONTROLLER_BUTTON_MAX = 21
 
   # Typedef
 
@@ -107,6 +117,7 @@ module SDL2
       :SDL_GameControllerGetVendor,
       :SDL_GameControllerGetProduct,
       :SDL_GameControllerGetProductVersion,
+      :SDL_GameControllerGetSerial,
       :SDL_GameControllerGetAttached,
       :SDL_GameControllerGetJoystick,
       :SDL_GameControllerEventState,
@@ -114,12 +125,26 @@ module SDL2
       :SDL_GameControllerGetAxisFromString,
       :SDL_GameControllerGetStringForAxis,
       :SDL_GameControllerGetBindForAxis,
+      :SDL_GameControllerHasAxis,
       :SDL_GameControllerGetAxis,
       :SDL_GameControllerGetButtonFromString,
       :SDL_GameControllerGetStringForButton,
       :SDL_GameControllerGetBindForButton,
+      :SDL_GameControllerHasButton,
       :SDL_GameControllerGetButton,
+      :SDL_GameControllerGetNumTouchpads,
+      :SDL_GameControllerGetNumTouchpadFingers,
+      :SDL_GameControllerGetTouchpadFinger,
+      :SDL_GameControllerHasSensor,
+      :SDL_GameControllerSetSensorEnabled,
+      :SDL_GameControllerIsSensorEnabled,
+      :SDL_GameControllerGetSensorDataRate,
+      :SDL_GameControllerGetSensorData,
       :SDL_GameControllerRumble,
+      :SDL_GameControllerRumbleTriggers,
+      :SDL_GameControllerHasLED,
+      :SDL_GameControllerSetLED,
+      :SDL_GameControllerSendEffect,
       :SDL_GameControllerClose,
     ]
     args = {
@@ -143,6 +168,7 @@ module SDL2
       :SDL_GameControllerGetVendor => [:pointer],
       :SDL_GameControllerGetProduct => [:pointer],
       :SDL_GameControllerGetProductVersion => [:pointer],
+      :SDL_GameControllerGetSerial => [:pointer],
       :SDL_GameControllerGetAttached => [:pointer],
       :SDL_GameControllerGetJoystick => [:pointer],
       :SDL_GameControllerEventState => [:int],
@@ -150,12 +176,26 @@ module SDL2
       :SDL_GameControllerGetAxisFromString => [:pointer],
       :SDL_GameControllerGetStringForAxis => [:int],
       :SDL_GameControllerGetBindForAxis => [:pointer, :int],
+      :SDL_GameControllerHasAxis => [:pointer, :int],
       :SDL_GameControllerGetAxis => [:pointer, :int],
       :SDL_GameControllerGetButtonFromString => [:pointer],
       :SDL_GameControllerGetStringForButton => [:int],
       :SDL_GameControllerGetBindForButton => [:pointer, :int],
+      :SDL_GameControllerHasButton => [:pointer, :int],
       :SDL_GameControllerGetButton => [:pointer, :int],
+      :SDL_GameControllerGetNumTouchpads => [:pointer],
+      :SDL_GameControllerGetNumTouchpadFingers => [:pointer, :int],
+      :SDL_GameControllerGetTouchpadFinger => [:pointer, :int, :int, :pointer, :pointer, :pointer, :pointer],
+      :SDL_GameControllerHasSensor => [:pointer, :int],
+      :SDL_GameControllerSetSensorEnabled => [:pointer, :int, :int],
+      :SDL_GameControllerIsSensorEnabled => [:pointer, :int],
+      :SDL_GameControllerGetSensorDataRate => [:pointer, :int],
+      :SDL_GameControllerGetSensorData => [:pointer, :int, :pointer, :int],
       :SDL_GameControllerRumble => [:pointer, :ushort, :ushort, :uint],
+      :SDL_GameControllerRumbleTriggers => [:pointer, :ushort, :ushort, :uint],
+      :SDL_GameControllerHasLED => [:pointer],
+      :SDL_GameControllerSetLED => [:pointer, :uchar, :uchar, :uchar],
+      :SDL_GameControllerSendEffect => [:pointer, :pointer, :int],
       :SDL_GameControllerClose => [:pointer],
     }
     retvals = {
@@ -179,6 +219,7 @@ module SDL2
       :SDL_GameControllerGetVendor => :ushort,
       :SDL_GameControllerGetProduct => :ushort,
       :SDL_GameControllerGetProductVersion => :ushort,
+      :SDL_GameControllerGetSerial => :pointer,
       :SDL_GameControllerGetAttached => :int,
       :SDL_GameControllerGetJoystick => :pointer,
       :SDL_GameControllerEventState => :int,
@@ -186,12 +227,26 @@ module SDL2
       :SDL_GameControllerGetAxisFromString => :int,
       :SDL_GameControllerGetStringForAxis => :pointer,
       :SDL_GameControllerGetBindForAxis => SDL_GameControllerButtonBind,
+      :SDL_GameControllerHasAxis => :int,
       :SDL_GameControllerGetAxis => :short,
       :SDL_GameControllerGetButtonFromString => :int,
       :SDL_GameControllerGetStringForButton => :pointer,
       :SDL_GameControllerGetBindForButton => SDL_GameControllerButtonBind,
+      :SDL_GameControllerHasButton => :int,
       :SDL_GameControllerGetButton => :uchar,
+      :SDL_GameControllerGetNumTouchpads => :int,
+      :SDL_GameControllerGetNumTouchpadFingers => :int,
+      :SDL_GameControllerGetTouchpadFinger => :int,
+      :SDL_GameControllerHasSensor => :int,
+      :SDL_GameControllerSetSensorEnabled => :int,
+      :SDL_GameControllerIsSensorEnabled => :int,
+      :SDL_GameControllerGetSensorDataRate => :float,
+      :SDL_GameControllerGetSensorData => :int,
       :SDL_GameControllerRumble => :int,
+      :SDL_GameControllerRumbleTriggers => :int,
+      :SDL_GameControllerHasLED => :int,
+      :SDL_GameControllerSetLED => :int,
+      :SDL_GameControllerSendEffect => :int,
       :SDL_GameControllerClose => :void,
     }
     symbols.each do |sym|

data/lib/sdl2_haptic.rb

@@ -29,6 +29,7 @@ module SDL2
   SDL_HAPTIC_POLAR = 0
   SDL_HAPTIC_CARTESIAN = 1
   SDL_HAPTIC_SPHERICAL = 2
+  SDL_HAPTIC_STEERING_AXIS = 3
   SDL_HAPTIC_INFINITY = 4294967295
 
   # Enum