diff --git a/glfw/build.zig b/glfw/build.zig index e3710eb1..268b0f42 100644 --- a/glfw/build.zig +++ b/glfw/build.zig @@ -262,7 +262,7 @@ fn confirmAppleSDKAgreement(allocator: *std.mem.Allocator) !bool { if (try stdin.readUntilDelimiterOrEof(buf[0..], '\n')) |user_input| { try stdout.print("\n", .{}); var in = user_input; - if (in[in.len-1] == '\r') in = in[0..in.len-1]; + if (in[in.len - 1] == '\r') in = in[0 .. in.len - 1]; return std.mem.eql(u8, in, "y") or std.mem.eql(u8, in, "Y") or std.mem.eql(u8, in, "yes") or std.mem.eql(u8, in, ""); } else { return false; diff --git a/glfw/src/action.zig b/glfw/src/action.zig new file mode 100644 index 00000000..abe7ef0d --- /dev/null +++ b/glfw/src/action.zig @@ -0,0 +1,10 @@ +const c = @cImport(@cInclude("GLFW/glfw3.h")); + +// The key or mouse button was released. +pub const release = C.GLFW_RELEASE; + +// The key or mouse button was pressed. +pub const press = C.GLFW_RELEASE; + +// The key was held down until it repeated. +pub const repeat = C.GLFW_REPEAT; diff --git a/glfw/src/main.zig b/glfw/src/main.zig index a8d67072..a36ed3a1 100644 --- a/glfw/src/main.zig +++ b/glfw/src/main.zig @@ -3,29 +3,8 @@ const testing = std.testing; const c = @cImport(@cInclude("GLFW/glfw3.h")); -// The major version number of the GLFW library. -// -// This is incremented when the API is changed in non-compatible ways. -pub const version_major = c.GLFW_VERSION_MAJOR; - -// The minor version number of the GLFW library. -// -// This is incremented when features are added to the API but it remains backward-compatible. -pub const version_minor = c.GLFW_VERSION_MINOR; - -// The revision number of the GLFW library. -// -// This is incremented when a bug fix release is made that does not contain any API changes. -pub const version_revision = c.GLFW_VERSION_REVISION; - -// The key or mouse button was released. -pub const release = C.GLFW_RELEASE - -// The key or mouse button was pressed. -pub const press = C.GLFW_RELEASE - -// The key was held down until it repeated. -pub const repeat = C.GLFW_REPEAT +pub const version = @import("version.zig"); +pub const action = @import("action.zig"); pub fn basicTest() void { if (c.glfwInit() != c.GLFW_TRUE) { @@ -48,7 +27,7 @@ pub fn basicTest() void { } test "version" { - std.debug.print("\nGLFW version v{}.{}.{}\n", .{version_major, version_minor, version_revision}); + std.debug.print("\nGLFW version v{}.{}.{}\n", .{ version.major, version.minor, version.revision }); } test "basic" { diff --git a/glfw/src/version.zig b/glfw/src/version.zig new file mode 100644 index 00000000..30c0fa65 --- /dev/null +++ b/glfw/src/version.zig @@ -0,0 +1,16 @@ +const c = @cImport(@cInclude("GLFW/glfw3.h")); + +// The major version number of the GLFW library. +// +// This is incremented when the API is changed in non-compatible ways. +pub const major = c.GLFW_VERSION_MAJOR; + +// The minor version number of the GLFW library. +// +// This is incremented when features are added to the API but it remains backward-compatible. +pub const minor = c.GLFW_VERSION_MINOR; + +// The revision number of the GLFW library. +// +// This is incremented when a bug fix release is made that does not contain any API changes. +pub const revision = c.GLFW_VERSION_REVISION;