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

glfw: remove [*c] pointers from api and return lengthed strings when possible

Browse source
This commit is contained in:
Silver 2021-11-11 09:42:49 +00:00 • committed by Stephen Gutekanst
parent 28a0aebd95
commit 673ce14acf
8 changed files with 43 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
glfw/src/clipboard.zig
View file

@ -17,7 +17,7 @@ const getError = @import("errors.zig").getError;
/// @thread_safety This function must only be called from the main thread.
///
/// see also: clipboard, glfwGetClipboardString
pub inline fn setClipboardString(value: [*c]const u8) Error!void {
pub inline fn setClipboardString(value: [*:0]const u8) Error!void {
c.glfwSetClipboardString(null, value);
try getError();
}
@ -28,7 +28,7 @@ pub inline fn setClipboardString(value: [*c]const u8) Error!void {
/// a UTF-8 encoded string. If the clipboard is empty or if its contents cannot be converted,
/// glfw.Error.FormatUnavailable is returned.
///
/// @return The contents of the clipboard as a UTF-8 encoded string, or null if an error occurred.
/// @return The contents of the clipboard as a UTF-8 encoded string.
///
/// Possible errors include glfw.Error.NotInitialized and glfw.Error.PlatformError.
///
@ -39,10 +39,10 @@ pub inline fn setClipboardString(value: [*c]const u8) Error!void {
/// @thread_safety This function must only be called from the main thread.
///
/// see also: clipboard, glfwSetClipboardString
pub inline fn getClipboardString() Error![*c]const u8 {
pub inline fn getClipboardString() Error![:0]const u8 {
const value = c.glfwGetClipboardString(null);
try getError();
return value;
return std.mem.span(value);
}
test "setClipboardString" {