@gtkx/ffi 0.9.3 → 0.10.0

package/dist/generated/pango/coverage.d.ts

@@ -44,7 +44,7 @@ export declare class Coverage extends GObject.GObject {
     /**
      * Increase the reference count on the `PangoCoverage` by one.
      */
-    refCoverage(): Coverage;
+    coverageRef(): Coverage;
     /**
      * Modify a particular index within `coverage`
      * @param index_ - the index to modify
@@ -62,7 +62,7 @@ export declare class Coverage extends GObject.GObject {
      *
      * If the result is zero, free the coverage and all associated memory.
      */
-    unrefCoverage(): void;
+    coverageUnref(): void;
     connect(signal: "notify", handler: (self: Coverage, pspec: GObject.ParamSpec) => void, after?: boolean): number;
     connect(signal: string, handler: (...args: any[]) => any, after?: boolean): number;
 }

package/dist/generated/pango/coverage.js

@@ -27,7 +27,7 @@ export class Coverage extends GObject.GObject {
             setInstantiating(false);
             this.id = call("libpango-1.0.so.0", "pango_coverage_new", [], {
                 type: "gobject",
-                borrowed: true,
+                borrowed: false,
             });
         }
         else {
@@ -55,7 +55,7 @@ export class Coverage extends GObject.GObject {
                 value: nBytes,
             },
         ], { type: "gobject", borrowed: true });
-        return getNativeObject(ptr);
+        return getNativeObject(ptr, Coverage);
     }
     /**
      * Copy an existing `PangoCoverage`.
@@ -106,7 +106,7 @@ export class Coverage extends GObject.GObject {
     /**
      * Increase the reference count on the `PangoCoverage` by one.
      */
