sdl2-bindings 0.0.1 → 0.0.6

data/lib/sdl2_haptic.rb

@@ -10,25 +10,26 @@ module SDL2
   extend FFI::Library
   # Define/Macro
 
-  SDL_HAPTIC_CONSTANT = ( 1 << 0 )
-  SDL_HAPTIC_SINE = ( 1 << 1 )
-  SDL_HAPTIC_LEFTRIGHT = ( 1 << 2 )
-  SDL_HAPTIC_TRIANGLE = ( 1 << 3 )
-  SDL_HAPTIC_SAWTOOTHUP = ( 1 << 4 )
-  SDL_HAPTIC_SAWTOOTHDOWN = ( 1 << 5 )
-  SDL_HAPTIC_RAMP = ( 1 << 6 )
-  SDL_HAPTIC_SPRING = ( 1 << 7 )
-  SDL_HAPTIC_DAMPER = ( 1 << 8 )
-  SDL_HAPTIC_INERTIA = ( 1 << 9 )
-  SDL_HAPTIC_FRICTION = ( 1 << 10 )
-  SDL_HAPTIC_CUSTOM = ( 1 << 11 )
-  SDL_HAPTIC_GAIN = ( 1 << 12 )
-  SDL_HAPTIC_AUTOCENTER = ( 1 << 13 )
-  SDL_HAPTIC_STATUS = ( 1 << 14 )
-  SDL_HAPTIC_PAUSE = ( 1 << 15 )
+  SDL_HAPTIC_CONSTANT = (1 << 0)
+  SDL_HAPTIC_SINE = (1 << 1)
+  SDL_HAPTIC_LEFTRIGHT = (1 << 2)
+  SDL_HAPTIC_TRIANGLE = (1 << 3)
+  SDL_HAPTIC_SAWTOOTHUP = (1 << 4)
+  SDL_HAPTIC_SAWTOOTHDOWN = (1 << 5)
+  SDL_HAPTIC_RAMP = (1 << 6)
+  SDL_HAPTIC_SPRING = (1 << 7)
+  SDL_HAPTIC_DAMPER = (1 << 8)
+  SDL_HAPTIC_INERTIA = (1 << 9)
+  SDL_HAPTIC_FRICTION = (1 << 10)
+  SDL_HAPTIC_CUSTOM = (1 << 11)
+  SDL_HAPTIC_GAIN = (1 << 12)
+  SDL_HAPTIC_AUTOCENTER = (1 << 13)
+  SDL_HAPTIC_STATUS = (1 << 14)
+  SDL_HAPTIC_PAUSE = (1 << 15)
   SDL_HAPTIC_POLAR = 0
   SDL_HAPTIC_CARTESIAN = 1
   SDL_HAPTIC_SPHERICAL = 2
+  SDL_HAPTIC_STEERING_AXIS = 3
   SDL_HAPTIC_INFINITY = 4294967295
 
   # Enum

data/lib/sdl2_hints.rb

@@ -10,6 +10,112 @@ module SDL2
   extend FFI::Library
   # Define/Macro
 
