@gtkx/ffi 0.1.6 → 0.1.7

package/dist/generated/gtk/print-dialog.js

@@ -1,5 +1,9 @@
 import { call } from "@gtkx/native";
 import { NativeError } from "@gtkx/ffi";
+import { PrintSetup } from "./print-setup.js";
+import { PageSetup } from "./page-setup.js";
+import { PrintSettings } from "./print-settings.js";
+import * as Gio from "../gio/index.js";
 export class PrintDialog {
     ptr;
     constructor(_args = []) {
@@ -28,20 +32,30 @@ export class PrintDialog {
         ], { type: "boolean" });
     }
     getPageSetup() {
-        return call("libgtk-4.so.1", "gtk_print_dialog_get_page_setup", [
+        const ptr = call("libgtk-4.so.1", "gtk_print_dialog_get_page_setup", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(PageSetup.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getPrintSettings() {
-        return call("libgtk-4.so.1", "gtk_print_dialog_get_print_settings", [
+        const ptr = call("libgtk-4.so.1", "gtk_print_dialog_get_print_settings", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(PrintSettings.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getTitle() {
         return call("libgtk-4.so.1", "gtk_print_dialog_get_title", [
@@ -51,129 +65,69 @@ export class PrintDialog {
             },
         ], { type: "string" });
     }
-    print(parent, setup, cancellable, callback, userData) {
-        call("libgtk-4.so.1", "gtk_print_dialog_print", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: parent,
-            },
-            {
-                type: {
-                    type: "boxed",
-                    innerType: "GtkPrintSetup",
-                    lib: "libgtk-4.so.1",
+    print(parent, setup, cancellable) {
+        return new Promise((resolve, reject) => {
+            const callback = (_source, asyncResult) => {
+                try {
+                    const error = { value: null };
+                    const ptr = call("libgtk-4.so.1", "gtk_print_dialog_print_finish", [
+                        { type: { type: "gobject" }, value: this.ptr },
+                        { type: { type: "gobject" }, value: asyncResult },
+                        {
+                            type: {
+                                type: "ref",
+                                innerType: {
+                                    type: "boxed",
+                                    innerType: "GError",
+                                    lib: "libglib-2.0.so.0",
+                                },
+                            },
+                            value: error,
+                        },
+                    ], { type: "gobject", borrowed: true });
+                    if (error.value !== null) {
+                        throw new NativeError(error.value);
+                    }
+                    if (ptr === null) {
+                        resolve(null);
+                        return;
+                    }
+                    const instance = Object.create(Gio.OutputStream.prototype);
+                    instance.ptr = ptr;
+                    resolve(instance);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            };
+            call("libgtk-4.so.1", "gtk_print_dialog_print", [
+                { type: { type: "gobject" }, value: this.ptr },
+                {
+                    type: { type: "gobject" },
+                    value: parent?.ptr ?? parent,
                 },
-                value: setup,
-            },
-            {
-                type: { type: "gobject" },
-                value: cancellable,
-            },
-            {
-                type: { type: "gobject" },
-                value: callback,
-            },
-            {
-                type: { type: "gobject" },
-                value: userData,
-            },
-        ], { type: "undefined" });
-    }
-    printFile(file, parent, setup, cancellable, callback, userData) {
-        call("libgtk-4.so.1", "gtk_print_dialog_print_file", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: parent,
-            },
-            {
-                type: {
-                    type: "boxed",
-                    innerType: "GtkPrintSetup",
-                    lib: "libgtk-4.so.1",
-                },
-                value: setup,
-            },
-            {
-                type: { type: "gobject" },
-                value: file,
-            },
-            {
-                type: { type: "gobject" },
-                value: cancellable,
-            },
-            {
-                type: { type: "gobject" },
-                value: callback,
-            },
-            {
-                type: { type: "gobject" },
-                value: userData,
-            },
-        ], { type: "undefined" });
-    }
-    printFileFinish(result) {
-        const error = { value: null };
-        const _result = call("libgtk-4.so.1", "gtk_print_dialog_print_file_finish", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: result,
-            },
-            {
-                type: {
-                    type: "ref",
-                    innerType: {
+                {
+                    type: {
                         type: "boxed",
-                        innerType: "GError",
-                        lib: "libglib-2.0.so.0",
+                        innerType: "GtkPrintSetup",
+                        lib: "libgtk-4.so.1",
                     },
+                    value: setup?.ptr ?? setup,
                 },
-                value: error,
-            },
-        ], { type: "boolean" });
-        if (error.value !== null) {
-            throw new NativeError(error.value);
-        }
-        return _result;
-    }
-    printFinish(result) {
-        const error = { value: null };
-        const _result = call("libgtk-4.so.1", "gtk_print_dialog_print_finish", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: result,
-            },
-            {
-                type: {
-                    type: "ref",
-                    innerType: {
-                        type: "boxed",
-                        innerType: "GError",
-                        lib: "libglib-2.0.so.0",
+                {
+                    type: { type: "gobject" },
+                    value: cancellable?.ptr ?? cancellable,
+                },
+                {
+                    type: {
+                        type: "asyncCallback",
+                        sourceType: { type: "gobject", borrowed: true },
+                        resultType: { type: "gobject", borrowed: true },
                     },
+                    value: callback,
                 },
-                value: error,
-            },
-        ], { type: "gobject", borrowed: true });
-        if (error.value !== null) {
-            throw new NativeError(error.value);
-        }
-        return _result;
+            ], { type: "undefined" });
+        });
     }
     setAcceptLabel(acceptLabel) {
         call("libgtk-4.so.1", "gtk_print_dialog_set_accept_label", [
@@ -207,7 +161,7 @@ export class PrintDialog {
             },
             {
                 type: { type: "gobject" },
-                value: pageSetup,
+                value: pageSetup?.ptr ?? pageSetup,
             },
         ], { type: "undefined" });
     }
@@ -219,7 +173,7 @@ export class PrintDialog {
             },
             {
                 type: { type: "gobject" },
-                value: printSettings,
+                value: printSettings?.ptr ?? printSettings,
             },
         ], { type: "undefined" });
     }
@@ -235,62 +189,66 @@ export class PrintDialog {
             },
         ], { type: "undefined" });
     }
-    setup(parent, cancellable, callback, userData) {
-        call("libgtk-4.so.1", "gtk_print_dialog_setup", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: parent,
-            },
-            {
-                type: { type: "gobject" },
-                value: cancellable,
-            },
-            {
-                type: { type: "gobject" },
-                value: callback,
-            },
-            {
-                type: { type: "gobject" },
-                value: userData,
-            },
-        ], { type: "undefined" });
-    }
-    setupFinish(result) {
-        const error = { value: null };
-        const _result = call("libgtk-4.so.1", "gtk_print_dialog_setup_finish", [
-            {
-                type: { type: "gobject" },
-                value: this.ptr,
-            },
-            {
-                type: { type: "gobject" },
-                value: result,
-            },
-            {
-                type: {
-                    type: "ref",
-                    innerType: {
+    setup(parent, cancellable) {
+        return new Promise((resolve, reject) => {
+            const callback = (_source, asyncResult) => {
+                try {
+                    const error = { value: null };
+                    const ptr = call("libgtk-4.so.1", "gtk_print_dialog_setup_finish", [
+                        { type: { type: "gobject" }, value: this.ptr },
+                        { type: { type: "gobject" }, value: asyncResult },
+                        {
+                            type: {
+                                type: "ref",
+                                innerType: {
+                                    type: "boxed",
+                                    innerType: "GError",
+                                    lib: "libglib-2.0.so.0",
+                                },
+                            },
+                            value: error,
+                        },
+                    ], {
                         type: "boxed",
-                        innerType: "GError",
-                        lib: "libglib-2.0.so.0",
+                        borrowed: true,
+                        innerType: "GtkPrintSetup",
+                        lib: "libgtk-4.so.1",
+                    });
+                    if (error.value !== null) {
+                        throw new NativeError(error.value);
+                    }
+                    if (ptr === null) {
+                        resolve(null);
+                        return;
+                    }
+                    const instance = Object.create(PrintSetup.prototype);
+                    instance.ptr = ptr;
+                    resolve(instance);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            };
+            call("libgtk-4.so.1", "gtk_print_dialog_setup", [
+                { type: { type: "gobject" }, value: this.ptr },
+                {
+                    type: { type: "gobject" },
+                    value: parent?.ptr ?? parent,
+                },
+                {
+                    type: { type: "gobject" },
+                    value: cancellable?.ptr ?? cancellable,
+                },
+                {
+                    type: {
+                        type: "asyncCallback",
+                        sourceType: { type: "gobject", borrowed: true },
+                        resultType: { type: "gobject", borrowed: true },
                     },
+                    value: callback,
                 },
-                value: error,
-            },
-        ], {
-            type: "boxed",
-            borrowed: true,
-            innerType: "GtkPrintSetup",
-            lib: "libgtk-4.so.1",
+            ], { type: "undefined" });
         });
-        if (error.value !== null) {
-            throw new NativeError(error.value);
-        }
-        return _result;
     }
     get acceptLabel() {
         throw new Error("Property getters not yet implemented");

package/dist/generated/gtk/print-job.d.ts

@@ -1,8 +1,12 @@
 import { Ref } from "@gtkx/native";
 import { NumberUpLayout, PageSet, PrintPages, PrintStatus } from "./enums.js";
+import { PageSetup } from "./page-setup.js";
+import { Printer } from "./printer.js";
+import { PrintSettings } from "./print-settings.js";
+import * as cairo from "../cairo/index.js";
 export declare class PrintJob {
     ptr: unknown;
-    constructor(title: string, printer: unknown, settings: unknown, pageSetup: unknown);
+    constructor(title: string, printer: Printer, settings: PrintSettings, pageSetup: PageSetup);
     constructor(_args: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     getCollate(): boolean;
@@ -12,13 +16,13 @@ export declare class PrintJob {
     getPageRanges(nRanges: Ref<number>): unknown[];
     getPageSet(): PageSet;
     getPages(): PrintPages;
-    getPrinter(): unknown;
+    getPrinter(): Printer;
     getReverse(): boolean;
     getRotate(): boolean;
     getScale(): number;
-    getSettings(): unknown;
+    getSettings(): PrintSettings;
     getStatus(): PrintStatus;
-    getSurface(): unknown;
+    getSurface(): cairo.Surface;
     getTitle(): string;
     getTrackPrintStatus(): boolean;
     send(callback: (...args: unknown[]) => unknown, dnotify: unknown, userData?: unknown): void;
@@ -35,9 +39,9 @@ export declare class PrintJob {
     setSourceFd(fd: number): boolean;
     setSourceFile(filename: string): boolean;
     setTrackPrintStatus(trackStatus: boolean): void;
-    get pageSetup(): unknown;
-    get printer(): unknown;
-    get settings(): unknown;
+    get pageSetup(): PageSetup;
+    get printer(): Printer;
+    get settings(): PrintSettings;
     get title(): string;
     get trackPrintStatus(): boolean;
     set trackPrintStatus(_value: boolean);

package/dist/generated/gtk/print-job.js

@@ -1,5 +1,8 @@
 import { call } from "@gtkx/native";
 import { NativeError } from "@gtkx/ffi";
+import { Printer } from "./printer.js";
+import { PrintSettings } from "./print-settings.js";
+import * as cairo from "../cairo/index.js";
 export class PrintJob {
     ptr;
     constructor(...args) {
@@ -15,15 +18,15 @@ export class PrintJob {
             },
             {
                 type: { type: "gobject" },
-                value: printer,
+                value: printer?.ptr ?? printer,
             },
             {
                 type: { type: "gobject" },
-                value: settings,
+                value: settings?.ptr ?? settings,
             },
             {
                 type: { type: "gobject" },
-                value: pageSetup,
+                value: pageSetup?.ptr ?? pageSetup,
             },
         ], { type: "gobject", borrowed: true });
     }
@@ -91,12 +94,17 @@ export class PrintJob {
         ], { type: "int", size: 32, unsigned: false });
     }
     getPrinter() {
-        return call("libgtk-4.so.1", "gtk_print_job_get_printer", [
+        const ptr = call("libgtk-4.so.1", "gtk_print_job_get_printer", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(Printer.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getReverse() {
         return call("libgtk-4.so.1", "gtk_print_job_get_reverse", [
@@ -123,12 +131,17 @@ export class PrintJob {
         ], { type: "float", size: 64 });
     }
     getSettings() {
-        return call("libgtk-4.so.1", "gtk_print_job_get_settings", [
+        const ptr = call("libgtk-4.so.1", "gtk_print_job_get_settings", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
             },
         ], { type: "gobject", borrowed: true });
+        if (ptr === null)
+            return null;
+        const instance = Object.create(PrintSettings.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getStatus() {
         return call("libgtk-4.so.1", "gtk_print_job_get_status", [
@@ -140,7 +153,7 @@ export class PrintJob {
     }
     getSurface() {
         const error = { value: null };
-        const result = call("libgtk-4.so.1", "gtk_print_job_get_surface", [
+        const ptr = call("libgtk-4.so.1", "gtk_print_job_get_surface", [
             {
                 type: { type: "gobject" },
                 value: this.ptr,
@@ -156,11 +169,20 @@ export class PrintJob {
                 },
                 value: error,
             },
-        ], { type: "gobject", borrowed: true });
+        ], {
+            type: "boxed",
+            borrowed: true,
+            innerType: "CairoSurface",
+            lib: "libgtk-4.so.1",
+        });
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        return result;
+        if (ptr === null)
+            return null;
+        const instance = Object.create(cairo.Surface.prototype);
+        instance.ptr = ptr;
+        return instance;
     }
     getTitle() {
         return call("libgtk-4.so.1", "gtk_print_job_get_title", [
@@ -190,11 +212,11 @@ export class PrintJob {
             },
             {
                 type: { type: "gobject" },
-                value: userData,
+                value: userData?.ptr ?? userData,
             },
             {
                 type: { type: "gobject" },
-                value: dnotify,
+                value: dnotify?.ptr ?? dnotify,
             },
         ], { type: "undefined" });
     }

package/dist/generated/gtk/print-operation-preview.d.ts

@@ -1,7 +1,8 @@
-export declare abstract class PrintOperationPreview {
-    protected abstract ptr: unknown;
+export declare class PrintOperationPreview {
+    ptr: unknown;
+    protected constructor(ptr: unknown);
+    static fromPtr(ptr: unknown): PrintOperationPreview;
     endPreview(): void;
     isSelected(pageNr: number): boolean;
     renderPage(pageNr: number): void;
-    connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
 }

package/dist/generated/gtk/print-operation-preview.js

@@ -1,7 +1,12 @@
 import { call } from "@gtkx/native";
-import { PageSetup } from "./page-setup.js";
-import { PrintContext } from "./print-context.js";
 export class PrintOperationPreview {
+    ptr;
+    constructor(ptr) {
+        this.ptr = ptr;
+    }
+    static fromPtr(ptr) {
+        return new PrintOperationPreview(ptr);
+    }
     endPreview() {
         call("libgtk-4.so.1", "gtk_print_operation_preview_end_preview", [
             {
@@ -34,38 +39,4 @@ export class PrintOperationPreview {
             },
         ], { type: "undefined" });
     }
-    connect(signal, handler, after = false) {
-        const signalMeta = {
-            "got-page-size": [
-                { type: { type: "gobject", borrowed: false }, cls: PrintContext },
-                { type: { type: "gobject", borrowed: false }, cls: PageSetup },
-            ],
-            ready: [
-                { type: { type: "gobject", borrowed: false }, cls: PrintContext },
-            ],
-        };
-        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/print-operation.d.ts

@@ -1,32 +1,35 @@
 import { PrintOperationAction, PrintOperationResult, PrintStatus, Unit } from "./enums.js";
+import { PageSetup } from "./page-setup.js";
+import { PrintSettings } from "./print-settings.js";
+import { Window } from "./window.js";
 export declare class PrintOperation {
     ptr: unknown;
     constructor(_args?: unknown[]);
     protected createPtr(_args: unknown[]): unknown;
     cancel(): void;
     drawPageFinish(): void;
-    getDefaultPageSetup(): unknown;
+    getDefaultPageSetup(): PageSetup;
     getEmbedPageSetup(): boolean;
     getError(): void;
     getHasSelection(): boolean;
     getNPagesToPrint(): number;
-    getPrintSettings(): unknown;
+    getPrintSettings(): PrintSettings;
     getStatus(): PrintStatus;
     getStatusString(): string;
     getSupportSelection(): boolean;
     isFinished(): boolean;
-    run(action: PrintOperationAction, parent?: unknown): PrintOperationResult;
+    run(action: PrintOperationAction, parent?: Window): PrintOperationResult;
     setAllowAsync(allowAsync: boolean): void;
     setCurrentPage(currentPage: number): void;
     setCustomTabLabel(label?: string): void;
-    setDefaultPageSetup(defaultPageSetup?: unknown): void;
+    setDefaultPageSetup(defaultPageSetup?: PageSetup): void;
     setDeferDrawing(): void;
     setEmbedPageSetup(embed: boolean): void;
     setExportFilename(filename: string): void;
     setHasSelection(hasSelection: boolean): void;
     setJobName(jobName: string): void;
     setNPages(nPages: number): void;
-    setPrintSettings(printSettings?: unknown): void;
+    setPrintSettings(printSettings?: PrintSettings): void;
     setShowProgress(showProgress: boolean): void;
     setSupportSelection(supportSelection: boolean): void;
     setTrackPrintStatus(trackStatus: boolean): void;
@@ -38,8 +41,8 @@ export declare class PrintOperation {
     set currentPage(_value: number);
     get customTabLabel(): string;
     set customTabLabel(_value: string);
-    get defaultPageSetup(): unknown;
-    set defaultPageSetup(_value: unknown);
+    get defaultPageSetup(): PageSetup;
+    set defaultPageSetup(_value: PageSetup);
     get embedPageSetup(): boolean;
     set embedPageSetup(_value: boolean);
     get exportFilename(): string;
@@ -51,8 +54,8 @@ export declare class PrintOperation {
     get nPages(): number;
     set nPages(_value: number);
     get nPagesToPrint(): number;
-    get printSettings(): unknown;
-    set printSettings(_value: unknown);
+    get printSettings(): PrintSettings;
+    set printSettings(_value: PrintSettings);
     get showProgress(): boolean;
     set showProgress(_value: boolean);
     get status(): PrintStatus;
@@ -65,5 +68,8 @@ export declare class PrintOperation {
     set unit(_value: Unit);
     get useFullPage(): boolean;
     set useFullPage(_value: boolean);
+    endPreview(): void;
+    isSelected(pageNr: number): boolean;
+    renderPage(pageNr: number): void;
     connect(signal: string, handler: (...args: unknown[]) => unknown, after?: boolean): number;
 }