-    refCoverage() {
+    coverageRef() {
         const ptr = call("libpango-1.0.so.0", "pango_coverage_ref", [
             {
                 type: { type: "gobject" },
@@ -171,7 +171,7 @@ export class Coverage extends GObject.GObject {
      *
      * If the result is zero, free the coverage and all associated memory.
      */
-    unrefCoverage() {
+    coverageUnref() {
         call("libpango-1.0.so.0", "pango_coverage_unref", [
             {
                 type: { type: "gobject" },
@@ -185,7 +185,9 @@ export class Coverage extends GObject.GObject {
         const returnType = undefined;
         const wrappedHandler = (...args) => {
             const self = getNativeObject(args[0]);
-            return handler(self, ...args.slice(1));
+            const callbackArgs = args.slice(1);
+            const result = handler(self, ...callbackArgs);
+            return result;
         };
         return call("libpango-1.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.id },

package/dist/generated/pango/font-description.js

@@ -100,7 +100,7 @@ export class FontDescription extends NativeObject {
             lib: "libpango-1.0.so.0",
             getTypeFn: "pango_font_description_get_type",
         });
-        return getNativeObject(ptr);
+        return getNativeObject(ptr, FontDescription);
     }
     /**
      * Determines if the style attributes of `new_match` are a closer match

package/dist/generated/pango/font-face.js

@@ -119,7 +119,9 @@ export class FontFace extends GObject.GObject {
         const returnType = undefined;
         const wrappedHandler = (...args) => {
             const self = getNativeObject(args[0]);
-            return handler(self, ...args.slice(1));
+            const callbackArgs = args.slice(1);
+            const result = handler(self, ...callbackArgs);
+            return result;
         };
         return call("libpango-1.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.id },

package/dist/generated/pango/font-family.d.ts

@@ -1,13 +1,6 @@
 import { Ref } from "@gtkx/native";
 import { FontFace } from "./font-face.js";
 import * as GObject from "../gobject/index.js";
-/**
- * A `PangoFontFamily` is used to represent a family of related
- * font faces.
- *
- * The font faces in a family share a common design, but differ in
- * slant, weight, width or other aspects.
- */
 export declare class FontFamily extends GObject.GObject {
     static readonly glibTypeName: string;
     static readonly objectType: "gobject";
@@ -126,6 +119,7 @@ export declare class FontFamily extends GObject.GObject {
      * @param added - the number of items added
      */
     itemsChanged(position: number, removed: number, added: number): void;
+    connect(signal: "items-changed", handler: (self: FontFamily, position: number, removed: number, added: number) => void, after?: boolean): number;
     connect(signal: "notify", handler: (self: FontFamily, pspec: GObject.ParamSpec) => void, after?: boolean): number;
     connect(signal: string, handler: (...args: any[]) => any, after?: boolean): number;
 }

package/dist/generated/pango/font-family.js

@@ -9,6 +9,16 @@ import * as GObject from "../gobject/index.js";
  * The font faces in a family share a common design, but differ in
  * slant, weight, width or other aspects.
  */
+const SIGNAL_META = {
+    "items-changed": {
+        params: [
+            { type: "int", size: 32, unsigned: true },
+            { type: "int", size: 32, unsigned: true },
+            { type: "int", size: 32, unsigned: true },
+        ],
+        returnType: { type: "undefined" },
+    },
+};
 export class FontFamily extends GObject.GObject {
     static glibTypeName = "PangoFontFamily";
     static objectType = "gobject";
@@ -235,12 +245,23 @@ export class FontFamily extends GObject.GObject {
         ], { type: "undefined" });
     }
     connect(signal, handler, after = false) {
+        const meta = SIGNAL_META[signal];
         const selfType = { type: "gobject", borrowed: true };
-        const argTypes = [selfType];
-        const returnType = undefined;
+        const argTypes = meta ? [selfType, ...meta.params] : [selfType];
+        const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
             const self = getNativeObject(args[0]);
-            return handler(self, ...args.slice(1));
+            const callbackArgs = args.slice(1);
+            if (!meta)
+                return handler(self, ...callbackArgs);
+            const wrapped = meta.params.map((t, i) => {
+                if (t?.type === "gobject" && callbackArgs[i] != null) {
+                    return getNativeObject(callbackArgs[i]);
+                }
+                return callbackArgs[i];
+            });
+            const result = handler(self, ...wrapped);
+            return result;
         };
         return call("libpango-1.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.id },

package/dist/generated/pango/font-map.d.ts

@@ -6,13 +6,6 @@ import { Font } from "./font.js";
 import { FontFamily } from "./font-family.js";
 import { Fontset } from "./fontset.js";
 import * as GObject from "../gobject/index.js";
-/**
- * A `PangoFontMap` represents the set of fonts available for a
- * particular rendering system.
- *
- * This is a virtual object with implementations being specific to
- * particular rendering systems.
- */
 export declare class FontMap extends GObject.GObject {
     static readonly glibTypeName: string;
     static readonly objectType: "gobject";
@@ -168,6 +161,7 @@ export declare class FontMap extends GObject.GObject {
      * @param added - the number of items added
      */
     itemsChanged(position: number, removed: number, added: number): void;
+    connect(signal: "items-changed", handler: (self: FontMap, position: number, removed: number, added: number) => void, after?: boolean): number;
     connect(signal: "notify", handler: (self: FontMap, pspec: GObject.ParamSpec) => void, after?: boolean): number;
     connect(signal: string, handler: (...args: any[]) => any, after?: boolean): number;
 }

package/dist/generated/pango/font-map.js

@@ -10,6 +10,16 @@ import * as GObject from "../gobject/index.js";
  * This is a virtual object with implementations being specific to
  * particular rendering systems.
  */
+const SIGNAL_META = {
+    "items-changed": {
+        params: [
+            { type: "int", size: 32, unsigned: true },
+            { type: "int", size: 32, unsigned: true },
+            { type: "int", size: 32, unsigned: true },
+        ],
+        returnType: { type: "undefined" },
+    },
+};
 export class FontMap extends GObject.GObject {
     static glibTypeName = "PangoFontMap";
     static objectType = "gobject";
@@ -381,12 +391,23 @@ export class FontMap extends GObject.GObject {
         ], { type: "undefined" });
     }
     connect(signal, handler, after = false) {
+        const meta = SIGNAL_META[signal];
         const selfType = { type: "gobject", borrowed: true };
-        const argTypes = [selfType];
-        const returnType = undefined;
+        const argTypes = meta ? [selfType, ...meta.params] : [selfType];
+        const returnType = meta?.returnType;
         const wrappedHandler = (...args) => {
             const self = getNativeObject(args[0]);
-            return handler(self, ...args.slice(1));
+            const callbackArgs = args.slice(1);
+            if (!meta)
+                return handler(self, ...callbackArgs);
+            const wrapped = meta.params.map((t, i) => {
+                if (t?.type === "gobject" && callbackArgs[i] != null) {
+                    return getNativeObject(callbackArgs[i]);
+                }
+                return callbackArgs[i];
+            });
+            const result = handler(self, ...wrapped);
+            return result;
         };
         return call("libpango-1.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.id },

package/dist/generated/pango/font.d.ts

@@ -2,13 +2,13 @@ import { Ref } from "@gtkx/native";
 import { FontDescription } from "./font-description.js";
 import { FontMetrics } from "./font-metrics.js";
 import { Language } from "./language.js";
+import { Rectangle } from "./rectangle.js";
 import { Context } from "./context.js";
 import { Coverage } from "./coverage.js";
 import { FontFace } from "./font-face.js";
 import { FontMap } from "./font-map.js";
 import * as GLib from "../glib/index.js";
 import * as GObject from "../gobject/index.js";
-import * as Gdk from "../gdk/index.js";
 import * as HarfBuzz from "../harfbuzz/index.js";
 import * as cairo from "../cairo/index.js";
 /**
@@ -106,7 +106,7 @@ export declare class Font extends GObject.GObject {
      * @param inkRect - rectangle used to store the extents of the glyph as drawn
      * @param logicalRect - rectangle used to store the logical extents of the glyph
      */
-    getGlyphExtents(glyph: cairo.Glyph, inkRect?: Gdk.Rectangle, logicalRect?: Gdk.Rectangle): void;
+    getGlyphExtents(glyph: cairo.Glyph, inkRect?: Rectangle, logicalRect?: Rectangle): void;
     /**
      * Returns the languages that are supported by `font`.
      *

package/dist/generated/pango/font.js

@@ -85,7 +85,7 @@ export class Font extends GObject.GObject {
         if (error.value !== null) {
             throw new NativeError(error.value);
         }
-        return getNativeObject(ptr);
+        return getNativeObject(ptr, Font);
     }
     /**
      * Returns a description of the font, with font size set in points.
@@ -272,24 +272,12 @@ export class Font extends GObject.GObject {
                 value: glyph?.id ?? glyph,
             },
             {
-                type: {
-                    type: "boxed",
-                    borrowed: true,
-                    innerType: "GdkRectangle",
-                    lib: "libgtk-4.so.1",
-                    getTypeFn: "gdk_rectangle_get_type",
-                },
+                type: { type: "struct", borrowed: true, innerType: "Rectangle" },
                 value: inkRect?.id ?? inkRect,
                 optional: true,
             },
             {
-                type: {
-                    type: "boxed",
-                    borrowed: true,
-                    innerType: "GdkRectangle",
-                    lib: "libgtk-4.so.1",
-                    getTypeFn: "gdk_rectangle_get_type",
-                },
+                type: { type: "struct", borrowed: true, innerType: "Rectangle" },
                 value: logicalRect?.id ?? logicalRect,
                 optional: true,
             },
@@ -406,7 +394,9 @@ export class Font extends GObject.GObject {
         const returnType = undefined;
         const wrappedHandler = (...args) => {
             const self = getNativeObject(args[0]);
-            return handler(self, ...args.slice(1));
+            const callbackArgs = args.slice(1);
+            const result = handler(self, ...callbackArgs);
+            return result;
         };
         return call("libpango-1.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.id },

package/dist/generated/pango/fontset-simple.js

@@ -34,7 +34,7 @@ export class FontsetSimple extends Fontset {
                     },
                     value: language?.id ?? language,
                 },
-            ], { type: "gobject", borrowed: true });
+            ], { type: "gobject", borrowed: false });
         }
         else {
             // @ts-ignore
@@ -76,7 +76,9 @@ export class FontsetSimple extends Fontset {
         const returnType = undefined;
         const wrappedHandler = (...args) => {
             const self = getNativeObject(args[0]);
-            return handler(self, ...args.slice(1));
+            const callbackArgs = args.slice(1);
+            const result = handler(self, ...callbackArgs);
+            return result;
         };
         return call("libpango-1.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.id },

package/dist/generated/pango/fontset.js

@@ -59,7 +59,9 @@ export class Fontset extends GObject.GObject {
         const returnType = undefined;
         const wrappedHandler = (...args) => {
             const self = getNativeObject(args[0]);
-            return handler(self, ...args.slice(1));
+            const callbackArgs = args.slice(1);
+            const result = handler(self, ...callbackArgs);
+            return result;
         };
         return call("libpango-1.0.so.0", "g_signal_connect_closure", [
             { type: { type: "gobject" }, value: this.id },

package/dist/generated/pango/functions.d.ts

@@ -7,11 +7,12 @@ import { FontDescription } from "./font-description.js";
 import { GlyphString } from "./glyph-string.js";
 import { Item } from "./item.js";
 import { Language } from "./language.js";
+import { LogAttr } from "./log-attr.js";
 import { Matrix } from "./matrix.js";
+import { Rectangle } from "./rectangle.js";
 import { TabArray } from "./tab-array.js";
 import { Context } from "./context.js";
 import * as GLib from "../glib/index.js";
-import * as Gdk from "../gdk/index.js";
 /**
  * Create a new allow-breaks attribute.
  *
@@ -54,7 +55,7 @@ export declare const attrBaselineShiftNew: (shift: number) => Attribute;
  * @param attrs - array with one
  * @param attrsLen - length of `attrs` array
  */
-export declare const attrBreak: (text: string, length: number, attrList: AttrList, offset: number, attrs: Ref<number[]>, attrsLen: number) => void;
+export declare const attrBreak: (text: string, length: number, attrList: AttrList, offset: number, attrs: Ref<LogAttr[]>, attrsLen: number) => void;
 /**
  * Create a new font fallback attribute.
  *
@@ -208,7 +209,7 @@ export declare const attrSentenceNew: () => Attribute;
  * @param inkRect - ink rectangle to assign to each character
  * @param logicalRect - logical rectangle to assign to each character
  */
-export declare const attrShapeNew: (inkRect: Gdk.Rectangle, logicalRect: Gdk.Rectangle) => Attribute;
+export declare const attrShapeNew: (inkRect: Rectangle, logicalRect: Rectangle) => Attribute;
 /**
  * Create a new attribute that influences how invisible
  * characters are rendered.
@@ -329,7 +330,7 @@ export declare const bidiTypeForUnichar: (ch: number) => BidiType;
  * @param attrs - an array to
  * @param attrsLen - size of the array passed as `attrs`
  */
-export declare const _break: (text: string, length: number, analysis: number, attrs: Ref<number[]>, attrsLen: number) => void;
+export declare const _break: (text: string, length: number, analysis: number, attrs: Ref<LogAttr[]>, attrsLen: number) => void;
 /**
  * This is the default break algorithm.
  *
@@ -346,7 +347,7 @@ export declare const _break: (text: string, length: number, analysis: number, at
  * @param attrs - logical
  * @param attrsLen - size of the array passed as `attrs`
  */
-export declare const defaultBreak: (text: string, length: number, attrs: Ref<number[]>, attrsLen: number, analysis?: number) => void;
+export declare const defaultBreak: (text: string, length: number, attrs: Ref<LogAttr[]>, attrsLen: number, analysis?: number) => void;
 /**
  * Converts extents from Pango units to device units.
  *
@@ -368,7 +369,7 @@ export declare const defaultBreak: (text: string, length: number, attrs: Ref<num
  * @param inclusive - rectangle to round to pixels inclusively
  * @param nearest - rectangle to round to nearest pixels
  */
-export declare const extentsToPixels: (inclusive: Ref<Gdk.Rectangle>, nearest: Ref<Gdk.Rectangle>) => void;
+export declare const extentsToPixels: (inclusive: Ref<Rectangle>, nearest: Ref<Rectangle>) => void;
 /**
  * Searches a string the first character that has a strong
  * direction, according to the Unicode bidirectional algorithm.
@@ -470,7 +471,7 @@ export declare const fontDescriptionFromString: (str: string) => FontDescription
  * @param attrs - array with one
  * @param attrsLen - length of `attrs` array
  */
-export declare const getLogAttrs: (text: string, length: number, level: number, language: Language, attrs: Ref<number[]>, attrsLen: number) => void;
+export declare const getLogAttrs: (text: string, length: number, level: number, language: Language, attrs: Ref<LogAttr[]>, attrsLen: number) => void;
 /**
  * Returns the mirrored character of a Unicode character.
  *
@@ -972,7 +973,7 @@ export declare const shapeFull: (itemText: string, itemLength: number, paragraph
  * @param glyphs - glyph string in which to store results
  * @param flags - flags influencing the shaping process
  */
-export declare const shapeItem: (item: Item, paragraphLength: number, glyphs: GlyphString, flags: ShapeFlags, paragraphText?: string, logAttrs?: number) => void;
+export declare const shapeItem: (item: Item, paragraphLength: number, glyphs: GlyphString, flags: ShapeFlags, paragraphText?: string, logAttrs?: LogAttr) => void;
 /**
  * Convert the characters in `text` into glyphs.
  *
@@ -1037,7 +1038,7 @@ export declare const tabArrayFromString: (text: string) => TabArray | null;
  * @param attrs - array with one
  * @param attrsLen - length of `attrs` array
  */
-export declare const tailorBreak: (text: string, length: number, analysis: number, offset: number, attrs: Ref<number[]>, attrsLen: number) => void;
+export declare const tailorBreak: (text: string, length: number, analysis: number, offset: number, attrs: Ref<LogAttr[]>, attrsLen: number) => void;
 /**
  * Trims leading and trailing whitespace from a string.
  * @param str - a string

package/dist/generated/pango/functions.js

@@ -7,7 +7,6 @@ import { FontDescription } from "./font-description.js";
 import { Language } from "./language.js";
 import { TabArray } from "./tab-array.js";
 import * as GLib from "../glib/index.js";
-import * as Gdk from "../gdk/index.js";
 /**
  * Create a new allow-breaks attribute.
  *
@@ -143,7 +142,7 @@ export const attrBreak = (text, length, attrList, offset, attrs, attrsLen) => {
                 type: "ref",
                 innerType: {
                     type: "array",
-                    itemType: { type: "int", size: 64, unsigned: true },
+                    itemType: { type: "struct", innerType: "LogAttr" },
                 },
             },
             value: attrs,
@@ -615,23 +614,11 @@ export const attrSentenceNew = () => {
 export const attrShapeNew = (inkRect, logicalRect) => {
     const ptr = call("libpango-1.0.so.0", "pango_attr_shape_new", [
         {
-            type: {
-                type: "boxed",
-                borrowed: true,
-                innerType: "GdkRectangle",
-                lib: "libgtk-4.so.1",
-                getTypeFn: "gdk_rectangle_get_type",
-            },
+            type: { type: "struct", innerType: "Rectangle" },
             value: inkRect?.id ?? inkRect,
         },
         {
-            type: {
-                type: "boxed",
-                borrowed: true,
-                innerType: "GdkRectangle",
-                lib: "libgtk-4.so.1",
-                getTypeFn: "gdk_rectangle_get_type",
-            },
+            type: { type: "struct", innerType: "Rectangle" },
             value: logicalRect?.id ?? logicalRect,
         },
     ], {
@@ -996,7 +983,7 @@ export const _break = (text, length, analysis, attrs, attrsLen) => {
                 type: "ref",
                 innerType: {
                     type: "array",
-                    itemType: { type: "int", size: 64, unsigned: true },
+                    itemType: { type: "struct", innerType: "LogAttr" },
                 },
             },
             value: attrs,
@@ -1043,7 +1030,7 @@ export const defaultBreak = (text, length, attrs, attrsLen, analysis) => {
                 type: "ref",
                 innerType: {
                     type: "array",
-                    itemType: { type: "int", size: 64, unsigned: true },
+                    itemType: { type: "struct", innerType: "LogAttr" },
                 },
             },
             value: attrs,
@@ -1080,30 +1067,18 @@ export const extentsToPixels = (inclusive, nearest) => {
         {
             type: {
                 type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "GdkRectangle",
-                    lib: "libgtk-4.so.1",
-                    getTypeFn: "gdk_rectangle_get_type",
-                },
+                innerType: { type: "struct", innerType: "Rectangle" },
             },
             value: inclusive,
         },
         {
             type: {
                 type: "ref",
-                innerType: {
-                    type: "boxed",
-                    innerType: "GdkRectangle",
-                    lib: "libgtk-4.so.1",
-                    getTypeFn: "gdk_rectangle_get_type",
-                },
+                innerType: { type: "struct", innerType: "Rectangle" },
             },
             value: nearest,
         },
     ], { type: "undefined" });
-    inclusive.value = getNativeObject(inclusive.value, Gdk.Rectangle);
-    nearest.value = getNativeObject(nearest.value, Gdk.Rectangle);
 };
 /**
  * Searches a string the first character that has a strong
@@ -1287,7 +1262,7 @@ export const getLogAttrs = (text, length, level, language, attrs, attrsLen) => {
                 type: "ref",
                 innerType: {
                     type: "array",
-                    itemType: { type: "int", size: 64, unsigned: true },
+                    itemType: { type: "struct", innerType: "LogAttr" },
                 },
             },
             value: attrs,
@@ -2484,8 +2459,8 @@ export const shapeItem = (item, paragraphLength, glyphs, flags, paragraphText, l
             value: paragraphLength,
         },
         {
-            type: { type: "int", size: 64, unsigned: true },
-            value: logAttrs,
+            type: { type: "struct", innerType: "LogAttr" },
+            value: logAttrs?.id ?? logAttrs,
             optional: true,
         },
         {
@@ -2659,7 +2634,7 @@ export const tailorBreak = (text, length, analysis, offset, attrs, attrsLen) =>
                 type: "ref",
                 innerType: {
                     type: "array",
-                    itemType: { type: "int", size: 64, unsigned: true },
+                    itemType: { type: "struct", innerType: "LogAttr" },
                 },
             },
             value: attrs,

package/dist/generated/pango/glyph-item-iter.d.ts

@@ -32,11 +32,11 @@ export interface GlyphItemIterInit {
  * gboolean have_cluster;
  *
  * for (have_cluster = pango_glyph_item_iter_init_start (&cluster_iter,
- * glyph_item, text);
- * have_cluster;
- * have_cluster = pango_glyph_item_iter_next_cluster (&cluster_iter))
+ *                                                       glyph_item, text);
+ *      have_cluster;
+ *      have_cluster = pango_glyph_item_iter_next_cluster (&cluster_iter))
  * {
- * ...
+ *   ...
  * }
  * ```
  *

package/dist/generated/pango/glyph-item-iter.js

@@ -27,11 +27,11 @@ import { registerNativeClass } from "../../registry.js";
  * gboolean have_cluster;
  *
  * for (have_cluster = pango_glyph_item_iter_init_start (&cluster_iter,
- * glyph_item, text);
- * have_cluster;
- * have_cluster = pango_glyph_item_iter_next_cluster (&cluster_iter))
+ *                                                       glyph_item, text);
+ *      have_cluster;
+ *      have_cluster = pango_glyph_item_iter_next_cluster (&cluster_iter))
  * {
- * ...
+ *   ...
  * }
  * ```
  *

package/dist/generated/pango/glyph-item.d.ts

@@ -3,6 +3,7 @@ import { NativeObject } from "../../native/base.js";
 import { AttrList } from "./attr-list.js";
 import { GlyphString } from "./glyph-string.js";
 import { Item } from "./item.js";
+import { LogAttr } from "./log-attr.js";
 export interface GlyphItemInit {
     yOffset?: number;
     startXOffset?: number;
@@ -71,7 +72,7 @@ export declare class GlyphItem extends NativeObject {
      * @param logAttrs - logical attributes for the item
      * @param letterSpacing - amount of letter spacing to add
      */
-    letterSpace(text: string, logAttrs: number[], letterSpacing: number): void;
+    letterSpace(text: string, logAttrs: LogAttr[], letterSpacing: number): void;
     /**
      * Modifies `orig` to cover only the text after `split_index`, and
      * returns a new item that covers the text before `split_index` that

package/dist/generated/pango/glyph-item.js

@@ -195,7 +195,7 @@ export class GlyphItem extends NativeObject {
             {
                 type: {
                     type: "array",
-                    itemType: { type: "int", size: 64, unsigned: true },
+                    itemType: { type: "struct", innerType: "LogAttr" },
                 },
                 value: logAttrs,
             },

package/dist/generated/pango/glyph-string.d.ts

@@ -1,7 +1,8 @@
 import { Ref } from "@gtkx/native";
 import { NativeObject } from "../../native/base.js";
+import { LogAttr } from "./log-attr.js";
+import { Rectangle } from "./rectangle.js";
 import { Font } from "./font.js";
-import * as Gdk from "../gdk/index.js";
 /**
  * A `PangoGlyphString` is used to store strings of glyphs with geometry
  * and visual attribute information.
@@ -35,7 +36,7 @@ export declare class GlyphString extends NativeObject {
      * @param inkRect - rectangle used to store the extents of the glyph string as drawn
      * @param logicalRect - rectangle used to store the logical extents of the glyph string
      */
-    extents(font: Font, inkRect?: Gdk.Rectangle, logicalRect?: Gdk.Rectangle): void;
+    extents(font: Font, inkRect?: Rectangle, logicalRect?: Rectangle): void;
     /**
      * Computes the extents of a sub-portion of a glyph string.
      *
@@ -48,7 +49,7 @@ export declare class GlyphString extends NativeObject {
      * @param inkRect - rectangle used to
      * @param logicalRect - rectangle used to
      */
-    extentsRange(start: number, end: number, font: Font, inkRect?: Gdk.Rectangle, logicalRect?: Gdk.Rectangle): void;
+    extentsRange(start: number, end: number, font: Font, inkRect?: Rectangle, logicalRect?: Rectangle): void;
     /**
      * Free a glyph string and associated storage.
      */
@@ -108,7 +109,7 @@ export declare class GlyphString extends NativeObject {
      * @param trailing - whether we should compute the result for the beginning (%FALSE)
      * @param xPos - location to store result
      */
-    indexToXFull(text: string, length: number, analysis: number, index_: number, trailing: boolean, attrs?: number, xPos?: Ref<number>): void;
+    indexToXFull(text: string, length: number, analysis: number, index_: number, trailing: boolean, attrs?: LogAttr, xPos?: Ref<number>): void;
     /**
      * Resize a glyph string to the given length.
      * @param newLen - the new length of the string