{@code void function_name(GLFWmonitor* monitor, int event)}
* For more information about the callback parameters, see the
- * {@link IGLFWMonitorFun function pointer type}.
+ * {@link GLFWMonitorFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -1715,8 +1714,8 @@ public static MemorySegment nsetMonitorCallback(MemorySegment callback) {
* library had not been initialized.
* @see #nsetMonitorCallback(MemorySegment) nsetMonitorCallback
*/
- public static MemorySegment setMonitorCallback(@Nullable IGLFWMonitorFun callback) {
- return nsetMonitorCallback(callback != null ? callback.address(Arena.global()) : MemorySegment.NULL);
+ public static MemorySegment setMonitorCallback(@Nullable GLFWMonitorFun callback) {
+ return nsetMonitorCallback(callback != null ? callback.stub(Arena.ofAuto()) : MemorySegment.NULL);
}
/**
@@ -3427,7 +3426,7 @@ public static MemorySegment getWindowUserPointer(MemorySegment window) {
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int xpos, int ypos)}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowPosFun function pointer type}.
+ * {@link GLFWWindowPosFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.remark Wayland: This callback will never be called, as there is no way for
* an application to know its global position.
@@ -3451,8 +3450,8 @@ public static MemorySegment nsetWindowPosCallback(MemorySegment window, MemorySe
* library had not been initialized.
* @see #nsetWindowPosCallback(MemorySegment, MemorySegment) nsetWindowPosCallback
*/
- public static MemorySegment setWindowPosCallback(MemorySegment window, @Nullable IGLFWWindowPosFun callback) {
- return nsetWindowPosCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowPosCallback(MemorySegment window, @Nullable GLFWWindowPosFun callback) {
+ return nsetWindowPosCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3469,7 +3468,7 @@ public static MemorySegment setWindowPosCallback(MemorySegment window, @Nullable
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int width, int height)}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowSizeFun function pointer type}.
+ * {@link GLFWWindowSizeFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -3491,8 +3490,8 @@ public static MemorySegment nsetWindowSizeCallback(MemorySegment window, MemoryS
* library had not been initialized.
* @see #nsetWindowSizeCallback(MemorySegment, MemorySegment) nsetWindowSizeCallback
*/
- public static MemorySegment setWindowSizeCallback(MemorySegment window, @Nullable IGLFWWindowSizeFun callback) {
- return nsetWindowSizeCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowSizeCallback(MemorySegment window, @Nullable GLFWWindowSizeFun callback) {
+ return nsetWindowSizeCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3514,7 +3513,7 @@ public static MemorySegment setWindowSizeCallback(MemorySegment window, @Nullabl
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window)}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowCloseFun function pointer type}.
+ * {@link GLFWWindowCloseFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.remark macOS: Selecting Quit from the application menu will trigger the
* close callback for all windows.
@@ -3538,8 +3537,8 @@ public static MemorySegment nsetWindowCloseCallback(MemorySegment window, Memory
* library had not been initialized.
* @see #nsetWindowCloseCallback(MemorySegment, MemorySegment) nsetWindowCloseCallback
*/
- public static MemorySegment setWindowCloseCallback(MemorySegment window, @Nullable IGLFWWindowCloseFun callback) {
- return nsetWindowCloseCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowCloseCallback(MemorySegment window, @Nullable GLFWWindowCloseFun callback) {
+ return nsetWindowCloseCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3560,7 +3559,7 @@ public static MemorySegment setWindowCloseCallback(MemorySegment window, @Nullab
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window);}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowRefreshFun function pointer type}.
+ * {@link GLFWWindowRefreshFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -3582,8 +3581,8 @@ public static MemorySegment nsetWindowRefreshCallback(MemorySegment window, Memo
* library had not been initialized.
* @see #nsetWindowRefreshCallback(MemorySegment, MemorySegment) nsetWindowRefreshCallback
*/
- public static MemorySegment setWindowRefreshCallback(MemorySegment window, @Nullable IGLFWWindowRefreshFun callback) {
- return nsetWindowRefreshCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowRefreshCallback(MemorySegment window, @Nullable GLFWWindowRefreshFun callback) {
+ return nsetWindowRefreshCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3605,7 +3604,7 @@ public static MemorySegment setWindowRefreshCallback(MemorySegment window, @Null
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int focused)}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowFocusFun function pointer type}.
+ * {@link GLFWWindowFocusFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -3627,8 +3626,8 @@ public static MemorySegment nsetWindowFocusCallback(MemorySegment window, Memory
* library had not been initialized.
* @see #nsetWindowFocusCallback(MemorySegment, MemorySegment) nsetWindowFocusCallback
*/
- public static MemorySegment setWindowFocusCallback(MemorySegment window, @Nullable IGLFWWindowFocusFun callback) {
- return nsetWindowFocusCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowFocusCallback(MemorySegment window, @Nullable GLFWWindowFocusFun callback) {
+ return nsetWindowFocusCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3644,7 +3643,7 @@ public static MemorySegment setWindowFocusCallback(MemorySegment window, @Nullab
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int iconified)}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowIconifyFun function pointer type}.
+ * {@link GLFWWindowIconifyFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.remark Wayland: The XDG-shell protocol has no event for iconification, so
* this callback will never be called.
@@ -3668,8 +3667,8 @@ public static MemorySegment nsetWindowIconifyCallback(MemorySegment window, Memo
* library had not been initialized.
* @see #nsetWindowIconifyCallback(MemorySegment, MemorySegment) nsetWindowIconifyCallback
*/
- public static MemorySegment setWindowIconifyCallback(MemorySegment window, @Nullable IGLFWWindowIconifyFun callback) {
- return nsetWindowIconifyCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowIconifyCallback(MemorySegment window, @Nullable GLFWWindowIconifyFun callback) {
+ return nsetWindowIconifyCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3685,7 +3684,7 @@ public static MemorySegment setWindowIconifyCallback(MemorySegment window, @Null
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int maximized)}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowMaximizeFun function pointer type}.
+ * {@link GLFWWindowMaximizeFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -3707,8 +3706,8 @@ public static MemorySegment nsetWindowMaximizeCallback(MemorySegment window, Mem
* library had not been initialized.
* @see #nsetWindowMaximizeCallback(MemorySegment, MemorySegment) nsetWindowMaximizeCallback
*/
- public static MemorySegment setWindowMaximizeCallback(MemorySegment window, @Nullable IGLFWWindowMaximizeFun callback) {
- return nsetWindowMaximizeCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowMaximizeCallback(MemorySegment window, @Nullable GLFWWindowMaximizeFun callback) {
+ return nsetWindowMaximizeCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3724,7 +3723,7 @@ public static MemorySegment setWindowMaximizeCallback(MemorySegment window, @Nul
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int width, int height)}
* For more information about the callback parameters, see the
- * {@link IGLFWFramebufferSizeFun function pointer type}.
+ * {@link GLFWFramebufferSizeFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -3746,8 +3745,8 @@ public static MemorySegment nsetFramebufferSizeCallback(MemorySegment window, Me
* library had not been initialized.
* @see #nsetFramebufferSizeCallback(MemorySegment, MemorySegment) nsetFramebufferSizeCallback
*/
- public static MemorySegment setFramebufferSizeCallback(MemorySegment window, @Nullable IGLFWFramebufferSizeFun callback) {
- return nsetFramebufferSizeCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setFramebufferSizeCallback(MemorySegment window, @Nullable GLFWFramebufferSizeFun callback) {
+ return nsetFramebufferSizeCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -3763,7 +3762,7 @@ public static MemorySegment setFramebufferSizeCallback(MemorySegment window, @Nu
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, float xscale, float yscale)}
* For more information about the callback parameters, see the
- * {@link IGLFWWindowContentScaleFun function pointer type}.
+ * {@link GLFWWindowContentScaleFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
* @see #ngetWindowContentScale(MemorySegment, MemorySegment, MemorySegment) getWindowContentScale
@@ -3786,8 +3785,8 @@ public static MemorySegment nsetWindowContentScaleCallback(MemorySegment window,
* library had not been initialized.
* @see #nsetWindowContentScaleCallback(MemorySegment, MemorySegment) nsetWindowContentScaleCallback
*/
- public static MemorySegment setWindowContentScaleCallback(MemorySegment window, @Nullable IGLFWWindowContentScaleFun callback) {
- return nsetWindowContentScaleCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setWindowContentScaleCallback(MemorySegment window, @Nullable GLFWWindowContentScaleFun callback) {
+ return nsetWindowContentScaleCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -4512,7 +4511,7 @@ public static void setCursor(MemorySegment window, MemorySegment cursor) {
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int key, int scancode, int action, int mods)}
* For more information about the callback parameters, see the
- * {@link IGLFWKeyFun function pointer type}.
+ * {@link GLFWKeyFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -4534,8 +4533,8 @@ public static MemorySegment nsetKeyCallback(MemorySegment window, MemorySegment
* library had not been initialized.
* @see #nsetKeyCallback(MemorySegment, MemorySegment) nsetKeyCallback
*/
- public static MemorySegment setKeyCallback(MemorySegment window, @Nullable IGLFWKeyFun callback) {
- return nsetKeyCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setKeyCallback(MemorySegment window, @Nullable GLFWKeyFun callback) {
+ return nsetKeyCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -4563,7 +4562,7 @@ public static MemorySegment setKeyCallback(MemorySegment window, @Nullable IGLFW
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, unsigned int codepoint)}
* For more information about the callback parameters, see the
- * {@link IGLFWCharFun function pointer type}.
+ * {@link GLFWCharFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -4585,8 +4584,8 @@ public static MemorySegment nsetCharCallback(MemorySegment window, MemorySegment
* library had not been initialized.
* @see #nsetCharCallback(MemorySegment, MemorySegment) nsetCharCallback
*/
- public static MemorySegment setCharCallback(MemorySegment window, @Nullable IGLFWCharFun callback) {
- return nsetCharCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setCharCallback(MemorySegment window, @Nullable GLFWCharFun callback) {
+ return nsetCharCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -4608,7 +4607,7 @@ public static MemorySegment setCharCallback(MemorySegment window, @Nullable IGLF
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int button, int action, int mods)}
* For more information about the callback parameters, see the
- * {@link IGLFWMouseButtonFun function pointer type}.
+ * {@link GLFWMouseButtonFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -4630,8 +4629,8 @@ public static MemorySegment nsetMouseButtonCallback(MemorySegment window, Memory
* library had not been initialized.
* @see #nsetMouseButtonCallback(MemorySegment, MemorySegment) nsetMouseButtonCallback
*/
- public static MemorySegment setMouseButtonCallback(MemorySegment window, @Nullable IGLFWMouseButtonFun callback) {
- return nsetMouseButtonCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setMouseButtonCallback(MemorySegment window, @Nullable GLFWMouseButtonFun callback) {
+ return nsetMouseButtonCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -4649,7 +4648,7 @@ public static MemorySegment setMouseButtonCallback(MemorySegment window, @Nullab
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, double xpos, double ypos);}
* For more information about the callback parameters, see the
- * {@link IGLFWCursorPosFun function pointer type}.
+ * {@link GLFWCursorPosFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -4671,8 +4670,8 @@ public static MemorySegment nsetCursorPosCallback(MemorySegment window, MemorySe
* library had not been initialized.
* @see #nsetCursorPosCallback(MemorySegment, MemorySegment) nsetCursorPosCallback
*/
- public static MemorySegment setCursorPosCallback(MemorySegment window, @Nullable IGLFWCursorPosFun callback) {
- return nsetCursorPosCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setCursorPosCallback(MemorySegment window, @Nullable GLFWCursorPosFun callback) {
+ return nsetCursorPosCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -4689,7 +4688,7 @@ public static MemorySegment setCursorPosCallback(MemorySegment window, @Nullable
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int entered)}
* For more information about the callback parameters, see the
- * {@link IGLFWCursorEnterFun function pointer type}.
+ * {@link GLFWCursorEnterFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -4711,8 +4710,8 @@ public static MemorySegment nsetCursorEnterCallback(MemorySegment window, Memory
* library had not been initialized.
* @see #nsetCursorEnterCallback(MemorySegment, MemorySegment) nsetCursorEnterCallback
*/
- public static MemorySegment setCursorEnterCallback(MemorySegment window, @Nullable IGLFWCursorEnterFun callback) {
- return nsetCursorEnterCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setCursorEnterCallback(MemorySegment window, @Nullable GLFWCursorEnterFun callback) {
+ return nsetCursorEnterCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -4732,7 +4731,7 @@ public static MemorySegment setCursorEnterCallback(MemorySegment window, @Nullab
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, double xoffset, double yoffset)}
* For more information about the callback parameters, see the
- * {@link IGLFWScrollFun function pointer type}.
+ * {@link GLFWScrollFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -4754,8 +4753,8 @@ public static MemorySegment nsetScrollCallback(MemorySegment window, MemorySegme
* library had not been initialized.
* @see #nsetScrollCallback(MemorySegment, MemorySegment) nsetScrollCallback
*/
- public static MemorySegment setScrollCallback(MemorySegment window, @Nullable IGLFWScrollFun callback) {
- return nsetScrollCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setScrollCallback(MemorySegment window, @Nullable GLFWScrollFun callback) {
+ return nsetScrollCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -4776,7 +4775,7 @@ public static MemorySegment setScrollCallback(MemorySegment window, @Nullable IG
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(GLFWwindow* window, int path_count, const char* paths[])}
* For more information about the callback parameters, see the
- * {@link IGLFWDropFun function pointer type}.
+ * {@link GLFWDropFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.remark Wayland: File drop is currently unimplemented.
* @glfw.thread_safety This function must only be called from the main thread.
@@ -4799,8 +4798,8 @@ public static MemorySegment nsetDropCallback(MemorySegment window, MemorySegment
* library had not been initialized.
* @see #nsetDropCallback(MemorySegment, MemorySegment) nsetDropCallback
*/
- public static MemorySegment setDropCallback(MemorySegment window, @Nullable IGLFWDropFun callback) {
- return nsetDropCallback(window, callback != null ? callback.address(GLFWCallbacks.create(window)) : MemorySegment.NULL);
+ public static MemorySegment setDropCallback(MemorySegment window, @Nullable GLFWDropFun callback) {
+ return nsetDropCallback(window, callback != null ? callback.stub(GLFWCallbacks.create(window)) : MemorySegment.NULL);
}
/**
@@ -5215,7 +5214,7 @@ public static boolean joystickIsGamepad(int jid) {
* library had not been initialized.
* @glfw.callback_signature {@code void function_name(int jid, int event)}
* For more information about the callback parameters, see the
- * {@link IGLFWJoystickFun function pointer type}.
+ * {@link GLFWJoystickFun function pointer type}.
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function must only be called from the main thread.
*/
@@ -5236,8 +5235,8 @@ public static MemorySegment nsetJoystickCallback(MemorySegment callback) {
* library had not been initialized.
* @see #nsetJoystickCallback(MemorySegment) nsetJoystickCallback
*/
- public static MemorySegment setJoystickCallback(@Nullable IGLFWJoystickFun callback) {
- return nsetJoystickCallback(callback != null ? callback.address(Arena.global()) : MemorySegment.NULL);
+ public static MemorySegment setJoystickCallback(@Nullable GLFWJoystickFun callback) {
+ return nsetJoystickCallback(callback != null ? callback.stub(Arena.ofAuto()) : MemorySegment.NULL);
}
/**
diff --git a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java
index 05e1b152..8aebde72 100644
--- a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java
+++ b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java
@@ -1,7 +1,7 @@
/*
* MIT License
*
- * Copyright (c) 2022-2023 Overrun Organization
+ * Copyright (c) 2022-2024 Overrun Organization
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -18,8 +18,8 @@
import java.lang.foreign.Arena;
import java.lang.foreign.MemorySegment;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* The GLFW window callbacks.
@@ -28,7 +28,7 @@
* @since 0.1.0
*/
public final class GLFWCallbacks {
- private static final Map* This function does not apply to Vulkan. If you are rendering with Vulkan, - * see {@link GLFWVulkan#nglfwGetInstanceProcAddress(MemorySegment, MemorySegment) glfwGetInstanceProcAddress}, + * see {@link GLFWVulkan#ngetInstanceProcAddress(MemorySegment, MemorySegment) glfwGetInstanceProcAddress}, * {@code vkGetInstanceProcAddr} and {@code vkGetDeviceProcAddr} instead. * * @param procName The ASCII encoded name of the function. @@ -5823,7 +5819,7 @@ public static MemorySegment getProcAddress(String procName) { * surface creation or even instance creation is possible. Call * {@link #ngetRequiredInstanceExtensions getRequiredInstanceExtensions} to check whether the * extensions necessary for Vulkan surface creation are available and - * {@link GLFWVulkan#glfwGetPhysicalDevicePresentationSupport glfwGetPhysicalDevicePresentationSupport} + * {@link GLFWVulkan#getPhysicalDevicePresentationSupport glfwGetPhysicalDevicePresentationSupport} * to check whether a queue family of a physical device supports image presentation. * * @return {@code true} if Vulkan is minimally available, or {@code false} diff --git a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWGamepadState.java b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWGamepadState.java index 0ff1095a..a7133d8b 100644 --- a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWGamepadState.java +++ b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWGamepadState.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022-2023 Overrun Organization + * Copyright (c) 2022-2024 Overrun Organization * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -16,81 +16,78 @@ package overrungl.glfw; -import overrungl.Struct; +import overrun.marshal.struct.Struct; import java.lang.foreign.*; -import java.lang.foreign.MemoryLayout.PathElement; -import java.lang.invoke.VarHandle; /** * This describes the input state of a gamepad. *
* struct GLFWgamepadstate {
- * unsigned char {@link #buttons() buttons}[15];
- * float {@link #axes() axes}[6];
+ * unsigned char {@link #buttons}[15];
+ * float {@link #axes}[6];
* }
* struct GLFWgammaramp {
- * unsigned short* {@link #red() red};
- * unsigned short* {@link #green() green};
- * unsigned short* {@link #blue() blue};
+ * unsigned short* {@link #red};
+ * unsigned short* {@link #green};
+ * unsigned short* {@link #blue};
* unsigned int {@link #size};
* }
* struct GLFWimage {
- * int {@link #width() width};
- * int {@link #height() height};
- * unsigned char* {@link #pixels() pixels};
+ * int {@link #width};
+ * int {@link #height};
+ * unsigned char* {@link #pixels};
* }* This is incremented when the API is changed in non-compatible ways. */ - public static final int VERSION_MAJOR = 3; + int VERSION_MAJOR = 3; /** * The minor version number of the GLFW header. *
* This is incremented when features are added to the API, but it remains backward-compatible. */ - public static final int VERSION_MINOR = 3; + int VERSION_MINOR = 3; /** * The revision number of the GLFW header. *
* This is incremented when a bug fix release is made that does not contain any API changes. */ - public static final int VERSION_REVISION = 9; + int VERSION_REVISION = 9; /** * One. @@ -63,7 +69,7 @@ public final class GLFW { * {@code true} or {@code _True} or {@code GL_TRUE} or {@code VK_TRUE} or anything else that is equal * to one. */ - public static final int TRUE = 1; + int TRUE = 1; /** * Zero. *
@@ -71,25 +77,25 @@ public final class GLFW { * {@code false} or {@code _False} or {@code GL_FALSE} or {@code VK_FALSE} or anything else that is * equal to zero. */ - public static final int FALSE = 0; + int FALSE = 0; /** * The key or mouse button was released. */ - public static final int RELEASE = 0; + int RELEASE = 0; /** * The key or mouse button was pressed. */ - public static final int PRESS = 1; + int PRESS = 1; /** * The key was held down until it repeated. */ - public static final int REPEAT = 2; + int REPEAT = 2; /** * Joystick hat states. */ - public static final int HAT_CENTERED = 0, + int HAT_CENTERED = 0, HAT_UP = 1, HAT_RIGHT = 2, HAT_DOWN = 4, @@ -103,12 +109,12 @@ public final class GLFW { /** * The unknown key */ - public static final int KEY_UNKNOWN = -1; + int KEY_UNKNOWN = -1; /** * Printable keys */ - public static final int KEY_SPACE = 32, + int KEY_SPACE = 32, KEY_APOSTROPHE = 39, /* ' */ KEY_COMMA = 44, /* , */ KEY_MINUS = 45, /* - */ @@ -162,7 +168,7 @@ public final class GLFW { /** * Function keys */ - public static final int KEY_ESCAPE = 256, + int KEY_ESCAPE = 256, KEY_ENTER = 257, KEY_TAB = 258, KEY_BACKSPACE = 259, @@ -233,39 +239,39 @@ public final class GLFW { KEY_RIGHT_SUPER = 347, KEY_MENU = 348; - public static final int KEY_LAST = KEY_MENU; + int KEY_LAST = KEY_MENU; /** * If this bit is set one or more Shift keys were held down. */ - public static final int MOD_SHIFT = 0x0001; + int MOD_SHIFT = 0x0001; /** * If this bit is set one or more Control keys were held down. */ - public static final int MOD_CONTROL = 0x0002; + int MOD_CONTROL = 0x0002; /** * If this bit is set one or more Alt keys were held down. */ - public static final int MOD_ALT = 0x0004; + int MOD_ALT = 0x0004; /** * If this bit is set one or more Super keys were held down. */ - public static final int MOD_SUPER = 0x0008; + int MOD_SUPER = 0x0008; /** * If this bit is set the Caps Lock key is enabled and the * {@link #LOCK_KEY_MODS} input mode is set. */ - public static final int MOD_CAPS_LOCK = 0x0010; + int MOD_CAPS_LOCK = 0x0010; /** * If this bit is set the Num Lock key is enabled and the * {@link #LOCK_KEY_MODS} input mode is set. */ - public static final int MOD_NUM_LOCK = 0x0020; + int MOD_NUM_LOCK = 0x0020; /** * Mouse button IDs. */ - public static final int MOUSE_BUTTON_1 = 0, + int MOUSE_BUTTON_1 = 0, MOUSE_BUTTON_2 = 1, MOUSE_BUTTON_3 = 2, MOUSE_BUTTON_4 = 3, @@ -281,7 +287,7 @@ public final class GLFW { /** * Joystick IDs. **/ - public static final int JOYSTICK_1 = 0, + int JOYSTICK_1 = 0, JOYSTICK_2 = 1, JOYSTICK_3 = 2, JOYSTICK_4 = 3, @@ -302,7 +308,7 @@ public final class GLFW { /** * Gamepad buttons. */ - public static final int GAMEPAD_BUTTON_A = 0, + int GAMEPAD_BUTTON_A = 0, GAMEPAD_BUTTON_B = 1, GAMEPAD_BUTTON_X = 2, GAMEPAD_BUTTON_Y = 3, @@ -327,7 +333,7 @@ public final class GLFW { /** * Gamepad axes. **/ - public static final int GAMEPAD_AXIS_LEFT_X = 0, + int GAMEPAD_AXIS_LEFT_X = 0, GAMEPAD_AXIS_LEFT_Y = 1, GAMEPAD_AXIS_RIGHT_X = 2, GAMEPAD_AXIS_RIGHT_Y = 3, @@ -341,7 +347,7 @@ public final class GLFW { *
@@ -352,7 +358,7 @@ public final class GLFW { * Application programmer error. Initialize GLFW before calling any * function that requires initialization. */ - public static final int NOT_INITIALIZED = 0x00010001; + int NOT_INITIALIZED = 0x00010001; /** * No context is current for this thread. *
@@ -364,7 +370,7 @@ public final class GLFW { * Application programmer error. Ensure a context is current before * calling functions that require a current context. */ - public static final int NO_CURRENT_CONTEXT = 0x00010002; + int NO_CURRENT_CONTEXT = 0x00010002; /** * One of the arguments to the function was an invalid enum value, for example * requesting {@link #RED_BITS} with {@link #getWindowAttrib}. @@ -372,7 +378,7 @@ public final class GLFW { *
@@ -452,7 +458,7 @@ public final class GLFW { * If emitted when querying the clipboard, ignore the error or report it to * the user, as appropriate. */ - public static final int FORMAT_UNAVAILABLE = 0x00010009; + int FORMAT_UNAVAILABLE = 0x00010009; /** * The specified window does not have an OpenGL or OpenGL ES context. *
@@ -462,7 +468,7 @@ public final class GLFW { *
+ * This function sets the system clipboard to the specified, UTF-8 encoded + * string. + * + * @param string A UTF-8 encoded string. + * @glfw.errors Possible errors include {@link #NOT_INITIALIZED} and + * {@link #PLATFORM_ERROR}. + * @glfw.pointer_lifetime The specified string is copied before this function + * returns. + * @glfw.thread_safety This function must only be called from the main thread. + * @see #ngetClipboardString() getClipboardString + */ + @Skip + default void nsetClipboardString(MemorySegment string) { + nsetClipboardString(MemorySegment.NULL, string); } /** @@ -5413,13 +4656,10 @@ static void nsetClipboardString(MemorySegment string) { * @param string A UTF-8 encoded string. * @see #nsetClipboardString(MemorySegment) nsetClipboardString */ - static void setClipboardString(String string) { - final MemoryStack stack = MemoryStack.stackGet(); - final long stackPointer = stack.getPointer(); - try { + @Skip + default void setClipboardString(String string) { + try (MemoryStack stack = MemoryStack.stackPush()) { nsetClipboardString(stack.allocateFrom(string)); - } finally { - stack.setPointer(stackPointer); } } @@ -5431,6 +4671,7 @@ static void setClipboardString(String string) { * if its contents cannot be converted, {@link MemorySegment#NULL NULL} is returned and a * {@link #FORMAT_UNAVAILABLE} error is generated. * + * @param window Deprecated. Any valid window or {@code NULL}. * @return The contents of the clipboard as a UTF-8 encoded string, or {@link MemorySegment#NULL NULL} * if an error occurred. * @glfw.errors Possible errors include {@link #NOT_INITIALIZED}, @@ -5443,12 +4684,33 @@ static void setClipboardString(String string) { * @glfw.thread_safety This function must only be called from the main thread. * @see #nsetClipboardString(MemorySegment) setClipboardString */ - static MemorySegment ngetClipboardString() { - try { - return (MemorySegment) glfwGetClipboardString.invokeExact(MemorySegment.NULL); - } catch (Throwable e) { - throw new AssertionError("should not reach here", e); - } + @Entrypoint("glfwGetClipboardString") + @SizedSeg(Unmarshal.STR_SIZE) + MemorySegment ngetClipboardString(MemorySegment window); + + /** + * Returns the contents of the clipboard as a string. + *
+ * This function returns the contents of the system clipboard, if it contains
+ * or is convertible to a UTF-8 encoded string. If the clipboard is empty or
+ * if its contents cannot be converted, {@link MemorySegment#NULL NULL} is returned and a
+ * {@link #FORMAT_UNAVAILABLE} error is generated.
+ *
+ * @return The contents of the clipboard as a UTF-8 encoded string, or {@link MemorySegment#NULL NULL}
+ * if an error occurred.
+ * @glfw.errors Possible errors include {@link #NOT_INITIALIZED},
+ * {@link #FORMAT_UNAVAILABLE} and {@link #PLATFORM_ERROR}.
+ * @glfw.pointer_lifetime The returned string is allocated and freed by GLFW. You
+ * should not free it yourself. It is valid until the next call to
+ * {@code getClipboardString} or
+ * {@link #nsetClipboardString(MemorySegment) setClipboardString},
+ * or until the library is terminated.
+ * @glfw.thread_safety This function must only be called from the main thread.
+ * @see #nsetClipboardString(MemorySegment) setClipboardString
+ */
+ @Skip
+ default MemorySegment ngetClipboardString() {
+ return ngetClipboardString(MemorySegment.NULL);
}
/**
@@ -5458,10 +4720,10 @@ static MemorySegment ngetClipboardString() {
* if an error occurred.
* @see #ngetClipboardString() ngetClipboardString
*/
+ @Skip
@Nullable
- static String getClipboardString(@Deprecated MemorySegment window) {
- var pString = ngetClipboardString();
- return RuntimeHelper.isNullptr(pString) ? null : pString.getString(0);
+ default String getClipboardString() {
+ return ngetClipboardString().getString(0L);
}
/**
@@ -5485,13 +4747,8 @@ static String getClipboardString(@Deprecated MemorySegment window) {
* writing of the internal base time is not atomic, so it needs to be
* externally synchronized with calls to {@link #setTime}.
*/
- static double getTime() {
- try {
- return (double) glfwGetTime.invokeExact();
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwGetTime")
+ double getTime();
/**
* Sets the GLFW time.
@@ -5513,13 +4770,8 @@ static double getTime() {
* writing of the internal base time is not atomic, so it needs to be
* externally synchronized with calls to {@link #getTime}.
*/
- static void setTime(double time) {
- try {
- glfwSetTime.invokeExact(time);
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwSetTime")
+ void setTime(double time);
/**
* Returns the current value of the raw timer.
@@ -5534,13 +4786,8 @@ static void setTime(double time) {
* @glfw.thread_safety This function may be called from any thread.
* @see #getTimerFrequency
*/
- static long getTimerValue() {
- try {
- return (long) glfwGetTimerValue.invokeExact();
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwGetTimerValue")
+ long getTimerValue();
/**
* Returns the frequency, in Hz, of the raw timer.
@@ -5553,13 +4800,8 @@ static long getTimerValue() {
* @glfw.thread_safety This function may be called from any thread.
* @see #getTimerValue
*/
- static long getTimerFrequency() {
- try {
- return (long) glfwGetTimerFrequency.invokeExact();
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwGetTimerFrequency")
+ long getTimerFrequency();
/**
* Makes the context of the specified window current for the calling
@@ -5597,13 +4839,8 @@ static long getTimerFrequency() {
* @glfw.thread_safety This function may be called from any thread.
* @see #getCurrentContext
*/
- static void makeContextCurrent(MemorySegment window) {
- try {
- glfwMakeContextCurrent.invokeExact(window);
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwMakeContextCurrent")
+ void makeContextCurrent(MemorySegment window);
/**
* Returns the window whose context is current on the calling thread.
@@ -5617,13 +4854,8 @@ static void makeContextCurrent(MemorySegment window) {
* @glfw.thread_safety This function may be called from any thread.
* @see #makeContextCurrent
*/
- static MemorySegment getCurrentContext() {
- try {
- return (MemorySegment) glfwGetCurrentContext.invokeExact();
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwGetCurrentContext")
+ MemorySegment getCurrentContext();
/**
* Swaps the front and back buffers of the specified window.
@@ -5647,13 +4879,8 @@ static MemorySegment getCurrentContext() {
* @glfw.thread_safety This function may be called from any thread.
* @see #swapInterval
*/
- static void swapBuffers(MemorySegment window) {
- try {
- glfwSwapBuffers.invokeExact(window);
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwSwapBuffers")
+ void swapBuffers(MemorySegment window);
/**
* Sets the swap interval for the current context.
@@ -5690,13 +4917,8 @@ static void swapBuffers(MemorySegment window) {
* @glfw.thread_safety This function may be called from any thread.
* @see #swapBuffers
*/
- static void swapInterval(int interval) {
- try {
- glfwSwapInterval.invokeExact(interval);
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwSwapInterval")
+ void swapInterval(int interval);
/**
* Returns whether the specified extension is available.
@@ -5727,13 +4949,9 @@ static void swapInterval(int interval) {
* @glfw.thread_safety This function may be called from any thread.
* @see #ngetProcAddress
*/
- static boolean nextensionSupported(MemorySegment extension) {
- try {
- return (int) glfwExtensionSupported.invokeExact(extension) != FALSE;
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Convert(Type.INT)
+ @Entrypoint("glfwExtensionSupported")
+ boolean nextensionSupported(MemorySegment extension);
/**
* Returns whether the specified extension is available.
@@ -5743,15 +4961,9 @@ static boolean nextensionSupported(MemorySegment extension) {
* otherwise.
* @see #nextensionSupported(MemorySegment) nextensionSupported
*/
- static boolean extensionSupported(String extension) {
- final MemoryStack stack = MemoryStack.stackGet();
- final long stackPointer = stack.getPointer();
- try {
- return nextensionSupported(stack.allocateFrom(extension));
- } finally {
- stack.setPointer(stackPointer);
- }
- }
+ @Convert(Type.INT)
+ @Entrypoint("glfwExtensionSupported")
+ boolean extensionSupported(@StrCharset("US-ASCII") String extension);
/**
* Returns the address of the specified function for the current
@@ -5784,13 +4996,8 @@ static boolean extensionSupported(String extension) {
* @glfw.thread_safety This function may be called from any thread.
* @see #nextensionSupported
*/
- static MemorySegment ngetProcAddress(MemorySegment procName) {
- try {
- return (MemorySegment) glfwGetProcAddress.invokeExact(procName);
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwGetProcAddress")
+ MemorySegment ngetProcAddress(MemorySegment procName);
/**
* Returns the address of the specified function for the current
@@ -5801,15 +5008,8 @@ static MemorySegment ngetProcAddress(MemorySegment procName) {
* error occurred.
* @see #ngetProcAddress(MemorySegment) ngetProcAddress
*/
- static MemorySegment getProcAddress(String procName) {
- final MemoryStack stack = MemoryStack.stackGet();
- final long stackPointer = stack.getPointer();
- try {
- return ngetProcAddress(stack.allocateFrom(procName));
- } finally {
- stack.setPointer(stackPointer);
- }
- }
+ @Entrypoint("glfwGetProcAddress")
+ MemorySegment getProcAddress(String procName);
/**
* Returns whether the Vulkan loader and an ICD have been found.
@@ -5829,13 +5029,9 @@ static MemorySegment getProcAddress(String procName) {
* @glfw.errors Possible errors include {@link #NOT_INITIALIZED}.
* @glfw.thread_safety This function may be called from any thread.
*/
- static boolean vulkanSupported() {
- try {
- return (int) glfwVulkanSupported.invokeExact() != FALSE;
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Convert(Type.INT)
+ @Entrypoint("glfwVulkanSupported")
+ boolean vulkanSupported();
/**
* Returns the Vulkan instance extensions required by GLFW.
@@ -5869,13 +5065,8 @@ static boolean vulkanSupported() {
* library is terminated.
* @glfw.thread_safety This function may be called from any thread.
*/
- static MemorySegment ngetRequiredInstanceExtensions(MemorySegment count) {
- try {
- return (MemorySegment) glfwGetRequiredInstanceExtensions.invokeExact(count);
- } catch (Throwable e) {
- throw new AssertionError("should not reach here", e);
- }
- }
+ @Entrypoint("glfwGetRequiredInstanceExtensions")
+ MemorySegment ngetRequiredInstanceExtensions(MemorySegment count);
/**
* Returns the Vulkan instance extensions required by GLFW.
@@ -5884,19 +5075,14 @@ static MemorySegment ngetRequiredInstanceExtensions(MemorySegment count) {
* error occurred.
* @see #ngetRequiredInstanceExtensions(MemorySegment) ngetRequiredInstanceExtensions
*/
- static String @Nullable [] getRequiredInstanceExtensions() {
- var stack = MemoryStack.stackGet();
- long stackPointer = stack.getPointer();
- MemorySegment pExt;
- final int count;
- try {
- var pCount = stack.callocInt();
- pExt = ngetRequiredInstanceExtensions(pCount);
- count = pCount.get(JAVA_INT, 0);
- } finally {
- stack.setPointer(stackPointer);
+ @Skip
+ default String @Nullable [] getRequiredInstanceExtensions() {
+ try (MemoryStack stack = MemoryStack.stackPush()) {
+ var pCount = stack.ints(0);
+ MemorySegment pExt = ngetRequiredInstanceExtensions(pCount);
+ final int count = pCount.get(JAVA_INT, 0);
+ if (count == 0) return null;
+ return Unmarshal.unmarshalAsStringArray(pExt.reinterpret(ADDRESS.scale(0L, count)));
}
- if (count == 0) return null;
- return RuntimeHelper.toUnboundedArray(pExt, new String[count]);
}
}
diff --git a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java
index 8aebde72..99d03e85 100644
--- a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java
+++ b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCallbacks.java
@@ -52,22 +52,23 @@ public static Arena create(MemorySegment window) {
*/
public static void free(MemorySegment window) {
if (ARENA_MAP.containsKey(window)) {
- GLFW.setCharCallback(window, null);
- GLFW.setCursorEnterCallback(window, null);
- GLFW.setCursorPosCallback(window, null);
- GLFW.setDropCallback(window, null);
- GLFW.setFramebufferSizeCallback(window, null);
- GLFW.setKeyCallback(window, null);
- GLFW.setMouseButtonCallback(window, null);
- GLFW.setScrollCallback(window, null);
- GLFW.setWindowCloseCallback(window, null);
- GLFW.setWindowContentScaleCallback(window, null);
- GLFW.setWindowFocusCallback(window, null);
- GLFW.setWindowIconifyCallback(window, null);
- GLFW.setWindowMaximizeCallback(window, null);
- GLFW.setWindowPosCallback(window, null);
- GLFW.setWindowRefreshCallback(window, null);
- GLFW.setWindowSizeCallback(window, null);
+ final GLFW glfw = GLFW.INSTANCE;
+ glfw.setCharCallback(window, null);
+ glfw.setCursorEnterCallback(window, null);
+ glfw.setCursorPosCallback(window, null);
+ glfw.setDropCallback(window, null);
+ glfw.setFramebufferSizeCallback(window, null);
+ glfw.setKeyCallback(window, null);
+ glfw.setMouseButtonCallback(window, null);
+ glfw.setScrollCallback(window, null);
+ glfw.setWindowCloseCallback(window, null);
+ glfw.setWindowContentScaleCallback(window, null);
+ glfw.setWindowFocusCallback(window, null);
+ glfw.setWindowIconifyCallback(window, null);
+ glfw.setWindowMaximizeCallback(window, null);
+ glfw.setWindowPosCallback(window, null);
+ glfw.setWindowRefreshCallback(window, null);
+ glfw.setWindowSizeCallback(window, null);
ARENA_MAP.remove(window).close();
}
}
diff --git a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWErrorFun.java b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWErrorFun.java
index 93a333ed..a8751f40 100644
--- a/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWErrorFun.java
+++ b/modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWErrorFun.java
@@ -68,10 +68,10 @@ default void ninvoke(int errorCode, @NativeType("const char*") @SizedSeg(Unmarsh
/**
* Sets the error callback.
*
- * @return The previous callback or {@code NULL}.
+ * @return The previously set callback, or {@link MemorySegment#NULL NULL} if no callback was set.
*/
default MemorySegment set() {
- return GLFW.setErrorCallback(this);
+ return GLFW.INSTANCE.setErrorCallback(this);
}
@Override
diff --git a/modules/overrungl.nfd/src/main/java/overrungl/nfd/NFDNFilterItem.java b/modules/overrungl.nfd/src/main/java/overrungl/nfd/NFDNFilterItem.java
index e8f5317a..5856d329 100644
--- a/modules/overrungl.nfd/src/main/java/overrungl/nfd/NFDNFilterItem.java
+++ b/modules/overrungl.nfd/src/main/java/overrungl/nfd/NFDNFilterItem.java
@@ -99,8 +99,8 @@ public static NFDNFilterItem create(SegmentAllocator allocator, Pair