From 25defdb451f2f396ded3341b002718a5bbb38152 Mon Sep 17 00:00:00 2001 From: hwsmm Date: Tue, 2 Jul 2024 22:05:05 +0900 Subject: [PATCH] Update bindings to f7877902436eae72e3931b2d9ab9d213e095baab --- SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs | 28 ++ SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs | 7 +- SDL3-CS/SDL3/ClangSharp/SDL_keyboard.g.cs | 5 +- SDL3-CS/SDL3/ClangSharp/SDL_keycode.g.cs | 308 ++++------------------ SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs | 8 +- SDL3-CS/SDL3/ClangSharp/SDL_scancode.g.cs | 1 + SDL3-CS/SDL3/ClangSharp/SDL_stdinc.g.cs | 7 + SDL3-CS/SDL3/ClangSharp/SDL_vulkan.g.cs | 2 +- SDL3-CS/SDL3/SDL_keycode.cs | 85 +----- 9 files changed, 112 insertions(+), 339 deletions(-) diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs index ade922b..0dade2f 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs @@ -83,6 +83,7 @@ namespace SDL SDL_EVENT_KEYMAP_CHANGED, SDL_EVENT_KEYBOARD_ADDED, SDL_EVENT_KEYBOARD_REMOVED, + SDL_EVENT_TEXT_EDITING_CANDIDATES, SDL_EVENT_MOUSE_MOTION = 0x400, SDL_EVENT_MOUSE_BUTTON_DOWN, SDL_EVENT_MOUSE_BUTTON_UP, @@ -252,6 +253,30 @@ namespace SDL public int length; } + public unsafe partial struct SDL_TextEditingCandidatesEvent + { + public SDL_EventType type; + + [NativeTypeName("Uint32")] + public uint reserved; + + [NativeTypeName("Uint64")] + public ulong timestamp; + + public SDL_WindowID windowID; + + [NativeTypeName("const char *const *")] + public byte** candidates; + + [NativeTypeName("Sint32")] + public int num_candidates; + + [NativeTypeName("Sint32")] + public int selected_candidate; + + public SDL_bool horizontal; + } + public unsafe partial struct SDL_TextInputEvent { public SDL_EventType type; @@ -920,6 +945,9 @@ namespace SDL [FieldOffset(0)] public SDL_TextEditingEvent edit; + [FieldOffset(0)] + public SDL_TextEditingCandidatesEvent edit_candidates; + [FieldOffset(0)] public SDL_TextInputEvent text; diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs index ba1059a..92cd771 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs @@ -197,11 +197,8 @@ namespace SDL [NativeTypeName("#define SDL_HINT_HIDAPI_IGNORE_DEVICES \"SDL_HIDAPI_IGNORE_DEVICES\"")] public static ReadOnlySpan SDL_HINT_HIDAPI_IGNORE_DEVICES => "SDL_HIDAPI_IGNORE_DEVICES"u8; - [NativeTypeName("#define SDL_HINT_IME_INTERNAL_EDITING \"SDL_IME_INTERNAL_EDITING\"")] - public static ReadOnlySpan SDL_HINT_IME_INTERNAL_EDITING => "SDL_IME_INTERNAL_EDITING"u8; - - [NativeTypeName("#define SDL_HINT_IME_SHOW_UI \"SDL_IME_SHOW_UI\"")] - public static ReadOnlySpan SDL_HINT_IME_SHOW_UI => "SDL_IME_SHOW_UI"u8; + [NativeTypeName("#define SDL_HINT_IME_IMPLEMENTED_UI \"SDL_IME_IMPLEMENTED_UI\"")] + public static ReadOnlySpan SDL_HINT_IME_IMPLEMENTED_UI => "SDL_IME_IMPLEMENTED_UI"u8; [NativeTypeName("#define SDL_HINT_IOS_HIDE_HOME_INDICATOR \"SDL_IOS_HIDE_HOME_INDICATOR\"")] public static ReadOnlySpan SDL_HINT_IOS_HIDE_HOME_INDICATOR => "SDL_IOS_HIDE_HOME_INDICATOR"u8; diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_keyboard.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_keyboard.g.cs index b9eb53b..25acad7 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_keyboard.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_keyboard.g.cs @@ -97,7 +97,10 @@ namespace SDL public static extern int SDL_ClearComposition(SDL_Window* window); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern int SDL_SetTextInputRect(SDL_Window* window, [NativeTypeName("const SDL_Rect *")] SDL_Rect* rect); + public static extern int SDL_SetTextInputArea(SDL_Window* window, [NativeTypeName("const SDL_Rect *")] SDL_Rect* rect, int cursor); + + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + public static extern int SDL_GetTextInputArea(SDL_Window* window, SDL_Rect* rect, int* cursor); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern SDL_bool SDL_HasScreenKeyboardSupport(); diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_keycode.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_keycode.g.cs index 9e0ac35..3d4e512 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_keycode.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_keycode.g.cs @@ -144,84 +144,6 @@ namespace SDL [NativeTypeName("#define SDLK_AT 0x00000040u")] public const uint SDLK_AT = 0x00000040U; - [NativeTypeName("#define SDLK_A 0x00000041u")] - public const uint SDLK_A = 0x00000041U; - - [NativeTypeName("#define SDLK_B 0x00000042u")] - public const uint SDLK_B = 0x00000042U; - - [NativeTypeName("#define SDLK_C 0x00000043u")] - public const uint SDLK_C = 0x00000043U; - - [NativeTypeName("#define SDLK_D 0x00000044u")] - public const uint SDLK_D = 0x00000044U; - - [NativeTypeName("#define SDLK_E 0x00000045u")] - public const uint SDLK_E = 0x00000045U; - - [NativeTypeName("#define SDLK_F 0x00000046u")] - public const uint SDLK_F = 0x00000046U; - - [NativeTypeName("#define SDLK_G 0x00000047u")] - public const uint SDLK_G = 0x00000047U; - - [NativeTypeName("#define SDLK_H 0x00000048u")] - public const uint SDLK_H = 0x00000048U; - - [NativeTypeName("#define SDLK_I 0x00000049u")] - public const uint SDLK_I = 0x00000049U; - - [NativeTypeName("#define SDLK_J 0x0000004au")] - public const uint SDLK_J = 0x0000004aU; - - [NativeTypeName("#define SDLK_K 0x0000004bu")] - public const uint SDLK_K = 0x0000004bU; - - [NativeTypeName("#define SDLK_L 0x0000004cu")] - public const uint SDLK_L = 0x0000004cU; - - [NativeTypeName("#define SDLK_M 0x0000004du")] - public const uint SDLK_M = 0x0000004dU; - - [NativeTypeName("#define SDLK_N 0x0000004eu")] - public const uint SDLK_N = 0x0000004eU; - - [NativeTypeName("#define SDLK_O 0x0000004fu")] - public const uint SDLK_O = 0x0000004fU; - - [NativeTypeName("#define SDLK_P 0x00000050u")] - public const uint SDLK_P = 0x00000050U; - - [NativeTypeName("#define SDLK_Q 0x00000051u")] - public const uint SDLK_Q = 0x00000051U; - - [NativeTypeName("#define SDLK_R 0x00000052u")] - public const uint SDLK_R = 0x00000052U; - - [NativeTypeName("#define SDLK_S 0x00000053u")] - public const uint SDLK_S = 0x00000053U; - - [NativeTypeName("#define SDLK_T 0x00000054u")] - public const uint SDLK_T = 0x00000054U; - - [NativeTypeName("#define SDLK_U 0x00000055u")] - public const uint SDLK_U = 0x00000055U; - - [NativeTypeName("#define SDLK_V 0x00000056u")] - public const uint SDLK_V = 0x00000056U; - - [NativeTypeName("#define SDLK_W 0x00000057u")] - public const uint SDLK_W = 0x00000057U; - - [NativeTypeName("#define SDLK_X 0x00000058u")] - public const uint SDLK_X = 0x00000058U; - - [NativeTypeName("#define SDLK_Y 0x00000059u")] - public const uint SDLK_Y = 0x00000059U; - - [NativeTypeName("#define SDLK_Z 0x0000005au")] - public const uint SDLK_Z = 0x0000005aU; - [NativeTypeName("#define SDLK_LEFTBRACKET 0x0000005bu")] public const uint SDLK_LEFTBRACKET = 0x0000005bU; @@ -240,83 +162,83 @@ namespace SDL [NativeTypeName("#define SDLK_GRAVE 0x00000060u")] public const uint SDLK_GRAVE = 0x00000060U; - [NativeTypeName("#define SDLK_a 0x00000061u")] - public const uint SDLK_a = 0x00000061U; + [NativeTypeName("#define SDLK_A 0x00000061u")] + public const uint SDLK_A = 0x00000061U; - [NativeTypeName("#define SDLK_b 0x00000062u")] - public const uint SDLK_b = 0x00000062U; + [NativeTypeName("#define SDLK_B 0x00000062u")] + public const uint SDLK_B = 0x00000062U; - [NativeTypeName("#define SDLK_c 0x00000063u")] - public const uint SDLK_c = 0x00000063U; + [NativeTypeName("#define SDLK_C 0x00000063u")] + public const uint SDLK_C = 0x00000063U; - [NativeTypeName("#define SDLK_d 0x00000064u")] - public const uint SDLK_d = 0x00000064U; + [NativeTypeName("#define SDLK_D 0x00000064u")] + public const uint SDLK_D = 0x00000064U; - [NativeTypeName("#define SDLK_e 0x00000065u")] - public const uint SDLK_e = 0x00000065U; + [NativeTypeName("#define SDLK_E 0x00000065u")] + public const uint SDLK_E = 0x00000065U; - [NativeTypeName("#define SDLK_f 0x00000066u")] - public const uint SDLK_f = 0x00000066U; + [NativeTypeName("#define SDLK_F 0x00000066u")] + public const uint SDLK_F = 0x00000066U; - [NativeTypeName("#define SDLK_g 0x00000067u")] - public const uint SDLK_g = 0x00000067U; + [NativeTypeName("#define SDLK_G 0x00000067u")] + public const uint SDLK_G = 0x00000067U; - [NativeTypeName("#define SDLK_h 0x00000068u")] - public const uint SDLK_h = 0x00000068U; + [NativeTypeName("#define SDLK_H 0x00000068u")] + public const uint SDLK_H = 0x00000068U; - [NativeTypeName("#define SDLK_i 0x00000069u")] - public const uint SDLK_i = 0x00000069U; + [NativeTypeName("#define SDLK_I 0x00000069u")] + public const uint SDLK_I = 0x00000069U; - [NativeTypeName("#define SDLK_j 0x0000006au")] - public const uint SDLK_j = 0x0000006aU; + [NativeTypeName("#define SDLK_J 0x0000006au")] + public const uint SDLK_J = 0x0000006aU; - [NativeTypeName("#define SDLK_k 0x0000006bu")] - public const uint SDLK_k = 0x0000006bU; + [NativeTypeName("#define SDLK_K 0x0000006bu")] + public const uint SDLK_K = 0x0000006bU; - [NativeTypeName("#define SDLK_l 0x0000006cu")] - public const uint SDLK_l = 0x0000006cU; + [NativeTypeName("#define SDLK_L 0x0000006cu")] + public const uint SDLK_L = 0x0000006cU; - [NativeTypeName("#define SDLK_m 0x0000006du")] - public const uint SDLK_m = 0x0000006dU; + [NativeTypeName("#define SDLK_M 0x0000006du")] + public const uint SDLK_M = 0x0000006dU; - [NativeTypeName("#define SDLK_n 0x0000006eu")] - public const uint SDLK_n = 0x0000006eU; + [NativeTypeName("#define SDLK_N 0x0000006eu")] + public const uint SDLK_N = 0x0000006eU; - [NativeTypeName("#define SDLK_o 0x0000006fu")] - public const uint SDLK_o = 0x0000006fU; + [NativeTypeName("#define SDLK_O 0x0000006fu")] + public const uint SDLK_O = 0x0000006fU; - [NativeTypeName("#define SDLK_p 0x00000070u")] - public const uint SDLK_p = 0x00000070U; + [NativeTypeName("#define SDLK_P 0x00000070u")] + public const uint SDLK_P = 0x00000070U; - [NativeTypeName("#define SDLK_q 0x00000071u")] - public const uint SDLK_q = 0x00000071U; + [NativeTypeName("#define SDLK_Q 0x00000071u")] + public const uint SDLK_Q = 0x00000071U; - [NativeTypeName("#define SDLK_r 0x00000072u")] - public const uint SDLK_r = 0x00000072U; + [NativeTypeName("#define SDLK_R 0x00000072u")] + public const uint SDLK_R = 0x00000072U; - [NativeTypeName("#define SDLK_s 0x00000073u")] - public const uint SDLK_s = 0x00000073U; + [NativeTypeName("#define SDLK_S 0x00000073u")] + public const uint SDLK_S = 0x00000073U; - [NativeTypeName("#define SDLK_t 0x00000074u")] - public const uint SDLK_t = 0x00000074U; + [NativeTypeName("#define SDLK_T 0x00000074u")] + public const uint SDLK_T = 0x00000074U; - [NativeTypeName("#define SDLK_u 0x00000075u")] - public const uint SDLK_u = 0x00000075U; + [NativeTypeName("#define SDLK_U 0x00000075u")] + public const uint SDLK_U = 0x00000075U; - [NativeTypeName("#define SDLK_v 0x00000076u")] - public const uint SDLK_v = 0x00000076U; + [NativeTypeName("#define SDLK_V 0x00000076u")] + public const uint SDLK_V = 0x00000076U; - [NativeTypeName("#define SDLK_w 0x00000077u")] - public const uint SDLK_w = 0x00000077U; + [NativeTypeName("#define SDLK_W 0x00000077u")] + public const uint SDLK_W = 0x00000077U; - [NativeTypeName("#define SDLK_x 0x00000078u")] - public const uint SDLK_x = 0x00000078U; + [NativeTypeName("#define SDLK_X 0x00000078u")] + public const uint SDLK_X = 0x00000078U; - [NativeTypeName("#define SDLK_y 0x00000079u")] - public const uint SDLK_y = 0x00000079U; + [NativeTypeName("#define SDLK_Y 0x00000079u")] + public const uint SDLK_Y = 0x00000079U; - [NativeTypeName("#define SDLK_z 0x0000007au")] - public const uint SDLK_z = 0x0000007aU; + [NativeTypeName("#define SDLK_Z 0x0000007au")] + public const uint SDLK_Z = 0x0000007aU; [NativeTypeName("#define SDLK_LEFTBRACE 0x0000007bu")] public const uint SDLK_LEFTBRACE = 0x0000007bU; @@ -333,6 +255,9 @@ namespace SDL [NativeTypeName("#define SDLK_DELETE 0x0000007fu")] public const uint SDLK_DELETE = 0x0000007fU; + [NativeTypeName("#define SDLK_PLUSMINUS 0x000000b1u")] + public const uint SDLK_PLUSMINUS = 0x000000b1U; + [NativeTypeName("#define SDLK_CAPSLOCK 0x40000039u")] public const uint SDLK_CAPSLOCK = 0x40000039U; @@ -411,63 +336,12 @@ namespace SDL [NativeTypeName("#define SDLK_NUMLOCKCLEAR 0x40000053u")] public const uint SDLK_NUMLOCKCLEAR = 0x40000053U; - [NativeTypeName("#define SDLK_KP_DIVIDE 0x40000054u")] - public const uint SDLK_KP_DIVIDE = 0x40000054U; - - [NativeTypeName("#define SDLK_KP_MULTIPLY 0x40000055u")] - public const uint SDLK_KP_MULTIPLY = 0x40000055U; - - [NativeTypeName("#define SDLK_KP_MINUS 0x40000056u")] - public const uint SDLK_KP_MINUS = 0x40000056U; - - [NativeTypeName("#define SDLK_KP_PLUS 0x40000057u")] - public const uint SDLK_KP_PLUS = 0x40000057U; - - [NativeTypeName("#define SDLK_KP_ENTER 0x40000058u")] - public const uint SDLK_KP_ENTER = 0x40000058U; - - [NativeTypeName("#define SDLK_KP_1 0x40000059u")] - public const uint SDLK_KP_1 = 0x40000059U; - - [NativeTypeName("#define SDLK_KP_2 0x4000005au")] - public const uint SDLK_KP_2 = 0x4000005aU; - - [NativeTypeName("#define SDLK_KP_3 0x4000005bu")] - public const uint SDLK_KP_3 = 0x4000005bU; - - [NativeTypeName("#define SDLK_KP_4 0x4000005cu")] - public const uint SDLK_KP_4 = 0x4000005cU; - - [NativeTypeName("#define SDLK_KP_5 0x4000005du")] - public const uint SDLK_KP_5 = 0x4000005dU; - - [NativeTypeName("#define SDLK_KP_6 0x4000005eu")] - public const uint SDLK_KP_6 = 0x4000005eU; - - [NativeTypeName("#define SDLK_KP_7 0x4000005fu")] - public const uint SDLK_KP_7 = 0x4000005fU; - - [NativeTypeName("#define SDLK_KP_8 0x40000060u")] - public const uint SDLK_KP_8 = 0x40000060U; - - [NativeTypeName("#define SDLK_KP_9 0x40000061u")] - public const uint SDLK_KP_9 = 0x40000061U; - - [NativeTypeName("#define SDLK_KP_0 0x40000062u")] - public const uint SDLK_KP_0 = 0x40000062U; - - [NativeTypeName("#define SDLK_KP_PERIOD 0x40000063u")] - public const uint SDLK_KP_PERIOD = 0x40000063U; - [NativeTypeName("#define SDLK_APPLICATION 0x40000065u")] public const uint SDLK_APPLICATION = 0x40000065U; [NativeTypeName("#define SDLK_POWER 0x40000066u")] public const uint SDLK_POWER = 0x40000066U; - [NativeTypeName("#define SDLK_KP_EQUALS 0x40000067u")] - public const uint SDLK_KP_EQUALS = 0x40000067U; - [NativeTypeName("#define SDLK_F13 0x40000068u")] public const uint SDLK_F13 = 0x40000068U; @@ -546,12 +420,6 @@ namespace SDL [NativeTypeName("#define SDLK_VOLUMEDOWN 0x40000081u")] public const uint SDLK_VOLUMEDOWN = 0x40000081U; - [NativeTypeName("#define SDLK_KP_COMMA 0x40000085u")] - public const uint SDLK_KP_COMMA = 0x40000085U; - - [NativeTypeName("#define SDLK_KP_EQUALSAS400 0x40000086u")] - public const uint SDLK_KP_EQUALSAS400 = 0x40000086U; - [NativeTypeName("#define SDLK_ALTERASE 0x40000099u")] public const uint SDLK_ALTERASE = 0x40000099U; @@ -606,60 +474,12 @@ namespace SDL [NativeTypeName("#define SDLK_CURRENCYSUBUNIT 0x400000b5u")] public const uint SDLK_CURRENCYSUBUNIT = 0x400000b5U; - [NativeTypeName("#define SDLK_KP_LEFTPAREN 0x400000b6u")] - public const uint SDLK_KP_LEFTPAREN = 0x400000b6U; - - [NativeTypeName("#define SDLK_KP_RIGHTPAREN 0x400000b7u")] - public const uint SDLK_KP_RIGHTPAREN = 0x400000b7U; - - [NativeTypeName("#define SDLK_KP_LEFTBRACE 0x400000b8u")] - public const uint SDLK_KP_LEFTBRACE = 0x400000b8U; - - [NativeTypeName("#define SDLK_KP_RIGHTBRACE 0x400000b9u")] - public const uint SDLK_KP_RIGHTBRACE = 0x400000b9U; - - [NativeTypeName("#define SDLK_KP_TAB 0x400000bau")] - public const uint SDLK_KP_TAB = 0x400000baU; - - [NativeTypeName("#define SDLK_KP_BACKSPACE 0x400000bbu")] - public const uint SDLK_KP_BACKSPACE = 0x400000bbU; - - [NativeTypeName("#define SDLK_KP_A 0x400000bcu")] - public const uint SDLK_KP_A = 0x400000bcU; - - [NativeTypeName("#define SDLK_KP_B 0x400000bdu")] - public const uint SDLK_KP_B = 0x400000bdU; - - [NativeTypeName("#define SDLK_KP_C 0x400000beu")] - public const uint SDLK_KP_C = 0x400000beU; - - [NativeTypeName("#define SDLK_KP_D 0x400000bfu")] - public const uint SDLK_KP_D = 0x400000bfU; - - [NativeTypeName("#define SDLK_KP_E 0x400000c0u")] - public const uint SDLK_KP_E = 0x400000c0U; - - [NativeTypeName("#define SDLK_KP_F 0x400000c1u")] - public const uint SDLK_KP_F = 0x400000c1U; - [NativeTypeName("#define SDLK_KP_XOR 0x400000c2u")] public const uint SDLK_KP_XOR = 0x400000c2U; [NativeTypeName("#define SDLK_KP_POWER 0x400000c3u")] public const uint SDLK_KP_POWER = 0x400000c3U; - [NativeTypeName("#define SDLK_KP_PERCENT 0x400000c4u")] - public const uint SDLK_KP_PERCENT = 0x400000c4U; - - [NativeTypeName("#define SDLK_KP_LESS 0x400000c5u")] - public const uint SDLK_KP_LESS = 0x400000c5U; - - [NativeTypeName("#define SDLK_KP_GREATER 0x400000c6u")] - public const uint SDLK_KP_GREATER = 0x400000c6U; - - [NativeTypeName("#define SDLK_KP_AMPERSAND 0x400000c7u")] - public const uint SDLK_KP_AMPERSAND = 0x400000c7U; - [NativeTypeName("#define SDLK_KP_DBLAMPERSAND 0x400000c8u")] public const uint SDLK_KP_DBLAMPERSAND = 0x400000c8U; @@ -669,21 +489,6 @@ namespace SDL [NativeTypeName("#define SDLK_KP_DBLVERTICALBAR 0x400000cau")] public const uint SDLK_KP_DBLVERTICALBAR = 0x400000caU; - [NativeTypeName("#define SDLK_KP_COLON 0x400000cbu")] - public const uint SDLK_KP_COLON = 0x400000cbU; - - [NativeTypeName("#define SDLK_KP_HASH 0x400000ccu")] - public const uint SDLK_KP_HASH = 0x400000ccU; - - [NativeTypeName("#define SDLK_KP_SPACE 0x400000cdu")] - public const uint SDLK_KP_SPACE = 0x400000cdU; - - [NativeTypeName("#define SDLK_KP_AT 0x400000ceu")] - public const uint SDLK_KP_AT = 0x400000ceU; - - [NativeTypeName("#define SDLK_KP_EXCLAM 0x400000cfu")] - public const uint SDLK_KP_EXCLAM = 0x400000cfU; - [NativeTypeName("#define SDLK_KP_MEMSTORE 0x400000d0u")] public const uint SDLK_KP_MEMSTORE = 0x400000d0U; @@ -705,9 +510,6 @@ namespace SDL [NativeTypeName("#define SDLK_KP_MEMDIVIDE 0x400000d6u")] public const uint SDLK_KP_MEMDIVIDE = 0x400000d6U; - [NativeTypeName("#define SDLK_KP_PLUSMINUS 0x400000d7u")] - public const uint SDLK_KP_PLUSMINUS = 0x400000d7U; - [NativeTypeName("#define SDLK_KP_CLEAR 0x400000d8u")] public const uint SDLK_KP_CLEAR = 0x400000d8U; diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs index 0deb096..76536fd 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs @@ -185,6 +185,9 @@ namespace SDL [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern int SDL_GetRenderLogicalPresentation(SDL_Renderer* renderer, int* w, int* h, SDL_RendererLogicalPresentation* mode, SDL_ScaleMode* scale_mode); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + public static extern int SDL_GetRenderLogicalPresentationRect(SDL_Renderer* renderer, SDL_FRect* rect); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern int SDL_RenderCoordinatesFromWindow(SDL_Renderer* renderer, float window_x, float window_y, float* x, float* y); @@ -279,10 +282,7 @@ namespace SDL public static extern int SDL_RenderGeometry(SDL_Renderer* renderer, SDL_Texture* texture, [NativeTypeName("const SDL_Vertex *")] SDL_Vertex* vertices, int num_vertices, [NativeTypeName("const int *")] int* indices, int num_indices); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern int SDL_RenderGeometryRaw(SDL_Renderer* renderer, SDL_Texture* texture, [NativeTypeName("const float *")] float* xy, int xy_stride, [NativeTypeName("const SDL_Color *")] SDL_Color* color, int color_stride, [NativeTypeName("const float *")] float* uv, int uv_stride, int num_vertices, [NativeTypeName("const void *")] IntPtr indices, int num_indices, int size_indices); - - [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern int SDL_RenderGeometryRawFloat(SDL_Renderer* renderer, SDL_Texture* texture, [NativeTypeName("const float *")] float* xy, int xy_stride, [NativeTypeName("const SDL_FColor *")] SDL_FColor* color, int color_stride, [NativeTypeName("const float *")] float* uv, int uv_stride, int num_vertices, [NativeTypeName("const void *")] IntPtr indices, int num_indices, int size_indices); + public static extern int SDL_RenderGeometryRaw(SDL_Renderer* renderer, SDL_Texture* texture, [NativeTypeName("const float *")] float* xy, int xy_stride, [NativeTypeName("const SDL_FColor *")] SDL_FColor* color, int color_stride, [NativeTypeName("const float *")] float* uv, int uv_stride, int num_vertices, [NativeTypeName("const void *")] IntPtr indices, int num_indices, int size_indices); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern SDL_Surface* SDL_RenderReadPixels(SDL_Renderer* renderer, [NativeTypeName("const SDL_Rect *")] SDL_Rect* rect); diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_scancode.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_scancode.g.cs index 487ad49..ca1ccd8 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_scancode.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_scancode.g.cs @@ -274,6 +274,7 @@ namespace SDL SDL_SCANCODE_SOFTRIGHT = 288, SDL_SCANCODE_CALL = 289, SDL_SCANCODE_ENDCALL = 290, + SDL_SCANCODE_RESERVED = 400, SDL_NUM_SCANCODES = 512, } } diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_stdinc.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_stdinc.g.cs index afcf52f..ffb2b86 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_stdinc.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_stdinc.g.cs @@ -343,6 +343,10 @@ namespace SDL [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern int SDL_strncasecmp([NativeTypeName("const char *")] byte* str1, [NativeTypeName("const char *")] byte* str2, [NativeTypeName("size_t")] nuint maxlen); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + [return: NativeTypeName("Uint32")] + public static extern uint SDL_StepUTF8([NativeTypeName("const char **")] byte** pstr, [NativeTypeName("size_t *")] nuint* pslen); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern int SDL_sscanf([NativeTypeName("const char *")] byte* text, [NativeTypeName("const char *")] byte* fmt, __arglist); @@ -665,6 +669,9 @@ namespace SDL [NativeTypeName("#define SDL_PRIX32 \"X\"")] public static ReadOnlySpan SDL_PRIX32 => "X"u8; + [NativeTypeName("#define SDL_INVALID_UNICODE_CODEPOINT 0xFFFD")] + public const int SDL_INVALID_UNICODE_CODEPOINT = 0xFFFD; + [NativeTypeName("#define SDL_PI_D 3.141592653589793238462643383279502884")] public const double SDL_PI_D = 3.141592653589793238462643383279502884; diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_vulkan.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_vulkan.g.cs index c759262..00c249f 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_vulkan.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_vulkan.g.cs @@ -57,7 +57,7 @@ namespace SDL public static extern byte** SDL_Vulkan_GetInstanceExtensions([NativeTypeName("Uint32 *")] uint* count); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern SDL_bool SDL_Vulkan_CreateSurface(SDL_Window* window, [NativeTypeName("VkInstance")] VkInstance_T* instance, [NativeTypeName("const struct VkAllocationCallbacks *")] VkAllocationCallbacks* allocator, [NativeTypeName("VkSurfaceKHR *")] VkSurfaceKHR_T** surface); + public static extern int SDL_Vulkan_CreateSurface(SDL_Window* window, [NativeTypeName("VkInstance")] VkInstance_T* instance, [NativeTypeName("const struct VkAllocationCallbacks *")] VkAllocationCallbacks* allocator, [NativeTypeName("VkSurfaceKHR *")] VkSurfaceKHR_T** surface); [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern void SDL_Vulkan_DestroySurface([NativeTypeName("VkInstance")] VkInstance_T* instance, [NativeTypeName("VkSurfaceKHR")] VkSurfaceKHR_T* surface, [NativeTypeName("const struct VkAllocationCallbacks *")] VkAllocationCallbacks* allocator); diff --git a/SDL3-CS/SDL3/SDL_keycode.cs b/SDL3-CS/SDL3/SDL_keycode.cs index 325a2c2..af3a4fa 100644 --- a/SDL3-CS/SDL3/SDL_keycode.cs +++ b/SDL3-CS/SDL3/SDL_keycode.cs @@ -8,6 +8,7 @@ namespace SDL [Typedef] public enum SDL_Keycode : UInt32 { + SDLK_SCANCODE_MASK = SDL3.SDLK_SCANCODE_MASK, SDLK_UNKNOWN = SDL3.SDLK_UNKNOWN, SDLK_RETURN = SDL3.SDLK_RETURN, SDLK_ESCAPE = SDL3.SDLK_ESCAPE, @@ -46,6 +47,12 @@ namespace SDL SDLK_GREATER = SDL3.SDLK_GREATER, SDLK_QUESTION = SDL3.SDLK_QUESTION, SDLK_AT = SDL3.SDLK_AT, + SDLK_LEFTBRACKET = SDL3.SDLK_LEFTBRACKET, + SDLK_BACKSLASH = SDL3.SDLK_BACKSLASH, + SDLK_RIGHTBRACKET = SDL3.SDLK_RIGHTBRACKET, + SDLK_CARET = SDL3.SDLK_CARET, + SDLK_UNDERSCORE = SDL3.SDLK_UNDERSCORE, + SDLK_GRAVE = SDL3.SDLK_GRAVE, SDLK_A = SDL3.SDLK_A, SDLK_B = SDL3.SDLK_B, SDLK_C = SDL3.SDLK_C, @@ -72,43 +79,12 @@ namespace SDL SDLK_X = SDL3.SDLK_X, SDLK_Y = SDL3.SDLK_Y, SDLK_Z = SDL3.SDLK_Z, - SDLK_LEFTBRACKET = SDL3.SDLK_LEFTBRACKET, - SDLK_BACKSLASH = SDL3.SDLK_BACKSLASH, - SDLK_RIGHTBRACKET = SDL3.SDLK_RIGHTBRACKET, - SDLK_CARET = SDL3.SDLK_CARET, - SDLK_UNDERSCORE = SDL3.SDLK_UNDERSCORE, - SDLK_GRAVE = SDL3.SDLK_GRAVE, - SDLK_a = SDL3.SDLK_a, - SDLK_b = SDL3.SDLK_b, - SDLK_c = SDL3.SDLK_c, - SDLK_d = SDL3.SDLK_d, - SDLK_e = SDL3.SDLK_e, - SDLK_f = SDL3.SDLK_f, - SDLK_g = SDL3.SDLK_g, - SDLK_h = SDL3.SDLK_h, - SDLK_i = SDL3.SDLK_i, - SDLK_j = SDL3.SDLK_j, - SDLK_k = SDL3.SDLK_k, - SDLK_l = SDL3.SDLK_l, - SDLK_m = SDL3.SDLK_m, - SDLK_n = SDL3.SDLK_n, - SDLK_o = SDL3.SDLK_o, - SDLK_p = SDL3.SDLK_p, - SDLK_q = SDL3.SDLK_q, - SDLK_r = SDL3.SDLK_r, - SDLK_s = SDL3.SDLK_s, - SDLK_t = SDL3.SDLK_t, - SDLK_u = SDL3.SDLK_u, - SDLK_v = SDL3.SDLK_v, - SDLK_w = SDL3.SDLK_w, - SDLK_x = SDL3.SDLK_x, - SDLK_y = SDL3.SDLK_y, - SDLK_z = SDL3.SDLK_z, SDLK_LEFTBRACE = SDL3.SDLK_LEFTBRACE, SDLK_PIPE = SDL3.SDLK_PIPE, SDLK_RIGHTBRACE = SDL3.SDLK_RIGHTBRACE, SDLK_TILDE = SDL3.SDLK_TILDE, SDLK_DELETE = SDL3.SDLK_DELETE, + SDLK_PLUSMINUS = SDL3.SDLK_PLUSMINUS, SDLK_CAPSLOCK = SDL3.SDLK_CAPSLOCK, SDLK_F1 = SDL3.SDLK_F1, SDLK_F2 = SDL3.SDLK_F2, @@ -135,25 +111,8 @@ namespace SDL SDLK_DOWN = SDL3.SDLK_DOWN, SDLK_UP = SDL3.SDLK_UP, SDLK_NUMLOCKCLEAR = SDL3.SDLK_NUMLOCKCLEAR, - SDLK_KP_DIVIDE = SDL3.SDLK_KP_DIVIDE, - SDLK_KP_MULTIPLY = SDL3.SDLK_KP_MULTIPLY, - SDLK_KP_MINUS = SDL3.SDLK_KP_MINUS, - SDLK_KP_PLUS = SDL3.SDLK_KP_PLUS, - SDLK_KP_ENTER = SDL3.SDLK_KP_ENTER, - SDLK_KP_1 = SDL3.SDLK_KP_1, - SDLK_KP_2 = SDL3.SDLK_KP_2, - SDLK_KP_3 = SDL3.SDLK_KP_3, - SDLK_KP_4 = SDL3.SDLK_KP_4, - SDLK_KP_5 = SDL3.SDLK_KP_5, - SDLK_KP_6 = SDL3.SDLK_KP_6, - SDLK_KP_7 = SDL3.SDLK_KP_7, - SDLK_KP_8 = SDL3.SDLK_KP_8, - SDLK_KP_9 = SDL3.SDLK_KP_9, - SDLK_KP_0 = SDL3.SDLK_KP_0, - SDLK_KP_PERIOD = SDL3.SDLK_KP_PERIOD, SDLK_APPLICATION = SDL3.SDLK_APPLICATION, SDLK_POWER = SDL3.SDLK_POWER, - SDLK_KP_EQUALS = SDL3.SDLK_KP_EQUALS, SDLK_F13 = SDL3.SDLK_F13, SDLK_F14 = SDL3.SDLK_F14, SDLK_F15 = SDL3.SDLK_F15, @@ -180,8 +139,6 @@ namespace SDL SDLK_MUTE = SDL3.SDLK_MUTE, SDLK_VOLUMEUP = SDL3.SDLK_VOLUMEUP, SDLK_VOLUMEDOWN = SDL3.SDLK_VOLUMEDOWN, - SDLK_KP_COMMA = SDL3.SDLK_KP_COMMA, - SDLK_KP_EQUALSAS400 = SDL3.SDLK_KP_EQUALSAS400, SDLK_ALTERASE = SDL3.SDLK_ALTERASE, SDLK_SYSREQ = SDL3.SDLK_SYSREQ, SDLK_CANCEL = SDL3.SDLK_CANCEL, @@ -200,32 +157,11 @@ namespace SDL SDLK_DECIMALSEPARATOR = SDL3.SDLK_DECIMALSEPARATOR, SDLK_CURRENCYUNIT = SDL3.SDLK_CURRENCYUNIT, SDLK_CURRENCYSUBUNIT = SDL3.SDLK_CURRENCYSUBUNIT, - SDLK_KP_LEFTPAREN = SDL3.SDLK_KP_LEFTPAREN, - SDLK_KP_RIGHTPAREN = SDL3.SDLK_KP_RIGHTPAREN, - SDLK_KP_LEFTBRACE = SDL3.SDLK_KP_LEFTBRACE, - SDLK_KP_RIGHTBRACE = SDL3.SDLK_KP_RIGHTBRACE, - SDLK_KP_TAB = SDL3.SDLK_KP_TAB, - SDLK_KP_BACKSPACE = SDL3.SDLK_KP_BACKSPACE, - SDLK_KP_A = SDL3.SDLK_KP_A, - SDLK_KP_B = SDL3.SDLK_KP_B, - SDLK_KP_C = SDL3.SDLK_KP_C, - SDLK_KP_D = SDL3.SDLK_KP_D, - SDLK_KP_E = SDL3.SDLK_KP_E, - SDLK_KP_F = SDL3.SDLK_KP_F, SDLK_KP_XOR = SDL3.SDLK_KP_XOR, SDLK_KP_POWER = SDL3.SDLK_KP_POWER, - SDLK_KP_PERCENT = SDL3.SDLK_KP_PERCENT, - SDLK_KP_LESS = SDL3.SDLK_KP_LESS, - SDLK_KP_GREATER = SDL3.SDLK_KP_GREATER, - SDLK_KP_AMPERSAND = SDL3.SDLK_KP_AMPERSAND, SDLK_KP_DBLAMPERSAND = SDL3.SDLK_KP_DBLAMPERSAND, SDLK_KP_VERTICALBAR = SDL3.SDLK_KP_VERTICALBAR, SDLK_KP_DBLVERTICALBAR = SDL3.SDLK_KP_DBLVERTICALBAR, - SDLK_KP_COLON = SDL3.SDLK_KP_COLON, - SDLK_KP_HASH = SDL3.SDLK_KP_HASH, - SDLK_KP_SPACE = SDL3.SDLK_KP_SPACE, - SDLK_KP_AT = SDL3.SDLK_KP_AT, - SDLK_KP_EXCLAM = SDL3.SDLK_KP_EXCLAM, SDLK_KP_MEMSTORE = SDL3.SDLK_KP_MEMSTORE, SDLK_KP_MEMRECALL = SDL3.SDLK_KP_MEMRECALL, SDLK_KP_MEMCLEAR = SDL3.SDLK_KP_MEMCLEAR, @@ -233,7 +169,6 @@ namespace SDL SDLK_KP_MEMSUBTRACT = SDL3.SDLK_KP_MEMSUBTRACT, SDLK_KP_MEMMULTIPLY = SDL3.SDLK_KP_MEMMULTIPLY, SDLK_KP_MEMDIVIDE = SDL3.SDLK_KP_MEMDIVIDE, - SDLK_KP_PLUSMINUS = SDL3.SDLK_KP_PLUSMINUS, SDLK_KP_CLEAR = SDL3.SDLK_KP_CLEAR, SDLK_KP_CLEARENTRY = SDL3.SDLK_KP_CLEARENTRY, SDLK_KP_BINARY = SDL3.SDLK_KP_BINARY, @@ -281,7 +216,7 @@ namespace SDL SDLK_SOFTLEFT = SDL3.SDLK_SOFTLEFT, SDLK_SOFTRIGHT = SDL3.SDLK_SOFTRIGHT, SDLK_CALL = SDL3.SDLK_CALL, - SDLK_ENDCALL = SDL3.SDLK_ENDCALL + SDLK_ENDCALL = SDL3.SDLK_ENDCALL, } [Flags] @@ -304,7 +239,7 @@ namespace SDL SDL_KMOD_CTRL = (UInt16)SDL3.SDL_KMOD_CTRL, SDL_KMOD_SHIFT = (UInt16)SDL3.SDL_KMOD_SHIFT, SDL_KMOD_ALT = (UInt16)SDL3.SDL_KMOD_ALT, - SDL_KMOD_GUI = (UInt16)SDL3.SDL_KMOD_GUI + SDL_KMOD_GUI = (UInt16)SDL3.SDL_KMOD_GUI, } public static partial class SDL3