+  SDL_HINT_FRAMEBUFFER_ACCELERATION = "SDL_FRAMEBUFFER_ACCELERATION"
+  SDL_HINT_RENDER_DRIVER = "SDL_RENDER_DRIVER"
+  SDL_HINT_RENDER_OPENGL_SHADERS = "SDL_RENDER_OPENGL_SHADERS"
+  SDL_HINT_RENDER_DIRECT3D_THREADSAFE = "SDL_RENDER_DIRECT3D_THREADSAFE"
+  SDL_HINT_RENDER_DIRECT3D11_DEBUG = "SDL_RENDER_DIRECT3D11_DEBUG"
+  SDL_HINT_RENDER_LOGICAL_SIZE_MODE = "SDL_RENDER_LOGICAL_SIZE_MODE"
+  SDL_HINT_RENDER_SCALE_QUALITY = "SDL_RENDER_SCALE_QUALITY"
+  SDL_HINT_RENDER_VSYNC = "SDL_RENDER_VSYNC"
+  SDL_HINT_VIDEO_ALLOW_SCREENSAVER = "SDL_VIDEO_ALLOW_SCREENSAVER"
+  SDL_HINT_VIDEO_EXTERNAL_CONTEXT = "SDL_VIDEO_EXTERNAL_CONTEXT"
+  SDL_HINT_VIDEO_X11_XVIDMODE = "SDL_VIDEO_X11_XVIDMODE"
+  SDL_HINT_VIDEO_X11_XINERAMA = "SDL_VIDEO_X11_XINERAMA"
+  SDL_HINT_VIDEO_X11_XRANDR = "SDL_VIDEO_X11_XRANDR"
+  SDL_HINT_VIDEO_X11_WINDOW_VISUALID = "SDL_VIDEO_X11_WINDOW_VISUALID"
+  SDL_HINT_VIDEO_X11_NET_WM_PING = "SDL_VIDEO_X11_NET_WM_PING"
+  SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR = "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR"
+  SDL_HINT_VIDEO_X11_FORCE_EGL = "SDL_VIDEO_X11_FORCE_EGL"
+  SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN = "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN"
+  SDL_HINT_WINDOWS_INTRESOURCE_ICON = "SDL_WINDOWS_INTRESOURCE_ICON"
+  SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL = "SDL_WINDOWS_INTRESOURCE_ICON_SMALL"
+  SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP = "SDL_WINDOWS_ENABLE_MESSAGELOOP"
+  SDL_HINT_GRAB_KEYBOARD = "SDL_GRAB_KEYBOARD"
+  SDL_HINT_MOUSE_DOUBLE_CLICK_TIME = "SDL_MOUSE_DOUBLE_CLICK_TIME"
+  SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS = "SDL_MOUSE_DOUBLE_CLICK_RADIUS"
+  SDL_HINT_MOUSE_NORMAL_SPEED_SCALE = "SDL_MOUSE_NORMAL_SPEED_SCALE"
+  SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE = "SDL_MOUSE_RELATIVE_SPEED_SCALE"
+  SDL_HINT_MOUSE_RELATIVE_SCALING = "SDL_MOUSE_RELATIVE_SCALING"
+  SDL_HINT_MOUSE_RELATIVE_MODE_WARP = "SDL_MOUSE_RELATIVE_MODE_WARP"
+  SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH = "SDL_MOUSE_FOCUS_CLICKTHROUGH"
+  SDL_HINT_TOUCH_MOUSE_EVENTS = "SDL_TOUCH_MOUSE_EVENTS"
+  SDL_HINT_MOUSE_TOUCH_EVENTS = "SDL_MOUSE_TOUCH_EVENTS"
+  SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS = "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"
+  SDL_HINT_IDLE_TIMER_DISABLED = "SDL_IOS_IDLE_TIMER_DISABLED"
+  SDL_HINT_ORIENTATIONS = "SDL_IOS_ORIENTATIONS"
+  SDL_HINT_APPLE_TV_CONTROLLER_UI_EVENTS = "SDL_APPLE_TV_CONTROLLER_UI_EVENTS"
+  SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION = "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION"
+  SDL_HINT_IOS_HIDE_HOME_INDICATOR = "SDL_IOS_HIDE_HOME_INDICATOR"
+  SDL_HINT_ACCELEROMETER_AS_JOYSTICK = "SDL_ACCELEROMETER_AS_JOYSTICK"
+  SDL_HINT_TV_REMOTE_AS_JOYSTICK = "SDL_TV_REMOTE_AS_JOYSTICK"
+  SDL_HINT_XINPUT_ENABLED = "SDL_XINPUT_ENABLED"
+  SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING = "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING"
+  SDL_HINT_GAMECONTROLLERTYPE = "SDL_GAMECONTROLLERTYPE"
+  SDL_HINT_GAMECONTROLLERCONFIG = "SDL_GAMECONTROLLERCONFIG"
+  SDL_HINT_GAMECONTROLLERCONFIG_FILE = "SDL_GAMECONTROLLERCONFIG_FILE"
+  SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES = "SDL_GAMECONTROLLER_IGNORE_DEVICES"
+  SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT = "SDL_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT"
+  SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS = "SDL_GAMECONTROLLER_USE_BUTTON_LABELS"
+  SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS = "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS"
+  SDL_HINT_JOYSTICK_HIDAPI = "SDL_JOYSTICK_HIDAPI"
+  SDL_HINT_JOYSTICK_HIDAPI_PS4 = "SDL_JOYSTICK_HIDAPI_PS4"
+  SDL_HINT_JOYSTICK_HIDAPI_PS5 = "SDL_JOYSTICK_HIDAPI_PS5"
+  SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE = "SDL_JOYSTICK_HIDAPI_PS4_RUMBLE"
+  SDL_HINT_JOYSTICK_HIDAPI_STEAM = "SDL_JOYSTICK_HIDAPI_STEAM"
+  SDL_HINT_JOYSTICK_HIDAPI_SWITCH = "SDL_JOYSTICK_HIDAPI_SWITCH"
+  SDL_HINT_JOYSTICK_HIDAPI_XBOX = "SDL_JOYSTICK_HIDAPI_XBOX"
+  SDL_HINT_JOYSTICK_HIDAPI_CORRELATE_XINPUT = "SDL_JOYSTICK_HIDAPI_CORRELATE_XINPUT"
+  SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE = "SDL_JOYSTICK_HIDAPI_GAMECUBE"
+  SDL_HINT_ENABLE_STEAM_CONTROLLERS = "SDL_ENABLE_STEAM_CONTROLLERS"
+  SDL_HINT_JOYSTICK_RAWINPUT = "SDL_JOYSTICK_RAWINPUT"
+  SDL_HINT_JOYSTICK_THREAD = "SDL_JOYSTICK_THREAD"
+  SDL_HINT_LINUX_JOYSTICK_DEADZONES = "SDL_LINUX_JOYSTICK_DEADZONES"
+  SDL_HINT_ALLOW_TOPMOST = "SDL_ALLOW_TOPMOST"
+  SDL_HINT_TIMER_RESOLUTION = "SDL_TIMER_RESOLUTION"
+  SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION = "SDL_QTWAYLAND_CONTENT_ORIENTATION"
+  SDL_HINT_QTWAYLAND_WINDOW_FLAGS = "SDL_QTWAYLAND_WINDOW_FLAGS"
+  SDL_HINT_THREAD_STACK_SIZE = "SDL_THREAD_STACK_SIZE"
+  SDL_HINT_THREAD_PRIORITY_POLICY = "SDL_THREAD_PRIORITY_POLICY"
+  SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL = "SDL_THREAD_FORCE_REALTIME_TIME_CRITICAL"
+  SDL_HINT_VIDEO_HIGHDPI_DISABLED = "SDL_VIDEO_HIGHDPI_DISABLED"
+  SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK = "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK"
+  SDL_HINT_VIDEO_WIN_D3DCOMPILER = "SDL_VIDEO_WIN_D3DCOMPILER"
+  SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT = "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT"
+  SDL_HINT_WINRT_PRIVACY_POLICY_URL = "SDL_WINRT_PRIVACY_POLICY_URL"
+  SDL_HINT_WINRT_PRIVACY_POLICY_LABEL = "SDL_WINRT_PRIVACY_POLICY_LABEL"
+  SDL_HINT_WINRT_HANDLE_BACK_BUTTON = "SDL_WINRT_HANDLE_BACK_BUTTON"
+  SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES = "SDL_VIDEO_MAC_FULLSCREEN_SPACES"
+  SDL_HINT_MAC_BACKGROUND_APP = "SDL_MAC_BACKGROUND_APP"
+  SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION = "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION"
+  SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION = "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION"
+  SDL_HINT_IME_INTERNAL_EDITING = "SDL_IME_INTERNAL_EDITING"
+  SDL_HINT_ANDROID_TRAP_BACK_BUTTON = "SDL_ANDROID_TRAP_BACK_BUTTON"
+  SDL_HINT_ANDROID_BLOCK_ON_PAUSE = "SDL_ANDROID_BLOCK_ON_PAUSE"
+  SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO = "SDL_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO"
+  SDL_HINT_RETURN_KEY_HIDES_IME = "SDL_RETURN_KEY_HIDES_IME"
+  SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT = "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT"
+  SDL_HINT_EMSCRIPTEN_ASYNCIFY = "SDL_EMSCRIPTEN_ASYNCIFY"
+  SDL_HINT_NO_SIGNAL_HANDLERS = "SDL_NO_SIGNAL_HANDLERS"
+  SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 = "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4"
+  SDL_HINT_BMP_SAVE_LEGACY_FORMAT = "SDL_BMP_SAVE_LEGACY_FORMAT"
+  SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING = "SDL_WINDOWS_DISABLE_THREAD_NAMING"
+  SDL_HINT_RPI_VIDEO_LAYER = "SDL_RPI_VIDEO_LAYER"
+  SDL_HINT_VIDEO_DOUBLE_BUFFER = "SDL_VIDEO_DOUBLE_BUFFER"
+  SDL_HINT_OPENGL_ES_DRIVER = "SDL_OPENGL_ES_DRIVER"
+  SDL_HINT_AUDIO_RESAMPLING_MODE = "SDL_AUDIO_RESAMPLING_MODE"
+  SDL_HINT_AUDIO_CATEGORY = "SDL_AUDIO_CATEGORY"
+  SDL_HINT_RENDER_BATCHING = "SDL_RENDER_BATCHING"
+  SDL_HINT_AUTO_UPDATE_JOYSTICKS = "SDL_AUTO_UPDATE_JOYSTICKS"
+  SDL_HINT_AUTO_UPDATE_SENSORS = "SDL_AUTO_UPDATE_SENSORS"
+  SDL_HINT_EVENT_LOGGING = "SDL_EVENT_LOGGING"
+  SDL_HINT_WAVE_RIFF_CHUNK_SIZE = "SDL_WAVE_RIFF_CHUNK_SIZE"
+  SDL_HINT_WAVE_TRUNCATION = "SDL_WAVE_TRUNCATION"
+  SDL_HINT_WAVE_FACT_CHUNK = "SDL_WAVE_FACT_CHUNK"
+  SDL_HINT_DISPLAY_USABLE_BOUNDS = "SDL_DISPLAY_USABLE_BOUNDS"
+  SDL_HINT_AUDIO_DEVICE_APP_NAME = "SDL_AUDIO_DEVICE_APP_NAME"
+  SDL_HINT_AUDIO_DEVICE_STREAM_NAME = "SDL_AUDIO_DEVICE_STREAM_NAME"
+  SDL_HINT_PREFERRED_LOCALES = "SDL_PREFERRED_LOCALES"
 
   # Enum
 
