Various small fixes

generator/src/main/java/org/javagi/configuration/ClassNames.java

@@ -25,17 +25,15 @@
 import static com.squareup.javapoet.ClassName.get;
 
 public final class ClassNames {
-    private static final String PKG_TOPLEVEL        = "org.javagi";
     private static final String PKG_BASE            = "org.javagi.base";
     private static final String PKG_INTEROP         = "org.javagi.interop";
     private static final String PKG_GIO             = "org.javagi.gio";
     private static final String PKG_GOBJECT         = "org.javagi.gobject";
     private static final String PKG_GOBJECT_TYPES   = "org.javagi.gobject.types";
     private static final String PKG_GTK_TYPES       = "org.javagi.gtk.types";
 
-    public static final ClassName CONSTANTS = get(PKG_TOPLEVEL, "Constants");
-
     public static final ClassName ALIAS = get(PKG_BASE, "Alias");
+    public static final ClassName CONSTANTS = get(PKG_BASE, "Constants");
     public static final ClassName ENUMERATION = get(PKG_BASE, "Enumeration");
     public static final ClassName FLOATING = get(PKG_BASE, "Floating");
     public static final ClassName FUNCTION_POINTER = get(PKG_BASE, "FunctionPointer");

generator/src/main/java/org/javagi/generators/PostprocessingGenerator.java

@@ -253,10 +253,12 @@ private void takeOwnership(MethodSpec.Builder builder) {
             // struct, and copy the contents manually
             else if (hasMemoryLayout && copyFunc == null) {
                 var copyVar = v instanceof ReturnValue ? "_copy" : ("_" + getName() + "Copy");
-                builder.addStatement("$T $L = $T.malloc($T.getMemoryLayout().byteSize())",
-                            MemorySegment.class, copyVar, ClassNames.G_LIB, v.anyType().typeName())
-                        .addStatement("$T.copy($L.handle(), $L)",
-                            ClassNames.INTEROP, paramName, copyVar)
+                builder.addStatement("long $Lsize = $T.getMemoryLayout().byteSize()",
+                                copyVar, v.anyType().typeName())
+                        .addStatement("$T $L = $T.malloc($Lsize)",
+                            MemorySegment.class, copyVar, ClassNames.G_LIB, copyVar)
+                        .addStatement("$T.copy($L.handle(), $L, $Lsize)",
+                            ClassNames.INTEROP, paramName, copyVar, copyVar)
                         .addStatement("$L.address = $L", paramName, copyVar);
             }
 

modules/main/adw/Adw-1.metadata

@@ -1 +1,3 @@
+// SplitButton.getDirection() overrides Widget.getDirection()
+// with a different return type. Rename to getArrowDirection()
 SplitButton.get_direction name=get_arrow_direction

modules/main/glib/src/main/java/org/javagi/Constants.java → modules/main/glib/src/main/java/org/javagi/base/Constants.java

@@ -17,7 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.javagi;
+package org.javagi.base;
 
 /**
  * Java-GI global constant definitions

modules/main/glib/src/main/java/org/javagi/base/GLibLogger.java

@@ -19,7 +19,6 @@
 
 package org.javagi.base;
 
-import org.javagi.Constants;
 import org.gnome.glib.GLib;
 import org.gnome.glib.LogLevelFlags;
 

modules/main/glib/src/main/java/org/javagi/interop/Interop.java

@@ -28,7 +28,7 @@
 import java.util.Arrays;
 import java.util.function.Function;
 
-import org.javagi.Constants;
+import org.javagi.base.Constants;
 import org.javagi.base.Enumeration;
 import org.gnome.glib.GLib;
 
@@ -38,7 +38,6 @@
 import org.javagi.base.Proxy;
 import org.jetbrains.annotations.Nullable;
 
-import static java.lang.Long.max;
 import static java.lang.foreign.MemorySegment.NULL;
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 
@@ -50,13 +49,13 @@
 public class Interop {
 
     private final static int INT_UNBOUNDED = Integer.MAX_VALUE;
-
     private final static long LONG_UNBOUNDED = Long.MAX_VALUE;
 
     private final static boolean LONG_AS_INT = Linker.nativeLinker()
             .canonicalLayouts().get("long").equals(ValueLayout.JAVA_INT);
 
     private final static Linker LINKER = Linker.nativeLinker();
+    private final static Cleaner CLEANER = Cleaner.create();
 
     private static SymbolLookup symbolLookup = LINKER.defaultLookup();
 
@@ -155,18 +154,17 @@ public static MethodHandle upcallHandle(MethodHandles.Lookup lookup,
     }
 
     /**
-     * Register a Cleaner that will close the arena when the instance is
+     * Register a Cleaner action that will close the arena when the instance is
      * garbage-collected, coupling the lifetime of the arena to the lifetime of
      * the instance.
      *
      * @param  arena    a memory arena that can be closed (normally
-     *                  {@link Arena#ofConfined()} or {@link Arena#ofAuto()}.
+     *                  {@link Arena#ofConfined()} or {@link Arena#ofShared()}.
      * @param  instance an object
      * @return the arena (for method chaining)
      */
     public static Arena attachArena(Arena arena, Object instance) {
-        Cleaner cleaner = Cleaner.create();
-        cleaner.register(instance, arena::close);
+        CLEANER.register(instance, arena::close);
         return arena;
     }
 
@@ -202,17 +200,15 @@ public static MemorySegment dereference(MemorySegment pointer) {
     }
 
     /**
-     * First reinterpret the memory segments so they have equal size, then copy
-     * {@code src} into {@code dst}.
+     * Reinterpret both memory segments to the specified size and copy
+     * {@code size} bytes from {@code src} into {@code dst}.
      *
      * @param src source memory segment
      * @param dst destination memory segment
+     * @param size the number of bytes to copy
      */
-    public static void copy(MemorySegment src, MemorySegment dst) {
-        long size = max(src.byteSize(), dst.byteSize());
-        src.reinterpret(size);
-        dst.reinterpret(size);
-        dst.copyFrom(src);
+    public static void copy(MemorySegment src, MemorySegment dst, long size) {
+        dst.reinterpret(size).copyFrom(src.reinterpret(size));
     }
 
     /**

modules/main/gobject/src/main/java/org/javagi/gobject/JavaClosure.java

@@ -30,7 +30,7 @@
 import org.gnome.gobject.Closure;
 import org.gnome.gobject.Value;
 
-import static org.javagi.Constants.LOG_DOMAIN;
+import static org.javagi.base.Constants.LOG_DOMAIN;
 
 /**
  * An implementation of {@link Closure} that can be used with Java callbacks.

modules/main/gobject/src/main/java/org/javagi/gobject/types/Overrides.java

@@ -35,7 +35,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import static org.javagi.Constants.LOG_DOMAIN;
+import static org.javagi.base.Constants.LOG_DOMAIN;
 
 /**
  * Helper class to register method overrides in a new GType.

modules/main/gobject/src/main/java/org/javagi/gobject/types/Properties.java

@@ -39,7 +39,7 @@
 import java.util.*;
 import java.util.function.Consumer;
 
-import static org.javagi.Constants.LOG_DOMAIN;
+import static org.javagi.base.Constants.LOG_DOMAIN;
 import static org.javagi.gobject.annotations.Property.NOT_SET;
 import static java.lang.Character.isUpperCase;
 

modules/main/gobject/src/main/java/org/javagi/gobject/types/Types.java

@@ -36,7 +36,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static org.javagi.Constants.LOG_DOMAIN;
+import static org.javagi.base.Constants.LOG_DOMAIN;
 import static java.util.Objects.requireNonNull;
 import static org.gnome.gobject.GObjects.typeTestFlags;
 

modules/main/gtk/src/main/java/org/javagi/gtk/BuilderJavaScope.java

@@ -31,7 +31,7 @@
 import java.lang.reflect.Method;
 import java.util.Set;
 
-import static org.javagi.Constants.LOG_DOMAIN;
+import static org.javagi.base.Constants.LOG_DOMAIN;
 
 /**
  * The {@code BuilderJavaScope} class can be used with a {@link GtkBuilder} to

modules/main/gtk/src/main/java/org/javagi/gtk/types/TemplateTypes.java

@@ -47,7 +47,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static org.javagi.Constants.LOG_DOMAIN;
+import static org.javagi.base.Constants.LOG_DOMAIN;
 import static org.javagi.gobject.types.Types.*;
 import static java.util.Objects.requireNonNull;