zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glfw: add Cursor.createStandard

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-10-22 00:04:20 -07:00 • committed by Stephen Gutekanst
parent 509e7f3b4b
commit d97a1b5669
2 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

65
glfw/src/Cursor.zig
View file

@ -12,6 +12,27 @@ const Cursor = @This();
ptr: *c.GLFWcursor, ptr: *c.GLFWcursor,
// TODO(enum)
// Standard system cursor shapes.
/// The regular arrow cursor shape.
pub const arrow_cursor = c.GLFW_ARROW_CURSOR;
/// The text input I-beam cursor shape.
pub const ibeam_cursor = c.GLFW_IBEAM_CURSOR;
/// The crosshair shape.
pub const crosshair_cursor = c.GLFW_CROSSHAIR_CURSOR;
/// The hand shape.
pub const hand_cursor = c.GLFW_HAND_CURSOR;
/// The horizontal resize arrow shape.
pub const hresize_cursor = c.GLFW_HRESIZE_CURSOR;
/// The vertical resize arrow shape.
pub const vresize_cursor = c.GLFW_VRESIZE_CURSOR;
/// Creates a custom cursor. /// Creates a custom cursor.
/// ///
/// Creates a new custom cursor image that can be set for a window with glfw.Cursor.set. The cursor /// Creates a new custom cursor image that can be set for a window with glfw.Cursor.set. The cursor
@ -44,25 +65,23 @@ pub inline fn create(image: Image, xhot: isize, yhot: isize) Error!Cursor {
return Cursor{ .ptr = cursor.? }; return Cursor{ .ptr = cursor.? };
} }
// TODO(cursor icon) /// Creates a cursor with a standard shape.
// /// Creates a cursor with a standard shape. ///
// /// /// Returns a cursor with a standard shape (see shapes), that can be set for a window with glfw.Window.setCursor.
// /// Returns a cursor with a [standard shape](@ref shapes), that can be set for ///
// /// a window with @ref glfwSetCursor. /// @param[in] shape One of the standard shapes (see shapes).
// /// /// @return A new cursor ready to use.
// /// @param[in] shape One of the [standard shapes](@ref shapes). ///
// /// @return A new cursor ready to use or null if an /// Possible errors include glfw.Error.NotInitialized, glfw.Error.InvalidEnum and glfw.Error.PlatformError.
// /// error occurred. ///
// /// /// @thread_safety This function must only be called from the main thread.
// /// Possible errors include glfw.Error.NotInitialized, glfw.Error.InvalidEnum and glfw.Error.PlatformError. ///
// /// /// see also: cursor_object, glfwCreateCursor
// /// @thread_safety This function must only be called from the main thread. pub inline fn createStandard(shape: isize) Error!Cursor {
// /// const cursor = c.glfwCreateStandardCursor(@intCast(c_int, shape));
// /// see also: cursor_object, glfwCreateCursor try getError();
// /// return Cursor{ .ptr = cursor.? };
// /// }
// /// @ingroup input
// GLFWAPI GLFWcursor* glfwCreateStandardCursor(int shape);
// TODO(cursor icon) // TODO(cursor icon)
// /// Destroys a cursor. // /// Destroys a cursor.
@ -100,3 +119,11 @@ test "create" {
_ = glfw.Cursor.create(image, 0, 0) catch |err| std.debug.print("failed to create cursor, custom cursors not supported? error={}\n", .{err}); _ = glfw.Cursor.create(image, 0, 0) catch |err| std.debug.print("failed to create cursor, custom cursors not supported? error={}\n", .{err});
} }
test "createStandard" {
const glfw = @import("main.zig");
try glfw.init();
defer glfw.terminate();
_ = glfw.Cursor.createStandard(glfw.Cursor.ibeam_cursor) catch |err| std.debug.print("failed to create cursor, custom cursors not supported? error={}\n", .{err});
}

19
glfw/src/consts.zig
View file

@ -169,25 +169,6 @@ pub const native_context_api = c.GLFW_NATIVE_CONTEXT_API;
pub const egl_context_api = c.GLFW_EGL_CONTEXT_API; pub const egl_context_api = c.GLFW_EGL_CONTEXT_API;
pub const osmesa_context_api = c.GLFW_OSMESA_CONTEXT_API; pub const osmesa_context_api = c.GLFW_OSMESA_CONTEXT_API;
// Standard system cursor shapes.
/// The regular arrow cursor shape.
pub const arrow_cursor = c.GLFW_ARROW_CURSOR;
/// The text input I-beam cursor shape.
pub const ibeam_cursor = c.GLFW_IBEAM_CURSOR;
/// The crosshair shape.
pub const crosshair_cursor = c.GLFW_CROSSHAIR_CURSOR;
/// The hand shape.
pub const hand_cursor = c.GLFW_HAND_CURSOR;
/// The horizontal resize arrow shape.
pub const hresize_cursor = c.GLFW_HRESIZE_CURSOR;
/// The vertical resize arrow shape.
pub const vresize_cursor = c.GLFW_VRESIZE_CURSOR;
pub const connected = c.GLFW_CONNECTED; pub const connected = c.GLFW_CONNECTED;
pub const disconnected = c.GLFW_DISCONNECTED; pub const disconnected = c.GLFW_DISCONNECTED;