mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2026-02-04 08:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dummy animation

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2026-01-31 22:51:44 +01:00
parent b0dcc12785
commit 1a04a608a1
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/animations/Dummy.zig
View File

@@ -1,14 +0,0 @@
const std = @import("std");
const Animation = @import("../tui/Animation.zig");
const Dummy = @This();
pub fn animation(self: *Dummy) Animation {
return Animation.init(self, deinit, realloc, draw);
}
fn deinit(_: *Dummy) void {}
fn realloc(_: *Dummy) anyerror!void {}
fn draw(_: *Dummy) void {}

18
src/main.zig
View File

@@ -10,7 +10,6 @@ const enums = @import("enums.zig");
const Environment = @import("Environment.zig"); const Environment = @import("Environment.zig");
const ColorMix = @import("animations/ColorMix.zig"); const ColorMix = @import("animations/ColorMix.zig");
const Doom = @import("animations/Doom.zig"); const Doom = @import("animations/Doom.zig");
const Dummy = @import("animations/Dummy.zig");
const Matrix = @import("animations/Matrix.zig"); const Matrix = @import("animations/Matrix.zig");
const GameOfLife = @import("animations/GameOfLife.zig"); const GameOfLife = @import("animations/GameOfLife.zig");
const DurFile = @import("animations/DurFile.zig"); const DurFile = @import("animations/DurFile.zig");
@@ -70,7 +69,7 @@ const UiState = struct {
update: bool, update: bool,
buffer: *TerminalBuffer, buffer: *TerminalBuffer,
animation_timed_out: bool, animation_timed_out: bool,
animation: *Animation, animation: *?Animation,
can_draw_battery: bool, can_draw_battery: bool,
info_line: *InfoLine, info_line: *InfoLine,
animate: bool, animate: bool,
@@ -507,7 +506,7 @@ pub fn main() !void {
is_autologin = true; is_autologin = true;
} }
var animation: Animation = undefined; var animation: ?Animation = null;
var state = UiState{ var state = UiState{
.auth_fails = 0, .auth_fails = 0,
.update = true, .update = true,
@@ -580,10 +579,7 @@ pub fn main() !void {
// Initialize the animation, if any // Initialize the animation, if any
switch (config.animation) { switch (config.animation) {
.none => { .none => {},
var dummy = Dummy{};
animation = dummy.animation();
},
.doom => { .doom => {
var doom = try Doom.init(allocator, &buffer, config.doom_top_color, config.doom_middle_color, config.doom_bottom_color, config.doom_fire_height, config.doom_fire_spread); var doom = try Doom.init(allocator, &buffer, config.doom_top_color, config.doom_middle_color, config.doom_bottom_color, config.doom_fire_height, config.doom_fire_spread);
animation = doom.animation(); animation = doom.animation();
@@ -605,7 +601,7 @@ pub fn main() !void {
animation = dur.animation(); animation = dur.animation();
}, },
} }
defer animation.deinit(); defer if (animation) |*a| a.deinit();
const shutdown_key = try std.fmt.parseInt(u8, config.shutdown_key[1..], 10); const shutdown_key = try std.fmt.parseInt(u8, config.shutdown_key[1..], 10);
const restart_key = try std.fmt.parseInt(u8, config.restart_key[1..], 10); const restart_key = try std.fmt.parseInt(u8, config.restart_key[1..], 10);
@@ -660,7 +656,7 @@ pub fn main() !void {
buffer.width = width; buffer.width = width;
buffer.height = height; buffer.height = height;
animation.realloc() catch |err| { if (animation) |*a| a.realloc() catch |err| {
try info_line.addMessage(lang.err_alloc, config.error_bg, config.error_fg); try info_line.addMessage(lang.err_alloc, config.error_bg, config.error_fg);
try log_file.err("tui", "failed to reallocate animation buffers: {s}", .{@errorName(err)}); try log_file.err("tui", "failed to reallocate animation buffers: {s}", .{@errorName(err)});
}; };
@@ -685,7 +681,7 @@ pub fn main() !void {
if (config.animation_timeout_sec > 0 and time.seconds - animation_time_start.seconds > config.animation_timeout_sec) { if (config.animation_timeout_sec > 0 and time.seconds - animation_time_start.seconds > config.animation_timeout_sec) {
state.animation_timed_out = true; state.animation_timed_out = true;
animation.deinit(); if (animation) |*a| a.deinit();
} }
} else if (config.bigclock != .none and config.clock == null) { } else if (config.bigclock != .none and config.clock == null) {
const time = try interop.getTimeOfDay(); const time = try interop.getTimeOfDay();
@@ -1020,7 +1016,7 @@ fn drawUi(config: Config, lang: Lang, log_file: *LogFile, state: *UiState) !bool
var length: usize = config.edge_margin; var length: usize = config.edge_margin;
if (!state.animation_timed_out) state.animation.draw(); if (!state.animation_timed_out) if (state.animation.*) |*a| a.draw();
if (!config.hide_version_string) { if (!config.hide_version_string) {
state.buffer.drawLabel(ly_version_str, config.edge_margin, state.buffer.height - 1 - config.edge_margin); state.buffer.drawLabel(ly_version_str, config.edge_margin, state.buffer.height - 1 - config.edge_margin);