Merge pull request #37 from kcbanner/0.15.x

Remove usingnamespace usage and fixup build script / callconv deprecations

Author: hazeycode

build.zig

@@ -38,21 +38,19 @@ pub fn build(b: *std.Build) void {
 
     if (target.result.os.tag == .emscripten) return;
 
-    const glfw = if (options.shared) blk: {
-        const lib = b.addSharedLibrary(.{
-            .name = "glfw",
+    const glfw = b.addLibrary(.{
+        .name = "glfw",
+        .linkage = if (options.shared) .dynamic else .static,
+        .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
-        });
-        if (target.result.os.tag == .windows) {
-            lib.root_module.addCMacro("_GLFW_BUILD_DLL", "");
-        }
-        break :blk lib;
-    } else b.addStaticLibrary(.{
-        .name = "glfw",
-        .target = target,
-        .optimize = optimize,
+        }),
     });
+
+    if (options.shared and target.result.os.tag == .windows) {
+        glfw.root_module.addCMacro("_GLFW_BUILD_DLL", "");
+    }
+
     b.installArtifact(glfw);
     glfw.installHeadersDirectory(b.path("libs/glfw/include"), "", .{});
 
@@ -183,9 +181,11 @@ pub fn build(b: *std.Build) void {
     const test_step = b.step("test", "Run zglfw tests");
     const tests = b.addTest(.{
         .name = "zglfw-tests",
-        .root_source_file = b.path("src/zglfw.zig"),
-        .target = target,
-        .optimize = optimize,
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/zglfw.zig"),
+            .target = target,
+            .optimize = optimize,
+        }),
     });
     addIncludePaths(b, tests, target, options);
     linkSystemLibs(b, tests, target, options);

src/zglfw.zig

@@ -151,7 +151,7 @@ extern fn glfwGetError(out_desc: ?*?[*:0]const u8) ErrorCode;
 
 pub const setErrorCallback = glfwSetErrorCallback;
 extern fn glfwSetErrorCallback(?ErrorFn) ?ErrorFn;