@@ -42,8 +148,8 @@ module SDL2
       :SDL_SetHint => [:pointer, :pointer],
       :SDL_GetHint => [:pointer],
       :SDL_GetHintBoolean => [:pointer, :int],
-      :SDL_AddHintCallback => [:pointer, :pointer, :pointer],
-      :SDL_DelHintCallback => [:pointer, :pointer, :pointer],
+      :SDL_AddHintCallback => [:pointer, :SDL_HintCallback, :pointer],
+      :SDL_DelHintCallback => [:pointer, :SDL_HintCallback, :pointer],
       :SDL_ClearHints => [],
     }
     retvals = {

data/lib/sdl2_joystick.rb

@@ -10,6 +10,7 @@ module SDL2
   extend FFI::Library
   # Define/Macro
 
+  SDL_IPHONE_MAX_GFORCE = 5.0
   SDL_JOYSTICK_AXIS_MAX = 32767
   SDL_JOYSTICK_AXIS_MIN = -32768
   SDL_HAT_CENTERED = 0x00
@@ -17,10 +18,10 @@ module SDL2
   SDL_HAT_RIGHT = 0x02
   SDL_HAT_DOWN = 0x04
   SDL_HAT_LEFT = 0x08
-  SDL_HAT_RIGHTUP = ( SDL_HAT_RIGHT | SDL_HAT_UP )
-  SDL_HAT_RIGHTDOWN = ( SDL_HAT_RIGHT | SDL_HAT_DOWN )
-  SDL_HAT_LEFTUP = ( SDL_HAT_LEFT | SDL_HAT_UP )
-  SDL_HAT_LEFTDOWN = ( SDL_HAT_LEFT | SDL_HAT_DOWN )
+  SDL_HAT_RIGHTUP = (SDL_HAT_RIGHT | SDL_HAT_UP)
+  SDL_HAT_RIGHTDOWN = (SDL_HAT_RIGHT | SDL_HAT_DOWN)
+  SDL_HAT_LEFTUP = (SDL_HAT_LEFT | SDL_HAT_UP)
+  SDL_HAT_LEFTDOWN = (SDL_HAT_LEFT | SDL_HAT_DOWN)
 
   # Enum
 
@@ -74,12 +75,21 @@ module SDL2
       :SDL_JoystickGetDeviceInstanceID,
       :SDL_JoystickOpen,
       :SDL_JoystickFromInstanceID,
+      :SDL_JoystickFromPlayerIndex,
+      :SDL_JoystickAttachVirtual,
+      :SDL_JoystickDetachVirtual,
+      :SDL_JoystickIsVirtual,
+      :SDL_JoystickSetVirtualAxis,
+      :SDL_JoystickSetVirtualButton,
+      :SDL_JoystickSetVirtualHat,
       :SDL_JoystickName,
       :SDL_JoystickGetPlayerIndex,
+      :SDL_JoystickSetPlayerIndex,
       :SDL_JoystickGetGUID,
       :SDL_JoystickGetVendor,
       :SDL_JoystickGetProduct,
       :SDL_JoystickGetProductVersion,
+      :SDL_JoystickGetSerial,
       :SDL_JoystickGetType,
       :SDL_JoystickGetGUIDString,
       :SDL_JoystickGetGUIDFromString,
@@ -97,6 +107,9 @@ module SDL2
       :SDL_JoystickGetBall,
       :SDL_JoystickGetButton,
       :SDL_JoystickRumble,
+      :SDL_JoystickRumbleTriggers,
+      :SDL_JoystickHasLED,
+      :SDL_JoystickSetLED,
       :SDL_JoystickClose,
       :SDL_JoystickCurrentPowerLevel,
     ]
