@gtkx/ffi 0.1.34 → 0.1.36

package/dist/generated/pangocairo/functions.js

@@ -1,11 +1,11 @@
 import { call } from "@gtkx/native";
-import { wrapPtr } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as Pango from "../pango/index.js";
 import * as cairo from "../cairo/index.js";
 export const contextGetFontOptions = (context) => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_context_get_font_options", [
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: context?.ptr ?? context,
         },
     ], {
@@ -16,12 +16,12 @@ export const contextGetFontOptions = (context) => {
     });
     if (ptr === null)
         return null;
-    return wrapPtr(ptr, cairo.FontOptions);
+    return getObject(ptr, cairo.FontOptions);
 };
 export const contextGetResolution = (context) => {
     return call("libpangocairo-1.0.so.0", "pango_cairo_context_get_resolution", [
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: context?.ptr ?? context,
         },
     ], { type: "float", size: 64 });
@@ -29,12 +29,13 @@ export const contextGetResolution = (context) => {
 export const contextSetFontOptions = (context, options) => {
     call("libpangocairo-1.0.so.0", "pango_cairo_context_set_font_options", [
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: context?.ptr ?? context,
         },
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoFontOptions",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -45,7 +46,7 @@ export const contextSetFontOptions = (context, options) => {
 export const contextSetResolution = (context, dpi) => {
     call("libpangocairo-1.0.so.0", "pango_cairo_context_set_resolution", [
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: context?.ptr ?? context,
         },
         {
@@ -57,7 +58,7 @@ export const contextSetResolution = (context, dpi) => {
 export const contextSetShapeRenderer = (context, func, data, dnotify) => {
     call("libpangocairo-1.0.so.0", "pango_cairo_context_set_shape_renderer", [
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: context?.ptr ?? context,
         },
         {
@@ -79,32 +80,35 @@ export const createContext = (cr) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
     ], { type: "gobject", borrowed: true });
-    return wrapPtr(ptr, Pango.Context);
+    return getObject(ptr, Pango.Context);
 };
 export const createLayout = (cr) => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_create_layout", [
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
     ], { type: "gobject", borrowed: true });
-    return wrapPtr(ptr, Pango.Layout);
+    return getObject(ptr, Pango.Layout);
 };
 export const errorUnderlinePath = (cr, x, y, width, height) => {
     call("libpangocairo-1.0.so.0", "pango_cairo_error_underline_path", [
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -130,14 +134,14 @@ export const errorUnderlinePath = (cr, x, y, width, height) => {
 };
 export const fontMapGetDefault = () => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_font_map_get_default", [], { type: "gobject", borrowed: true });
-    return wrapPtr(ptr, Pango.FontMap);
+    return getObject(ptr, Pango.FontMap);
 };
 export const fontMapNew = () => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_font_map_new", [], {
         type: "gobject",
         borrowed: true,
     });
-    return wrapPtr(ptr, Pango.FontMap);
+    return getObject(ptr, Pango.FontMap);
 };
 export const fontMapNewForFontType = (fonttype) => {
     const ptr = call("libpangocairo-1.0.so.0", "pango_cairo_font_map_new_for_font_type", [
@@ -148,25 +152,27 @@ export const fontMapNewForFontType = (fonttype) => {
     ], { type: "gobject", borrowed: true });
     if (ptr === null)
         return null;
-    return wrapPtr(ptr, Pango.FontMap);
+    return getObject(ptr, Pango.FontMap);
 };
 export const glyphStringPath = (cr, font, glyphs) => {
     call("libpangocairo-1.0.so.0", "pango_cairo_glyph_string_path", [
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: font?.ptr ?? font,
         },
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "PangoGlyphString",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -179,6 +185,7 @@ export const layoutLinePath = (cr, line) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -187,6 +194,7 @@ export const layoutLinePath = (cr, line) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "PangoLayoutLine",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -199,13 +207,14 @@ export const layoutPath = (cr, layout) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: layout?.ptr ?? layout,
         },
     ], { type: "undefined" });
@@ -215,6 +224,7 @@ export const showErrorUnderline = (cr, x, y, width, height) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -243,6 +253,7 @@ export const showGlyphItem = (cr, text, glyphItem) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -255,6 +266,7 @@ export const showGlyphItem = (cr, text, glyphItem) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "PangoGlyphItem",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -267,18 +279,20 @@ export const showGlyphString = (cr, font, glyphs) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: font?.ptr ?? font,
         },
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "PangoGlyphString",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -291,13 +305,14 @@ export const showLayout = (cr, layout) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: layout?.ptr ?? layout,
         },
     ], { type: "undefined" });
