diff --git a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLHints.java b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLHints.java index efa058342a..c423f43fd1 100644 --- a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLHints.java +++ b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLHints.java @@ -166,6 +166,7 @@ private Functions() {} SDL_HINT_MAC_BACKGROUND_APP = "SDL_MAC_BACKGROUND_APP", SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK = "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK", SDL_HINT_MAC_OPENGL_ASYNC_DISPATCH = "SDL_MAC_OPENGL_ASYNC_DISPATCH", + SDL_HINT_MAC_OPTION_AS_ALT = "SDL_MAC_OPTION_AS_ALT", SDL_HINT_MAC_SCROLL_MOMENTUM = "SDL_MAC_SCROLL_MOMENTUM", SDL_HINT_MAIN_CALLBACK_RATE = "SDL_MAIN_CALLBACK_RATE", SDL_HINT_MOUSE_AUTO_CAPTURE = "SDL_MOUSE_AUTO_CAPTURE", diff --git a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLStorage.java b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLStorage.java index c86cfaacf7..accbf193d2 100644 --- a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLStorage.java +++ b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLStorage.java @@ -332,20 +332,20 @@ public static boolean nSDL_EnumerateStorageDirectory(long storage, long path, lo /** {@code bool SDL_EnumerateStorageDirectory(SDL_Storage * storage, char const * path, SDL_EnumerateDirectoryCallback callback, void * userdata)} */ @NativeType("bool") - public static boolean SDL_EnumerateStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") ByteBuffer path, @NativeType("SDL_EnumerateDirectoryCallback") SDL_EnumerateDirectoryCallbackI callback, @NativeType("void *") long userdata) { + public static boolean SDL_EnumerateStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") @Nullable ByteBuffer path, @NativeType("SDL_EnumerateDirectoryCallback") SDL_EnumerateDirectoryCallbackI callback, @NativeType("void *") long userdata) { if (CHECKS) { - checkNT1(path); + checkNT1Safe(path); } - return nSDL_EnumerateStorageDirectory(storage, memAddress(path), callback.address(), userdata); + return nSDL_EnumerateStorageDirectory(storage, memAddressSafe(path), callback.address(), userdata); } /** {@code bool SDL_EnumerateStorageDirectory(SDL_Storage * storage, char const * path, SDL_EnumerateDirectoryCallback callback, void * userdata)} */ @NativeType("bool") - public static boolean SDL_EnumerateStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") CharSequence path, @NativeType("SDL_EnumerateDirectoryCallback") SDL_EnumerateDirectoryCallbackI callback, @NativeType("void *") long userdata) { + public static boolean SDL_EnumerateStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") @Nullable CharSequence path, @NativeType("SDL_EnumerateDirectoryCallback") SDL_EnumerateDirectoryCallbackI callback, @NativeType("void *") long userdata) { MemoryStack stack = stackGet(); int stackPointer = stack.getPointer(); try { - stack.nUTF8(path, true); - long pathEncoded = stack.getPointerAddress(); + stack.nUTF8Safe(path, true); + long pathEncoded = path == null ? NULL : stack.getPointerAddress(); return nSDL_EnumerateStorageDirectory(storage, pathEncoded, callback.address(), userdata); } finally { stack.setPointer(stackPointer); @@ -515,15 +515,15 @@ public static long nSDL_GlobStorageDirectory(long storage, long path, long patte /** {@code char ** SDL_GlobStorageDirectory(SDL_Storage * storage, char const * path, char const * pattern, SDL_GlobFlags flags, int * count)} */ @NativeType("char **") - public static @Nullable PointerBuffer SDL_GlobStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") ByteBuffer path, @NativeType("char const *") @Nullable ByteBuffer pattern, @NativeType("SDL_GlobFlags") int flags) { + public static @Nullable PointerBuffer SDL_GlobStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") @Nullable ByteBuffer path, @NativeType("char const *") @Nullable ByteBuffer pattern, @NativeType("SDL_GlobFlags") int flags) { if (CHECKS) { - checkNT1(path); + checkNT1Safe(path); checkNT1Safe(pattern); } MemoryStack stack = stackGet(); int stackPointer = stack.getPointer(); IntBuffer count = stack.callocInt(1); try { - long __result = nSDL_GlobStorageDirectory(storage, memAddress(path), memAddressSafe(pattern), flags, memAddress(count)); + long __result = nSDL_GlobStorageDirectory(storage, memAddressSafe(path), memAddressSafe(pattern), flags, memAddress(count)); return memPointerBufferSafe(__result, count.get(0)); } finally { stack.setPointer(stackPointer); @@ -532,12 +532,12 @@ public static long nSDL_GlobStorageDirectory(long storage, long path, long patte /** {@code char ** SDL_GlobStorageDirectory(SDL_Storage * storage, char const * path, char const * pattern, SDL_GlobFlags flags, int * count)} */ @NativeType("char **") - public static @Nullable PointerBuffer SDL_GlobStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") CharSequence path, @NativeType("char const *") @Nullable CharSequence pattern, @NativeType("SDL_GlobFlags") int flags) { + public static @Nullable PointerBuffer SDL_GlobStorageDirectory(@NativeType("SDL_Storage *") long storage, @NativeType("char const *") @Nullable CharSequence path, @NativeType("char const *") @Nullable CharSequence pattern, @NativeType("SDL_GlobFlags") int flags) { MemoryStack stack = stackGet(); int stackPointer = stack.getPointer(); try { IntBuffer count = stack.callocInt(1); - stack.nUTF8(path, true); - long pathEncoded = stack.getPointerAddress(); + stack.nUTF8Safe(path, true); + long pathEncoded = path == null ? NULL : stack.getPointerAddress(); stack.nUTF8Safe(pattern, true); long patternEncoded = pattern == null ? NULL : stack.getPointerAddress(); long __result = nSDL_GlobStorageDirectory(storage, pathEncoded, patternEncoded, flags, memAddress(count)); diff --git a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLTray.java b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLTray.java index 08bbd2ef44..41361dd24a 100644 --- a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLTray.java +++ b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLTray.java @@ -49,7 +49,8 @@ private Functions() {} DestroyTray = apiGetFunctionAddress(SDL.getLibrary(), "SDL_DestroyTray"), GetTrayEntryParent = apiGetFunctionAddress(SDL.getLibrary(), "SDL_GetTrayEntryParent"), GetTrayMenuParentEntry = apiGetFunctionAddress(SDL.getLibrary(), "SDL_GetTrayMenuParentEntry"), - GetTrayMenuParentTray = apiGetFunctionAddress(SDL.getLibrary(), "SDL_GetTrayMenuParentTray"); + GetTrayMenuParentTray = apiGetFunctionAddress(SDL.getLibrary(), "SDL_GetTrayMenuParentTray"), + UpdateTrays = apiGetFunctionAddress(SDL.getLibrary(), "SDL_UpdateTrays"); } @@ -430,4 +431,12 @@ public static long SDL_GetTrayMenuParentTray(@NativeType("SDL_TrayMenu *") long return invokePP(menu, __functionAddress); } + // --- [ SDL_UpdateTrays ] --- + + /** {@code void SDL_UpdateTrays(void)} */ + public static void SDL_UpdateTrays() { + long __functionAddress = Functions.UpdateTrays; + invokeV(__functionAddress); + } + } \ No newline at end of file diff --git a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLVersion.java b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLVersion.java index d01a86ef5d..5e53a31a35 100644 --- a/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLVersion.java +++ b/modules/lwjgl/sdl/src/generated/java/org/lwjgl/sdl/SDLVersion.java @@ -29,9 +29,9 @@ private Functions() {} public static final int SDL_MAJOR_VERSION = 3; - public static final int SDL_MINOR_VERSION = 1; + public static final int SDL_MINOR_VERSION = 2; - public static final int SDL_MICRO_VERSION = 10; + public static final int SDL_MICRO_VERSION = 0; public static final int SDL_VERSION = SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_MICRO_VERSION); diff --git a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_hints.kt b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_hints.kt index b3747c0952..fe9d7acff3 100644 --- a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_hints.kt +++ b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_hints.kt @@ -137,6 +137,7 @@ val SDL_hints = "SDLHints".nativeClassSDL("SDL_hints") { "HINT_MAC_BACKGROUND_APP".."SDL_MAC_BACKGROUND_APP", "HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK".."SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK", "HINT_MAC_OPENGL_ASYNC_DISPATCH".."SDL_MAC_OPENGL_ASYNC_DISPATCH", + "HINT_MAC_OPTION_AS_ALT".."SDL_MAC_OPTION_AS_ALT", "HINT_MAC_SCROLL_MOMENTUM".."SDL_MAC_SCROLL_MOMENTUM", "HINT_MAIN_CALLBACK_RATE".."SDL_MAIN_CALLBACK_RATE", "HINT_MOUSE_AUTO_CAPTURE".."SDL_MOUSE_AUTO_CAPTURE", diff --git a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_storage.kt b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_storage.kt index d7cc304346..71c3b37620 100644 --- a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_storage.kt +++ b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_storage.kt @@ -85,7 +85,7 @@ val SDL_storage = "SDLStorage".nativeClassSDL("SDL_storage") { "EnumerateStorageDirectory", SDL_Storage.p("storage"), - charUTF8.const.p("path"), + nullable..charUTF8.const.p("path"), SDL_EnumerateDirectoryCallback("callback"), nullable..opaque_p("userdata") ) @@ -131,7 +131,7 @@ val SDL_storage = "SDLStorage".nativeClassSDL("SDL_storage") { "GlobStorageDirectory", SDL_Storage.p("storage"), - charUTF8.const.p("path"), + nullable..charUTF8.const.p("path"), nullable..charUTF8.const.p("pattern"), SDL_GlobFlags("flags"), AutoSizeResult..int.p("count") diff --git a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_tray.kt b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_tray.kt index 9a68bad7d5..75afd50dcf 100644 --- a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_tray.kt +++ b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_tray.kt @@ -159,4 +159,10 @@ val SDL_tray = "SDLTray".nativeClassSDL("SDL_tray") { SDL_TrayMenu.p("menu") ) + + void( + "UpdateTrays", + + void() + ) } \ No newline at end of file diff --git a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_version.kt b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_version.kt index b8c3e18a10..ebd71cf85d 100644 --- a/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_version.kt +++ b/modules/lwjgl/sdl/src/templates/kotlin/sdl/templates/SDL_version.kt @@ -9,8 +9,8 @@ import sdl.* val SDL_version = "SDLVersion".nativeClassSDL("SDL_version") { IntConstant("MAJOR_VERSION".."3") - IntConstant("MINOR_VERSION".."1") - IntConstant("MICRO_VERSION".."10") + IntConstant("MINOR_VERSION".."2") + IntConstant("MICRO_VERSION".."0") int("GetVersion", void()) charASCII.const.p("GetRevision", void())