@@ -114,12 +127,21 @@ module SDL2
       :SDL_JoystickGetDeviceInstanceID => [:int],
       :SDL_JoystickOpen => [:int],
       :SDL_JoystickFromInstanceID => [:int],
+      :SDL_JoystickFromPlayerIndex => [:int],
+      :SDL_JoystickAttachVirtual => [:int, :int, :int, :int],
+      :SDL_JoystickDetachVirtual => [:int],
+      :SDL_JoystickIsVirtual => [:int],
+      :SDL_JoystickSetVirtualAxis => [:pointer, :int, :short],
+      :SDL_JoystickSetVirtualButton => [:pointer, :int, :uchar],
+      :SDL_JoystickSetVirtualHat => [:pointer, :int, :uchar],
       :SDL_JoystickName => [:pointer],
       :SDL_JoystickGetPlayerIndex => [:pointer],
+      :SDL_JoystickSetPlayerIndex => [:pointer, :int],
       :SDL_JoystickGetGUID => [:pointer],
       :SDL_JoystickGetVendor => [:pointer],
       :SDL_JoystickGetProduct => [:pointer],
       :SDL_JoystickGetProductVersion => [:pointer],
+      :SDL_JoystickGetSerial => [:pointer],
       :SDL_JoystickGetType => [:pointer],
       :SDL_JoystickGetGUIDString => [SDL_JoystickGUID, :pointer, :int],
       :SDL_JoystickGetGUIDFromString => [:pointer],