@@ -307,6 +322,7 @@ export const showLayoutLine = (cr, line) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -315,6 +331,7 @@ export const showLayoutLine = (cr, line) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "PangoLayoutLine",
                 lib: "libpangocairo-1.0.so.0",
             },
@@ -327,13 +344,14 @@ export const updateContext = (cr, context) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: context?.ptr ?? context,
         },
     ], { type: "undefined" });
@@ -343,13 +361,14 @@ export const updateLayout = (cr, layout) => {
         {
             type: {
                 type: "boxed",
+                borrowed: true,
                 innerType: "CairoContext",
                 lib: "libpangocairo-1.0.so.0",
             },
             value: cr?.ptr ?? cr,
         },
         {
-            type: { type: "gobject" },
+            type: { type: "gobject", borrowed: true },
             value: layout?.ptr ?? layout,
         },
     ], { type: "undefined" });

package/dist/native.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from "node:events";
-import { createRef } from "@gtkx/native";
-export { createRef };
+import { createRef, getObjectId } from "@gtkx/native";
+export { createRef, getObjectId };
 import type { ApplicationFlags } from "./generated/gio/enums.js";
 import { Application } from "./generated/gtk/application.js";
 type NativeEventMap = {
@@ -8,8 +8,9 @@ type NativeEventMap = {
     stop: [];
 };
 export declare const events: EventEmitter<NativeEventMap>;
-export declare const wrapPtr: <T extends object>(ptr: unknown, cls: {
+export declare const getObject: <T extends object>(ptr: unknown, cls: {
     prototype: T;
 }) => T;
 export declare const start: (appId: string, flags?: ApplicationFlags) => Application;
+export declare const getCurrentApp: () => Application;
 export declare const stop: () => void;

package/dist/native.js

@@ -1,10 +1,11 @@
 import { EventEmitter } from "node:events";
-import { createRef, start as nativeStart, stop as nativeStop } from "@gtkx/native";
-export { createRef };
+import { createRef, getObjectId, start as nativeStart, stop as nativeStop } from "@gtkx/native";
+export { createRef, getObjectId };
 import { Application } from "./generated/gtk/application.js";
+let currentApp = null;
 let keepAliveTimeout = null;
 export const events = new EventEmitter();
-export const wrapPtr = (ptr, cls) => {
+export const getObject = (ptr, cls) => {
     const instance = Object.create(cls.prototype);
     instance.ptr = ptr;
     return instance;
@@ -13,16 +14,30 @@ const keepAlive = () => {
     keepAliveTimeout = setTimeout(() => keepAlive(), 2147483647);
 };
 export const start = (appId, flags) => {
+    if (currentApp) {
+        return currentApp;
+    }
     const app = nativeStart(appId, flags);
+    currentApp = getObject(app, Application);
     events.emit("start");
     keepAlive();
-    return wrapPtr(app, Application);
+    return currentApp;
+};
+export const getCurrentApp = () => {
+    if (!currentApp) {
+        throw new Error("GTK application not initialized. Call start() first.");
+    }
+    return currentApp;
 };
 export const stop = () => {
+    if (!currentApp) {
+        return;
+    }
     if (keepAliveTimeout) {
         clearTimeout(keepAliveTimeout);
         keepAliveTimeout = null;
     }
     events.emit("stop");
     nativeStop();
+    currentApp = null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/ffi",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Generated TypeScript FFI bindings for GTK4 libraries",
   "keywords": [
     "gtk",
@@ -46,10 +46,10 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/native": "0.1.34"
+    "@gtkx/native": "0.1.36"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.1.34"
+    "@gtkx/gir": "0.1.36"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",