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

Show UI errors in info line again

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2026-02-12 11:20:54 +01:00
parent 32d5330efb
commit 01dcfa207e
3 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth.zig
View File

@@ -105,7 +105,7 @@ pub fn authenticate(allocator: std.mem.Allocator, log_file: *LogFile, options: A
try log_file.info("auth/passwd", "setting user shell", .{});
if (user_entry.shell == null) interop.setUserShell(&user_entry);
var shared_err = try SharedError.init();
var shared_err = try SharedError.init(null, null);
defer shared_err.deinit();
log_file.deinit();

35
src/main.zig
View File

@@ -1054,6 +1054,7 @@ pub fn main() !void {
try state.buffer.registerKeybind("Ctrl+C", &quit, &state);
// TODO: Make this generic for any Text widget present in the UI
try state.buffer.registerKeybind("Ctrl+U", &clearPassword, &state);
try state.buffer.registerKeybind("K", &viMoveCursorUp, &state);
@@ -1093,7 +1094,6 @@ pub fn main() !void {
);
}
// Position components and place cursor accordingly
if (state.is_autologin) _ = try authenticate(&state);
const active_widget = switch (default_input) {
@@ -1103,7 +1103,7 @@ pub fn main() !void {
.password => state.password_widget,
};
var shared_error = try SharedError.init();
var shared_error = try SharedError.init(&uiErrorHandler, &state);
defer shared_error.deinit();
try state.buffer.runEventLoop(
@@ -1119,6 +1119,35 @@ pub fn main() !void {
);
}
fn uiErrorHandler(err: anyerror, ctx: *anyopaque) anyerror!void {
var state: *UiState = @ptrCast(@alignCast(ctx));
switch (err) {
error.SetCursorFailed => {
try state.info_line.addMessage(
state.lang.err_alloc,
state.config.error_bg,
state.config.error_fg,
);
},
error.WidgetReallocationFailed => {
try state.info_line.addMessage(
state.lang.err_alloc,
state.config.error_bg,
state.config.error_fg,
);
},
error.CurrentWidgetHandlingFailed => {
try state.info_line.addMessage(
state.lang.err_alloc,
state.config.error_bg,
state.config.error_fg,
);
},
else => unreachable,
}
}
fn disableInsertMode(ptr: *anyopaque) !bool {
var state: *UiState = @ptrCast(@alignCast(ptr));
@@ -1256,7 +1285,7 @@ fn authenticate(ptr: *anyopaque) !bool {
}
}
var shared_err = try SharedError.init();
var shared_err = try SharedError.init(null, null);
defer shared_err.deinit();
{