-pub const ErrorFn = *const fn (ErrorCode, desc: ?[*:0]const u8) callconv(.C) void;
+pub const ErrorFn = *const fn (ErrorCode, desc: ?[*:0]const u8) callconv(.c) void;
 
 pub fn rawMouseMotionSupported() bool {
     return glfwRawMouseMotionSupported() == TRUE;
@@ -736,6 +736,7 @@ pub const Window = opaque {
     pub const getClipboardString = zglfw.getClipboardString;
     pub const setClipboardString = zglfw.setClipboardString;
     pub const setCursor = zglfw.setCursor;
+    pub const getInputMode = zglfw.getInputMode;
     pub const setInputMode = zglfw.setInputMode;
     pub const setInputModeUntyped = zglfw.setInputModeUntyped;
     pub const swapBuffers = zglfw.swapBuffers;
@@ -832,47 +833,47 @@ extern fn glfwSetWindowUserPointer(window: *Window, pointer: ?*anyopaque) void;
 
 pub const setFramebufferSizeCallback = glfwSetFramebufferSizeCallback;
 extern fn glfwSetFramebufferSizeCallback(*Window, ?FramebufferSizeFn) ?FramebufferSizeFn;
-pub const FramebufferSizeFn = *const fn (*Window, width: c_int, height: c_int) callconv(.C) void;
+pub const FramebufferSizeFn = *const fn (*Window, width: c_int, height: c_int) callconv(.c) void;
 
 pub const setWindowSizeCallback = glfwSetWindowSizeCallback;
 extern fn glfwSetWindowSizeCallback(*Window, ?WindowSizeFn) ?WindowSizeFn;
-pub const WindowSizeFn = *const fn (*Window, width: c_int, height: c_int) callconv(.C) void;
+pub const WindowSizeFn = *const fn (*Window, width: c_int, height: c_int) callconv(.c) void;
 
 pub const setWindowPosCallback = glfwSetWindowPosCallback;
 extern fn glfwSetWindowPosCallback(*Window, ?WindowPosFn) ?WindowPosFn;
-pub const WindowPosFn = *const fn (*Window, x: c_int, y: c_int) callconv(.C) void;
+pub const WindowPosFn = *const fn (*Window, x: c_int, y: c_int) callconv(.c) void;
 
 pub const setWindowFocusCallback = glfwSetWindowFocusCallback;
 extern fn glfwSetWindowFocusCallback(*Window, ?WindowFocusFn) ?WindowFocusFn;
-pub const WindowFocusFn = *const fn (*Window, focused: Bool) callconv(.C) void;
+pub const WindowFocusFn = *const fn (*Window, focused: Bool) callconv(.c) void;
 
 pub const setWindowIconifyCallback = glfwSetWindowIconifyCallback;
 extern fn glfwSetWindowIconifyCallback(*Window, ?IconifyFn) ?IconifyFn;
-pub const IconifyFn = *const fn (*Window, iconified: Bool) callconv(.C) void;
+pub const IconifyFn = *const fn (*Window, iconified: Bool) callconv(.c) void;
 
 pub const setWindowContentScaleCallback = glfwSetWindowContentScaleCallback;
 extern fn glfwSetWindowContentScaleCallback(*Window, ?WindowContentScaleFn) ?WindowContentScaleFn;
-pub const WindowContentScaleFn = *const fn (*Window, xscale: f32, yscale: f32) callconv(.C) void;
+pub const WindowContentScaleFn = *const fn (*Window, xscale: f32, yscale: f32) callconv(.c) void;
 
 pub const setWindowCloseCallback = glfwSetWindowCloseCallback;
 extern fn glfwSetWindowCloseCallback(*Window, ?WindowCloseFn) ?WindowCloseFn;
-pub const WindowCloseFn = *const fn (*Window) callconv(.C) void;
+pub const WindowCloseFn = *const fn (*Window) callconv(.c) void;
 
 pub const setKeyCallback = glfwSetKeyCallback;
 extern fn glfwSetKeyCallback(*Window, ?KeyFn) ?KeyFn;
-pub const KeyFn = *const fn (*Window, Key, scancode: c_int, Action, Mods) callconv(.C) void;
+pub const KeyFn = *const fn (*Window, Key, scancode: c_int, Action, Mods) callconv(.c) void;
 
 pub const setCharCallback = glfwSetCharCallback;
 extern fn glfwSetCharCallback(*Window, ?CharFn) ?CharFn;
-pub const CharFn = *const fn (*Window, codepoint: u32) callconv(.C) void;
+pub const CharFn = *const fn (*Window, codepoint: u32) callconv(.c) void;
 
 pub const setDropCallback = glfwSetDropCallback;
 extern fn glfwSetDropCallback(window: *Window, callback: ?DropFn) ?DropFn;
 pub const DropFn = *const fn (
     window: *Window,
     path_count: i32,
     paths: [*][*:0]const u8,
-) callconv(.C) void;
+) callconv(.c) void;
 
 pub const setMouseButtonCallback = glfwSetMouseButtonCallback;
 extern fn glfwSetMouseButtonCallback(window: *Window, callback: ?MouseButtonFn) ?MouseButtonFn;
@@ -881,7 +882,7 @@ pub const MouseButtonFn = *const fn (
     button: MouseButton,
     action: Action,
     mods: Mods,
-) callconv(.C) void;
+) callconv(.c) void;
 
 pub const getWindowMonitor = glfwGetWindowMonitor;
 extern fn glfwGetWindowMonitor(window: *Window) ?*Monitor;
