[GLFW] Rewrite GLFW

modules/overrungl.core/src/main/java/overrungl/Addressable.java

@@ -24,6 +24,7 @@
  * @author squid233
  * @since 0.1.0
  */
+@Deprecated(since = "0.1.0")
 @FunctionalInterface
 public interface Addressable {
     /**

modules/overrungl.core/src/main/java/overrungl/ArrayPointer.java

@@ -24,6 +24,7 @@
  * @author squid233
  * @since 0.1.0
  */
+@Deprecated(since = "0.1.0")
 public interface ArrayPointer extends Addressable {
     /**
      * {@return the count of the elements in this array}

modules/overrungl.core/src/main/java/overrungl/Callback.java

@@ -32,6 +32,7 @@
  * @author squid233
  * @since 0.1.0
  */
+@Deprecated(since = "0.1.0")
 public interface Callback {
     /**
      * Gets the address with the given arena.

modules/overrungl.core/src/main/java/overrungl/Pointer.java

@@ -25,6 +25,7 @@
  * @author squid233
  * @since 0.1.0
  */
+@Deprecated(since = "0.1.0")
 public class Pointer implements Addressable {
     /**
      * The pointer address.

modules/overrungl.core/src/main/java/overrungl/Struct.java

@@ -25,6 +25,7 @@
  * @author squid233
  * @since 0.1.0
  */
+@Deprecated(since = "0.1.0")
 public class Struct extends Pointer {
     /**
      * The memory layout of this struct.

modules/overrungl.core/src/main/java/overrungl/internal/Exceptions.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2023 Overrun Organization
+ * Copyright (c) 2023-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
@@ -22,6 +22,7 @@
  * @author squid233
  * @since 0.1.0
  */
+@Deprecated(since = "0.1.0")
 public final class Exceptions {
     /**
      * {@link IllegalStateException}

modules/overrungl.core/src/main/java/overrungl/internal/RuntimeHelper.java

@@ -97,16 +97,6 @@ public static String unboundPointerString(MemorySegment segment, int index) {
         return reinterpreting(segment, index, str -> MemoryUtil.strlen(str) + 1).getString(0);
     }
 
-    /**
-     * Converts the segment into a string.
-     *
-     * @param segment the segment
-     * @return the string
-     */
-    public static String getString(MemorySegment segment) {
-        return segment.reinterpret(MemoryUtil.strlen(segment) + 1).getString(0);
-    }
-
     /**
      * Generates a string for unknown token.
      *

modules/overrungl.core/src/main/java/overrungl/util/MemoryStack.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
@@ -39,6 +39,7 @@
  * @see Configurations#DEBUG_STACK
  * @since 0.1.0
  */
+@Deprecated(since = "0.1.0")
 public sealed class MemoryStack extends Pointer implements Arena {
     private static final boolean DEBUG = Configurations.DEBUG.get();
     private static final boolean DEBUG_STACK = Configurations.DEBUG_STACK.get();

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<MemorySegment, Arena> ARENA_MAP = new HashMap<>();
+    private static final Map<MemorySegment, Arena> ARENA_MAP = new ConcurrentHashMap<>();
 
     private GLFWCallbacks() {
         //no instance
@@ -42,7 +42,7 @@ private GLFWCallbacks() {
      * @return the arena.
      */
     public static Arena create(MemorySegment window) {
-        return ARENA_MAP.computeIfAbsent(window, k -> Arena.ofConfined());
+        return ARENA_MAP.computeIfAbsent(window, _ -> Arena.ofConfined());
     }
 
     /**
@@ -52,6 +52,22 @@ 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);
             ARENA_MAP.remove(window).close();
         }
     }

modules/overrungl.glfw/src/main/java/overrungl/glfw/IGLFWCharFun.java → modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCharFun.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,47 +16,40 @@
 
 package overrungl.glfw;
 
-import overrungl.Callback;
+import overrun.marshal.Upcall;
 
-import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 
 /**
  * This is the function pointer type for Unicode character callbacks.
  * A Unicode character callback function has the following signature:
  * {@snippet :
- * @Invoker(IGLFWCharFun::invoke)
- * void functionName(MemorySegment window, int codepoint);
+ * void functionName(MemorySegment window, int codepoint); // @link regex="functionName" target="#invoke"
  * }
  *
  * @author squid233
  * @see GLFW#setCharCallback
  * @since 0.1.0
  */
 @FunctionalInterface
-public interface IGLFWCharFun extends Callback {
-    FunctionDescriptor DESC = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.JAVA_INT);
-    MethodType MTYPE = DESC.toMethodType();
+public interface GLFWCharFun extends Upcall {
+    /**
+     * The type.
+     */
+    Type<GLFWCharFun> TYPE = Upcall.type();
 
     /**
      * The function pointer type for Unicode character callbacks.
      *
      * @param window    The window that received the event.
      * @param codepoint The Unicode code point of the character.
      */
+    @Stub
     void invoke(MemorySegment window, int codepoint);
 
     @Override
-    default FunctionDescriptor descriptor() {
-        return DESC;
-    }
-
-    @Override
-    default MethodHandle handle(MethodHandles.Lookup lookup) throws NoSuchMethodException, IllegalAccessException {
-        return lookup.findVirtual(IGLFWCharFun.class, "invoke", MTYPE);
+    default MemorySegment stub(Arena arena) {
+        return TYPE.of(arena, this);
     }
 }

modules/overrungl.glfw/src/main/java/overrungl/glfw/IGLFWCursorEnterFun.java → modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCursorEnterFun.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,31 +16,28 @@
 
 package overrungl.glfw;
 
-import overrungl.Callback;
+import overrun.marshal.Upcall;
 
-import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 
 /**
  * This is the function pointer type for cursor enter/leave callbacks.
  * A cursor enter/leave callback function has the following signature:
  * {@snippet :
- * @Invoker(IGLFWCursorEnterFun::invoke)
- * void functionName(MemorySegment window, boolean entered);
+ * void functionName(MemorySegment window, boolean entered); // @link regex="functionName" target="#invoke"
  * }
  *
  * @author squid233
  * @see GLFW#setCursorEnterCallback
  * @since 0.1.0
  */
 @FunctionalInterface
-public interface IGLFWCursorEnterFun extends Callback {
-    FunctionDescriptor DESC = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.JAVA_INT);
-    MethodType MTYPE = DESC.toMethodType();
+public interface GLFWCursorEnterFun extends Upcall {
+    /**
+     * The type.
+     */
+    Type<GLFWCursorEnterFun> TYPE = Upcall.type();
 
     /**
      * The function pointer type for cursor enter/leave callbacks.
@@ -51,17 +48,20 @@ public interface IGLFWCursorEnterFun extends Callback {
      */
     void invoke(MemorySegment window, boolean entered);
 
+    /**
+     * The function pointer type for cursor enter/leave callbacks.
+     *
+     * @param window  The window that received the event.
+     * @param entered {@code true} if the cursor entered the window's content
+     *                area, or {@code false} if it left it.
+     */
+    @Stub
     default void ninvoke(MemorySegment window, int entered) {
         invoke(window, entered != GLFW.FALSE);
     }
 
     @Override
-    default FunctionDescriptor descriptor() {
-        return DESC;
-    }
-
-    @Override
-    default MethodHandle handle(MethodHandles.Lookup lookup) throws NoSuchMethodException, IllegalAccessException {
-        return lookup.findVirtual(IGLFWCursorEnterFun.class, "ninvoke", MTYPE);
+    default MemorySegment stub(Arena arena) {
+        return TYPE.of(arena, this);
     }
 }

modules/overrungl.glfw/src/main/java/overrungl/glfw/IGLFWCursorPosFun.java → modules/overrungl.glfw/src/main/java/overrungl/glfw/GLFWCursorPosFun.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,31 +16,28 @@
 
 package overrungl.glfw;
 
-import overrungl.Callback;
+import overrun.marshal.Upcall;
 
-import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 
 /**
  * This is the function pointer type for cursor position callbacks. A cursor
  * position callback function has the following signature:
  * {@snippet :
- * @Invoker(IGLFWCursorPosFun::invoke)
- * void functionName(MemorySegment window, double xpos, double ypos);
+ * void functionName(MemorySegment window, double xpos, double ypos); // @link regex="functionName" target="#invoke"
  * }
  *
  * @author squid233
  * @see GLFW#setCursorPosCallback
  * @since 0.1.0
  */
 @FunctionalInterface
-public interface IGLFWCursorPosFun extends Callback {
-    FunctionDescriptor DESC = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.JAVA_DOUBLE, ValueLayout.JAVA_DOUBLE);
-    MethodType MTYPE = DESC.toMethodType();
+public interface GLFWCursorPosFun extends Upcall {
+    /**
+     * The type.
+     */
+    Type<GLFWCursorPosFun> TYPE = Upcall.type();
 
     /**
      * The function pointer type for cursor position callbacks.
@@ -49,15 +46,11 @@ public interface IGLFWCursorPosFun extends Callback {
      * @param xpos   The new cursor x-coordinate, relative to the left edge of the content area.
      * @param ypos   The new cursor y-coordinate, relative to the top edge of the content area.
      */
+    @Stub
     void invoke(MemorySegment window, double xpos, double ypos);
 
     @Override
-    default FunctionDescriptor descriptor() {
-        return DESC;
-    }
-
-    @Override
-    default MethodHandle handle(MethodHandles.Lookup lookup) throws NoSuchMethodException, IllegalAccessException {
-        return lookup.findVirtual(IGLFWCursorPosFun.class, "invoke", MTYPE);
+    default MemorySegment stub(Arena arena) {
+        return TYPE.of(arena, this);
     }
 }