@gtkx/ffi 0.1.6 → 0.1.7

package/dist/generated/gtk/tree-model.d.ts

@@ -1,10 +1,13 @@
 import { Ref } from "@gtkx/native";
 import { TreeModelFlags } from "./enums.js";
-import type { TreeIter } from "./tree-iter.js";
-import type { TreePath } from "./tree-path.js";
-export declare abstract class TreeModel {
-    protected abstract ptr: unknown;
-    filterNew(root?: TreePath): unknown;
+import { TreeIter } from "./tree-iter.js";
+import { TreePath } from "./tree-path.js";
+import * as GObject from "../gobject/index.js";
+export declare class TreeModel {
+    ptr: unknown;
+    protected constructor(ptr: unknown);
+    static fromPtr(ptr: unknown): TreeModel;
+    filterNew(root?: TreePath): TreeModel;
     foreach(func: (...args: unknown[]) => unknown, userData?: unknown): void;
     get(iter: TreeIter): void;
     getColumnType(index_: number): number;
@@ -16,7 +19,7 @@ export declare abstract class TreeModel {
     getPath(iter: TreeIter): TreePath;
     getStringFromIter(iter: TreeIter): string;
     getValist(iter: TreeIter, varArgs: unknown): void;
-    getValue(iter: TreeIter, column: number, value: Ref<unknown>): void;
+    getValue(iter: TreeIter, column: number, value: Ref<GObject.Value>): void;
     iterChildren(iter: Ref<TreeIter>, parent?: TreeIter): boolean;
     iterHasChild(iter: TreeIter): boolean;
     iterNChildren(iter?: TreeIter): number;
@@ -32,5 +35,4 @@ export declare abstract class TreeModel {
     rowsReordered(path: TreePath, iter: TreeIter, newOrder: number): void;
     rowsReorderedWithLength(path: TreePath, newOrder: number[], length: number, iter?: TreeIter): void;
     unrefNode(iter: TreeIter): void;
-    connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
 }

package/dist/generated/gtk/tree-model.js

@@ -1,7 +1,15 @@
 import { call } from "@gtkx/native";
+import { TreePath } from "./tree-path.js";
 export class TreeModel {
+    ptr;
+    constructor(ptr) {
+        this.ptr = ptr;
+    }
+    static fromPtr(ptr) {
+        return new TreeModel(ptr);
+    }
     filterNew(root) {
-        return call("libgtk-4.so.1", "gtk_tree_model_filter_new", [
+        const ptr = call("libgtk-4.so.1", "gtk_tree_model_filter_new", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -12,9 +20,14 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: root,
+                value: root?.ptr ?? root,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(TreeModel.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     foreach(func, userData) {
         call("libgtk-4.so.1", "gtk_tree_model_foreach", [
@@ -28,7 +41,7 @@ export class TreeModel {
             },
             {
                 type: { type: "gobject" },
-                value: userData,
+                value: userData?.ptr ?? userData,
             },
         ], { type: "undefined" });
     }
@@ -44,7 +57,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "undefined" });
     }
@@ -91,7 +104,7 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
         ], { type: "boolean" });
     }
@@ -146,7 +159,7 @@ export class TreeModel {
         ], { type: "int", size: 32, unsigned: false });
     }
     getPath(iter) {
-        return call("libgtk-4.so.1", "gtk_tree_model_get_path", [
+        const ptr = call("libgtk-4.so.1", "gtk_tree_model_get_path", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -157,7 +170,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], {
             type: "boxed",
@@ -165,6 +178,11 @@ export class TreeModel {
             innerType: "GtkTreePath",
             lib: "libgtk-4.so.1",
         });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(TreePath.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getStringFromIter(iter) {
         return call("libgtk-4.so.1", "gtk_tree_model_get_string_from_iter", [
@@ -178,7 +196,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "string" });
     }
@@ -194,11 +212,11 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
             {
                 type: { type: "gobject" },
-                value: varArgs,
+                value: varArgs?.ptr ?? varArgs,
             },
         ], { type: "undefined" });
     }
@@ -214,14 +232,21 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
             {
                 type: { type: "int", size: 32, unsigned: false },
                 value: column,
             },
             {
-                type: { type: "ref", innerType: { type: "gobject" } },
+                type: {
+                    type: "ref",
+                    innerType: {
+                        type: "boxed",
+                        innerType: "GValue",
+                        lib: "libgtk-4.so.1",
+                    },
+                },
                 value: value,
             },
         ], { type: "undefined" });
