@gtkx/gir 0.7.0 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/gir",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "GObject Introspection file parser for GTKX",
   "keywords": [
     "gtk",

package/src/types.ts

@@ -348,8 +348,8 @@ export type FfiTypeDescriptor = {
     itemType?: FfiTypeDescriptor;
     /** List type for arrays (glist, gslist) - indicates native GList/GSList iteration. */
     listType?: "glist" | "gslist";
-    /** Trampoline type for callbacks (asyncReady, destroy, sourceFunc, drawFunc, compareDataFunc). Default is "closure". */
-    trampoline?: "asyncReady" | "destroy" | "sourceFunc" | "drawFunc" | "compareDataFunc";
+    /** Trampoline type for callbacks (asyncReady, destroy, sourceFunc, drawFunc, compareDataFunc, tickFunc). Default is "closure". */
+    trampoline?: "asyncReady" | "destroy" | "sourceFunc" | "drawFunc" | "compareDataFunc" | "tickFunc";
     /** Source type for asyncReady callback (the GObject source). */
     sourceType?: FfiTypeDescriptor;
     /** Result type for asyncReady callback (the GAsyncResult). */
@@ -648,15 +648,15 @@ const BASIC_TYPE_MAP = new Map<string, TypeMapping>([
     ["guchar", { ts: "number", ffi: { type: "int", size: 8, unsigned: true } }],
     ["gint", { ts: "number", ffi: { type: "int", size: 32, unsigned: false } }],
     ["guint", { ts: "number", ffi: { type: "int", size: 32, unsigned: true } }],
-    ["gshort", { ts: "number", ffi: { type: "int", size: 32, unsigned: false } }],
-    ["gushort", { ts: "number", ffi: { type: "int", size: 32, unsigned: true } }],
+    ["gshort", { ts: "number", ffi: { type: "int", size: 16, unsigned: false } }],
+    ["gushort", { ts: "number", ffi: { type: "int", size: 16, unsigned: true } }],
     ["glong", { ts: "number", ffi: { type: "int", size: 64, unsigned: false } }],
     ["gulong", { ts: "number", ffi: { type: "int", size: 64, unsigned: true } }],
     ["GType", { ts: "number", ffi: { type: "int", size: 64, unsigned: true } }],
     ["gint8", { ts: "number", ffi: { type: "int", size: 8, unsigned: false } }],
     ["guint8", { ts: "number", ffi: { type: "int", size: 8, unsigned: true } }],
-    ["gint16", { ts: "number", ffi: { type: "int", size: 32, unsigned: false } }],
-    ["guint16", { ts: "number", ffi: { type: "int", size: 32, unsigned: true } }],
+    ["gint16", { ts: "number", ffi: { type: "int", size: 16, unsigned: false } }],
+    ["guint16", { ts: "number", ffi: { type: "int", size: 16, unsigned: true } }],
     ["gint32", { ts: "number", ffi: { type: "int", size: 32, unsigned: false } }],
     ["guint32", { ts: "number", ffi: { type: "int", size: 32, unsigned: true } }],
     ["gint64", { ts: "number", ffi: { type: "int", size: 64, unsigned: false } }],
@@ -1199,6 +1199,20 @@ export class TypeMapper {
             };
         }
 
+        if (param.type.name === "Gtk.TickCallback" || param.type.name === "TickCallback") {
+            return {
+                ts: "(widget: unknown, frameClock: unknown) => boolean",
+                ffi: {
+                    type: "callback",
+                    trampoline: "tickFunc",
+                    argTypes: [
+                        { type: "gobject", borrowed: true },
+                        { type: "gobject", borrowed: true },
+                    ],
+                },
+            };
+        }
+
         if (param.type.name === "GLib.Closure" || this.isCallback(param.type.name)) {
             return {
                 ts: "(...args: unknown[]) => unknown",
@@ -1246,6 +1260,10 @@ export class TypeMapper {
             "DrawingAreaDrawFunc",
             "GLib.CompareDataFunc",
             "CompareDataFunc",
+            "GLib.SourceFunc",
+            "SourceFunc",
+            "Gtk.TickCallback",
+            "TickCallback",
         ];
         return allParams.some(
             (p) => trampolineCallbacks.includes(p.type.name) && (p.closure === paramIndex || p.destroy === paramIndex),