From dbff763b5cbce037ace678fd04f36d1dbd4fccc1 Mon Sep 17 00:00:00 2001 From: hwsmm <9151706+hwsmm@users.noreply.github.com> Date: Sun, 11 Aug 2024 14:06:24 +0900 Subject: [PATCH] Update bindings to f93920a4f16c4d16f6cd3797191e7894542dac4b --- SDL3-CS/SDL3/ClangSharp/SDL_audio.g.cs | 4 + SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs | 133 +++++++++++++----------- SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs | 6 ++ SDL3-CS/SDL3/ClangSharp/SDL_mouse.g.cs | 8 +- SDL3-CS/SDL3/ClangSharp/SDL_pen.g.cs | 117 +++------------------ SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs | 7 +- SDL3-CS/SDL3/SDL_pen.cs | 40 ++----- 7 files changed, 115 insertions(+), 200 deletions(-) diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_audio.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_audio.g.cs index 0c2d9c0..fdddd50 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_audio.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_audio.g.cs @@ -212,6 +212,10 @@ namespace SDL [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern int SDL_ConvertAudioSamples([NativeTypeName("const SDL_AudioSpec *")] SDL_AudioSpec* src_spec, [NativeTypeName("const Uint8 *")] byte* src_data, int src_len, [NativeTypeName("const SDL_AudioSpec *")] SDL_AudioSpec* dst_spec, [NativeTypeName("Uint8 **")] byte** dst_data, int* dst_len); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetAudioFormatName", ExactSpelling = true)] + [return: NativeTypeName("const char *")] + public static extern byte* Unsafe_SDL_GetAudioFormatName(SDL_AudioFormat format); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern int SDL_GetSilenceValueForFormat(SDL_AudioFormat format); diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs index 4d7d2d8..ea2a823 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs @@ -74,8 +74,6 @@ namespace SDL SDL_EVENT_WINDOW_ENTER_FULLSCREEN, SDL_EVENT_WINDOW_LEAVE_FULLSCREEN, SDL_EVENT_WINDOW_DESTROYED, - SDL_EVENT_WINDOW_PEN_ENTER, - SDL_EVENT_WINDOW_PEN_LEAVE, SDL_EVENT_WINDOW_HDR_STATE_CHANGED, SDL_EVENT_WINDOW_FIRST = SDL_EVENT_WINDOW_SHOWN, SDL_EVENT_WINDOW_LAST = SDL_EVENT_WINDOW_HDR_STATE_CHANGED, @@ -127,11 +125,14 @@ namespace SDL SDL_EVENT_AUDIO_DEVICE_REMOVED, SDL_EVENT_AUDIO_DEVICE_FORMAT_CHANGED, SDL_EVENT_SENSOR_UPDATE = 0x1200, - SDL_EVENT_PEN_DOWN = 0x1300, + SDL_EVENT_PEN_PROXIMITY_IN = 0x1300, + SDL_EVENT_PEN_PROXIMITY_OUT, + SDL_EVENT_PEN_DOWN, SDL_EVENT_PEN_UP, - SDL_EVENT_PEN_MOTION, SDL_EVENT_PEN_BUTTON_DOWN, SDL_EVENT_PEN_BUTTON_UP, + SDL_EVENT_PEN_MOTION, + SDL_EVENT_PEN_AXIS, SDL_EVENT_CAMERA_DEVICE_ADDED = 0x1400, SDL_EVENT_CAMERA_DEVICE_REMOVED, SDL_EVENT_CAMERA_DEVICE_APPROVED, @@ -722,7 +723,7 @@ namespace SDL public SDL_WindowID windowID; } - public partial struct SDL_PenTipEvent + public partial struct SDL_PenProximityEvent { public SDL_EventType type; @@ -735,28 +736,6 @@ namespace SDL public SDL_WindowID windowID; public SDL_PenID which; - - [NativeTypeName("Uint8")] - public byte tip; - - [NativeTypeName("Uint8")] - public byte state; - - [NativeTypeName("Uint16")] - public ushort pen_state; - - public float x; - - public float y; - - [NativeTypeName("float[6]")] - public _axes_e__FixedBuffer axes; - - [InlineArray(6)] - public partial struct _axes_e__FixedBuffer - { - public float e0; - } } public partial struct SDL_PenMotionEvent @@ -773,27 +752,38 @@ namespace SDL public SDL_PenID which; - [NativeTypeName("Uint8")] - public byte padding1; + public SDL_PenInputFlags pen_state; - [NativeTypeName("Uint8")] - public byte padding2; + public float x; - [NativeTypeName("Uint16")] - public ushort pen_state; + public float y; + } + + public partial struct SDL_PenTouchEvent + { + public SDL_EventType type; + + [NativeTypeName("Uint32")] + public uint reserved; + + [NativeTypeName("Uint64")] + public ulong timestamp; + + public SDL_WindowID windowID; + + public SDL_PenID which; + + public SDL_PenInputFlags pen_state; public float x; public float y; - [NativeTypeName("float[6]")] - public _axes_e__FixedBuffer axes; + [NativeTypeName("Uint8")] + public byte eraser; - [InlineArray(6)] - public partial struct _axes_e__FixedBuffer - { - public float e0; - } + [NativeTypeName("Uint8")] + public byte state; } public partial struct SDL_PenButtonEvent @@ -810,27 +800,42 @@ namespace SDL public SDL_PenID which; - [NativeTypeName("Uint8")] - public byte button; - - [NativeTypeName("Uint8")] - public byte state; - - [NativeTypeName("Uint16")] - public ushort pen_state; + public SDL_PenInputFlags pen_state; public float x; public float y; - [NativeTypeName("float[6]")] - public _axes_e__FixedBuffer axes; + [NativeTypeName("Uint8")] + public byte button; - [InlineArray(6)] - public partial struct _axes_e__FixedBuffer - { - public float e0; - } + [NativeTypeName("Uint8")] + public byte state; + } + + public partial struct SDL_PenAxisEvent + { + public SDL_EventType type; + + [NativeTypeName("Uint32")] + public uint reserved; + + [NativeTypeName("Uint64")] + public ulong timestamp; + + public SDL_WindowID windowID; + + public SDL_PenID which; + + public SDL_PenInputFlags pen_state; + + public float x; + + public float y; + + public SDL_PenAxis axis; + + public float value; } public unsafe partial struct SDL_DropEvent @@ -1021,7 +1026,10 @@ namespace SDL public SDL_TouchFingerEvent tfinger; [FieldOffset(0)] - public SDL_PenTipEvent ptip; + public SDL_PenProximityEvent pproximity; + + [FieldOffset(0)] + public SDL_PenTouchEvent ptouch; [FieldOffset(0)] public SDL_PenMotionEvent pmotion; @@ -1029,6 +1037,9 @@ namespace SDL [FieldOffset(0)] public SDL_PenButtonEvent pbutton; + [FieldOffset(0)] + public SDL_PenAxisEvent paxis; + [FieldOffset(0)] public SDL_DropEvent drop; @@ -1086,19 +1097,19 @@ namespace SDL public static extern int SDL_PushEvent(SDL_Event* @event); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern void SDL_SetEventFilter([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); + public static extern void SDL_SetEventFilter([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_bool SDL_GetEventFilter([NativeTypeName("SDL_EventFilter *")] delegate* unmanaged[Cdecl]* filter, [NativeTypeName("void **")] IntPtr* userdata); + public static extern SDL_bool SDL_GetEventFilter([NativeTypeName("SDL_EventFilter *")] delegate* unmanaged[Cdecl]* filter, [NativeTypeName("void **")] IntPtr* userdata); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern int SDL_AddEventWatch([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); + public static extern int SDL_AddEventWatch([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern void SDL_DelEventWatch([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); + public static extern void SDL_DelEventWatch([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern void SDL_FilterEvents([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); + public static extern void SDL_FilterEvents([NativeTypeName("SDL_EventFilter")] delegate* unmanaged[Cdecl] filter, [NativeTypeName("void*")] IntPtr userdata); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern void SDL_SetEventEnabled([NativeTypeName("Uint32")] uint type, SDL_bool enabled); diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs index 2dfc620..2582293 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs @@ -257,6 +257,9 @@ namespace SDL [NativeTypeName("#define SDL_HINT_JOYSTICK_FLIGHTSTICK_DEVICES_EXCLUDED \"SDL_JOYSTICK_FLIGHTSTICK_DEVICES_EXCLUDED\"")] public static ReadOnlySpan SDL_HINT_JOYSTICK_FLIGHTSTICK_DEVICES_EXCLUDED => "SDL_JOYSTICK_FLIGHTSTICK_DEVICES_EXCLUDED"u8; + [NativeTypeName("#define SDL_HINT_JOYSTICK_GAMEINPUT \"SDL_JOYSTICK_GAMEINPUT\"")] + public static ReadOnlySpan SDL_HINT_JOYSTICK_GAMEINPUT => "SDL_JOYSTICK_GAMEINPUT"u8; + [NativeTypeName("#define SDL_HINT_JOYSTICK_GAMECUBE_DEVICES \"SDL_JOYSTICK_GAMECUBE_DEVICES\"")] public static ReadOnlySpan SDL_HINT_JOYSTICK_GAMECUBE_DEVICES => "SDL_JOYSTICK_GAMECUBE_DEVICES"u8; @@ -695,6 +698,9 @@ namespace SDL [NativeTypeName("#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP \"SDL_WINDOWS_ENABLE_MESSAGELOOP\"")] public static ReadOnlySpan SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP => "SDL_WINDOWS_ENABLE_MESSAGELOOP"u8; + [NativeTypeName("#define SDL_HINT_WINDOWS_GAMEINPUT \"SDL_WINDOWS_GAMEINPUT\"")] + public static ReadOnlySpan SDL_HINT_WINDOWS_GAMEINPUT => "SDL_WINDOWS_GAMEINPUT"u8; + [NativeTypeName("#define SDL_HINT_WINDOWS_RAW_KEYBOARD \"SDL_WINDOWS_RAW_KEYBOARD\"")] public static ReadOnlySpan SDL_HINT_WINDOWS_RAW_KEYBOARD => "SDL_WINDOWS_RAW_KEYBOARD"u8; diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_mouse.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_mouse.g.cs index ab78696..67c5eb6 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_mouse.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_mouse.g.cs @@ -93,14 +93,14 @@ namespace SDL public static extern int SDL_WarpMouseGlobal(float x, float y); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern int SDL_SetRelativeMouseMode(SDL_bool enabled); + public static extern int SDL_SetWindowRelativeMouseMode(SDL_Window* window, SDL_bool enabled); + + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + public static extern SDL_bool SDL_GetWindowRelativeMouseMode(SDL_Window* window); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern int SDL_CaptureMouse(SDL_bool enabled); - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_bool SDL_GetRelativeMouseMode(); - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern SDL_Cursor* SDL_CreateCursor([NativeTypeName("const Uint8 *")] byte* data, [NativeTypeName("const Uint8 *")] byte* mask, int w, int h, int hot_x, int hot_y); diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_pen.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_pen.g.cs index 210a25b..df3695a 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_pen.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_pen.g.cs @@ -23,125 +23,40 @@ 3. This notice may not be removed or altered from any source distribution. */ -using System.Runtime.InteropServices; -using static SDL.SDL_PenAxis; - namespace SDL { public enum SDL_PenAxis { - SDL_PEN_AXIS_PRESSURE = 0, + SDL_PEN_AXIS_PRESSURE, SDL_PEN_AXIS_XTILT, SDL_PEN_AXIS_YTILT, SDL_PEN_AXIS_DISTANCE, SDL_PEN_AXIS_ROTATION, SDL_PEN_AXIS_SLIDER, SDL_PEN_NUM_AXES, - SDL_PEN_AXIS_LAST = SDL_PEN_NUM_AXES - 1, } - public enum SDL_PenSubtype + public static partial class SDL3 { - SDL_PEN_TYPE_UNKNOWN = 0, - SDL_PEN_TYPE_ERASER = 1, - SDL_PEN_TYPE_PEN, - SDL_PEN_TYPE_PENCIL, - SDL_PEN_TYPE_BRUSH, - SDL_PEN_TYPE_AIRBRUSH, - SDL_PEN_TYPE_LAST = SDL_PEN_TYPE_AIRBRUSH, - } + [NativeTypeName("#define SDL_PEN_INPUT_DOWN (1u << 0)")] + public const uint SDL_PEN_INPUT_DOWN = (1U << 0); - public partial struct SDL_PenCapabilityInfo - { - public float max_tilt; + [NativeTypeName("#define SDL_PEN_INPUT_BUTTON_1 (1u << 1)")] + public const uint SDL_PEN_INPUT_BUTTON_1 = (1U << 1); - [NativeTypeName("Uint32")] - public uint wacom_id; + [NativeTypeName("#define SDL_PEN_INPUT_BUTTON_2 (1u << 2)")] + public const uint SDL_PEN_INPUT_BUTTON_2 = (1U << 2); - [NativeTypeName("Sint8")] - public sbyte num_buttons; - } + [NativeTypeName("#define SDL_PEN_INPUT_BUTTON_3 (1u << 3)")] + public const uint SDL_PEN_INPUT_BUTTON_3 = (1U << 3); - public static unsafe partial class SDL3 - { - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_PenID* SDL_GetPens(int* count); + [NativeTypeName("#define SDL_PEN_INPUT_BUTTON_4 (1u << 4)")] + public const uint SDL_PEN_INPUT_BUTTON_4 = (1U << 4); - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - [return: NativeTypeName("Uint32")] - public static extern uint SDL_GetPenStatus(SDL_PenID instance_id, float* x, float* y, float* axes, [NativeTypeName("size_t")] nuint num_axes); + [NativeTypeName("#define SDL_PEN_INPUT_BUTTON_5 (1u << 5)")] + public const uint SDL_PEN_INPUT_BUTTON_5 = (1U << 5); - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_PenID SDL_GetPenFromGUID(SDL_GUID guid); - - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_GUID SDL_GetPenGUID(SDL_PenID instance_id); - - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_bool SDL_PenConnected(SDL_PenID instance_id); - - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, EntryPoint = "SDL_GetPenName", ExactSpelling = true)] - [return: NativeTypeName("const char *")] - public static extern byte* Unsafe_SDL_GetPenName(SDL_PenID instance_id); - - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_PenCapabilityFlags SDL_GetPenCapabilities(SDL_PenID instance_id, SDL_PenCapabilityInfo* capabilities); - - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_PenSubtype SDL_GetPenType(SDL_PenID instance_id); - - [NativeTypeName("#define SDL_PEN_INVALID ((SDL_PenID)0)")] - public const SDL_PenID SDL_PEN_INVALID = ((SDL_PenID)(0)); - - [NativeTypeName("#define SDL_PEN_INFO_UNKNOWN (-1)")] - public const int SDL_PEN_INFO_UNKNOWN = (-1); - - [NativeTypeName("#define SDL_PEN_FLAG_DOWN_BIT_INDEX 13")] - public const int SDL_PEN_FLAG_DOWN_BIT_INDEX = 13; - - [NativeTypeName("#define SDL_PEN_FLAG_INK_BIT_INDEX 14")] - public const int SDL_PEN_FLAG_INK_BIT_INDEX = 14; - - [NativeTypeName("#define SDL_PEN_FLAG_ERASER_BIT_INDEX 15")] - public const int SDL_PEN_FLAG_ERASER_BIT_INDEX = 15; - - [NativeTypeName("#define SDL_PEN_FLAG_AXIS_BIT_OFFSET 16")] - public const int SDL_PEN_FLAG_AXIS_BIT_OFFSET = 16; - - [NativeTypeName("#define SDL_PEN_TIP_INK SDL_PEN_FLAG_INK_BIT_INDEX")] - public const int SDL_PEN_TIP_INK = 14; - - [NativeTypeName("#define SDL_PEN_TIP_ERASER SDL_PEN_FLAG_ERASER_BIT_INDEX")] - public const int SDL_PEN_TIP_ERASER = 15; - - [NativeTypeName("#define SDL_PEN_DOWN_MASK SDL_PEN_CAPABILITY(SDL_PEN_FLAG_DOWN_BIT_INDEX)")] - public const uint SDL_PEN_DOWN_MASK = (1U << (13)); - - [NativeTypeName("#define SDL_PEN_INK_MASK SDL_PEN_CAPABILITY(SDL_PEN_FLAG_INK_BIT_INDEX)")] - public const uint SDL_PEN_INK_MASK = (1U << (14)); - - [NativeTypeName("#define SDL_PEN_ERASER_MASK SDL_PEN_CAPABILITY(SDL_PEN_FLAG_ERASER_BIT_INDEX)")] - public const uint SDL_PEN_ERASER_MASK = (1U << (15)); - - [NativeTypeName("#define SDL_PEN_AXIS_PRESSURE_MASK SDL_PEN_AXIS_CAPABILITY(SDL_PEN_AXIS_PRESSURE)")] - public const uint SDL_PEN_AXIS_PRESSURE_MASK = (1U << ((int)(SDL_PEN_AXIS_PRESSURE) + 16)); - - [NativeTypeName("#define SDL_PEN_AXIS_XTILT_MASK SDL_PEN_AXIS_CAPABILITY(SDL_PEN_AXIS_XTILT)")] - public const uint SDL_PEN_AXIS_XTILT_MASK = (1U << ((int)(SDL_PEN_AXIS_XTILT) + 16)); - - [NativeTypeName("#define SDL_PEN_AXIS_YTILT_MASK SDL_PEN_AXIS_CAPABILITY(SDL_PEN_AXIS_YTILT)")] - public const uint SDL_PEN_AXIS_YTILT_MASK = (1U << ((int)(SDL_PEN_AXIS_YTILT) + 16)); - - [NativeTypeName("#define SDL_PEN_AXIS_DISTANCE_MASK SDL_PEN_AXIS_CAPABILITY(SDL_PEN_AXIS_DISTANCE)")] - public const uint SDL_PEN_AXIS_DISTANCE_MASK = (1U << ((int)(SDL_PEN_AXIS_DISTANCE) + 16)); - - [NativeTypeName("#define SDL_PEN_AXIS_ROTATION_MASK SDL_PEN_AXIS_CAPABILITY(SDL_PEN_AXIS_ROTATION)")] - public const uint SDL_PEN_AXIS_ROTATION_MASK = (1U << ((int)(SDL_PEN_AXIS_ROTATION) + 16)); - - [NativeTypeName("#define SDL_PEN_AXIS_SLIDER_MASK SDL_PEN_AXIS_CAPABILITY(SDL_PEN_AXIS_SLIDER)")] - public const uint SDL_PEN_AXIS_SLIDER_MASK = (1U << ((int)(SDL_PEN_AXIS_SLIDER) + 16)); - - [NativeTypeName("#define SDL_PEN_AXIS_BIDIRECTIONAL_MASKS (SDL_PEN_AXIS_XTILT_MASK | SDL_PEN_AXIS_YTILT_MASK)")] - public const uint SDL_PEN_AXIS_BIDIRECTIONAL_MASKS = ((1U << ((int)(SDL_PEN_AXIS_XTILT) + 16)) | (1U << ((int)(SDL_PEN_AXIS_YTILT) + 16))); + [NativeTypeName("#define SDL_PEN_INPUT_ERASER_TIP (1u << 30)")] + public const uint SDL_PEN_INPUT_ERASER_TIP = (1U << 30); } } diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs index 15899dc..2aa45e3 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs @@ -547,8 +547,11 @@ namespace SDL [NativeTypeName("#define SDL_WINDOW_MOUSE_CAPTURE SDL_UINT64_C(0x0000000000004000)")] public const ulong SDL_WINDOW_MOUSE_CAPTURE = (0x0000000000004000UL); - [NativeTypeName("#define SDL_WINDOW_ALWAYS_ON_TOP SDL_UINT64_C(0x0000000000008000)")] - public const ulong SDL_WINDOW_ALWAYS_ON_TOP = (0x0000000000008000UL); + [NativeTypeName("#define SDL_WINDOW_MOUSE_RELATIVE_MODE SDL_UINT64_C(0x0000000000008000)")] + public const ulong SDL_WINDOW_MOUSE_RELATIVE_MODE = (0x0000000000008000UL); + + [NativeTypeName("#define SDL_WINDOW_ALWAYS_ON_TOP SDL_UINT64_C(0x0000000000010000)")] + public const ulong SDL_WINDOW_ALWAYS_ON_TOP = (0x0000000000010000UL); [NativeTypeName("#define SDL_WINDOW_UTILITY SDL_UINT64_C(0x0000000000020000)")] public const ulong SDL_WINDOW_UTILITY = (0x0000000000020000UL); diff --git a/SDL3-CS/SDL3/SDL_pen.cs b/SDL3-CS/SDL3/SDL_pen.cs index dddfe91..751bbe0 100644 --- a/SDL3-CS/SDL3/SDL_pen.cs +++ b/SDL3-CS/SDL3/SDL_pen.cs @@ -2,7 +2,6 @@ // See the LICENCE file in the repository root for full licence text. using System; -using JetBrains.Annotations; namespace SDL { @@ -11,37 +10,14 @@ namespace SDL [Flags] [Typedef] - public enum SDL_PenCapabilityFlags : uint + public enum SDL_PenInputFlags : UInt32 { - SDL_PEN_DOWN_MASK = SDL3.SDL_PEN_DOWN_MASK, - SDL_PEN_INK_MASK = SDL3.SDL_PEN_INK_MASK, - SDL_PEN_ERASER_MASK = SDL3.SDL_PEN_ERASER_MASK, - SDL_PEN_AXIS_PRESSURE_MASK = SDL3.SDL_PEN_AXIS_PRESSURE_MASK, - SDL_PEN_AXIS_XTILT_MASK = SDL3.SDL_PEN_AXIS_XTILT_MASK, - SDL_PEN_AXIS_YTILT_MASK = SDL3.SDL_PEN_AXIS_YTILT_MASK, - SDL_PEN_AXIS_DISTANCE_MASK = SDL3.SDL_PEN_AXIS_DISTANCE_MASK, - SDL_PEN_AXIS_ROTATION_MASK = SDL3.SDL_PEN_AXIS_ROTATION_MASK, - SDL_PEN_AXIS_SLIDER_MASK = SDL3.SDL_PEN_AXIS_SLIDER_MASK, - SDL_PEN_AXIS_BIDIRECTIONAL_MASKS = SDL3.SDL_PEN_AXIS_BIDIRECTIONAL_MASKS, - } - - public static partial class SDL3 - { - [Constant] - public const SDL_MouseID SDL_PEN_MOUSEID = unchecked((SDL_MouseID)(-2)); - - [Macro] - public static SDL_PenCapabilityFlags SDL_PEN_CAPABILITY(int capbit) => (SDL_PenCapabilityFlags)(1ul << (capbit)); - - [Macro] - public static SDL_PenCapabilityFlags SDL_PEN_AXIS_CAPABILITY(SDL_PenAxis axis) => SDL_PEN_CAPABILITY((int)axis + SDL_PEN_FLAG_AXIS_BIT_OFFSET); - - [MustDisposeResource] - public static unsafe SDLArray? SDL_GetPens() - { - int count; - var array = SDL_GetPens(&count); - return SDLArray.Create(array, count); - } + SDL_PEN_INPUT_DOWN = SDL3.SDL_PEN_INPUT_DOWN, + SDL_PEN_INPUT_BUTTON_1 = SDL3.SDL_PEN_INPUT_BUTTON_1, + SDL_PEN_INPUT_BUTTON_2 = SDL3.SDL_PEN_INPUT_BUTTON_2, + SDL_PEN_INPUT_BUTTON_3 = SDL3.SDL_PEN_INPUT_BUTTON_3, + SDL_PEN_INPUT_BUTTON_4 = SDL3.SDL_PEN_INPUT_BUTTON_4, + SDL_PEN_INPUT_BUTTON_5 = SDL3.SDL_PEN_INPUT_BUTTON_5, + SDL_PEN_INPUT_ERASER_TIP = SDL3.SDL_PEN_INPUT_ERASER_TIP, } }