@@ -137,6 +159,9 @@ module SDL2
       :SDL_JoystickGetBall => [:pointer, :int, :pointer, :pointer],
       :SDL_JoystickGetButton => [:pointer, :int],
       :SDL_JoystickRumble => [:pointer, :ushort, :ushort, :uint],
+      :SDL_JoystickRumbleTriggers => [:pointer, :ushort, :ushort, :uint],
+      :SDL_JoystickHasLED => [:pointer],
+      :SDL_JoystickSetLED => [:pointer, :uchar, :uchar, :uchar],
       :SDL_JoystickClose => [:pointer],
       :SDL_JoystickCurrentPowerLevel => [:pointer],
     }
@@ -154,12 +179,21 @@ module SDL2
       :SDL_JoystickGetDeviceInstanceID => :int,
       :SDL_JoystickOpen => :pointer,
       :SDL_JoystickFromInstanceID => :pointer,
+      :SDL_JoystickFromPlayerIndex => :pointer,
+      :SDL_JoystickAttachVirtual => :int,
+      :SDL_JoystickDetachVirtual => :int,
+      :SDL_JoystickIsVirtual => :int,
+      :SDL_JoystickSetVirtualAxis => :int,
+      :SDL_JoystickSetVirtualButton => :int,
+      :SDL_JoystickSetVirtualHat => :int,
       :SDL_JoystickName => :pointer,
       :SDL_JoystickGetPlayerIndex => :int,
