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

Merge changes

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2025-10-23 22:16:24 +02:00
parent 4171e29995 106f157a2c
commit 6f62106fcc
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/config.ini
View File

@@ -138,6 +138,9 @@ doom_middle_color = 0x00C78F17
# DOOM animation custom bottom color (high intensity flames) # DOOM animation custom bottom color (high intensity flames)
doom_bottom_color = 0x00FFFFFF doom_bottom_color = 0x00FFFFFF
# Set margin to the edges of the DM (useful for curved monitors)
edge_margin = 0
# Error background color id # Error background color id
error_bg = 0x00000000 error_bg = 0x00000000

1
src/config/Config.zig
View File

@@ -39,6 +39,7 @@ doom_fire_spread: u8 = 2,
doom_top_color: u32 = 0x00FF0000, doom_top_color: u32 = 0x00FF0000,
doom_middle_color: u32 = 0x00FFFF00, doom_middle_color: u32 = 0x00FFFF00,
doom_bottom_color: u32 = 0x00FFFFFF, doom_bottom_color: u32 = 0x00FFFFFF,
edge_margin: u8 = 0,
error_bg: u32 = 0x00000000, error_bg: u32 = 0x00000000,
error_fg: u32 = 0x01FF0000, error_fg: u32 = 0x01FF0000,
fg: u32 = 0x00FFFFFF, fg: u32 = 0x00FFFFFF,

41
src/main.zig
View File

@@ -577,12 +577,12 @@ pub fn main() !void {
_ = termbox.tb_clear(); _ = termbox.tb_clear();
var length: usize = 0; var length: usize = config.edge_margin;
if (!animation_timed_out) animation.draw(); if (!animation_timed_out) animation.draw();
if (!config.hide_version_string) { if (!config.hide_version_string) {
buffer.drawLabel(ly_version_str, 0, buffer.height - 1); buffer.drawLabel(ly_version_str, config.edge_margin, buffer.height - 1 - config.edge_margin);
} }
if (config.battery_id) |id| draw_battery: { if (config.battery_id) |id| draw_battery: {
@@ -598,8 +598,11 @@ pub fn main() !void {
var battery_buf: [16:0]u8 = undefined; var battery_buf: [16:0]u8 = undefined;
const battery_str = std.fmt.bufPrintZ(&battery_buf, "BAT: {d}%", .{battery_percentage}) catch break :draw_battery; const battery_str = std.fmt.bufPrintZ(&battery_buf, "BAT: {d}%", .{battery_percentage}) catch break :draw_battery;
const battery_y: usize = if (config.hide_key_hints) 0 else 1; var battery_y: usize = config.edge_margin;
buffer.drawLabel(battery_str, 0, battery_y); if (!config.hide_key_hints) {
battery_y += 1;
}
buffer.drawLabel(battery_str, config.edge_margin, battery_y);
can_draw_battery = true; can_draw_battery = true;
} }
@@ -672,44 +675,44 @@ pub fn main() !void {
info_line.label.draw(); info_line.label.draw();
if (!config.hide_key_hints) { if (!config.hide_key_hints) {
buffer.drawLabel(config.shutdown_key, length, 0); buffer.drawLabel(config.shutdown_key, length, config.edge_margin);
length += config.shutdown_key.len + 1; length += config.shutdown_key.len + 1;
buffer.drawLabel(" ", length - 1, 0); buffer.drawLabel(" ", length - 1, config.edge_margin);
buffer.drawLabel(lang.shutdown, length, 0); buffer.drawLabel(lang.shutdown, length, config.edge_margin);
length += shutdown_len + 1; length += shutdown_len + 1;
buffer.drawLabel(config.restart_key, length, 0); buffer.drawLabel(config.restart_key, length, config.edge_margin);
length += config.restart_key.len + 1; length += config.restart_key.len + 1;
buffer.drawLabel(" ", length - 1, 0); buffer.drawLabel(" ", length - 1, config.edge_margin);
buffer.drawLabel(lang.restart, length, 0); buffer.drawLabel(lang.restart, length, config.edge_margin);
length += restart_len + 1; length += restart_len + 1;
if (config.sleep_cmd != null) { if (config.sleep_cmd != null) {
buffer.drawLabel(config.sleep_key, length, 0); buffer.drawLabel(config.sleep_key, length, config.edge_margin);
length += config.sleep_key.len + 1; length += config.sleep_key.len + 1;
buffer.drawLabel(" ", length - 1, 0); buffer.drawLabel(" ", length - 1, config.edge_margin);
buffer.drawLabel(lang.sleep, length, 0); buffer.drawLabel(lang.sleep, length, config.edge_margin);
length += sleep_len + 1; length += sleep_len + 1;
} }
if (config.brightness_down_key) |key| { if (config.brightness_down_key) |key| {
buffer.drawLabel(key, length, 0); buffer.drawLabel(key, length, config.edge_margin);
length += key.len + 1; length += key.len + 1;
buffer.drawLabel(" ", length - 1, 0); buffer.drawLabel(" ", length - 1, config.edge_margin);
buffer.drawLabel(lang.brightness_down, length, 0); buffer.drawLabel(lang.brightness_down, length, config.edge_margin);
length += brightness_down_len + 1; length += brightness_down_len + 1;
} }
if (config.brightness_up_key) |key| { if (config.brightness_up_key) |key| {
buffer.drawLabel(key, length, 0); buffer.drawLabel(key, length, config.edge_margin);
length += key.len + 1; length += key.len + 1;
buffer.drawLabel(" ", length - 1, 0); buffer.drawLabel(" ", length - 1, config.edge_margin);
buffer.drawLabel(lang.brightness_up, length, 0); buffer.drawLabel(lang.brightness_up, length, config.edge_margin);
length += brightness_up_len + 1; length += brightness_up_len + 1;
} }
} }