1
Fork 0
mirror of https://github.com/RGBCube/ZTerm synced 2025-07-29 08:57:46 +00:00

Adjust some stuff

This commit is contained in:
RGBCube 2023-05-17 23:03:14 +03:00
parent acc8f529ef
commit cc538aa18a
2 changed files with 15 additions and 13 deletions

View file

@ -5,24 +5,24 @@ const Thread = std.Thread;
const time = std.time; const time = std.time;
const Spinner = @This(); const Spinner = @This();
const default_frame_rate = 150 * time.ns_per_ms; const default_framerate = 100 * time.ns_per_ms;
const default_charset = [_][]const u8{ "|", "/", "-", "\\" }; const default_charset = [_][]const u8{ "|", "/", "-", "\\" };
keep_going: AtomicBool, keep_going: AtomicBool,
spinner_thread: ?Thread, spinner_thread: ?Thread,
// The number of nanoseconds to wait between frames. // The number of nanoseconds to wait between frames.
framerate: u64, framerate_ns: u64,
charset: [4][]const u8, charset: []const []const u8,
message: []const u8, message: []const u8,
pub fn new(framerate: ?u64, charset: ?[4][]const u8, message: ?[]const u8) Spinner { pub fn new(framerate_ns: ?u64, charset: ?[]const []const u8, message: ?[]const u8) Spinner {
return Spinner{ return Spinner{
.keep_going = AtomicBool.init(false), .keep_going = AtomicBool.init(false),
.spinner_thread = null, .spinner_thread = null,
.framerate = framerate orelse default_frame_rate, .framerate_ns = framerate_ns orelse default_framerate,
.charset = charset orelse default_charset, .charset = charset orelse &default_charset,
.message = message orelse "", .message = message orelse "",
}; };
} }
@ -34,21 +34,20 @@ pub fn start(sp: *Spinner) !void {
pub fn stop(sp: *Spinner) void { pub fn stop(sp: *Spinner) void {
sp.keep_going.store(false, .SeqCst); sp.keep_going.store(false, .SeqCst);
(sp.spinner_thread orelse unreachable).join(); if (sp.spinner_thread) |*thread| thread.join();
} }
fn animateSpinnerOnce(sp: *Spinner) !void { fn animateSpinnerOnce(sp: *Spinner) !void {
var stdOut = std.io.getStdOut(); var stdOut = std.io.getStdOut();
for (sp.charset) |frame| { for (sp.charset) |frame| {
_ = try stdOut.write("\r");
_ = try stdOut.write(frame); _ = try stdOut.write(frame);
_ = try stdOut.write(" "); _ = try stdOut.write(" ");
_ = try stdOut.write(sp.message); _ = try stdOut.write(sp.message);
// Jumps to the start of the line. time.sleep(sp.framerate_ns);
_ = try stdOut.write("\r");
time.sleep(sp.framerate);
} }
} }

View file

@ -1,11 +1,14 @@
const Spinner = @import("src/Spinner.zig"); const Spinner = @import("src/Spinner.zig");
const time = @import("std").time; const std = @import("std");
const time = std.time;
pub fn main() !void { pub fn main() !void {
var sp = Spinner.new(null, null, "Loading..."); var sp = Spinner.new(100 * time.ns_per_ms, null, "Loading...");
try sp.start(); try sp.start();
time.sleep(5 * time.ns_per_s); time.sleep(5 * time.ns_per_s);
sp.stop(); sp.stop();
} }