+      :SDL_JoystickSetPlayerIndex => :void,
       :SDL_JoystickGetGUID => SDL_JoystickGUID,
       :SDL_JoystickGetVendor => :ushort,
       :SDL_JoystickGetProduct => :ushort,
       :SDL_JoystickGetProductVersion => :ushort,
+      :SDL_JoystickGetSerial => :pointer,
       :SDL_JoystickGetType => :int,
       :SDL_JoystickGetGUIDString => :void,
       :SDL_JoystickGetGUIDFromString => SDL_JoystickGUID,
@@ -177,6 +211,9 @@ module SDL2
       :SDL_JoystickGetBall => :int,
       :SDL_JoystickGetButton => :uchar,
       :SDL_JoystickRumble => :int,
+      :SDL_JoystickRumbleTriggers => :int,
+      :SDL_JoystickHasLED => :int,
+      :SDL_JoystickSetLED => :int,
       :SDL_JoystickClose => :void,
       :SDL_JoystickCurrentPowerLevel => :int,
     }

data/lib/sdl2_keycode.rb

@@ -266,10 +266,15 @@ module SDL2
   KMOD_CAPS = 8192
   KMOD_MODE = 16384
   KMOD_RESERVED = 32768
+  KMOD_CTRL = 192
+  KMOD_SHIFT = 3
+  KMOD_ALT = 768
+  KMOD_GUI = 3072
 
   # Typedef
 
   typedef :int, :SDL_Keycode
+  typedef :int, :SDL_KeyCode
   typedef :int, :SDL_Keymod
 
   # Struct

data/lib/sdl2_log.rb

@@ -44,6 +44,7 @@ module SDL2
 
   # Typedef
 
+  typedef :int, :SDL_LogCategory
   typedef :int, :SDL_LogPriority
   callback :SDL_LogOutputFunction, [:pointer, :int, :int, :pointer], :void
 
@@ -83,7 +84,7 @@ module SDL2
       :SDL_LogCritical => [:int, :pointer],
       :SDL_LogMessage => [:int, :int, :pointer],
       :SDL_LogGetOutputFunction => [:pointer, :pointer],
