feat: add support for mach-glfw using Zig v2024.1.0-mach

README.md

@@ -1,4 +1,4 @@
-# zgui v0.1.0 - dear imgui bindings
+# zgui v1.89.6 - dear imgui bindings
 
 Easy to use, hand-crafted API with default arguments, named parameters and Zig style text formatting. [Here](https://github.com/michal-z/zig-gamedev/tree/main/samples/minimal_zgpu_zgui) is a simple sample application, and [here](https://github.com/michal-z/zig-gamedev/tree/main/samples/gui_test_wgpu) is a full one.
 
@@ -11,41 +11,64 @@ Easy to use, hand-crafted API with default arguments, named parameters and Zig s
 
 ## Getting started
 
-Copy `zgui` to a subdirectory in your project and add the following to your `build.zig.zon` .dependencies:
+Copy `zgui` folder to a `libs` subdirectory of the root of your project and add the following to your `build.zig.zon` .dependencies:
 ```zig
     .zgui = .{ .path = "libs/zgui" },
 ```
 
-To get glfw/wgpu rendering backend working also copy `zglfw`, `system-sdk`, `zgpu` and `zpool` folders and add the depenency paths (see [zgpu](https://github.com/zig-gamedev/zig-gamedev/tree/main/libs/zgpu) for the details).
+To get glfw/wgpu rendering backend working also copy `zgpu`, `zglfw`, `zpool` and `system-sdk` folders and add the depenency paths (see [zgpu](https://github.com/zig-gamedev/zig-gamedev/tree/main/libs/zgpu) for the details). Alternatively, you can provide your own rendering backend by specifying `.no_backend` in the package options.
 
 Then in your `build.zig` add:
 ```zig
+const zgui = @import("zgui");
+
+// Needed for glfw/wgpu rendering backend
+const zglfw = @import("zglfw");
+const zgpu = @import("zgpu");
+const zpool = @import("zpool");
 
 pub fn build(b: *std.Build) void {
-    const exe = b.addExecutable(.{ ... });
+    ...
+    const optimize = b.standardOptimizeOption(.{});
+    const target = b.standardTargetOptions(.{});
 
-    const zgui = b.dependency("zgui", .{
-        .shared = false,
-        .with_implot = true,
+    const zgui_pkg = zgui.package(b, target, optimize, .{
+        .options = .{ .backend = .glfw_wgpu },
     });
-    exe.root_module.addImport("zgui", zgui.module("root"));
-    exe.linkLibrary(zgui.artifact("imgui"));
+
+    zgui_pkg.link(exe);
     
-    { // Needed for glfw/wgpu rendering backend
-        const zglfw = b.dependency("zglfw", .{});
-        exe.root_module.addImport("zglfw", zglfw.module("root"));
-        exe.linkLibrary(zglfw.artifact("glfw"));
+    // Needed for glfw/wgpu rendering backend
+    const zglfw_pkg = zglfw.package(b, target, optimize, .{});
+    const zpool_pkg = zpool.package(b, target, optimize, .{});
+    const zgpu_pkg = zgpu.package(b, target, optimize, .{
+        .deps = .{ .zpool = zpool_pkg.zpool, .zglfw = zglfw_pkg.zglfw },
+    });
 
-        const zpool = b.dependency("zpool", .{});
-        exe.root_module.addImport("zpool", zglfw.module("root"));
-
-        const zgpu = b.dependency("zgpu", .{});
-        exe.root_module.addImport("zgpu", zglfw.module("root"));
-        exe.linkLibrary(zglfw.artifact("wgpu"));
-    }
+    zglfw_pkg.link(exe);
+    zgpu_pkg.link(exe);
 }
 ```
 
+You may also include zgui without bundled imgui or implot:
+
+```zig
+// In build.zig
+
+    const pkg = zgui.package(b, exe.target, .ReleaseSafe, .{
+        .options = .{
+            .backend = .no_backend,
+            .with_imgui = false,
+            .with_implot = false,
+        },
+    });
+    const lib = pkg.zgui_c_cpp;
+    lib.defineCMacro("IMGUI_USER_CONFIG",
+        \\"../imconfig_custom.h"
+    );
+    lib.addIncludePath("lib/imgui");
+```
+
 Now in your code you may import and use `zgui`:
 
 ```zig

build.zig

@@ -4,48 +4,62 @@ pub const Backend = enum {
     no_backend,
     glfw_wgpu,
     glfw_opengl3,
-    glfw_dx12,
     win32_dx12,
     mach_glfw_opengl3,
 };
 
-pub fn build(b: *std.Build) void {
-    const optimize = b.standardOptimizeOption(.{});
-    const target = b.standardTargetOptions(.{});
+const default_options = struct {
+    const shared = false;
+    const with_imgui = true;
+    const with_implot = true;
+};
 
-    const options = .{
-        .backend = b.option(Backend, "backend", "Backend to build (default: no_backend)") orelse .no_backend,
-        .shared = b.option(
-            bool,
-            "shared",
-            "Bulid as a shared library",
-        ) orelse false,
-        .with_implot = b.option(
-            bool,
-            "with_implot",
-            "Build with bundled implot source",
-        ) orelse true,
-    };
+pub const Options = struct {
+    backend: Backend,
+    shared: bool = default_options.shared,
+    /// use bundled imgui source
+    with_imgui: bool = default_options.with_imgui,
+    /// use bundled implot source
+    with_implot: bool = default_options.with_implot,
+};
 
-    const options_step = b.addOptions();
-    inline for (std.meta.fields(@TypeOf(options))) |field| {
-        options_step.addOption(field.type, field.name, @field(options, field.name));
+pub const Package = struct {
+    options: Options,
+    zgui: *std.Build.Module,
+    zgui_options: *std.Build.Module,
+    zgui_c_cpp: *std.Build.Step.Compile,
+
+    pub fn link(pkg: Package, exe: *std.Build.Step.Compile) void {
+        exe.linkLibrary(pkg.zgui_c_cpp);
+        exe.root_module.addImport("zgui", pkg.zgui);
+        exe.root_module.addImport("zgui_options", pkg.zgui_options);
     }
+};
 
-    const options_module = options_step.createModule();
+pub fn package(
+    b: *std.Build,
+    target: std.Build.ResolvedTarget,
+    optimize: std.builtin.Mode,
+    args: struct {
+        options: Options,
+    },
+) Package {
+    const step = b.addOptions();
+    step.addOption(Backend, "backend", args.options.backend);
+    step.addOption(bool, "shared", args.options.shared);
 
-    _ = b.addModule("root", .{
-        .root_source_file = .{ .path = "src/gui.zig" },
+    const zgui_options = step.createModule();
+
+    const zgui = b.addModule("zgui", .{
+        .root_source_file = .{ .path = thisDir() ++ "/src/gui.zig" },
         .imports = &.{
-            .{ .name = "zgui_options", .module = options_module },
+            .{ .name = "zgui_options", .module = zgui_options },
         },
     });
 
-    const cflags = &.{"-fno-sanitize=undefined"};
-
-    const imgui = if (options.shared) blk: {
+    const zgui_c_cpp = if (args.options.shared) blk: {
         const lib = b.addSharedLibrary(.{
-            .name = "imgui",
+            .name = "zgui",
             .target = target,
             .optimize = optimize,
         });
@@ -63,123 +77,160 @@ pub fn build(b: *std.Build) void {
 
         break :blk lib;
     } else b.addStaticLibrary(.{
-        .name = "imgui",
+        .name = "zgui",
         .target = target,
         .optimize = optimize,
     });
 
-    b.installArtifact(imgui);
+    zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/libs" });
+    zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/libs/imgui" });
 
-    imgui.addIncludePath(.{ .path = "libs" });
-    imgui.addIncludePath(.{ .path = "libs/imgui" });
+    const abi = target.result.abi;
+    zgui_c_cpp.linkLibC();
+    if (abi != .msvc)
+        zgui_c_cpp.linkLibCpp();
 
-    imgui.linkLibC();
-    if (target.result.abi != .msvc)
-        imgui.linkLibCpp();
+    const cflags = &.{"-fno-sanitize=undefined"};
 
-    imgui.addCSourceFile(.{
-        .file = .{ .path = "src/zgui.cpp" },
+    zgui_c_cpp.addCSourceFile(.{
+        .file = .{ .path = thisDir() ++ "/src/zgui.cpp" },
         .flags = cflags,
     });
 
-    imgui.addCSourceFiles(.{
-        .files = &.{
-            "libs/imgui/imgui.cpp",
-            "libs/imgui/imgui_widgets.cpp",
-            "libs/imgui/imgui_tables.cpp",
-            "libs/imgui/imgui_draw.cpp",
-            "libs/imgui/imgui_demo.cpp",
-        },
-        .flags = cflags,
-    });
-
-    if (options.with_implot) {
-        imgui.defineCMacro("ZGUI_IMPLOT", "1");
-        imgui.addCSourceFiles(.{
+    if (args.options.with_imgui) {
+        zgui_c_cpp.addCSourceFiles(.{
             .files = &.{
-                "libs/imgui/implot_demo.cpp",
-                "libs/imgui/implot.cpp",
-                "libs/imgui/implot_items.cpp",
+                thisDir() ++ "/libs/imgui/imgui.cpp",
+                thisDir() ++ "/libs/imgui/imgui_widgets.cpp",
+                thisDir() ++ "/libs/imgui/imgui_tables.cpp",
+                thisDir() ++ "/libs/imgui/imgui_draw.cpp",
+                thisDir() ++ "/libs/imgui/imgui_demo.cpp",
+            },
+            .flags = cflags,
+        });
+    }
+
+    if (args.options.with_implot) {
+        zgui_c_cpp.defineCMacro("ZGUI_IMPLOT", "1");
+        zgui_c_cpp.addCSourceFiles(.{
+            .files = &.{
+                thisDir() ++ "/libs/imgui/implot_demo.cpp",
+                thisDir() ++ "/libs/imgui/implot.cpp",
+                thisDir() ++ "/libs/imgui/implot_items.cpp",
             },
             .flags = cflags,
         });
     } else {
-        imgui.defineCMacro("ZGUI_IMPLOT", "0");
+        zgui_c_cpp.defineCMacro("ZGUI_IMPLOT", "0");
     }
 
-    switch (options.backend) {
+    switch (args.options.backend) {
         .glfw_wgpu => {
             const zglfw = b.dependency("zglfw", .{});
             const zgpu = b.dependency("zgpu", .{});
-            imgui.addIncludePath(.{ .path = zglfw.path("libs/glfw/include").getPath(b) });
-            imgui.addIncludePath(.{ .path = zgpu.path("libs/dawn/include").getPath(b) });
-            imgui.addCSourceFiles(.{
+            zgui_c_cpp.addIncludePath(.{ .path = zglfw.path("libs/glfw/include").getPath(b) });
+            zgui_c_cpp.addIncludePath(.{ .path = zgpu.path("libs/dawn/include").getPath(b) });
+            zgui_c_cpp.addCSourceFiles(.{
                 .files = &.{
-                    "libs/imgui/backends/imgui_impl_glfw.cpp",
-                    "libs/imgui/backends/imgui_impl_wgpu.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_glfw.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_wgpu.cpp",
                 },
                 .flags = cflags,
             });
         },
         .glfw_opengl3 => {
             const zglfw = b.dependency("zglfw", .{});
-            imgui.addIncludePath(.{ .path = zglfw.path("libs/glfw/include").getPath(b) });
-            imgui.addCSourceFiles(.{
+            zgui_c_cpp.addIncludePath(.{ .path = zglfw.path("libs/glfw/include").getPath(b) });
+            zgui_c_cpp.addCSourceFiles(.{
                 .files = &.{
-                    "libs/imgui/backends/imgui_impl_glfw.cpp",
-                    "libs/imgui/backends/imgui_impl_opengl3.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_glfw.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_opengl3.cpp",
                 },
                 .flags = &(cflags.* ++ .{"-DIMGUI_IMPL_OPENGL_LOADER_CUSTOM"}),
             });
         },
-        .glfw_dx12 => {
-            const zglfw = b.dependency("zglfw", .{});
-            imgui.addIncludePath(.{ .path = zglfw.path("libs/glfw/include").getPath(b) });
-            imgui.addCSourceFiles(.{
-                .files = &.{
-                    "libs/imgui/backends/imgui_impl_glfw.cpp",
-                    "libs/imgui/backends/imgui_impl_dx12.cpp",
-                },
-                .flags = cflags,
-            });
-            imgui.linkSystemLibrary("d3dcompiler_47");
-        },
         .mach_glfw_opengl3 => {
-            imgui.addCSourceFiles(.{
+            const glfw = b.dependency("glfw", .{});
+            zgui_c_cpp.linkLibrary(glfw.artifact("glfw"));
+
+            zgui_c_cpp.addCSourceFiles(.{
                 .files = &.{
-                    "libs/imgui/backends/imgui_impl_glfw.cpp",
-                    "libs/imgui/backends/imgui_impl_opengl3.cpp",
-                    "libs/imgui/backends/imgui_impl_opengl3_loader.h",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_glfw.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_opengl3.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_opengl3_loader.h",
                 },
                 .flags = cflags,
             });
         },
         .win32_dx12 => {
-            imgui.addCSourceFiles(.{
+            zgui_c_cpp.addCSourceFiles(.{
                 .files = &.{
-                    "libs/imgui/backends/imgui_impl_win32.cpp",
-                    "libs/imgui/backends/imgui_impl_dx12.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_win32.cpp",
+                    thisDir() ++ "/libs/imgui/backends/imgui_impl_dx12.cpp",
                 },
                 .flags = cflags,
             });
-            imgui.linkSystemLibrary("d3dcompiler_47");
-            imgui.linkSystemLibrary("dwmapi");
+            zgui_c_cpp.linkSystemLibrary("d3dcompiler_47");
+            zgui_c_cpp.linkSystemLibrary("dwmapi");
         },
         .no_backend => {},
     }
 
-    const test_step = b.step("test", "Run zgui tests");
+    return .{
+        .options = args.options,
+        .zgui = zgui,
+        .zgui_options = zgui_options,
+        .zgui_c_cpp = zgui_c_cpp,
+    };
+}
 
-    const tests = b.addTest(.{
-        .name = "zgui-tests",
-        .root_source_file = .{ .path = "src/gui.zig" },
+pub fn build(b: *std.Build) void {
+    const optimize = b.standardOptimizeOption(.{});
+    const target = b.standardTargetOptions(.{});
+
+    _ = package(b, target, optimize, .{
+        .options = .{
+            .backend = b.option(Backend, "backend", "Select backend") orelse .no_backend,
+            .shared = b.option(
+                bool,
+                "shared",
+                "Bulid as a shared library",
+            ) orelse default_options.shared,
+            .with_imgui = b.option(
+                bool,
+                "with_imgui",
+                "Build with bundled imgui source",
+            ) orelse default_options.with_imgui,
+            .with_implot = b.option(
+                bool,
+                "with_implot",
+                "Build with bundled implot source",
+            ) orelse default_options.with_implot,
+        },
+    });
+
+    const test_step = b.step("test", "Run zgui tests");
+    test_step.dependOn(runTests(b, optimize, target));
+}
+
+pub fn runTests(
+    b: *std.Build,
+    optimize: std.builtin.OptimizeMode,
+    target: std.Build.ResolvedTarget,
+) *std.Build.Step {
+    const gui_tests = b.addTest(.{
+        .name = "gui-tests",
+        .root_source_file = .{ .path = thisDir() ++ "/src/gui.zig" },
         .target = target,
         .optimize = optimize,
     });
-    b.installArtifact(tests);
-
-    tests.root_module.addImport("zgui_options", options_module);
-    tests.linkLibrary(imgui);
-
-    test_step.dependOn(&b.addRunArtifact(tests).step);
+    const pkg = package(b, target, optimize, .{
+        .options = .{ .backend = .no_backend },
+    });
+    pkg.link(gui_tests);
+    return &b.addRunArtifact(gui_tests).step;
+}
+
+inline fn thisDir() []const u8 {
+    return comptime std.fs.path.dirname(@src().file) orelse ".";
 }

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = "zgui",
-    .version = "0.1.0",
+    .version = "1.89.6",
     .paths = .{
         "build.zig",
         "build.zig.zon",

libs/imgui/backends/imgui_impl_wgpu.cpp

@@ -189,13 +189,6 @@ static void SafeRelease(WGPUBuffer& res)
         wgpuBufferRelease(res);
     res = nullptr;
 }
-// FIX(zig-gamedev): https://github.com/ocornut/imgui/commit/9266c0d2d1390e50d2d8070896932c2564594407
-static void SafeRelease(WGPUPipelineLayout& res)
- {
-     if (res)
-         wgpuPipelineLayoutRelease(res);
-     res = nullptr;
- }
 static void SafeRelease(WGPURenderPipeline& res)
 {
     if (res)
@@ -671,15 +664,7 @@ bool ImGui_ImplWGPU_CreateDeviceObjects()
     depth_stencil_state.depthWriteEnabled = false;
     depth_stencil_state.depthCompare = WGPUCompareFunction_Always;
     depth_stencil_state.stencilFront.compare = WGPUCompareFunction_Always;
-    // FIX(zig-gamedev): https://github.com/ocornut/imgui/commit/03417cc77d15100b18c486b55db409ee5e9c363e
-    depth_stencil_state.stencilFront.failOp = WGPUStencilOperation_Keep;
-    depth_stencil_state.stencilFront.depthFailOp = WGPUStencilOperation_Keep;
-    depth_stencil_state.stencilFront.passOp = WGPUStencilOperation_Keep;
     depth_stencil_state.stencilBack.compare = WGPUCompareFunction_Always;
-    // FIX(zig-gamedev): https://github.com/ocornut/imgui/commit/03417cc77d15100b18c486b55db409ee5e9c363e
-    depth_stencil_state.stencilBack.failOp = WGPUStencilOperation_Keep;
-    depth_stencil_state.stencilBack.depthFailOp = WGPUStencilOperation_Keep;
-    depth_stencil_state.stencilBack.passOp = WGPUStencilOperation_Keep;
 
     // Configure disabled depth-stencil state
     graphics_pipeline_desc.depthStencil = (bd->depthStencilFormat == WGPUTextureFormat_Undefined) ? nullptr :  &depth_stencil_state;
@@ -709,8 +694,6 @@ bool ImGui_ImplWGPU_CreateDeviceObjects()
 
     SafeRelease(vertex_shader_desc.module);
     SafeRelease(pixel_shader_desc.module);
-    // FIX(zig-gamedev): https://github.com/ocornut/imgui/commit/9266c0d2d1390e50d2d8070896932c2564594407
-    SafeRelease(graphics_pipeline_desc.layout);
     SafeRelease(bg_layouts[0]);
 
     return true;

src/backend_glfw_dx12.zig

@@ -1,74 +0,0 @@
-const gui = @import("gui.zig");
-
-pub fn init(
-    window: *const anyopaque, // zglfw.Window
-    device: *const anyopaque, // ID3D12Device
-    num_frames_in_flight: u32,
-    rtv_format: c_uint, // DXGI_FORMAT
-    cbv_srv_heap: *const anyopaque, // ID3D12DescriptorHeap
-    font_srv_cpu_desc_handle: D3D12_CPU_DESCRIPTOR_HANDLE,
-    font_srv_gpu_desc_handle: D3D12_GPU_DESCRIPTOR_HANDLE,
-) void {
-    if (!ImGui_ImplGlfw_InitForOther(window, true)) {
-        @panic("failed to init glfw for imgui");
-    }
-
-    if (!ImGui_ImplDX12_Init(
-        device,
-        num_frames_in_flight,
-        rtv_format,
-        cbv_srv_heap,
-        font_srv_cpu_desc_handle,
-        font_srv_gpu_desc_handle,
-    )) {
-        @panic("failed to init d3d12 for imgui");
-    }
-}
-
-pub fn deinit() void {
-    ImGui_ImplGlfw_Shutdown();
-    ImGui_ImplDX12_Shutdown();
-}
-
-pub fn newFrame(fb_width: u32, fb_height: u32) void {
-    ImGui_ImplGlfw_NewFrame();
-    ImGui_ImplDX12_NewFrame();
-
-    gui.io.setDisplaySize(@as(f32, @floatFromInt(fb_width)), @as(f32, @floatFromInt(fb_height)));
-    gui.io.setDisplayFramebufferScale(1.0, 1.0);
-
-    gui.newFrame();
-}
-
-pub fn draw(
-    graphics_command_list: *const anyopaque, // *ID3D12GraphicsCommandList
-) void {
-    gui.render();
-    ImGui_ImplDX12_RenderDrawData(gui.getDrawData(), graphics_command_list);
-}
-
-pub const D3D12_CPU_DESCRIPTOR_HANDLE = extern struct {
-    ptr: c_ulonglong,
-};
-
-pub const D3D12_GPU_DESCRIPTOR_HANDLE = extern struct {
-    ptr: c_ulonglong,
-};
-
-extern fn ImGui_ImplGlfw_InitForOther(window: *const anyopaque, install_callbacks: bool) bool;
-extern fn ImGui_ImplGlfw_NewFrame() void;
-extern fn ImGui_ImplGlfw_Shutdown() void;
-extern fn ImGui_ImplDX12_Init(
-    device: *const anyopaque, // ID3D12Device
-    num_frames_in_flight: u32,
-    rtv_format: u32, // DXGI_FORMAT
-    cbv_srv_heap: *const anyopaque, // ID3D12DescriptorHeap
-    font_srv_cpu_desc_handle: D3D12_CPU_DESCRIPTOR_HANDLE,
-    font_srv_gpu_desc_handle: D3D12_GPU_DESCRIPTOR_HANDLE,
-) bool;
-extern fn ImGui_ImplDX12_Shutdown() void;
-extern fn ImGui_ImplDX12_NewFrame() void;
-extern fn ImGui_ImplDX12_RenderDrawData(
-    draw_data: *const anyopaque, // *ImDrawData
-    graphics_command_list: *const anyopaque, // *ID3D12GraphicsCommandList
-) void;

src/zgui.cpp

@@ -460,51 +460,6 @@ ZGUI_API bool zguiDragScalarN(
     return ImGui::DragScalarN(label, data_type, p_data, components, v_speed, p_min, p_max, format, flags);
 }
 
-ZGUI_API bool zguiBeginDragDropSource(ImGuiDragDropFlags flags = 0) {
-  return ImGui::BeginDragDropSource(flags);
-}
-ZGUI_API bool zguiSetDragDropPayload(
-    const char* type,
-    const void* data,
-    size_t sz,
-    ImGuiCond cond = 0
-) {
-  return ImGui::SetDragDropPayload(type, data, sz, cond);
-}
-ZGUI_API void zguiEndDragDropSource() {
-  return ImGui::EndDragDropSource();
-}
-ZGUI_API bool zguiBeginDragDropTarget() {
-  return ImGui::BeginDragDropTarget();
-}
-ZGUI_API const ImGuiPayload* zguiAcceptDragDropPayload(
-    const char* type,
-    ImGuiDragDropFlags flags = 0
-) {
-  return ImGui::AcceptDragDropPayload(type);
-}
-ZGUI_API void zguiEndDragDropTarget() {
-  return ImGui::EndDragDropTarget();
-}
-ZGUI_API const ImGuiPayload* zguiGetDragDropPayload() {
-  return ImGui::GetDragDropPayload();
-}
-
-ZGUI_API void zguiImGuiPayload_Clear(ImGuiPayload* payload) { payload->Clear(); }
-
-ZGUI_API bool zguiImGuiPayload_IsDataType(const ImGuiPayload* payload, const char* type) {
-  return payload->IsDataType(type);
-}
-
-ZGUI_API bool zguiImGuiPayload_IsPreview(const ImGuiPayload* payload) {
-  return payload->IsPreview();
-}
-
-ZGUI_API bool zguiImGuiPayload_IsDelivery(const ImGuiPayload* payload) {
-  return payload->IsDelivery();
-}
-
-
 ZGUI_API bool zguiCombo(
     const char* label,
     int* current_item,
@@ -1070,7 +1025,7 @@ ZGUI_API void zguiPushStyleColor4f(ImGuiCol idx, const float col[4]) {
     ImGui::PushStyleColor(idx, { col[0], col[1], col[2], col[3] });
 }
 
-ZGUI_API void zguiPushStyleColor1u(ImGuiCol idx, ImU32 col) {
+ZGUI_API void zguiPushStyleColor1u(ImGuiCol idx, unsigned int col) {
     ImGui::PushStyleColor(idx, col);
 }
 
@@ -1302,10 +1257,6 @@ ZGUI_API bool zguiIoGetWantCaptureKeyboard(void) {
     return ImGui::GetIO().WantCaptureKeyboard;
 }
 
-ZGUI_API bool zguiIoGetWantTextInput(void) {
-    return ImGui::GetIO().WantTextInput;
-}
-
 ZGUI_API void zguiIoSetIniFilename(const char* filename) {
     ImGui::GetIO().IniFilename = filename;
 }
@@ -1360,7 +1311,7 @@ ZGUI_API void zguiIoSetKeyEventNativeData(ImGuiKey key, int keycode, int scancod
     ImGui::GetIO().SetKeyEventNativeData(key, keycode, scancode);
 }
 
-ZGUI_API void zguiIoAddCharacterEvent(unsigned int c) {
+ZGUI_API void zguiIoAddCharacterEvent(int c) {
     ImGui::GetIO().AddInputCharacter(c);
 }
 
@@ -1628,7 +1579,7 @@ ZGUI_API void zguiTableSetColumnEnabled(int column_n, bool v) {
     ImGui::TableSetColumnEnabled(column_n, v);
 }
 
-ZGUI_API void zguiTableSetBgColor(ImGuiTableBgTarget target, ImU32 color, int column_n) {
+ZGUI_API void zguiTableSetBgColor(ImGuiTableBgTarget target, unsigned int color, int column_n) {
     ImGui::TableSetBgColor(target, color, column_n);
 }
 //--------------------------------------------------------------------------------------------------
@@ -1776,7 +1727,7 @@ ZGUI_API void zguiDrawList_AddLine(
     ImDrawList* draw_list,
     const float p1[2],
     const float p2[2],
-    ImU32 col,
+    unsigned int col,
     float thickness
 ) {
     draw_list->AddLine({ p1[0], p1[1] }, { p2[0], p2[1] }, col, thickness);
@@ -1786,7 +1737,7 @@ ZGUI_API void zguiDrawList_AddRect(
     ImDrawList* draw_list,
     const float pmin[2],
     const float pmax[2],
-    ImU32 col,
+    unsigned int col,
     float rounding,
     ImDrawFlags flags,
     float thickness
@@ -1798,7 +1749,7 @@ ZGUI_API void zguiDrawList_AddRectFilled(
     ImDrawList* draw_list,
     const float pmin[2],
     const float pmax[2],
-    ImU32 col,
+    unsigned int col,
     float rounding,
     ImDrawFlags flags
 ) {
@@ -1809,10 +1760,10 @@ ZGUI_API void zguiDrawList_AddRectFilledMultiColor(
     ImDrawList* draw_list,
     const float pmin[2],
     const float pmax[2],
-    ImU32 col_upr_left,
-    ImU32 col_upr_right,
-    ImU32 col_bot_right,
-    ImU32 col_bot_left
+    unsigned int col_upr_left,
+    unsigned int col_upr_right,
+    unsigned int col_bot_right,
+    unsigned int col_bot_left
 ) {
     draw_list->AddRectFilledMultiColor(
         { pmin[0], pmin[1] },
@@ -1830,7 +1781,7 @@ ZGUI_API void zguiDrawList_AddQuad(
     const float p2[2],
     const float p3[2],
     const float p4[2],
-    ImU32 col,
+    unsigned int col,
     float thickness
 ) {
     draw_list->AddQuad({ p1[0], p1[1] }, { p2[0], p2[1] }, { p3[0], p3[1] }, { p4[0], p4[1] }, col, thickness);
@@ -1842,7 +1793,7 @@ ZGUI_API void zguiDrawList_AddQuadFilled(
     const float p2[2],
     const float p3[2],
     const float p4[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->AddQuadFilled({ p1[0], p1[1] }, { p2[0], p2[1] }, { p3[0], p3[1] }, { p4[0], p4[1] }, col);
 }
@@ -1852,7 +1803,7 @@ ZGUI_API void zguiDrawList_AddTriangle(
     const float p1[2],
     const float p2[2],
     const float p3[2],
-    ImU32 col,
+    unsigned int col,
     float thickness
 ) {
     draw_list->AddTriangle({ p1[0], p1[1] }, { p2[0], p2[1] }, { p3[0], p3[1] }, col, thickness);
@@ -1863,7 +1814,7 @@ ZGUI_API void zguiDrawList_AddTriangleFilled(
     const float p1[2],
     const float p2[2],
     const float p3[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->AddTriangleFilled({ p1[0], p1[1] }, { p2[0], p2[1] }, { p3[0], p3[1] }, col);
 }
@@ -1872,7 +1823,7 @@ ZGUI_API void zguiDrawList_AddCircle(
     ImDrawList* draw_list,
     const float center[2],
     float radius,
-    ImU32 col,
+    unsigned int col,
     int num_segments,
     float thickness
 ) {
@@ -1883,7 +1834,7 @@ ZGUI_API void zguiDrawList_AddCircleFilled(
     ImDrawList* draw_list,
     const float center[2],
     float radius,
-    ImU32 col,
+    unsigned int col,
     int num_segments
 ) {
     draw_list->AddCircleFilled({ center[0], center[1] }, radius, col, num_segments);
@@ -1893,7 +1844,7 @@ ZGUI_API void zguiDrawList_AddNgon(
     ImDrawList* draw_list,
     const float center[2],
     float radius,
-    ImU32 col,
+    unsigned int col,
     int num_segments,
     float thickness
 ) {
@@ -1904,7 +1855,7 @@ ZGUI_API void zguiDrawList_AddNgonFilled(
     ImDrawList* draw_list,
     const float center[2],
     float radius,
-    ImU32 col,
+    unsigned int col,
     int num_segments
 ) {
     draw_list->AddNgonFilled({ center[0], center[1] }, radius, col, num_segments);
@@ -1913,7 +1864,7 @@ ZGUI_API void zguiDrawList_AddNgonFilled(
 ZGUI_API void zguiDrawList_AddText(
     ImDrawList* draw_list,
     const float pos[2],
-    ImU32 col,
+    unsigned int col,
     const char* text_begin,
     const char* text_end
 ) {
@@ -1924,7 +1875,7 @@ ZGUI_API void zguiDrawList_AddPolyline(
     ImDrawList* draw_list,
     const float points[][2],
     int num_points,
-    ImU32 col,
+    unsigned int col,
     ImDrawFlags flags,
     float thickness
 ) {
@@ -1935,7 +1886,7 @@ ZGUI_API void zguiDrawList_AddConvexPolyFilled(
     ImDrawList* draw_list,
     const float points[][2],
     int num_points,
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->AddConvexPolyFilled((const ImVec2*)&points[0][0], num_points, col);
 }
@@ -1946,7 +1897,7 @@ ZGUI_API void zguiDrawList_AddBezierCubic(
     const float p2[2],
     const float p3[2],
     const float p4[2],
-    ImU32 col,
+    unsigned int col,
     float thickness,
     int num_segments
 ) {
@@ -1960,7 +1911,7 @@ ZGUI_API void zguiDrawList_AddBezierQuadratic(
     const float p1[2],
     const float p2[2],
     const float p3[2],
-    ImU32 col,
+    unsigned int col,
     float thickness,
     int num_segments
 ) {
@@ -1976,7 +1927,7 @@ ZGUI_API void zguiDrawList_AddImage(
     const float pmax[2],
     const float uvmin[2],
     const float uvmax[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->AddImage(
         user_texture_id,
@@ -1999,7 +1950,7 @@ ZGUI_API void zguiDrawList_AddImageQuad(
     const float uv2[2],
     const float uv3[2],
     const float uv4[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->AddImageQuad(
         user_texture_id,
@@ -2022,7 +1973,7 @@ ZGUI_API void zguiDrawList_AddImageRounded(
     const float pmax[2],
     const float uvmin[2],
     const float uvmax[2],
-    ImU32 col,
+    unsigned int col,
     float rounding,
     ImDrawFlags flags
 ) {
@@ -2050,11 +2001,11 @@ ZGUI_API void zguiDrawList_PathLineToMergeDuplicate(ImDrawList* draw_list, const
     draw_list->PathLineToMergeDuplicate({ pos[0], pos[1] });
 }
 
-ZGUI_API void zguiDrawList_PathFillConvex(ImDrawList* draw_list, ImU32 col) {
+ZGUI_API void zguiDrawList_PathFillConvex(ImDrawList* draw_list, unsigned int col) {
     draw_list->PathFillConvex(col);
 }
 
-ZGUI_API void zguiDrawList_PathStroke(ImDrawList* draw_list, ImU32 col, ImDrawFlags flags, float thickness) {
+ZGUI_API void zguiDrawList_PathStroke(ImDrawList* draw_list, unsigned int col, ImDrawFlags flags, float thickness) {
     draw_list->PathStroke(col, flags, thickness);
 }
 
@@ -2120,7 +2071,7 @@ ZGUI_API void zguiDrawList_PrimRect(
     ImDrawList* draw_list,
     const float a[2],
     const float b[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->PrimRect({ a[0], a[1] }, { b[0], b[1] }, col);
 }
@@ -2131,7 +2082,7 @@ ZGUI_API void zguiDrawList_PrimRectUV(
     const float b[2],
     const float uv_a[2],
     const float uv_b[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->PrimRectUV({ a[0], a[1] }, { b[0], b[1] }, { uv_a[0], uv_a[1] }, { uv_b[0], uv_b[1] }, col);
 }
@@ -2146,7 +2097,7 @@ ZGUI_API void zguiDrawList_PrimQuadUV(
     const float uv_b[2],
     const float uv_c[2],
     const float uv_d[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->PrimQuadUV(
         { a[0], a[1] }, { b[0], b[1] }, { c[0], c[1] }, { d[0], d[1] },
@@ -2159,7 +2110,7 @@ ZGUI_API void zguiDrawList_PrimWriteVtx(
     ImDrawList* draw_list,
     const float pos[2],
     const float uv[2],
-    ImU32 col
+    unsigned int col
 ) {
     draw_list->PrimWriteVtx({ pos[0], pos[1] }, { uv[0], uv[1] }, col);
 }
@@ -2238,7 +2189,7 @@ ZGUI_API void zguiPlot_PushStyleColor4f(ImPlotCol idx, const float col[4]) {
     ImPlot::PushStyleColor(idx, { col[0], col[1], col[2], col[3] });
 }
 
-ZGUI_API void zguiPlot_PushStyleColor1u(ImPlotCol idx, ImU32 col) {
+ZGUI_API void zguiPlot_PushStyleColor1u(ImPlotCol idx, unsigned int col) {
     ImPlot::PushStyleColor(idx, col);
 }