@gjsify/webgl 0.1.13 → 0.2.0

package/README.md

@@ -1,6 +1,6 @@
 # @gjsify/webgl
 
-GJS implementation of WebGL 1.0/2.0 using a custom Vala extension (gwebgl). Provides CanvasWebGLWidget extending Gtk.GLArea.
+GJS implementation of WebGL 1.0/2.0 using a custom Vala extension (gwebgl). Provides WebGLBridge extending Gtk.GLArea.
 
 Part of the [gjsify](https://github.com/gjsify/gjsify) project — Node.js and Web APIs for GJS (GNOME JavaScript).
 
@@ -15,9 +15,9 @@ yarn add @gjsify/webgl
 ## Usage
 
 ```typescript
-import { CanvasWebGLWidget } from '@gjsify/webgl';
+import { WebGLBridge } from '@gjsify/webgl';
 
-const widget = new CanvasWebGLWidget();
+const widget = new WebGLBridge();
 widget.installGlobals();
 
 widget.onReady((canvas, gl) => {
@@ -36,6 +36,9 @@ This package ships prebuilt native libraries for supported platforms:
 prebuilds/
   linux-x86_64/   libgwebgl.so + Gwebgl-0.1.typelib
   linux-aarch64/  libgwebgl.so + Gwebgl-0.1.typelib
+  linux-ppc64/    libgwebgl.so + Gwebgl-0.1.typelib
+  linux-s390x/    libgwebgl.so + Gwebgl-0.1.typelib
+  linux-riscv64/  libgwebgl.so + Gwebgl-0.1.typelib
 ```
 
 Use the gjsify CLI to run your app — it automatically sets `LD_LIBRARY_PATH` and
@@ -71,7 +74,7 @@ yarn build:prebuilds
 
 ## Prebuilt binaries
 
-Prebuilds for `linux-x86_64` and `linux-aarch64` are built automatically by CI
+Prebuilds for `linux-x86_64`, `linux-aarch64`, `linux-ppc64`, `linux-s390x`, and `linux-riscv64` are built automatically by CI
 (`.github/workflows/prebuilds.yml`) when the Vala source changes and committed back
 to the repository. They are included in the npm package via the `files` field.
 

package/lib/esm/conformance/setup.js

@@ -1,4 +1,4 @@
-import { CanvasWebGLWidget } from "@gjsify/webgl";
+import { WebGLBridge } from "@gjsify/webgl";
 import GLib from "@girs/glib-2.0";
 import Gtk from "@girs/gtk-4.0";
 function createGLSetup() {
@@ -7,7 +7,7 @@ function createGLSetup() {
   const readyLoop = new GLib.MainLoop(null, false);
   const win = new Gtk.Window({});
   win.set_default_size(200, 200);
-  const glArea = new CanvasWebGLWidget();
+  const glArea = new WebGLBridge();
   glArea.onReady((canvas, g) => {
     try {
       const gl = g;

package/lib/esm/index.js

@@ -6,7 +6,7 @@ import { WebGL2RenderingContext } from "./webgl2-rendering-context.js";
 globalThis.WebGLRenderingContext = WebGLRenderingContext;
 globalThis.WebGL2RenderingContext = WebGL2RenderingContext;
 export * from "./html-canvas-element.js";
-export * from "./canvas-webgl-widget.js";
+export * from "./webgl-bridge.js";
 export * from "./webgl-active-info.js";
 export * from "./webgl-buffer.js";
 export * from "./webgl-context-attributes.js";

package/lib/esm/{canvas-webgl-widget.js → webgl-bridge.js}

@@ -4,9 +4,9 @@ import Gtk from "gi://Gtk?version=4.0";
 import { HTMLCanvasElement as OurHTMLCanvasElement } from "./html-canvas-element.js";
 import { attachEventControllers } from "@gjsify/event-bridge";
 import { Event } from "@gjsify/dom-events";
-const CanvasWebGLWidget = GObject.registerClass(
-  { GTypeName: "GjsifyCanvasWebGLWidget" },
-  class CanvasWebGLWidget2 extends Gtk.GLArea {
+const WebGLBridge = GObject.registerClass(
+  { GTypeName: "GjsifyWebGLBridge" },
+  class WebGLBridge2 extends Gtk.GLArea {
     constructor(params) {
       super(params);
       this._canvas = null;
@@ -24,6 +24,12 @@ const CanvasWebGLWidget = GObject.registerClass(
       this.set_has_depth_buffer(true);
       this.set_has_stencil_buffer(true);
       attachEventControllers(this, () => this._canvas, { captureKeys: true });
+      this._tickCallbackId = this.add_tick_callback((_widget, _frameClock) => {
+        if (this._frameCallback !== null) {
+          this.queue_render();
+        }
+        return GLib.SOURCE_CONTINUE;
+      });
       const initId = this.connect("render", () => {
         this.disconnect(initId);
         this.make_current();
@@ -39,6 +45,18 @@ const CanvasWebGLWidget = GObject.registerClass(
           }
           this._readyCallbacks = [];
         }
+        this._renderTag = this.connect("render", (_widget) => {
+          if (this._frameCallback !== null) {
+            const time = (GLib.get_monotonic_time() - this._timeOrigin) / 1e3;
+            if (globalThis.__GJSIFY_DEBUG_RAF === true) {
+              console.log(`[rAF] frame callback fires t=${time.toFixed(1)}`);
+            }
+            const cb = this._frameCallback;
+            this._frameCallback = null;
+            cb(time);
+          }
+          return true;
+        });
         return true;
       });
       this.connect("resize", () => {
@@ -102,30 +120,13 @@ const CanvasWebGLWidget = GObject.registerClass(
     }
     /**
      * Schedules a single animation frame callback, matching the browser `requestAnimationFrame` API.
-     * Backed by GTK frame clock (vsync-synced) + the GLArea render signal.
-     * Returns 0 (handle — cancel not yet implemented).
+     * Backed by a persistent GTK frame clock tick callback (vsync-synced) + a persistent GLArea
+     * render signal handler. Both are installed once at construction / first render respectively,
+     * eliminating per-frame GLib.Source allocation and GObject signal connect/disconnect overhead.
+     * Returns 0 (handle — cancel via cancelAnimationFrame clears the pending callback).
      */
     requestAnimationFrame(cb) {
       this._frameCallback = cb;
-      if (this._tickCallbackId === null) {
-        this._tickCallbackId = this.add_tick_callback((_widget, _frameClock) => {
-          this._tickCallbackId = null;
-          if (this._renderTag === null) {
-            this._renderTag = this.connect("render", (_widget2) => {
-              this.disconnect(this._renderTag);
-              this._renderTag = null;
-              const time = (GLib.get_monotonic_time() - this._timeOrigin) / 1e3;
-              if (globalThis.__GJSIFY_DEBUG_RAF === true) {
-                console.log(`[rAF] frame callback fires t=${time.toFixed(1)}`);
-              }
-              this._frameCallback?.(time);
-              return true;
-            });
-          }
-          this.queue_render();
-          return GLib.SOURCE_REMOVE;
-        });
-      }
       this.queue_render();
       return 0;
     }
@@ -147,5 +148,5 @@ const CanvasWebGLWidget = GObject.registerClass(
   }
 );
 export {
-  CanvasWebGLWidget
+  WebGLBridge
 };

package/lib/esm/webgl1.spec.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, on } from "@gjsify/unit";
-import { CanvasWebGLWidget } from "@gjsify/webgl";
+import { WebGLBridge } from "@gjsify/webgl";
 import {
   makeProgram,
   drawTriangle,
@@ -21,7 +21,7 @@ var webgl1_spec_default = async () => {
     const readyLoop = new GLib.MainLoop(null, false);
     const win = new Gtk.Window({});
     win.set_default_size(200, 200);
-    glArea = new CanvasWebGLWidget();
+    glArea = new WebGLBridge();
     glArea.onReady((_c, g) => {
       gl = g;
       readyLoop.quit();

package/lib/esm/webgl2-rendering-context.js

@@ -821,8 +821,18 @@ class WebGL2RenderingContext extends WebGLContextBase {
     this._native2.vertexAttribIPointer(index, size, type, stride, offset);
   }
   drawBuffers(buffers) {
-    const mapped = buffers.map((b) => b === 1029 ? this.COLOR_ATTACHMENT0 : b);
-    this._native2.drawBuffers(Array.from(mapped));
+    let hasBack = false;
+    for (let i = 0; i < buffers.length; i++) {
+      if (buffers[i] === 1029) {
+        hasBack = true;
+        break;
+      }
+    }
+    if (!hasBack) {
+      this._native2.drawBuffers(buffers);
+      return;
+    }
+    this._native2.drawBuffers(buffers.map((b) => b === 1029 ? this.COLOR_ATTACHMENT0 : b));
   }
   drawRangeElements(mode, start, end, count, type, offset) {
     if (count < 0 || offset < 0) {
@@ -919,10 +929,10 @@ class WebGL2RenderingContext extends WebGLContextBase {
     void drawbuffer;
   }
   invalidateFramebuffer(target, attachments) {
-    this._native2.invalidateFramebuffer(target, Array.from(attachments));
+    this._native2.invalidateFramebuffer(target, attachments);
   }
   invalidateSubFramebuffer(target, attachments, x, y, width, height) {
-    this._native2.invalidateSubFramebuffer(target, Array.from(attachments), x, y, width, height);
+    this._native2.invalidateSubFramebuffer(target, attachments, x, y, width, height);
   }
   readBuffer(src) {
     this._native2.readBuffer(src);
@@ -966,53 +976,53 @@ class WebGL2RenderingContext extends WebGLContextBase {
   uniform1uiv(location, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Uint32Array ? data : new Uint32Array(data);
-    this._native2.uniform1uiv(location._, arr.length, Array.from(arr));
+    this._native2.uniform1uiv(location._, arr.length, arr);
   }
   uniform2uiv(location, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Uint32Array ? data : new Uint32Array(data);
-    this._native2.uniform2uiv(location._, arr.length / 2, Array.from(arr));
+    this._native2.uniform2uiv(location._, arr.length / 2, arr);
   }
   uniform3uiv(location, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Uint32Array ? data : new Uint32Array(data);
-    this._native2.uniform3uiv(location._, arr.length / 3, Array.from(arr));
+    this._native2.uniform3uiv(location._, arr.length / 3, arr);
   }
   uniform4uiv(location, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Uint32Array ? data : new Uint32Array(data);
-    this._native2.uniform4uiv(location._, arr.length / 4, Array.from(arr));
+    this._native2.uniform4uiv(location._, arr.length / 4, arr);
   }
   // ─── Non-square Matrix Uniforms ───────────────────────────────────────
   uniformMatrix2x3fv(location, transpose, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Float32Array ? data : new Float32Array(data);
-    this._native2.uniformMatrix2x3fv(location._, transpose, Array.from(arr));
+    this._native2.uniformMatrix2x3fv(location._, transpose, arr);
   }
   uniformMatrix3x2fv(location, transpose, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Float32Array ? data : new Float32Array(data);
-    this._native2.uniformMatrix3x2fv(location._, transpose, Array.from(arr));
+    this._native2.uniformMatrix3x2fv(location._, transpose, arr);
   }
   uniformMatrix2x4fv(location, transpose, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Float32Array ? data : new Float32Array(data);
-    this._native2.uniformMatrix2x4fv(location._, transpose, Array.from(arr));
+    this._native2.uniformMatrix2x4fv(location._, transpose, arr);
   }
   uniformMatrix4x2fv(location, transpose, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Float32Array ? data : new Float32Array(data);
-    this._native2.uniformMatrix4x2fv(location._, transpose, Array.from(arr));
+    this._native2.uniformMatrix4x2fv(location._, transpose, arr);
   }
   uniformMatrix3x4fv(location, transpose, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Float32Array ? data : new Float32Array(data);
-    this._native2.uniformMatrix3x4fv(location._, transpose, Array.from(arr));
+    this._native2.uniformMatrix3x4fv(location._, transpose, arr);
   }
   uniformMatrix4x3fv(location, transpose, data, _srcOffset, _srcLength) {
     if (!location) return;
     const arr = data instanceof Float32Array ? data : new Float32Array(data);
-    this._native2.uniformMatrix4x3fv(location._, transpose, Array.from(arr));
+    this._native2.uniformMatrix4x3fv(location._, transpose, arr);
   }
   // ─── getUniform — WebGL2 uint type support ────────────────────────────
   /** WebGL1 getUniform falls to default:null for UNSIGNED_INT types. Handle them here. */

package/lib/esm/webgl2.spec.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, on } from "@gjsify/unit";
-import { WebGL2RenderingContext as OurWebGL2RenderingContext, CanvasWebGLWidget } from "@gjsify/webgl";
+import { WebGL2RenderingContext as OurWebGL2RenderingContext, WebGLBridge } from "@gjsify/webgl";
 import {
   makeProgram,
   drawTriangle,
@@ -21,7 +21,7 @@ var webgl2_spec_default = async () => {
     const readyLoop = new GLib.MainLoop(null, false);
     const win = new Gtk.Window({});
     win.set_default_size(200, 200);
-    glArea = new CanvasWebGLWidget();
+    glArea = new WebGLBridge();
     glArea.onReady((c, _g) => {
       gl2 = c.getContext("webgl2");
       readyLoop.quit();

package/lib/types/conformance/setup.d.ts

@@ -1,13 +1,13 @@
-import { CanvasWebGLWidget } from '@gjsify/webgl';
+import { WebGLBridge } from '@gjsify/webgl';
 import Gtk from '@girs/gtk-4.0';
 export interface GLSetup {
     gl: WebGLRenderingContext;
     gl2: WebGL2RenderingContext | null;
-    glArea: CanvasWebGLWidget;
+    glArea: WebGLBridge;
     win: Gtk.Window;
 }
 /**
- * Synchronously initialises a GTK window + CanvasWebGLWidget and blocks until
+ * Synchronously initialises a GTK window + WebGLBridge and blocks until
  * the GL context is ready (or 10 s timeout).
  * Returns null when no display is available.
  */

package/lib/types/index.d.ts

@@ -2,7 +2,7 @@ import '@girs/gjs';
 import '@girs/gio-2.0';
 import '@girs/gtk-4.0';
 export * from './html-canvas-element.js';
-export * from './canvas-webgl-widget.js';
+export * from './webgl-bridge.js';
 export * from './webgl-active-info.js';
 export * from './webgl-buffer.js';
 export * from './webgl-context-attributes.js';

package/lib/types/{canvas-webgl-widget.d.ts → webgl-bridge.d.ts}

@@ -14,7 +14,7 @@ type WebGLReadyCallback = (canvas: globalThis.HTMLCanvasElement, gl: globalThis.
  *
  * Usage:
  * ```ts
- * const widget = new CanvasWebGLWidget();
+ * const widget = new WebGLBridge();
  * widget.installGlobals();  // sets globalThis.requestAnimationFrame
  * widget.onReady((canvas, gl) => {
  *     gl.clearColor(0, 0, 0, 1);
@@ -23,7 +23,7 @@ type WebGLReadyCallback = (canvas: globalThis.HTMLCanvasElement, gl: globalThis.
  * window.set_child(widget);
  * ```
  */
-export declare const CanvasWebGLWidget: {
+export declare const WebGLBridge: {
     new (params?: Partial<Gtk.GLArea.ConstructorProps>): {
         _canvas: OurHTMLCanvasElement | null;
         _readyCallbacks: WebGLReadyCallback[];
@@ -53,8 +53,10 @@ export declare const CanvasWebGLWidget: {
         onResize(cb: (width: number, height: number) => void): void;
         /**
          * Schedules a single animation frame callback, matching the browser `requestAnimationFrame` API.
-         * Backed by GTK frame clock (vsync-synced) + the GLArea render signal.
-         * Returns 0 (handle — cancel not yet implemented).
+         * Backed by a persistent GTK frame clock tick callback (vsync-synced) + a persistent GLArea
+         * render signal handler. Both are installed once at construction / first render respectively,
+         * eliminating per-frame GLib.Source allocation and GObject signal connect/disconnect overhead.
+         * Returns 0 (handle — cancel via cancelAnimationFrame clears the pending callback).
          */
         requestAnimationFrame(cb: FrameRequestCallback): number;
         /**
@@ -71,7 +73,7 @@ export declare const CanvasWebGLWidget: {
         set auto_render(val: boolean);
         get autoRender(): boolean;
         set autoRender(val: boolean);
-        get context(): Gdk.GLContext;
+        get context(): (Gdk.GLContext | null);
         get has_depth_buffer(): boolean;
         set has_depth_buffer(val: boolean);
         get hasDepthBuffer(): boolean;
@@ -98,8 +100,8 @@ export declare const CanvasWebGLWidget: {
         get_allowed_apis(): Gdk.GLAPI;
         get_api(): Gdk.GLAPI;
         get_auto_render(): boolean;
-        get_context(): Gdk.GLContext | null;
-        get_error(): GLib.Error | null;
+        get_context(): (Gdk.GLContext | null);
+        get_error(): (GLib.Error | null);
         get_has_depth_buffer(): boolean;
         get_has_stencil_buffer(): boolean;
         get_required_version(): [number, number];
@@ -108,7 +110,7 @@ export declare const CanvasWebGLWidget: {
         queue_render(): void;
         set_allowed_apis(apis: Gdk.GLAPI): void;
         set_auto_render(auto_render: boolean): void;
-        set_error(error?: GLib.Error | null): void;
+        set_error(error: (GLib.Error | null)): void;
         set_has_depth_buffer(has_depth_buffer: boolean): void;
         set_has_stencil_buffer(has_stencil_buffer: boolean): void;
         set_required_version(major: number, minor: number): void;
@@ -118,76 +120,40 @@ export declare const CanvasWebGLWidget: {
         get accessibleRole(): Gtk.AccessibleRole;
         set accessibleRole(val: Gtk.AccessibleRole);
         announce(message: string, priority: Gtk.AccessibleAnnouncementPriority): void;
-        get_accessible_id(): string | null;
-        get_accessible_parent(): Gtk.Accessible | null;
+        get_accessible_id(): (string | null);
+        get_accessible_parent(): (Gtk.Accessible | null);
         get_accessible_role(): Gtk.AccessibleRole;
         get_at_context(): Gtk.ATContext;
         get_bounds(): [boolean, number, number, number, number];
-        get_first_accessible_child(): Gtk.Accessible | null;
-        get_next_accessible_sibling(): Gtk.Accessible | null;
+        get_first_accessible_child(): (Gtk.Accessible | null);
+        get_next_accessible_sibling(): (Gtk.Accessible | null);
         get_platform_state(state: Gtk.AccessiblePlatformState): boolean;
         reset_property(property: Gtk.AccessibleProperty): void;
         reset_relation(relation: Gtk.AccessibleRelation): void;
         reset_state(state: Gtk.AccessibleState): void;
-        set_accessible_parent(parent?: Gtk.Accessible | null, next_sibling?: Gtk.Accessible | null): void;
-        update_next_accessible_sibling(new_sibling?: Gtk.Accessible | null): void;
+        set_accessible_parent(parent: (Gtk.Accessible | null), next_sibling: (Gtk.Accessible | null)): void;
+        update_next_accessible_sibling(new_sibling: (Gtk.Accessible | null)): void;
         update_platform_state(state: Gtk.AccessiblePlatformState): void;
         update_property(properties: Gtk.AccessibleProperty[], values: (GObject.Value | any)[]): void;
         update_relation(relations: Gtk.AccessibleRelation[], values: (GObject.Value | any)[]): void;
         update_state(states: Gtk.AccessibleState[], values: (GObject.Value | any)[]): void;
-        vfunc_get_accessible_id(): string | null;
-        vfunc_get_accessible_parent(): Gtk.Accessible | null;
-        vfunc_get_at_context(): Gtk.ATContext | null;
+        vfunc_get_accessible_id(): (string | null);
+        vfunc_get_accessible_parent(): (Gtk.Accessible | null);
+        vfunc_get_at_context(): (Gtk.ATContext | null);
         vfunc_get_bounds(): [boolean, number, number, number, number];
-        vfunc_get_first_accessible_child(): Gtk.Accessible | null;
-        vfunc_get_next_accessible_sibling(): Gtk.Accessible | null;
+        vfunc_get_first_accessible_child(): (Gtk.Accessible | null);
+        vfunc_get_next_accessible_sibling(): (Gtk.Accessible | null);
         vfunc_get_platform_state(state: Gtk.AccessiblePlatformState): boolean;
-        get_buildable_id(): string | null;
-        vfunc_add_child(builder: Gtk.Builder, child: GObject.Object, type?: string | null): void;
-        vfunc_custom_finished(builder: Gtk.Builder, child: GObject.Object | null, tagname: string, data?: any | null): void;
-        vfunc_custom_tag_end(builder: Gtk.Builder, child: GObject.Object | null, tagname: string, data?: any | null): void;
-        vfunc_custom_tag_start(builder: Gtk.Builder, child: GObject.Object | null, tagname: string): [boolean, Gtk.BuildableParser, any];
+        get_buildable_id(): (string | null);
+        vfunc_add_child(builder: Gtk.Builder, child: GObject.Object, type: (string | null)): void;
+        vfunc_custom_finished(builder: Gtk.Builder, child: (GObject.Object | null), tagname: string, data: (any | null)): void;
+        vfunc_custom_tag_end(builder: Gtk.Builder, child: (GObject.Object | null), tagname: string, data: (any | null)): void;
+        vfunc_custom_tag_start(builder: Gtk.Builder, child: (GObject.Object | null), tagname: string): [boolean, Gtk.BuildableParser, any];
         vfunc_get_id(): string;
         vfunc_get_internal_child<T = GObject.Object>(builder: Gtk.Builder, childname: string): T;
         vfunc_parser_finished(builder: Gtk.Builder): void;
         vfunc_set_buildable_property(builder: Gtk.Builder, name: string, value: unknown): void;
         vfunc_set_id(id: string): void;
-        bind_property(source_property: string, target: GObject.Object, target_property: string, flags: GObject.BindingFlags): GObject.Binding;
-        bind_property_full(source_property: string, target: GObject.Object, target_property: string, flags: GObject.BindingFlags, transform_to?: GObject.BindingTransformFunc | null, transform_from?: GObject.BindingTransformFunc | null, notify?: GLib.DestroyNotify | null): GObject.Binding;
-        bind_property_full(...args: never[]): any;
-        force_floating(): void;
-        freeze_notify(): void;
-        get_data(key: string): any | null;
-        get_property(property_name: string, value: GObject.Value | any): any;
-        get_qdata(quark: GLib.Quark): any | null;
-        getv(names: string[], values: (GObject.Value | any)[]): void;
-        is_floating(): boolean;
-        notify(property_name: string): void;
-        notify_by_pspec(pspec: GObject.ParamSpec): void;
-        ref(): GObject.Object;
-        ref_sink(): GObject.Object;
-        run_dispose(): void;
-        set_data(key: string, data?: any | null): void;
-        set_property(property_name: string, value: GObject.Value | any): void;
-        steal_data(key: string): any | null;
-        steal_qdata(quark: GLib.Quark): any | null;
-        thaw_notify(): void;
-        unref(): void;
-        watch_closure(closure: GObject.Closure): void;
-        vfunc_constructed(): void;
-        vfunc_dispatch_properties_changed(n_pspecs: number, pspecs: GObject.ParamSpec): void;
-        vfunc_dispose(): void;
-        vfunc_finalize(): void;
-        vfunc_get_property(property_id: number, value: unknown, pspec: GObject.ParamSpec): void;
-        vfunc_notify(pspec: GObject.ParamSpec): void;
-        vfunc_set_property(property_id: number, value: unknown, pspec: GObject.ParamSpec): void;
-        disconnect(id: number): void;
-        set(properties: {
-            [key: string]: any;
-        }): void;
-        block_signal_handler(id: number): void;
-        unblock_signal_handler(id: number): void;
-        stop_emission_by_name(detailedName: string): void;
         get can_focus(): boolean;
         set can_focus(val: boolean);
         get canFocus(): boolean;
@@ -202,8 +168,8 @@ export declare const CanvasWebGLWidget: {
         set cssClasses(val: string[]);
         get css_name(): string;
         get cssName(): string;
-        get cursor(): Gdk.Cursor;
-        set cursor(val: Gdk.Cursor);
+        get cursor(): (Gdk.Cursor | null);
+        set cursor(val: (Gdk.Cursor | null));
         get focus_on_click(): boolean;
         set focus_on_click(val: boolean);
         get focusOnClick(): boolean;
@@ -230,10 +196,10 @@ export declare const CanvasWebGLWidget: {
         set hexpand_set(val: boolean);
         get hexpandSet(): boolean;
         set hexpandSet(val: boolean);
-        get layout_manager(): Gtk.LayoutManager;
-        set layout_manager(val: Gtk.LayoutManager);
-        get layoutManager(): Gtk.LayoutManager;
-        set layoutManager(val: Gtk.LayoutManager);
+        get layout_manager(): (Gtk.LayoutManager | null);
+        set layout_manager(val: (Gtk.LayoutManager | null));
+        get layoutManager(): (Gtk.LayoutManager | null);
+        set layoutManager(val: (Gtk.LayoutManager | null));
         get limit_events(): boolean;
         set limit_events(val: boolean);
         get limitEvents(): boolean;
@@ -260,24 +226,24 @@ export declare const CanvasWebGLWidget: {
         set opacity(val: number);
         get overflow(): Gtk.Overflow;
         set overflow(val: Gtk.Overflow);
-        get parent(): Gtk.Widget;
+        get parent(): (Gtk.Widget | null);
         get receives_default(): boolean;
         set receives_default(val: boolean);
         get receivesDefault(): boolean;
         set receivesDefault(val: boolean);
-        get root(): Gtk.Root;
+        get root(): (Gtk.Root | null);
         get scale_factor(): number;
         get scaleFactor(): number;
         get sensitive(): boolean;
         set sensitive(val: boolean);
-        get tooltip_markup(): string;
-        set tooltip_markup(val: string);
-        get tooltipMarkup(): string;
-        set tooltipMarkup(val: string);
-        get tooltip_text(): string;
-        set tooltip_text(val: string);
-        get tooltipText(): string;
-        set tooltipText(val: string);
+        get tooltip_markup(): (string | null);
+        set tooltip_markup(val: (string | null));
+        get tooltipMarkup(): (string | null);
+        set tooltipMarkup(val: (string | null));
+        get tooltip_text(): (string | null);
+        set tooltip_text(val: (string | null));
+        get tooltipText(): (string | null);
+        set tooltipText(val: (string | null));
         get valign(): Gtk.Align;
         set valign(val: Gtk.Align);
         get vexpand(): boolean;
@@ -308,7 +274,7 @@ export declare const CanvasWebGLWidget: {
         vfunc_query_tooltip(x: number, y: number, keyboard_tooltip: boolean, tooltip: Gtk.Tooltip): boolean;
         vfunc_realize(): void;
         vfunc_root(): void;
-        vfunc_set_focus_child(child?: Gtk.Widget | null): void;
+        vfunc_set_focus_child(child: (Gtk.Widget | null)): void;
         vfunc_show(): void;
         vfunc_size_allocate(width: number, height: number, baseline: number): void;
         vfunc_snapshot(snapshot: Gtk.Snapshot): void;
@@ -319,13 +285,13 @@ export declare const CanvasWebGLWidget: {
         vfunc_unroot(): void;
         action_set_enabled(action_name: string, enabled: boolean): void;
         activate(): boolean;
-        activate_action(name: string, args?: GLib.Variant | null): boolean;
+        activate_action(name: string, args: (GLib.Variant | null)): boolean;
         activate_default(): void;
         add_controller(controller: Gtk.EventController): void;
         add_css_class(css_class: string): void;
         add_mnemonic_label(label: Gtk.Widget): void;
         add_tick_callback(callback: Gtk.TickCallback): number;
-        allocate(width: number, height: number, baseline: number, transform?: import("@girs/gsk-4.0").default.Transform | null): void;
+        allocate(width: number, height: number, baseline: number, transform: (import("@girs/gsk-4.0").default.Transform | null)): void;
         child_focus(direction: Gtk.DirectionType): boolean;
         compute_bounds(target: Gtk.Widget): [boolean, import("@girs/graphene-1.0").default.Rect];
         compute_expand(orientation: Gtk.Orientation): boolean;
@@ -333,7 +299,7 @@ export declare const CanvasWebGLWidget: {
         compute_transform(target: Gtk.Widget): [boolean, import("@girs/graphene-1.0").default.Matrix];
         contains(x: number, y: number): boolean;
         create_pango_context(): import("@girs/pango-1.0").default.Context;
-        create_pango_layout(text?: string | null): import("@girs/pango-1.0").default.Layout;
+        create_pango_layout(text: (string | null)): import("@girs/pango-1.0").default.Layout;
         dispose_template(widget_type: GObject.GType): void;
         drag_check_threshold(start_x: number, start_y: number, current_x: number, current_y: number): boolean;
         error_bell(): void;
@@ -341,7 +307,7 @@ export declare const CanvasWebGLWidget: {
         get_allocated_height(): number;
         get_allocated_width(): number;
         get_allocation(): Gtk.Allocation;
-        get_ancestor(widget_type: GObject.GType): Gtk.Widget | null;
+        get_ancestor(widget_type: GObject.GType): (Gtk.Widget | null);
         get_baseline(): number;
         get_can_focus(): boolean;
         get_can_target(): boolean;
@@ -350,23 +316,23 @@ export declare const CanvasWebGLWidget: {
         get_color(): Gdk.RGBA;
         get_css_classes(): string[];
         get_css_name(): string;
-        get_cursor(): Gdk.Cursor | null;
+        get_cursor(): (Gdk.Cursor | null);
         get_direction(): Gtk.TextDirection;
         get_display(): Gdk.Display;
-        get_first_child(): Gtk.Widget | null;
-        get_focus_child(): Gtk.Widget | null;
+        get_first_child(): (Gtk.Widget | null);
+        get_focus_child(): (Gtk.Widget | null);
         get_focus_on_click(): boolean;
         get_focusable(): boolean;
-        get_font_map(): import("@girs/pango-1.0").default.FontMap | null;
-        get_font_options(): import("@girs/gjs/cairo").default.FontOptions | null;
-        get_frame_clock(): Gdk.FrameClock | null;
+        get_font_map(): (import("@girs/pango-1.0").default.FontMap | null);
+        get_font_options(): (import("@girs/gjs/cairo").default.FontOptions | null);
+        get_frame_clock(): (Gdk.FrameClock | null);
         get_halign(): Gtk.Align;
         get_has_tooltip(): boolean;
         get_height(): number;
         get_hexpand(): boolean;
         get_hexpand_set(): boolean;
-        get_last_child(): Gtk.Widget | null;
-        get_layout_manager(): Gtk.LayoutManager | null;
+        get_last_child(): (Gtk.Widget | null);
+        get_layout_manager(): (Gtk.LayoutManager | null);
         get_limit_events(): boolean;
         get_mapped(): boolean;
         get_margin_bottom(): number;
@@ -374,19 +340,19 @@ export declare const CanvasWebGLWidget: {
         get_margin_start(): number;
         get_margin_top(): number;
         get_name(): string;
-        get_native(): Gtk.Native | null;
-        get_next_sibling(): Gtk.Widget | null;
+        get_native(): (Gtk.Native | null);
+        get_next_sibling(): (Gtk.Widget | null);
         get_opacity(): number;
         get_overflow(): Gtk.Overflow;
         get_pango_context(): import("@girs/pango-1.0").default.Context;
-        get_parent(): Gtk.Widget | null;
+        get_parent(): (Gtk.Widget | null);
         get_preferred_size(): [Gtk.Requisition | null, Gtk.Requisition | null];
-        get_prev_sibling(): Gtk.Widget | null;
+        get_prev_sibling(): (Gtk.Widget | null);
         get_primary_clipboard(): Gdk.Clipboard;
         get_realized(): boolean;
         get_receives_default(): boolean;
         get_request_mode(): Gtk.SizeRequestMode;
-        get_root(): Gtk.Root | null;
+        get_root(): (Gtk.Root | null);
         get_scale_factor(): number;
         get_sensitive(): boolean;
         get_settings(): Gtk.Settings;
@@ -395,8 +361,8 @@ export declare const CanvasWebGLWidget: {
         get_state_flags(): Gtk.StateFlags;
         get_style_context(): Gtk.StyleContext;
         get_template_child<T = GObject.Object>(widget_type: GObject.GType, name: string): T;
-        get_tooltip_markup(): string | null;
-        get_tooltip_text(): string | null;
+        get_tooltip_markup(): (string | null);
+        get_tooltip_text(): (string | null);
         get_valign(): Gtk.Align;
         get_vexpand(): boolean;
         get_vexpand_set(): boolean;
@@ -408,9 +374,9 @@ export declare const CanvasWebGLWidget: {
         hide(): void;
         in_destruction(): boolean;
         init_template(): void;
-        insert_action_group(name: string, group?: import("@girs/gio-2.0").default.ActionGroup | null): void;
-        insert_after(parent: Gtk.Widget, previous_sibling?: Gtk.Widget | null): void;
-        insert_before(parent: Gtk.Widget, next_sibling?: Gtk.Widget | null): void;
+        insert_action_group(name: string, group: (import("@girs/gio-2.0").default.ActionGroup | null)): void;
+        insert_after(parent: Gtk.Widget, previous_sibling: (Gtk.Widget | null)): void;
+        insert_before(parent: Gtk.Widget, next_sibling: (Gtk.Widget | null)): void;
         is_ancestor(ancestor: Gtk.Widget): boolean;
         is_drawable(): boolean;
         is_focus(): boolean;
@@ -423,7 +389,7 @@ export declare const CanvasWebGLWidget: {
         mnemonic_activate(group_cycling: boolean): boolean;
         observe_children(): import("@girs/gio-2.0").default.ListModel;
         observe_controllers(): import("@girs/gio-2.0").default.ListModel;
-        pick(x: number, y: number, flags: Gtk.PickFlags): Gtk.Widget | null;
+        pick(x: number, y: number, flags: Gtk.PickFlags): (Gtk.Widget | null);
         queue_allocate(): void;
         queue_draw(): void;
         queue_resize(): void;
@@ -436,19 +402,19 @@ export declare const CanvasWebGLWidget: {
         set_can_target(can_target: boolean): void;
         set_child_visible(child_visible: boolean): void;
         set_css_classes(classes: string[]): void;
-        set_cursor(cursor?: Gdk.Cursor | null): void;
-        set_cursor_from_name(name?: string | null): void;
+        set_cursor(cursor: (Gdk.Cursor | null)): void;
+        set_cursor_from_name(name: (string | null)): void;
         set_direction(dir: Gtk.TextDirection): void;
-        set_focus_child(child?: Gtk.Widget | null): void;
+        set_focus_child(child: (Gtk.Widget | null)): void;
         set_focus_on_click(focus_on_click: boolean): void;
         set_focusable(focusable: boolean): void;
-        set_font_map(font_map?: import("@girs/pango-1.0").default.FontMap | null): void;
-        set_font_options(options?: import("@girs/gjs/cairo").default.FontOptions | null): void;
+        set_font_map(font_map: (import("@girs/pango-1.0").default.FontMap | null)): void;
+        set_font_options(options: (import("@girs/gjs/cairo").default.FontOptions | null)): void;
         set_halign(align: Gtk.Align): void;
         set_has_tooltip(has_tooltip: boolean): void;
         set_hexpand(expand: boolean): void;
         set_hexpand_set(set: boolean): void;
-        set_layout_manager(layout_manager?: Gtk.LayoutManager | null): void;
+        set_layout_manager(layout_manager: (Gtk.LayoutManager | null)): void;
         set_limit_events(limit_events: boolean): void;
         set_margin_bottom(margin: number): void;
         set_margin_end(margin: number): void;
@@ -462,8 +428,8 @@ export declare const CanvasWebGLWidget: {
         set_sensitive(sensitive: boolean): void;
         set_size_request(width: number, height: number): void;
         set_state_flags(flags: Gtk.StateFlags, clear: boolean): void;
-        set_tooltip_markup(markup?: string | null): void;
-        set_tooltip_text(text?: string | null): void;
+        set_tooltip_markup(markup: (string | null)): void;
+        set_tooltip_text(text: (string | null)): void;
         set_valign(align: Gtk.Align): void;
         set_vexpand(expand: boolean): void;
         set_vexpand_set(set: boolean): void;
@@ -479,6 +445,41 @@ export declare const CanvasWebGLWidget: {
         unrealize(): void;
         unset_state_flags(flags: Gtk.StateFlags): void;
         [Symbol.iterator]: () => IterableIterator<Gtk.Widget>;
+        vfunc_constructed(): void;
+        vfunc_dispatch_properties_changed(n_pspecs: number, pspecs: GObject.ParamSpec): void;
+        vfunc_dispose(): void;
+        vfunc_finalize(): void;
+        vfunc_get_property(property_id: number, value: unknown, pspec: GObject.ParamSpec): void;
+        vfunc_notify(pspec: GObject.ParamSpec): void;
+        vfunc_set_property(property_id: number, value: unknown, pspec: GObject.ParamSpec): void;
+        bind_property(source_property: string, target: GObject.Object, target_property: string, flags: GObject.BindingFlags): GObject.Binding;
+        bind_property_full(source_property: string, target: GObject.Object, target_property: string, flags: GObject.BindingFlags, transform_to: (GObject.Closure | null), transform_from: (GObject.Closure | null)): GObject.Binding;
+        force_floating(): void;
+        freeze_notify(): void;
+        get_data(key: string): (any | null);
+        get_property(property_name: string, value: (GObject.Value | any)): any;
+        get_qdata(quark: GLib.Quark): (any | null);
+        getv(names: string[], values: (GObject.Value | any)[]): void;
+        is_floating(): boolean;
+        notify(property_name: string): void;
+        notify_by_pspec(pspec: GObject.ParamSpec): void;
+        ref(): GObject.Object;
+        ref_sink(): GObject.Object;
+        run_dispose(): void;
+        set_data(key: string, data: (any | null)): void;
+        set_property(property_name: string, value: (GObject.Value | any)): void;
+        steal_data(key: string): (any | null);
+        steal_qdata(quark: GLib.Quark): (any | null);
+        thaw_notify(): void;
+        unref(): void;
+        watch_closure(closure: GObject.Closure): void;
+        disconnect(id: number): void;
+        set(properties: {
+            [key: string]: any;
+        }): void;
+        block_signal_handler(id: number): void;
+        unblock_signal_handler(id: number): void;
+        stop_emission_by_name(detailedName: string): void;
     };
     $gtype: GObject.GType<Gtk.GLArea>;
     "new"(): Gtk.GLArea;
@@ -486,12 +487,12 @@ export declare const CanvasWebGLWidget: {
     set_default_direction(dir: Gtk.TextDirection): void;
     add_shortcut(shortcut: Gtk.Shortcut): void;
     bind_template_callback_full(callback_name: string, callback_symbol: GObject.Callback): void;
-    bind_template_child_full(name: string, internal_child: boolean, struct_offset: bigint | number): void;
+    bind_template_child_full(name: string, internal_child: boolean, struct_offset: (bigint | number)): void;
     get_accessible_role(): Gtk.AccessibleRole;
     get_activate_signal(): number;
     get_css_name(): string;
     get_layout_manager_type(): GObject.GType;
-    install_action(action_name: string, parameter_type: string | null, activate: Gtk.WidgetActionActivateFunc): void;
+    install_action(action_name: string, parameter_type: (string | null), activate: Gtk.WidgetActionActivateFunc): void;
     install_property_action(action_name: string, property_name: string): void;
     query_action(index_: number): [boolean, GObject.GType, string, GLib.VariantType | null, string];
     set_accessible_role(accessible_role: Gtk.AccessibleRole): void;
@@ -499,11 +500,11 @@ export declare const CanvasWebGLWidget: {
     set_activate_signal_from_name(signal_name: string): void;
     set_css_name(name: string): void;
     set_layout_manager_type(type: GObject.GType): void;
-    set_template(template_bytes: GLib.Bytes | Uint8Array): void;
+    set_template(template_bytes: (GLib.Bytes | Uint8Array)): void;
     set_template_from_resource(resource_name: string): void;
     set_template_scope(scope: Gtk.BuilderScope): void;
     newv(object_type: GObject.GType, parameters: GObject.Parameter[]): GObject.Object;
-    compat_control(what: bigint | number, data?: any | null): number;
+    compat_control(what: (bigint | number), data: (any | null)): number;
     interface_find_property(g_iface: GObject.TypeInterface, property_name: string): GObject.ParamSpec;
     interface_install_property(g_iface: GObject.TypeInterface, pspec: GObject.ParamSpec): void;
     interface_list_properties(g_iface: GObject.TypeInterface): GObject.ParamSpec[];
@@ -514,5 +515,5 @@ export declare const CanvasWebGLWidget: {
     override_property(property_id: number, name: string): void;
     _classInit(klass: any): any;
 };
-export type CanvasWebGLWidget = InstanceType<typeof CanvasWebGLWidget>;
+export type WebGLBridge = InstanceType<typeof WebGLBridge>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/webgl",
-  "version": "0.1.13",
+  "version": "0.2.0",
   "description": "WebGL module for Gjs",
   "module": "lib/esm/index.js",
   "types": "lib/types/index.d.ts",
@@ -23,7 +23,7 @@
     "check": "tsc --noEmit",
     "init:meson": "meson setup build .",
     "init:meson:wipe": "yarn init:meson --wipe",
-    "build": "yarn build:meson && yarn build:gjsify && yarn build:types",
+    "build": "yarn build:gjsify && yarn build:types",
     "build:gjsify": "gjsify build --library 'src/ts/**/*.{ts,js}'",
     "build:meson": "yarn init:meson && meson compile -C build",
     "build:types": "tsc",
@@ -39,19 +39,19 @@
     "WebGL"
   ],
   "devDependencies": {
-    "@gjsify/cli": "^0.1.13",
-    "@gjsify/unit": "^0.1.13",
+    "@gjsify/cli": "^0.2.0",
+    "@gjsify/unit": "^0.2.0",
     "@types/bit-twiddle": "^1.0.3",
     "@types/node": "^25.6.0",
-    "typescript": "^6.0.2"
+    "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@girs/gjs": "^4.0.0-rc.3",
-    "@girs/gtk-4.0": "^4.23.0-4.0.0-rc.3",
-    "@girs/gwebgl-0.1": "^0.1.0-4.0.0-rc.3",
-    "@gjsify/dom-elements": "^0.1.13",
-    "@gjsify/event-bridge": "^0.1.13",
-    "@gjsify/utils": "^0.1.13",
+    "@girs/gjs": "^4.0.0-rc.9",
+    "@girs/gtk-4.0": "^4.23.0-4.0.0-rc.9",
+    "@girs/gwebgl-0.1": "^0.1.0-4.0.0-rc.5",
+    "@gjsify/dom-elements": "^0.2.0",
+    "@gjsify/event-bridge": "^0.2.0",
+    "@gjsify/utils": "^0.2.0",
     "bit-twiddle": "^1.0.2",
     "glsl-tokenizer": "^2.1.5"
   }