-      :SDL_LogSetOutputFunction => [:pointer, :pointer],
+      :SDL_LogSetOutputFunction => [:SDL_LogOutputFunction, :pointer],
     }
     retvals = {
       :SDL_LogSetAllPriority => :void,

data/lib/sdl2_main.rb

@@ -65,5 +65,3 @@ module SDL2
 
 end
 
-# TODO : #define SDL_FALSE 0 and #define SDL_TRUE 1
-

data/lib/sdl2_messagebox.rb

@@ -16,6 +16,8 @@ module SDL2
   SDL_MESSAGEBOX_ERROR = 16
   SDL_MESSAGEBOX_WARNING = 32
   SDL_MESSAGEBOX_INFORMATION = 64
+  SDL_MESSAGEBOX_BUTTONS_LEFT_TO_RIGHT = 128
+  SDL_MESSAGEBOX_BUTTONS_RIGHT_TO_LEFT = 256
   SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 1
   SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 2
   SDL_MESSAGEBOX_COLOR_BACKGROUND = 0

data/lib/sdl2_mixer.rb

@@ -10,6 +10,19 @@ module SDL2
   extend FFI::Library
   # Define/Macro
 
+  SDL_MIXER_MAJOR_VERSION = 2
+  SDL_MIXER_MINOR_VERSION = 0
+  SDL_MIXER_PATCHLEVEL = 4
+  MIX_MAJOR_VERSION = SDL_MIXER_MAJOR_VERSION
+  MIX_MINOR_VERSION = SDL_MIXER_MINOR_VERSION
+  MIX_PATCHLEVEL = SDL_MIXER_PATCHLEVEL
+  MIX_CHANNELS = 8
+  MIX_DEFAULT_FREQUENCY = 22050
+  MIX_DEFAULT_FORMAT = AUDIO_S16LSB
+  MIX_DEFAULT_CHANNELS = 2
+  MIX_MAX_VOLUME = SDL_MIX_MAXVOLUME
+  MIX_CHANNEL_POST = -2
+  MIX_EFFECTSMAXSPEED = "MIX_EFFECTSMAXSPEED"
 
   # Enum
 
@@ -163,8 +176,8 @@ module SDL2
       :Mix_HookMusicFinished => [:pointer],
       :Mix_GetMusicHookData => [],
       :Mix_ChannelFinished => [:pointer],
-      :Mix_RegisterEffect => [:int, :pointer, :pointer, :pointer],
-      :Mix_UnregisterEffect => [:int, :pointer],
+      :Mix_RegisterEffect => [:int, :Mix_EffectFunc_t, :Mix_EffectDone_t, :pointer],
+      :Mix_UnregisterEffect => [:int, :Mix_EffectFunc_t],
       :Mix_UnregisterAllEffects => [:int],
       :Mix_SetPanning => [:int, :uchar, :uchar],
       :Mix_SetPosition => [:int, :short, :uchar],

data/lib/sdl2_pixels.rb

@@ -62,8 +62,13 @@ module SDL2
   SDL_PIXELFORMAT_INDEX4MSB = 304088064
   SDL_PIXELFORMAT_INDEX8 = 318769153
   SDL_PIXELFORMAT_RGB332 = 336660481
+  SDL_PIXELFORMAT_XRGB4444 = 353504258
   SDL_PIXELFORMAT_RGB444 = 353504258
+  SDL_PIXELFORMAT_XBGR4444 = 357698562
+  SDL_PIXELFORMAT_BGR444 = 357698562
+  SDL_PIXELFORMAT_XRGB1555 = 353570562
   SDL_PIXELFORMAT_RGB555 = 353570562
+  SDL_PIXELFORMAT_XBGR1555 = 357764866
   SDL_PIXELFORMAT_BGR555 = 357764866
   SDL_PIXELFORMAT_ARGB4444 = 355602434
   SDL_PIXELFORMAT_RGBA4444 = 356651010
@@ -77,8 +82,10 @@ module SDL2
   SDL_PIXELFORMAT_BGR565 = 357896194
   SDL_PIXELFORMAT_RGB24 = 386930691
   SDL_PIXELFORMAT_BGR24 = 390076419
+  SDL_PIXELFORMAT_XRGB8888 = 370546692
   SDL_PIXELFORMAT_RGB888 = 370546692
   SDL_PIXELFORMAT_RGBX8888 = 371595268
+  SDL_PIXELFORMAT_XBGR8888 = 374740996
   SDL_PIXELFORMAT_BGR888 = 374740996
   SDL_PIXELFORMAT_BGRX8888 = 375789572
   SDL_PIXELFORMAT_ARGB8888 = 372645892
@@ -101,6 +108,11 @@ module SDL2
 
   # Typedef
 
+  typedef :int, :SDL_PixelType
+  typedef :int, :SDL_BitmapOrder
+  typedef :int, :SDL_PackedOrder
+  typedef :int, :SDL_ArrayOrder
+  typedef :int, :SDL_PackedLayout
   typedef :int, :SDL_PixelFormatEnum
 
   # Struct

data/lib/sdl2_render.rb

@@ -17,6 +17,9 @@ module SDL2
   SDL_RENDERER_ACCELERATED = 2
   SDL_RENDERER_PRESENTVSYNC = 4
   SDL_RENDERER_TARGETTEXTURE = 8
+  SDL_ScaleModeNearest = 0
+  SDL_ScaleModeLinear = 1
+  SDL_ScaleModeBest = 2
   SDL_TEXTUREACCESS_STATIC = 0
   SDL_TEXTUREACCESS_STREAMING = 1
   SDL_TEXTUREACCESS_TARGET = 2
@@ -30,6 +33,7 @@ module SDL2
   # Typedef
 
   typedef :int, :SDL_RendererFlags
+  typedef :int, :SDL_ScaleMode
   typedef :int, :SDL_TextureAccess
   typedef :int, :SDL_TextureModulate
   typedef :int, :SDL_RendererFlip
@@ -69,9 +73,12 @@ module SDL2
       :SDL_GetTextureAlphaMod,
       :SDL_SetTextureBlendMode,
       :SDL_GetTextureBlendMode,
+      :SDL_SetTextureScaleMode,
+      :SDL_GetTextureScaleMode,
       :SDL_UpdateTexture,
       :SDL_UpdateYUVTexture,
       :SDL_LockTexture,
+      :SDL_LockTextureToSurface,
       :SDL_UnlockTexture,
       :SDL_RenderTargetSupported,
       :SDL_SetRenderTarget,
@@ -140,9 +147,12 @@ module SDL2
       :SDL_GetTextureAlphaMod => [:pointer, :pointer],
       :SDL_SetTextureBlendMode => [:pointer, :int],
       :SDL_GetTextureBlendMode => [:pointer, :pointer],
+      :SDL_SetTextureScaleMode => [:pointer, :int],
+      :SDL_GetTextureScaleMode => [:pointer, :pointer],
       :SDL_UpdateTexture => [:pointer, :pointer, :pointer, :int],
       :SDL_UpdateYUVTexture => [:pointer, :pointer, :pointer, :int, :pointer, :int, :pointer, :int],
       :SDL_LockTexture => [:pointer, :pointer, :pointer, :pointer],
+      :SDL_LockTextureToSurface => [:pointer, :pointer, :pointer],
       :SDL_UnlockTexture => [:pointer],
       :SDL_RenderTargetSupported => [:pointer],
       :SDL_SetRenderTarget => [:pointer, :pointer],
@@ -211,9 +221,12 @@ module SDL2
       :SDL_GetTextureAlphaMod => :int,
       :SDL_SetTextureBlendMode => :int,
       :SDL_GetTextureBlendMode => :int,
+      :SDL_SetTextureScaleMode => :int,
+      :SDL_GetTextureScaleMode => :int,
       :SDL_UpdateTexture => :int,
       :SDL_UpdateYUVTexture => :int,
       :SDL_LockTexture => :int,
+      :SDL_LockTextureToSurface => :int,
       :SDL_UnlockTexture => :void,
       :SDL_RenderTargetSupported => :int,
       :SDL_SetRenderTarget => :int,