sdl2-bindings 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 242c868e9ed8436d88f8e890290d5ff8226bb9a4a4fd62f9a4edae7606000170
-  data.tar.gz: 024c6b09bbbaafa2c22f877b63981c633b2dff91fa1f545994d6a18a1c26b3a7
+  metadata.gz: 533feab6661f4f13ec028b62c73801f5b8c44d3b204dcfd6acd4986c60297edf
+  data.tar.gz: 1b0a21d7edb08c3faf2cb9fb6863376fefa15086ccd2dfcaa75ed83a6fc3dc1e
 SHA512:
-  metadata.gz: 0ab03258483b32296880ef073a4b791da15b6b23af4824e590c381dc922e746fbd6aeb7223dec2023373a628ed8541d5e13020bd91495530e4071ff194b857c2
-  data.tar.gz: 8405148dbb57631a758a172843e720c26ed02caaa788b87295a5741f50d4cb809c7dbb6098f68b12364e78d22ae1fce61c1921fe15a8124380a7b63af10ae5d6
+  metadata.gz: 52d620b288f5f36afb018356f0788fd833cdaacd17bf20e79625ed1716cffbde8f5502b1e6d2e62b062dfc7546f763abf0b2c59b6c8e93a77b3de3718898bc50
+  data.tar.gz: 9ebe4273355e338e24deff7b35850a15dcb47c30e1ee11c2b7ca48dbacea21509f946c9b3beda3309560a5bcf3de05c3e4f1964fa6bc41526008ba62767298c5

data/ChangeLog

@@ -1,3 +1,31 @@
+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>
+
+	* lib/sdl2_stdinc.rb: Added.
+
 2019-08-31  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* Refactoring + Cleanup

data/LICENSE.txt

@@ -1,5 +1,5 @@
 sdl2-bindings : Yet another SDL2 wrapper for Ruby
-Copyright (c) 2015-2019 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 : 2019-08-31
+*   Last modified : 2021-02-21
 
 ## Features ##
 
@@ -29,13 +29,16 @@
     *   sdl2_mixer : 2.0.1
     *   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]
 
 ## License ##
 
 The zlib/libpng License ( http://opensource.org/licenses/Zlib ).
 
     sdl2-bindings : Yet another SDL2 wrapper for Ruby
-    Copyright (c) 2015-2019 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

@@ -29,7 +29,9 @@ require_relative 'sdl2_render.rb'
 require_relative 'sdl2_rwops.rb'
 require_relative 'sdl2_scancode.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'
@@ -113,6 +115,8 @@ module SDL2
     setup_scancode_symbols()
     setup_shape_symbols()
     setup_surface_symbols()
+    setup_syswm_symbols()
+    setup_stdinc_symbols()
     setup_timer_symbols()
     setup_touch_symbols()
     setup_version_symbols()

data/lib/sdl2_audio.rb

@@ -10,15 +10,33 @@ module SDL2
   extend FFI::Library
   # Define/Macro
 
-  SDL_AUDIO_MASK_BITSIZE = ( 0xFF )
-  SDL_AUDIO_MASK_DATATYPE = ( 1 << 8 )
-  SDL_AUDIO_MASK_ENDIAN = ( 1 << 12 )
-  SDL_AUDIO_MASK_SIGNED = ( 1 << 15 )
+  SDL_AUDIO_MASK_BITSIZE = 0xFF
+  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_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
 

data/lib/sdl2_blendmode.rb

@@ -17,6 +17,7 @@ module SDL2
   SDL_BLENDMODE_BLEND = 1
   SDL_BLENDMODE_ADD = 2
   SDL_BLENDMODE_MOD = 4
+  SDL_BLENDMODE_MUL = 8
   SDL_BLENDMODE_INVALID = 2147483647
   SDL_BLENDOPERATION_ADD = 1
   SDL_BLENDOPERATION_SUBTRACT = 2

data/lib/sdl2_cpuinfo.rb

@@ -39,10 +39,12 @@ module SDL2
       :SDL_HasAVX,
       :SDL_HasAVX2,
       :SDL_HasAVX512F,
+      :SDL_HasARMSIMD,
       :SDL_HasNEON,
       :SDL_GetSystemRAM,
       :SDL_SIMDGetAlignment,
       :SDL_SIMDAlloc,
+      :SDL_SIMDRealloc,
       :SDL_SIMDFree,
     ]
     args = {
@@ -60,10 +62,12 @@ module SDL2
       :SDL_HasAVX => [],
       :SDL_HasAVX2 => [],
       :SDL_HasAVX512F => [],
+      :SDL_HasARMSIMD => [],
       :SDL_HasNEON => [],
       :SDL_GetSystemRAM => [],
       :SDL_SIMDGetAlignment => [],
       :SDL_SIMDAlloc => [:ulong],
+      :SDL_SIMDRealloc => [:pointer, :ulong],
       :SDL_SIMDFree => [:pointer],
     }
     retvals = {
@@ -81,10 +85,12 @@ module SDL2
       :SDL_HasAVX => :int,
       :SDL_HasAVX2 => :int,
       :SDL_HasAVX512F => :int,
+      :SDL_HasARMSIMD => :int,
       :SDL_HasNEON => :int,
       :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

@@ -13,8 +13,8 @@ module SDL2
 
   SDL_RELEASED = 0
   SDL_PRESSED = 1
-  SDL_TEXTEDITINGEVENT_TEXT_SIZE = ( 32 )
-  SDL_TEXTINPUTEVENT_TEXT_SIZE = ( 32 )
+  SDL_TEXTEDITINGEVENT_TEXT_SIZE = 32
+  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,
@@ -311,6 +339,7 @@ module SDL2
       :dx, :float,
       :dy, :float,
       :pressure, :float,
+      :windowID, :uint,
     )
   end
 