@@ -249,7 +274,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: parent,
+                value: parent?.ptr ?? parent,
             },
         ], { type: "boolean" });
     }
@@ -265,7 +290,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "boolean" });
     }
@@ -281,7 +306,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "int", size: 32, unsigned: false });
     }
@@ -297,7 +322,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "boolean" });
     }
@@ -324,7 +349,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: parent,
+                value: parent?.ptr ?? parent,
             },
             {
                 type: { type: "int", size: 32, unsigned: false },
@@ -355,7 +380,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: child,
+                value: child?.ptr ?? child,
             },
         ], { type: "boolean" });
     }
@@ -371,7 +396,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "boolean" });
     }
@@ -387,7 +412,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "undefined" });
     }
@@ -403,7 +428,7 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
             {
                 type: {
@@ -411,7 +436,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "undefined" });
     }
@@ -427,7 +452,7 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
         ], { type: "undefined" });
     }
@@ -443,7 +468,7 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
             {
                 type: {
@@ -451,7 +476,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "undefined" });
     }
@@ -467,7 +492,7 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
             {
                 type: {
@@ -475,7 +500,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "undefined" });
     }
@@ -491,7 +516,7 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
             {
                 type: {
@@ -499,7 +524,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
             {
                 type: { type: "int", size: 32, unsigned: false },
@@ -519,7 +544,7 @@ export class TreeModel {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
             {
                 type: {
@@ -527,7 +552,7 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
             {
                 type: {
@@ -554,55 +579,8 @@ export class TreeModel {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
         ], { type: "undefined" });
     }
-    connect(signal, handler, after = false) {
-        const signalMeta = {
-            "row-changed": [
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreePath" } },
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreeIter" } },
-            ],
-            "row-deleted": [
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreePath" } },
-            ],
-            "row-has-child-toggled": [
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreePath" } },
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreeIter" } },
-            ],
-            "row-inserted": [
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreePath" } },
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreeIter" } },
-            ],
-            "rows-reordered": [
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreePath" } },
-                { type: { type: "boxed", borrowed: false, innerType: "GtkTreeIter" } },
-                { type: { type: "gobject" } },
-            ],
-        };
-        const meta = signalMeta[signal];
-        const selfType = { type: "gobject", borrowed: false };
-        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
-        const wrappedHandler = (...args) => {
-            const signalArgs = args.slice(1);
-            if (!meta)
-                return handler(...signalArgs);
-            const wrapped = meta.map((m, i) => {
-                if (m.cls && signalArgs[i] != null) {
-                    const inst = Object.create(m.cls.prototype);
-                    inst.ptr = signalArgs[i];
-                    return inst;
-                }
-                return signalArgs[i];
-            });
-            return handler(...wrapped);
-        };
-        return call("libgtk-4.so.1", "g_signal_connect_closure", [
-            { type: { type: "gobject" }, value: this.ptr },
-            { type: { type: "string" }, value: signal },
-            { type: { type: "callback", argTypes }, value: wrappedHandler },
-            { type: { type: "boolean" }, value: after },
-        ], { type: "int", size: 64, unsigned: true });
-    }
 }

package/dist/generated/gtk/tree-path.js

@@ -36,7 +36,7 @@ export class TreePath {
             },
             {
                 type: { type: "gobject" },
-                value: length,
+                value: length?.ptr ?? length,
             },
         ], { type: "boxed", borrowed: true, innerType: "TreePath" });
         const instance = Object.create(TreePath.prototype);
@@ -85,12 +85,12 @@ export class TreePath {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: b,
+                value: b?.ptr ?? b,
             },
         ], { type: "int", size: 32, unsigned: false });
     }
     copy() {
-        return call("libgtk-4.so.1", "gtk_tree_path_copy", [
+        const ptr = call("libgtk-4.so.1", "gtk_tree_path_copy", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -101,6 +101,11 @@ export class TreePath {
             innerType: "GtkTreePath",
             lib: "libgtk-4.so.1",
         });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(TreePath.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     down() {
         call("libgtk-4.so.1", "gtk_tree_path_down", [
@@ -161,7 +166,7 @@ export class TreePath {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: descendant,
+                value: descendant?.ptr ?? descendant,
             },
         ], { type: "boolean" });
     }
@@ -177,7 +182,7 @@ export class TreePath {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: ancestor,
+                value: ancestor?.ptr ?? ancestor,
             },
         ], { type: "boolean" });
     }

package/dist/generated/gtk/tree-row-reference.d.ts

@@ -1,17 +1,19 @@
-import type { TreeIter } from "./tree-iter.js";
-import type { TreePath } from "./tree-path.js";
+import { TreeIter } from "./tree-iter.js";
+import { TreePath } from "./tree-path.js";
+import { TreeModel } from "./tree-model.js";
+import * as GObject from "../gobject/index.js";
 export declare class TreeRowReference {
     ptr: unknown;
-    constructor(model: unknown, path: TreePath);
+    constructor(model: TreeModel, path: TreePath);
     constructor(_args: unknown[]);
-    static rowReferenceNewProxy(proxy: unknown, model: unknown, path: TreePath): TreeRowReference;
+    static rowReferenceNewProxy(proxy: GObject.GObject, model: TreeModel, path: TreePath): TreeRowReference;
     protected createPtr(_args: unknown[]): unknown;
-    static deleted(proxy: unknown, path: TreePath): void;
-    static inserted(proxy: unknown, path: TreePath): void;
-    static reordered(proxy: unknown, path: TreePath, iter: TreeIter, newOrder: number[]): void;
+    static deleted(proxy: GObject.GObject, path: TreePath): void;
+    static inserted(proxy: GObject.GObject, path: TreePath): void;
+    static reordered(proxy: GObject.GObject, path: TreePath, iter: TreeIter, newOrder: number[]): void;
     copy(): TreeRowReference;
     free(): void;
-    getModel(): unknown;
+    getModel(): TreeModel;
     getPath(): TreePath;
     valid(): boolean;
 }

package/dist/generated/gtk/tree-row-reference.js

@@ -1,4 +1,6 @@
 import { call } from "@gtkx/native";
+import { TreePath } from "./tree-path.js";
+import { TreeModel } from "./tree-model.js";
 export class TreeRowReference {
     ptr;
     constructor(...args) {
@@ -9,11 +11,11 @@ export class TreeRowReference {
         const ptr = call("libgtk-4.so.1", "gtk_tree_row_reference_new_proxy", [
             {
                 type: { type: "gobject" },
-                value: proxy,
+                value: proxy?.ptr ?? proxy,
             },
             {
                 type: { type: "gobject" },
-                value: model,
+                value: model?.ptr ?? model,
             },
             {
                 type: {
@@ -21,7 +23,7 @@ export class TreeRowReference {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
         ], { type: "boxed", borrowed: true, innerType: "TreeRowReference" });
         const instance = Object.create(TreeRowReference.prototype);
@@ -33,7 +35,7 @@ export class TreeRowReference {
         return call("libgtk-4.so.1", "gtk_tree_row_reference_new", [
             {
                 type: { type: "gobject" },
-                value: model,
+                value: model?.ptr ?? model,
             },
             {
                 type: {
@@ -41,7 +43,7 @@ export class TreeRowReference {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
         ], { type: "boxed", borrowed: true, innerType: "GtkTreeRowReference" });
     }
@@ -49,7 +51,7 @@ export class TreeRowReference {
         call("libgtk-4.so.1", "gtk_tree_row_reference_deleted", [
             {
                 type: { type: "gobject" },
-                value: proxy,
+                value: proxy?.ptr ?? proxy,
             },
             {
                 type: {
@@ -57,7 +59,7 @@ export class TreeRowReference {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
         ], { type: "undefined" });
     }
@@ -65,7 +67,7 @@ export class TreeRowReference {
         call("libgtk-4.so.1", "gtk_tree_row_reference_inserted", [
             {
                 type: { type: "gobject" },
-                value: proxy,
+                value: proxy?.ptr ?? proxy,
             },
             {
                 type: {
@@ -73,7 +75,7 @@ export class TreeRowReference {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
         ], { type: "undefined" });
     }
@@ -81,7 +83,7 @@ export class TreeRowReference {
         call("libgtk-4.so.1", "gtk_tree_row_reference_reordered", [
             {
                 type: { type: "gobject" },
-                value: proxy,
+                value: proxy?.ptr ?? proxy,
             },
             {
                 type: {
@@ -89,7 +91,7 @@ export class TreeRowReference {
                     innerType: "GtkTreePath",
                     lib: "libgtk-4.so.1",
                 },
-                value: path,
+                value: path?.ptr ?? path,
             },
             {
                 type: {
@@ -97,7 +99,7 @@ export class TreeRowReference {
                     innerType: "GtkTreeIter",
                     lib: "libgtk-4.so.1",
                 },
-                value: iter,
+                value: iter?.ptr ?? iter,
             },
             {
                 type: {
@@ -109,7 +111,7 @@ export class TreeRowReference {
         ], { type: "undefined" });
     }
     copy() {
-        return call("libgtk-4.so.1", "gtk_tree_row_reference_copy", [
+        const ptr = call("libgtk-4.so.1", "gtk_tree_row_reference_copy", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -120,6 +122,11 @@ export class TreeRowReference {
             innerType: "GtkTreeRowReference",
             lib: "libgtk-4.so.1",
         });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(TreeRowReference.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     free() {
         call("libgtk-4.so.1", "gtk_tree_row_reference_free", [
@@ -130,15 +137,20 @@ export class TreeRowReference {
         ], { type: "undefined" });
     }
     getModel() {
-        return call("libgtk-4.so.1", "gtk_tree_row_reference_get_model", [
+        const ptr = call("libgtk-4.so.1", "gtk_tree_row_reference_get_model", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(TreeModel.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getPath() {
-        return call("libgtk-4.so.1", "gtk_tree_row_reference_get_path", [
+        const ptr = call("libgtk-4.so.1", "gtk_tree_row_reference_get_path", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -149,6 +161,11 @@ export class TreeRowReference {
             innerType: "GtkTreePath",
             lib: "libgtk-4.so.1",
         });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(TreePath.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     valid() {
         return call("libgtk-4.so.1", "gtk_tree_row_reference_valid", [

package/dist/generated/gtk/tree-selection.d.ts

@@ -1,7 +1,9 @@
 import { Ref } from "@gtkx/native";
 import { SelectionMode } from "./enums.js";
-import type { TreeIter } from "./tree-iter.js";
-import type { TreePath } from "./tree-path.js";
+import { TreeIter } from "./tree-iter.js";
+import { TreePath } from "./tree-path.js";
+import { TreeModel } from "./tree-model.js";
+import { TreeView } from "./tree-view.js";
 export declare class TreeSelection {
     ptr: unknown;
     constructor(_args?: unknown[]);
@@ -9,9 +11,9 @@ export declare class TreeSelection {
     countSelectedRows(): number;
     getMode(): SelectionMode;
     getSelectFunction(): unknown;
-    getSelected(model?: Ref<unknown>, iter?: Ref<TreeIter>): boolean;
-    getSelectedRows(model?: Ref<unknown>): unknown;
-    getTreeView(): unknown;
+    getSelected(model?: Ref<TreeModel>, iter?: Ref<TreeIter>): boolean;
+    getSelectedRows(model?: Ref<TreeModel>): unknown;
+    getTreeView(): TreeView;
     getUserData(): unknown;
     iterIsSelected(iter: TreeIter): boolean;
     pathIsSelected(path: TreePath): boolean;