mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2026-03-25 17:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix active TTY detection for KMSCON

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2026-02-05 19:50:48 +01:00
parent 21fca058e7
commit 11735290b8
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ly-core/src/interop.zig
View File

@@ -96,8 +96,21 @@ fn PlatformStruct() type {
// 4. Finally, compare the major and minor device numbers with the // 4. Finally, compare the major and minor device numbers with the
// extracted values. If they correspond, parse [dir] to get the // extracted values. If they correspond, parse [dir] to get the
// TTY ID // TTY ID
pub fn getActiveTtyImpl(allocator: std.mem.Allocator) !u8 { pub fn getActiveTtyImpl(allocator: std.mem.Allocator, use_kmscon_vt: bool) !u8 {
var file_buffer: [256]u8 = undefined; var file_buffer: [256]u8 = undefined;
if (use_kmscon_vt) {
var file = try std.fs.openFileAbsolute("/sys/class/tty/tty0/active", .{});
defer file.close();
var reader = file.reader(&file_buffer);
var buffer: [16]u8 = undefined;
const read = try readBuffer(&reader.interface, &buffer);
const tty = buffer[0..(read - 1)];
return std.fmt.parseInt(u8, tty["tty".len..], 10);
}
var tty_major: u16 = undefined; var tty_major: u16 = undefined;
var tty_minor: u16 = undefined; var tty_minor: u16 = undefined;
@@ -242,7 +255,7 @@ fn PlatformStruct() type {
if (result != 0) return error.SetUserUidFailed; if (result != 0) return error.SetUserUidFailed;
} }
pub fn getActiveTtyImpl(_: std.mem.Allocator) !u8 { pub fn getActiveTtyImpl(_: std.mem.Allocator, _: bool) !u8 {
return error.FeatureUnimplemented; return error.FeatureUnimplemented;
} }
@@ -285,8 +298,8 @@ pub fn getTimeOfDay() !TimeOfDay {
}; };
} }
pub fn getActiveTty(allocator: std.mem.Allocator) !u8 { pub fn getActiveTty(allocator: std.mem.Allocator, use_kmscon_vt: bool) !u8 {
return platform_struct.getActiveTtyImpl(allocator); return platform_struct.getActiveTtyImpl(allocator, use_kmscon_vt);
} }
pub fn switchTty(tty: u8) !void { pub fn switchTty(tty: u8) !void {

4
src/main.zig
View File

@@ -568,14 +568,14 @@ pub fn main() !void {
var inactivity_cmd_ran = false; var inactivity_cmd_ran = false;
// Switch to selected TTY // Switch to selected TTY
const active_tty = interop.getActiveTty(allocator) catch |err| no_tty_found: { const active_tty = interop.getActiveTty(allocator, use_kmscon_vt) catch |err| no_tty_found: {
try info_line.addMessage(lang.err_get_active_tty, config.error_bg, config.error_fg); try info_line.addMessage(lang.err_get_active_tty, config.error_bg, config.error_fg);
try log_file.err("sys", "failed to get active tty: {s}", .{@errorName(err)}); try log_file.err("sys", "failed to get active tty: {s}", .{@errorName(err)});
break :no_tty_found build_options.fallback_tty; break :no_tty_found build_options.fallback_tty;
}; };
interop.switchTty(active_tty) catch |err| { interop.switchTty(active_tty) catch |err| {
try info_line.addMessage(lang.err_switch_tty, config.error_bg, config.error_fg); try info_line.addMessage(lang.err_switch_tty, config.error_bg, config.error_fg);
try log_file.err("sys", "failed to switch tty: {s}", .{@errorName(err)}); try log_file.err("sys", "failed to switch to tty {d}: {s}", .{ active_tty, @errorName(err) });
}; };
if (config.initial_info_text) |text| { if (config.initial_info_text) |text| {