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

Refactor active_input field-jumping logic (#873)

Browse Source 
Reviewed-on: https://codeberg.org/fairyglade/ly/pulls/873
Reviewed-by: AnErrupTion <anerruption@disroot.org>
Co-authored-by: radsammyt <radsammyt@noreply.codeberg.org>
Co-committed-by: radsammyt <radsammyt@noreply.codeberg.org>
This commit is contained in:
radsammyt
2025-12-01 20:07:59 +01:00
committed by AnErrupTion
parent d82fa82a87
commit 6cb53b6e38
2 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/enums.zig
View File

@@ -1,3 +1,4 @@
const std = @import("std");
pub const Animation = enum {
none,
doom,
@@ -19,6 +20,26 @@ pub const Input = enum {
session,
login,
password,
/// Moves the current Input forwards by one entry. If `reverse`, then the Input
/// moves backwards. If `wrap` is true, then the entry will wrap back around
pub fn move(self: *Input, reverse: bool, wrap: bool) void {
const maxNum = @typeInfo(Input).@"enum".fields.len - 1;
const selfNum = @intFromEnum(self.*);
if (reverse) {
if (wrap) {
self.* = @enumFromInt(selfNum -% 1);
} else if (selfNum != 0) {
self.* = @enumFromInt(selfNum - 1);
}
} else {
if (wrap) {
self.* = @enumFromInt(selfNum +% 1);
} else if (selfNum != maxNum) {
self.* = @enumFromInt(selfNum + 1);
}
}
}
};
pub const ViMode = enum {

38
src/main.zig
View File

@@ -938,37 +938,19 @@ pub fn main() !void {
update = true;
},
termbox.TB_KEY_CTRL_K, termbox.TB_KEY_ARROW_UP => {
active_input = switch (active_input) {
.session, .info_line => .info_line,
.login => .session,
.password => .login,
};
active_input.move(true, false);
update = true;
},
termbox.TB_KEY_CTRL_J, termbox.TB_KEY_ARROW_DOWN => {
active_input = switch (active_input) {
.info_line => .session,
.session => .login,
.login, .password => .password,
};
active_input.move(false, false);
update = true;
},
termbox.TB_KEY_TAB => {
active_input = switch (active_input) {
.info_line => .session,
.session => .login,
.login => .password,
.password => .info_line,
};
active_input.move(false, true);
update = true;
},
termbox.TB_KEY_BACK_TAB => {
active_input = switch (active_input) {
.info_line => .password,
.session => .info_line,
.login => .session,
.password => .login,
};
active_input.move(true, true);
update = true;
},
termbox.TB_KEY_ENTER => authenticate: {
@@ -1125,20 +1107,12 @@ pub fn main() !void {
if (!insert_mode) {
switch (event.ch) {
'k' => {
active_input = switch (active_input) {
.session, .info_line => .info_line,
.login => .session,
.password => .login,
};
active_input.move(true, false);
update = true;
continue;
},
'j' => {
active_input = switch (active_input) {
.info_line => .session,
.session => .login,
.login, .password => .password,
};
active_input.move(false, false);
update = true;
continue;
},