@gtkx/ffi 0.1.12 → 0.1.14

package/dist/generated/gobject/initially-unowned.d.ts

@@ -1,5 +1,8 @@
+import { ParamSpec } from "./param-spec.js";
 import { GObject } from "./object.js";
 export declare class InitiallyUnowned extends GObject {
     constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
+    connect(signal: "notify", handler: (self: InitiallyUnowned, pspec: ParamSpec) => void, after?: boolean): number;
+    connect(signal: string, handler: (...args: any[]) => any, after?: boolean): number;
 }

package/dist/generated/gobject/initially-unowned.js

@@ -1,5 +1,10 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
+import { ParamSpec } from "./param-spec.js";
 import { GObject } from "./object.js";
+const SIGNAL_META = {
+    notify: [{ type: { type: "gobject", borrowed: false }, cls: ParamSpec }],
+};
 export class InitiallyUnowned extends GObject {
     constructor(...args) {
         super(...args);
@@ -11,4 +16,28 @@ export class InitiallyUnowned extends GObject {
             { type: { type: "gobject" }, value: null },
         ], { type: "gobject", borrowed: true });
     }
+    connect(signal, handler, after = false) {
+        const meta = SIGNAL_META[signal];
+        const selfType = { type: "gobject", borrowed: true };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
+        const wrappedHandler = (...args) => {
+            const self = wrapPtr(args[0], InitiallyUnowned);
+            const signalArgs = args.slice(1);
+            if (!meta)
+                return handler(self, ...signalArgs);
+            const wrapped = meta.map((m, i) => {
+                if (m.cls && signalArgs[i] != null) {
+                    return wrapPtr(signalArgs[i], m.cls);
+                }
+                return signalArgs[i];
+            });
+            return handler(self, ...wrapped);
+        };
+        return call("libgobject-2.0.so.0", "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/gobject/object.d.ts

@@ -9,18 +9,18 @@ export declare class GObject {
     constructor(objectType: number, nParameters: number, parameters: unknown[]);
     constructor(...args: unknown[]);
     protected createPtr(args: unknown[]): unknown;
-    static compatControl(what: unknown, data?: unknown): unknown;
+    static compatControl(what: number, data?: number | null): number;
     static interfaceFindProperty(gIface: unknown, propertyName: string): ParamSpec;
     static interfaceInstallProperty(gIface: unknown, pspec: ParamSpec): void;
     static interfaceListProperties(gIface: unknown, nPropertiesP: Ref<number>): ParamSpec[];
     bindProperty(sourceProperty: string, target: GObject, targetProperty: string, flags: BindingFlags): Binding;
-    bindPropertyFull(sourceProperty: string, target: GObject, targetProperty: string, flags: BindingFlags, transformTo?: (...args: unknown[]) => unknown, transformFrom?: (...args: unknown[]) => unknown, userData?: unknown, notify?: unknown): Binding;
+    bindPropertyFull(sourceProperty: string, target: GObject, targetProperty: string, flags: BindingFlags, transformTo?: (...args: unknown[]) => unknown | null, transformFrom?: (...args: unknown[]) => unknown | null, userData?: number | null, notify?: () => void | null): Binding;
     bindPropertyWithClosures(sourceProperty: string, target: GObject, targetProperty: string, flags: BindingFlags, transformTo: Closure, transformFrom: Closure): Binding;
     forceFloating(): void;
     freezeNotify(): void;
-    getData(key: string): unknown;
+    getData(key: string): number | null;
     getProperty(propertyName: string, value: Value): void;
-    getQdata(quark: number): unknown;
+    getQdata(quark: number): number | null;
     getv(nProperties: number, names: string[], values: Value[]): void;
     isFloating(): boolean;
     notify(propertyName: string): void;
@@ -28,12 +28,13 @@ export declare class GObject {
     ref(): GObject;
     refSink(): GObject;
     runDispose(): void;
-    setData(key: string, data?: unknown): void;
+    setData(key: string, data?: number | null): void;
     setProperty(propertyName: string, value: Value): void;
-    stealData(key: string): unknown;
-    stealQdata(quark: number): unknown;
+    stealData(key: string): number | null;
+    stealQdata(quark: number): number | null;
     thawNotify(): void;
     unref(): void;
     watchClosure(closure: Closure): void;
-    connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
+    connect(signal: "notify", handler: (self: GObject, pspec: ParamSpec) => void, after?: boolean): number;
+    connect(signal: string, handler: (...args: any[]) => any, after?: boolean): number;
 }

package/dist/generated/gobject/object.js

@@ -1,6 +1,9 @@
 import { call } from "@gtkx/native";
 import { wrapPtr } from "@gtkx/ffi";
 import { ParamSpec } from "./param-spec.js";
+const SIGNAL_META = {
+    notify: [{ type: { type: "gobject", borrowed: false }, cls: ParamSpec }],
+};
 export class GObject {
     ptr;
     constructor(...args) {
@@ -21,19 +24,19 @@ export class GObject {
                 type: { type: "array", itemType: { type: "gobject" } },
                 value: parameters,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
     }
     static compatControl(what, data) {
         return call("libgobject-2.0.so.0", "g_object_compat_control", [
             {
-                type: { type: "gobject" },
-                value: what?.ptr ?? what,
+                type: { type: "int", size: 64, unsigned: true },
+                value: what,
             },
             {
-                type: { type: "gobject" },
-                value: data?.ptr ?? data,
+                type: { type: "int", size: 64, unsigned: true },
+                value: data,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "int", size: 64, unsigned: true });
     }
     static interfaceFindProperty(gIface, propertyName) {
         return call("libgobject-2.0.so.0", "g_object_interface_find_property", [
@@ -97,8 +100,6 @@ export class GObject {
                 value: flags,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return { ptr };
     }
     bindPropertyFull(sourceProperty, target, targetProperty, flags, transformTo, transformFrom, userData, notify) {
@@ -132,16 +133,14 @@ export class GObject {
                 value: transformFrom,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
             {
-                type: { type: "gobject" },
-                value: notify?.ptr ?? notify,
+                type: { type: "callback", trampoline: "destroy" },
+                value: notify,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return { ptr };
     }
     bindPropertyWithClosures(sourceProperty, target, targetProperty, flags, transformTo, transformFrom) {
@@ -183,8 +182,6 @@ export class GObject {
                 value: transformFrom?.ptr ?? transformFrom,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return { ptr };
     }
     forceFloating() {
@@ -213,7 +210,7 @@ export class GObject {
                 type: { type: "string" },
                 value: key,
             },
-        ], { type: "gobject" });
+        ], { type: "int", size: 64, unsigned: true });
     }
     getProperty(propertyName, value) {
         call("libgobject-2.0.so.0", "g_object_get_property", [
@@ -245,7 +242,7 @@ export class GObject {
                 type: { type: "int", size: 32, unsigned: true },
                 value: quark,
             },
-        ], { type: "gobject" });
+        ], { type: "int", size: 64, unsigned: true });
     }
     getv(nProperties, names, values) {
         call("libgobject-2.0.so.0", "g_object_getv", [
@@ -313,8 +310,6 @@ export class GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, GObject);
     }
     refSink() {
@@ -324,8 +319,6 @@ export class GObject {
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, GObject);
     }
     runDispose() {
@@ -347,8 +340,8 @@ export class GObject {
                 value: key,
             },
             {
-                type: { type: "gobject" },
-                value: data?.ptr ?? data,
+                type: { type: "int", size: 64, unsigned: true },
+                value: data,
             },
         ], { type: "undefined" });
     }
@@ -382,7 +375,7 @@ export class GObject {
                 type: { type: "string" },
                 value: key,
             },
-        ], { type: "gobject" });
+        ], { type: "int", size: 64, unsigned: true });
     }
     stealQdata(quark) {
         return call("libgobject-2.0.so.0", "g_object_steal_qdata", [
@@ -394,7 +387,7 @@ export class GObject {
                 type: { type: "int", size: 32, unsigned: true },
                 value: quark,
             },
-        ], { type: "gobject" });
+        ], { type: "int", size: 64, unsigned: true });
     }
     thawNotify() {
         call("libgobject-2.0.so.0", "g_object_thaw_notify", [
@@ -429,23 +422,21 @@ export class GObject {
         ], { type: "undefined" });
     }
     connect(signal, handler, after = false) {
-        const signalMeta = {
-            notify: [{ type: { type: "gobject", borrowed: false }, cls: ParamSpec }],
-        };
-        const meta = signalMeta[signal];
-        const selfType = { type: "gobject", borrowed: false };
+        const meta = SIGNAL_META[signal];
+        const selfType = { type: "gobject", borrowed: true };
         const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const self = wrapPtr(args[0], GObject);
             const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...signalArgs);
+                return handler(self, ...signalArgs);
             const wrapped = meta.map((m, i) => {
                 if (m.cls && signalArgs[i] != null) {
                     return wrapPtr(signalArgs[i], m.cls);
                 }
                 return signalArgs[i];
             });
-            return handler(...wrapped);
+            return handler(self, ...wrapped);
         };
         return call("libgobject-2.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.ptr },

package/dist/generated/gobject/param-spec.d.ts

@@ -4,14 +4,14 @@ export declare class ParamSpec {
     constructor(...args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     static isValidName(name: string): boolean;
-    getBlurb(): string;
+    getBlurb(): string | null;
     getDefaultValue(): Value;
     getName(): string;
     getNameQuark(): number;
     getNick(): string;
-    getQdata(quark: number): unknown;
-    getRedirectTarget(): ParamSpec;
-    setQdata(quark: number, data?: unknown): void;
+    getQdata(quark: number): number | null;
+    getRedirectTarget(): ParamSpec | null;
+    setQdata(quark: number, data?: number | null): void;
     sink(): void;
-    stealQdata(quark: number): unknown;
+    stealQdata(quark: number): number | null;
 }

package/dist/generated/gobject/param-spec.js

@@ -23,7 +23,7 @@ export class ParamSpec {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "string" });
+        ], { type: "string", borrowed: true });
     }
     getDefaultValue() {
         const ptr = call("libgobject-2.0.so.0", "g_param_spec_get_default_value", [
@@ -37,8 +37,6 @@ export class ParamSpec {
             innerType: "GValue",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, Value);
     }
     getName() {
@@ -47,7 +45,7 @@ export class ParamSpec {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "string" });
+        ], { type: "string", borrowed: true });
     }
     getNameQuark() {
         return call("libgobject-2.0.so.0", "g_param_spec_get_name_quark", [
@@ -63,7 +61,7 @@ export class ParamSpec {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
-        ], { type: "string" });
+        ], { type: "string", borrowed: true });
     }
     getQdata(quark) {
         return call("libgobject-2.0.so.0", "g_param_spec_get_qdata", [
@@ -75,7 +73,7 @@ export class ParamSpec {
                 type: { type: "int", size: 32, unsigned: true },
                 value: quark,
             },
-        ], { type: "gobject" });
+        ], { type: "int", size: 64, unsigned: true });
     }
     getRedirectTarget() {
         const ptr = call("libgobject-2.0.so.0", "g_param_spec_get_redirect_target", [
@@ -99,8 +97,8 @@ export class ParamSpec {
                 value: quark,
             },
             {
-                type: { type: "gobject" },
-                value: data?.ptr ?? data,
+                type: { type: "int", size: 64, unsigned: true },
+                value: data,
             },
         ], { type: "undefined" });
     }
