mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-20 19:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display error messages differently in info line (#661)

Browse Source 
* Add list of error messages to InfoLine.zig

* Change info and error cases according to review

* Add changes from review for width calculation
This commit is contained in:
Moabeat
2024-07-28 13:02:42 +02:00
committed by GitHub
parent 93554d9ba3
commit 19d4b195f3
6 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main.zig
View File

@@ -62,7 +62,8 @@ pub fn main() !void {
var config: Config = undefined;
var lang: Lang = undefined;
var save: Save = undefined;
var info_line = InfoLine{};
var info_line = InfoLine.init(allocator);
defer info_line.deinit();
if (res.args.help != 0) {
try clap.help(stderr, clap.Help, &params, .{});
@@ -100,7 +101,11 @@ pub fn main() !void {
const config_path = try std.fmt.allocPrint(allocator, "{s}{s}config.ini", .{ s, trailing_slash });
defer allocator.free(config_path);
config = config_ini.readFileToStructWithMap(config_path, mapped_config_fields) catch Config{};
config = config_ini.readFileToStructWithMap(config_path, mapped_config_fields) catch _config: {
// literal error message, due to language file not yet available
try info_line.addError("unable to parse config file");
break :_config Config{};
};
const lang_path = try std.fmt.allocPrint(allocator, "{s}{s}lang/{s}.ini", .{ s, trailing_slash, config.lang });
defer allocator.free(lang_path);
@@ -115,7 +120,11 @@ pub fn main() !void {
save = save_ini.readFileToStruct(save_path) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file);
}
} else {
config = config_ini.readFileToStructWithMap(build_options.data_directory ++ "/config.ini", mapped_config_fields) catch Config{};
config = config_ini.readFileToStructWithMap(build_options.data_directory ++ "/config.ini", mapped_config_fields) catch _config: {
// literal error message, due to language file not yet available
try info_line.addError("unable to parse config file");
break :_config Config{};
};
const lang_path = try std.fmt.allocPrint(allocator, "{s}/lang/{s}.ini", .{ build_options.data_directory, config.lang });
defer allocator.free(lang_path);
@@ -128,6 +137,9 @@ pub fn main() !void {
}
}
info_line.error_bg = config.error_bg;
info_line.error_fg = config.error_fg;
if (!build_options.enable_x11_support) try info_line.setText(lang.no_x11_support);
interop.setNumlock(config.numlock) catch {};
@@ -178,13 +190,13 @@ pub fn main() !void {
defer desktop.deinit();
desktop.addEnvironment(.{ .Name = lang.shell }, "", .shell) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
};
if (build_options.enable_x11_support) {
if (config.xinitrc) |xinitrc| {
desktop.addEnvironment(.{ .Name = lang.xinitrc, .Exec = xinitrc }, "", .xinitrc) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
};
}
}
@@ -227,10 +239,10 @@ pub fn main() !void {
switch (active_input) {
.session => desktop.handle(null, insert_mode),
.login => login.handle(null, insert_mode) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
.password => password.handle(null, insert_mode) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
}
}
@@ -274,7 +286,7 @@ pub fn main() !void {
// Switch to selected TTY if possible
open_console_dev: {
const fd = std.posix.open(config.console_dev, .{ .ACCMODE = .WRONLY }, 0) catch {
try info_line.setText(lang.err_console_dev);
try info_line.addError(lang.err_console_dev);
break :open_console_dev;
};
defer std.posix.close(fd);
@@ -310,10 +322,10 @@ pub fn main() !void {
switch (config.animation) {
.none => {},
.doom => doom.realloc() catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
.matrix => matrix.realloc() catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
}
@@ -362,10 +374,10 @@ pub fn main() !void {
switch (active_input) {
.session => desktop.handle(null, insert_mode),
.login => login.handle(null, insert_mode) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
.password => password.handle(null, insert_mode) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
}
@@ -386,7 +398,7 @@ pub fn main() !void {
buffer.drawLabel(lang.login, label_x, label_y + 4);
buffer.drawLabel(lang.password, label_x, label_y + 6);
info_line.draw(buffer);
try info_line.draw(buffer);
if (!config.hide_key_hints) {
var length: u64 = 0;
@@ -439,7 +451,7 @@ pub fn main() !void {
draw_lock_state: {
const lock_state = interop.getLockState(config.console_dev) catch {
try info_line.setText(lang.err_console_dev);
try info_line.addError(lang.err_console_dev);
break :draw_lock_state;
};
@@ -515,7 +527,7 @@ pub fn main() !void {
}
} else if (pressed_key == brightness_down_key and unistd.access(&config.brightnessctl[0], unistd.X_OK) == 0) brightness_change: {
const brightness_str = std.fmt.allocPrint(allocator, "{s}%-", .{config.brightness_change}) catch {
try info_line.setText(lang.err_brightness_change);
try info_line.addError(lang.err_brightness_change);
break :brightness_change;
};
defer allocator.free(brightness_str);
@@ -523,7 +535,7 @@ pub fn main() !void {
_ = brightness.spawnAndWait() catch .{};
} else if (pressed_key == brightness_up_key and unistd.access(&config.brightnessctl[0], unistd.X_OK) == 0) brightness_change: {
const brightness_str = std.fmt.allocPrint(allocator, "+{s}%", .{config.brightness_change}) catch {
try info_line.setText(lang.err_brightness_change);
try info_line.addError(lang.err_brightness_change);
break :brightness_change;
};
defer allocator.free(brightness_str);
@@ -595,7 +607,7 @@ pub fn main() !void {
try info_line.setText(lang.authenticating);
InfoLine.clearRendered(allocator, buffer) catch {};
info_line.draw(buffer);
try info_line.draw(buffer);
_ = termbox.tb_present();
session_pid = try std.posix.fork();
@@ -616,7 +628,7 @@ pub fn main() !void {
if (auth_err) |err| {
auth_fails += 1;
active_input = .password;
try info_line.setText(getAuthErrorMsg(err, lang));
try info_line.addError(getAuthErrorMsg(err, lang));
if (config.clear_password or err != error.PamAuthError) password.clear();
} else {
password.clear();
@@ -665,10 +677,10 @@ pub fn main() !void {
switch (active_input) {
.session => desktop.handle(&event, insert_mode),
.login => login.handle(&event, insert_mode) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
.password => password.handle(&event, insert_mode) catch {
try info_line.setText(lang.err_alloc);
try info_line.addError(lang.err_alloc);
},
}
update = true;