@@ -892,22 +893,22 @@ pub const CursorPosFn = *const fn (
     window: *Window,
     xpos: f64,
     ypos: f64,
-) callconv(.C) void;
+) callconv(.c) void;
 
 pub const setScrollCallback = glfwSetScrollCallback;
 extern fn glfwSetScrollCallback(window: *Window, callback: ?ScrollFn) ?ScrollFn;
 pub const ScrollFn = *const fn (
     window: *Window,
     xoffset: f64,
     yoffset: f64,
-) callconv(.C) void;
+) callconv(.c) void;
 
 pub const setCursorEnterCallback = glfwSetCursorEnterCallback;
 extern fn glfwSetCursorEnterCallback(window: *Window, callback: ?CursorEnterFn) ?CursorEnterFn;
 pub const CursorEnterFn = *const fn (
     window: *Window,
     entered: i32,
-) callconv(.C) void;
+) callconv(.c) void;
 
 pub const setWindowMonitor = glfwSetWindowMonitor;
 extern fn glfwSetWindowMonitor(
@@ -1009,6 +1010,19 @@ pub const InputMode = enum(c_int) {
         };
     }
 };
+pub fn getInputMode(
+    window: *Window,
+    comptime mode: InputMode,
+) Error!InputMode.ValueType(mode) {
+    return @enumFromInt(try getInputModeUntyped(window, mode));
+}
+pub fn getInputModeUntyped(window: *Window, mode: InputMode) Error!c_int {
+    const value = glfwGetInputMode(window, mode);
+    try maybeError();
+    return value;
+}
+extern fn glfwGetInputMode(*Window, InputMode) c_int;
+
 pub fn setInputMode(
     window: *Window,
     comptime mode: InputMode,
@@ -1232,20 +1246,29 @@ fn _isLinuxDesktopLike() bool {
 // Emscripten
 //
 //--------------------------------------------------------------------------------------------------
-const os = builtin.target.os.tag;
-usingnamespace if (os == .emscripten or os == .freestanding) struct {
-    // GLFW - emscripten uses older version that doesn't have these functions - implement dummies
-    var glfwGetGamepadStateWarnPrinted: bool = false;
-    pub export fn glfwGetGamepadState(_: i32, _: ?*anyopaque) i32 {
-        if (!glfwGetGamepadStateWarnPrinted) {
-            std.log.err("glfwGetGamepadState(): not implemented! Use emscripten specific functions: https://emscripten.org/docs/api_reference/html5.h.html?highlight=gamepadstate#c.emscripten_get_gamepad_status", .{});
-            glfwGetGamepadStateWarnPrinted = true;
+comptime {
+    const os = builtin.target.os.tag;
+    const emscripten = struct {
+        // GLFW - emscripten uses older version that doesn't have these functions - implement dummies
+        var glfwGetGamepadStateWarnPrinted: bool = false;
+        fn glfwGetGamepadState(_: i32, _: ?*anyopaque) callconv(.c) i32 {
+            if (!glfwGetGamepadStateWarnPrinted) {
+                std.log.err("glfwGetGamepadState(): not implemented! Use emscripten specific functions: https://emscripten.org/docs/api_reference/html5.h.html?highlight=gamepadstate#c.emscripten_get_gamepad_status", .{});
+                glfwGetGamepadStateWarnPrinted = true;
+            }
+            return 0; // false - failure
         }
-        return 0; // false - failure
-    }
 
-    /// use glfwSetCallback instead
-    pub export fn glfwGetError() i32 {
-        return 0; // no error
+        /// use glfwSetCallback instead
+        /// This is a stub implementation for Emscripten compatibility.
+        /// It always returns 0 to indicate no error, as Emscripten does not support this functionality.
+        fn glfwGetError() callconv(.c) i32 {
+            return 0; // no error
+        }
+    };
+
+    if (os == .emscripten or os == .freestanding) {
+        @export(&emscripten.glfwGetGamepadState, .{ .name = "glfwGetGamepadState" });
+        @export(&emscripten.glfwGetError, .{ .name = "glfwGetError" });
     }
-} else struct {};
+}