@@ -122,6 +120,6 @@ export class ParamSpec {
                 type: { type: "int", size: 32, unsigned: true },
                 value: quark,
             },
-        ], { type: "gobject" });
+        ], { type: "int", size: 64, unsigned: true });
     }
 }

package/dist/generated/gobject/signal-group.d.ts

@@ -1,5 +1,6 @@
 import { ConnectFlags } from "./enums.js";
 import { Closure } from "./closure.js";
+import { ParamSpec } from "./param-spec.js";
 import { GObject } from "./object.js";
 export declare class SignalGroup extends GObject {
     constructor(targetType: number);
@@ -7,10 +8,13 @@ export declare class SignalGroup extends GObject {
     protected createPtr(args: unknown[]): unknown;
     block(): void;
     connectClosure(detailedSignal: string, closure: Closure, after: boolean): void;
-    connectData(detailedSignal: string, cHandler: unknown, notify: unknown, flags: ConnectFlags, data?: unknown): void;
-    connectSwapped(detailedSignal: string, cHandler: unknown, data?: unknown): void;
-    dupTarget(): GObject;
-    setTarget(target?: GObject): void;
+    connectData(detailedSignal: string, cHandler: unknown, notify: unknown, flags: ConnectFlags, data?: number | null): void;
+    connectSwapped(detailedSignal: string, cHandler: unknown, data?: number | null): void;
+    dupTarget(): GObject | null;
+    setTarget(target?: GObject | null): void;
     unblock(): void;
-    connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
+    connect(signal: "bind", handler: (self: SignalGroup, instance: GObject) => void, after?: boolean): number;
+    connect(signal: "unbind", handler: (self: SignalGroup) => void, after?: boolean): number;
+    connect(signal: "notify", handler: (self: SignalGroup, pspec: ParamSpec) => void, after?: boolean): number;
+    connect(signal: string, handler: (...args: any[]) => any, after?: boolean): number;
 }

package/dist/generated/gobject/signal-group.js

@@ -1,6 +1,12 @@
 import { call } from "@gtkx/native";
 import { wrapPtr } from "@gtkx/ffi";
+import { ParamSpec } from "./param-spec.js";
 import { GObject } from "./object.js";
+const SIGNAL_META = {
+    bind: [{ type: { type: "gobject", borrowed: false }, cls: GObject }],
+    unbind: [],
+    notify: [{ type: { type: "gobject", borrowed: false }, cls: ParamSpec }],
+};
 export class SignalGroup extends GObject {
     constructor(...args) {
         super(...args);
@@ -12,7 +18,7 @@ export class SignalGroup extends GObject {
                 type: { type: "int", size: 64, unsigned: true },
                 value: targetType,
             },
-        ], { type: "gobject", borrowed: true });
+        ], { type: "gobject", borrowed: false });
     }
     block() {
         call("libgobject-2.0.so.0", "g_signal_group_block", [
@@ -61,8 +67,8 @@ export class SignalGroup extends GObject {
                 value: cHandler?.ptr ?? cHandler,
             },
             {
-                type: { type: "gobject" },
-                value: data?.ptr ?? data,
+                type: { type: "int", size: 64, unsigned: true },
+                value: data,
             },
             {
                 type: { type: "gobject" },
@@ -89,8 +95,8 @@ export class SignalGroup extends GObject {
                 value: cHandler?.ptr ?? cHandler,
             },
             {
-                type: { type: "gobject" },
-                value: data?.ptr ?? data,
+                type: { type: "int", size: 64, unsigned: true },
+                value: data,
             },
         ], { type: "undefined" });
     }
@@ -126,24 +132,21 @@ export class SignalGroup extends GObject {
         ], { type: "undefined" });
     }
     connect(signal, handler, after = false) {
-        const signalMeta = {
-            bind: [{ type: { type: "gobject", borrowed: false }, cls: GObject }],
-            unbind: [],
-        };
-        const meta = signalMeta[signal];
-        const selfType = { type: "gobject", borrowed: false };
+        const meta = SIGNAL_META[signal];
+        const selfType = { type: "gobject", borrowed: true };
         const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
         const wrappedHandler = (...args) => {
+            const self = wrapPtr(args[0], SignalGroup);
             const signalArgs = args.slice(1);
             if (!meta)
-                return handler(...signalArgs);
+                return handler(self, ...signalArgs);
             const wrapped = meta.map((m, i) => {
                 if (m.cls && signalArgs[i] != null) {
                     return wrapPtr(signalArgs[i], m.cls);
                 }
                 return signalArgs[i];
             });
-            return handler(...wrapped);
+            return handler(self, ...wrapped);
         };
         return call("libgobject-2.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.ptr },

package/dist/generated/gobject/type-module.d.ts

@@ -1,4 +1,5 @@
 import { TypeFlags } from "./enums.js";
+import { ParamSpec } from "./param-spec.js";
 import { GObject } from "./object.js";
 export declare class TypeModule extends GObject {
     constructor(...args: unknown[]);
@@ -12,4 +13,6 @@ export declare class TypeModule extends GObject {
     use(): boolean;
     completeInterfaceInfo(instanceType: number, interfaceType: number, info: unknown): void;
     completeTypeInfo(gType: number, info: unknown, valueTable: unknown): void;
+    connect(signal: "notify", handler: (self: TypeModule, pspec: ParamSpec) => void, after?: boolean): number;
+    connect(signal: string, handler: (...args: any[]) => any, after?: boolean): number;
 }

package/dist/generated/gobject/type-module.js

@@ -1,5 +1,10 @@
 import { call } from "@gtkx/native";
+import { wrapPtr } from "@gtkx/ffi";
+import { ParamSpec } from "./param-spec.js";
 import { GObject } from "./object.js";
+const SIGNAL_META = {
+    notify: [{ type: { type: "gobject", borrowed: false }, cls: ParamSpec }],
+};
 export class TypeModule extends GObject {
     constructor(...args) {
         super(...args);
@@ -159,4 +164,28 @@ export class TypeModule extends GObject {
             },
         ], { type: "undefined" });
     }
+    connect(signal, handler, after = false) {
+        const meta = SIGNAL_META[signal];
+        const selfType = { type: "gobject", borrowed: true };
+        const argTypes = meta ? [selfType, ...meta.map((m) => m.type)] : [selfType];
+        const wrappedHandler = (...args) => {
+            const self = wrapPtr(args[0], TypeModule);
+            const signalArgs = args.slice(1);
+            if (!meta)
+                return handler(self, ...signalArgs);
+            const wrapped = meta.map((m, i) => {
+                if (m.cls && signalArgs[i] != null) {
+                    return wrapPtr(signalArgs[i], m.cls);
+                }
+                return signalArgs[i];
+            });
+            return handler(self, ...wrapped);
+        };
+        return call("libgobject-2.0.so.0", "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/gobject/value-array.d.ts

@@ -4,14 +4,14 @@ export declare class ValueArray {
     constructor(nPrealloced: number);
     constructor(_args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
-    append(value?: Value): ValueArray;
+    append(value?: Value | null): ValueArray;
     copy(): ValueArray;
     getNth(index_: number): Value;
-    insert(index_: number, value?: Value): ValueArray;
-    prepend(value?: Value): ValueArray;
+    insert(index_: number, value?: Value | null): ValueArray;
+    prepend(value?: Value | null): ValueArray;
     remove(index_: number): ValueArray;
     sort(compareFunc: (...args: unknown[]) => unknown): ValueArray;
-    sortWithData(compareFunc: (...args: unknown[]) => unknown, userData?: unknown): ValueArray;
+    sortWithData(compareFunc: (...args: unknown[]) => unknown, userData?: number | null): ValueArray;
     get nValues(): number;
     set nValues(value: number);
     get values(): Value;

package/dist/generated/gobject/value-array.js

@@ -36,8 +36,6 @@ export class ValueArray {
             innerType: "GValueArray",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, ValueArray);
     }
     copy() {
@@ -52,8 +50,6 @@ export class ValueArray {
             innerType: "GValueArray",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, ValueArray);
     }
     getNth(index_) {
@@ -72,8 +68,6 @@ export class ValueArray {
             innerType: "GValue",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, Value);
     }
     insert(index_, value) {
@@ -100,8 +94,6 @@ export class ValueArray {
             innerType: "GValueArray",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, ValueArray);
     }
     prepend(value) {
@@ -124,8 +116,6 @@ export class ValueArray {
             innerType: "GValueArray",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, ValueArray);
     }
     remove(index_) {
@@ -144,8 +134,6 @@ export class ValueArray {
             innerType: "GValueArray",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, ValueArray);
     }
     sort(compareFunc) {
@@ -164,8 +152,6 @@ export class ValueArray {
             innerType: "GValueArray",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, ValueArray);
     }
     sortWithData(compareFunc, userData) {
@@ -179,8 +165,8 @@ export class ValueArray {
                 value: compareFunc,
             },
             {
-                type: { type: "gobject" },
-                value: userData?.ptr ?? userData,
+                type: { type: "int", size: 64, unsigned: true },
+                value: userData,
             },
         ], {
             type: "boxed",
@@ -188,8 +174,6 @@ export class ValueArray {
             innerType: "GValueArray",
             lib: "libgobject-2.0.so.0",
         });
-        if (ptr === null)
-            return null;
         return wrapPtr(ptr, ValueArray);
     }
     get nValues() {