@@ -412,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,
@@ -459,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

@@ -14,6 +14,14 @@ module SDL2
 
   # Enum
 
+  SDL_CONTROLLER_TYPE_UNKNOWN = 0
+  SDL_CONTROLLER_TYPE_XBOX360 = 1
+  SDL_CONTROLLER_TYPE_XBOXONE = 2
+  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_BINDTYPE_NONE = 0
   SDL_CONTROLLER_BINDTYPE_BUTTON = 1
   SDL_CONTROLLER_BINDTYPE_AXIS = 2
@@ -42,7 +50,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
 
@@ -69,6 +83,7 @@ module SDL2
     )
   end
 
+  typedef :int, :SDL_GameControllerType
   typedef :int, :SDL_GameControllerBindType
   typedef :int, :SDL_GameControllerAxis
   typedef :int, :SDL_GameControllerButton
@@ -88,14 +103,19 @@ module SDL2
       :SDL_GameControllerMapping,
       :SDL_IsGameController,
       :SDL_GameControllerNameForIndex,
+      :SDL_GameControllerTypeForIndex,
       :SDL_GameControllerMappingForDeviceIndex,
       :SDL_GameControllerOpen,
       :SDL_GameControllerFromInstanceID,
+      :SDL_GameControllerFromPlayerIndex,
       :SDL_GameControllerName,
+      :SDL_GameControllerGetType,
       :SDL_GameControllerGetPlayerIndex,
+      :SDL_GameControllerSetPlayerIndex,
       :SDL_GameControllerGetVendor,
       :SDL_GameControllerGetProduct,
       :SDL_GameControllerGetProductVersion,
+      :SDL_GameControllerGetSerial,
       :SDL_GameControllerGetAttached,
       :SDL_GameControllerGetJoystick,
       :SDL_GameControllerEventState,
@@ -103,12 +123,24 @@ 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_GameControllerGetSensorData,
       :SDL_GameControllerRumble,
+      :SDL_GameControllerRumbleTriggers,
+      :SDL_GameControllerHasLED,
+      :SDL_GameControllerSetLED,
       :SDL_GameControllerClose,
     ]
     args = {
@@ -120,14 +152,19 @@ module SDL2
       :SDL_GameControllerMapping => [:pointer],
       :SDL_IsGameController => [:int],
       :SDL_GameControllerNameForIndex => [:int],
+      :SDL_GameControllerTypeForIndex => [:int],
       :SDL_GameControllerMappingForDeviceIndex => [:int],
       :SDL_GameControllerOpen => [:int],
       :SDL_GameControllerFromInstanceID => [:int],
+      :SDL_GameControllerFromPlayerIndex => [:int],
       :SDL_GameControllerName => [:pointer],
+      :SDL_GameControllerGetType => [:pointer],
       :SDL_GameControllerGetPlayerIndex => [:pointer],
+      :SDL_GameControllerSetPlayerIndex => [:pointer, :int],
       :SDL_GameControllerGetVendor => [:pointer],
       :SDL_GameControllerGetProduct => [:pointer],
       :SDL_GameControllerGetProductVersion => [:pointer],
+      :SDL_GameControllerGetSerial => [:pointer],
       :SDL_GameControllerGetAttached => [:pointer],
       :SDL_GameControllerGetJoystick => [:pointer],
       :SDL_GameControllerEventState => [:int],
@@ -135,12 +172,24 @@ 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_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_GameControllerClose => [:pointer],
     }
     retvals = {
@@ -152,14 +201,19 @@ module SDL2
       :SDL_GameControllerMapping => :pointer,
       :SDL_IsGameController => :int,
       :SDL_GameControllerNameForIndex => :pointer,
+      :SDL_GameControllerTypeForIndex => :int,
       :SDL_GameControllerMappingForDeviceIndex => :pointer,
       :SDL_GameControllerOpen => :pointer,
       :SDL_GameControllerFromInstanceID => :pointer,
+      :SDL_GameControllerFromPlayerIndex => :pointer,
       :SDL_GameControllerName => :pointer,
+      :SDL_GameControllerGetType => :int,
       :SDL_GameControllerGetPlayerIndex => :int,
+      :SDL_GameControllerSetPlayerIndex => :void,
       :SDL_GameControllerGetVendor => :ushort,
       :SDL_GameControllerGetProduct => :ushort,
       :SDL_GameControllerGetProductVersion => :ushort,
+      :SDL_GameControllerGetSerial => :pointer,
       :SDL_GameControllerGetAttached => :int,
       :SDL_GameControllerGetJoystick => :pointer,
       :SDL_GameControllerEventState => :int,
@@ -167,12 +221,24 @@ 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_GameControllerGetSensorData => :int,
       :SDL_GameControllerRumble => :int,
+      :SDL_GameControllerRumbleTriggers => :int,
+      :SDL_GameControllerHasLED => :int,
+      :SDL_GameControllerSetLED => :int,
       :SDL_GameControllerClose => :void,
     }
     symbols.each do |sym|