Backport: Swap /usr/bin and /usr/sbin in PATH

Signed-off-by: AnErrupTion <anerruption@disroot.org>

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,68 +0,0 @@
-name: Bug report
-description: File a bug report.
-title: "[Bug] "
-labels: ["bug"]
-body:
-  - type: checkboxes
-    id: prerequisites
-    attributes:
-      label: Pre-requisites
-      description: By submitting this issue, you agree to have done the following.
-      options:
-        - label: I have looked for any other duplicate issues
-          required: true
-  - type: input
-    id: version
-    attributes:
-      label: Ly version
-      description: The output of `ly --version`. Please note that only Ly v1.1.0 and above are supported.
-      placeholder: 1.1.0-dev.12+2b0301c
-    validations:
-      required: true
-  - type: textarea
-    id: observed
-    attributes:
-      label: Observed behavior
-      description: What happened?
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: What did you expect to happen instead?
-    validations:
-      required: true
-  - type: input
-    id: desktop
-    attributes:
-      label: OS + Desktop environment/Window manager
-      description: Which OS and DE (or WM) did you use when observing the problem?
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: What **exactly** can someone else do in order to observe the problem you observed?
-      placeholder: |
-        1. Authenticate with ...
-        2. Go to ...
-        3. Create file ...
-        4. Log out and log back in
-        5. Observe error
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant logs
-      description: |
-        Please copy and paste (or attach) any relevant logs, error messages or any other output. This will be automatically formatted into code, so no need for backticks. Screenshots are accepted if they make life easier for you.
-        Moreover, it is almost always a good idea to include your session log and your general log files (found at ~/ly-session.log and /var/log/ly.log respectively by default) as it usually contains relevant information about the problem.
-      render: shell
-  - type: textarea
-    id: moreinfo
-    attributes:
-      label: Additional information
-      description: If you have any additional information that might be helpful in reproducing the problem, please provide it here.

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,22 +0,0 @@
-name: Feature request
-description: Request a new feature or enhancement.
-title: "[Feature] "
-labels: ["feature"]
-body:
-  - type: checkboxes
-    id: prerequisites
-    attributes:
-      label: Pre-requisites
-      description: By submitting this issue, you agree to have done the following.
-      options:
-        - label: I have looked for any other duplicate issues
-          required: true
-        - label: I have confirmed the requested feature doesn't exist in the latest version in development
-          required: true
-  - type: textarea
-    id: wanted
-    attributes:
-      label: Wanted behavior
-      description: What do you want to be added? Describe the behavior clearly.
-    validations:
-      required: true

.gitignore

@@ -1,5 +1,4 @@
 .idea/
 zig-cache/
 zig-out/
-valgrind.log
-.zig-cache
+valgrind.log

build.zig

@@ -1,71 +1,33 @@
 const std = @import("std");
-const builtin = @import("builtin");
-
-const PatchMap = std.StringHashMap([]const u8);
-const InitSystem = enum {
-    systemd,
-    openrc,
-    runit,
-    s6,
-    dinit,
-    sysvinit,
-    freebsd,
-};
-
-const min_zig_string = "0.15.0";
-const current_zig = builtin.zig_version;
-
-// Implementing zig version detection through compile time
-comptime {
-    const min_zig = std.SemanticVersion.parse(min_zig_string) catch unreachable;
-    if (current_zig.order(min_zig) == .lt) {
-        @compileError(std.fmt.comptimePrint("Your Zig version v{} does not meet the minimum build requirement of v{}", .{ current_zig, min_zig }));
-    }
-}
-
-const ly_version = std.SemanticVersion{ .major = 1, .minor = 2, .patch = 0 };
 
+const ly_version = std.SemanticVersion{ .major = 1, .minor = 0, .patch = 2 };
 var dest_directory: []const u8 = undefined;
-var config_directory: []const u8 = undefined;
-var prefix_directory: []const u8 = undefined;
-var executable_name: []const u8 = undefined;
-var init_system: InitSystem = undefined;
-var default_tty_str: []const u8 = undefined;
+var data_directory: []const u8 = undefined;
+var exe_name: []const u8 = undefined;
 
 pub fn build(b: *std.Build) !void {
     dest_directory = b.option([]const u8, "dest_directory", "Specify a destination directory for installation") orelse "";
-    config_directory = b.option([]const u8, "config_directory", "Specify a default config directory (default is /etc). This path gets embedded into the binary") orelse "/etc";
-    prefix_directory = b.option([]const u8, "prefix_directory", "Specify a default prefix directory (default is /usr)") orelse "/usr";
-    executable_name = b.option([]const u8, "name", "Specify installed executable file name (default is ly)") orelse "ly";
-    init_system = b.option(InitSystem, "init_system", "Specify the target init system (default is systemd)") orelse .systemd;
+    data_directory = b.option([]const u8, "data_directory", "Specify a default data directory (default is /etc/ly). This path gets embedded into the binary") orelse "/etc/ly";
+    exe_name = b.option([]const u8, "name", "Specify installed executable file name (default is ly)") orelse "ly";
+
+    const bin_directory = try b.allocator.dupe(u8, data_directory);
+    data_directory = try std.fs.path.join(b.allocator, &[_][]const u8{ dest_directory, data_directory });
 
     const build_options = b.addOptions();
+    build_options.addOption([]const u8, "data_directory", bin_directory);
+
     const version_str = try getVersionStr(b, "ly", ly_version);
-    const enable_x11_support = b.option(bool, "enable_x11_support", "Enable X11 support (default is on)") orelse true;
-    const default_tty = b.option(u8, "default_tty", "Set the TTY (default is 2)") orelse 2;
-    const fallback_tty = b.option(u8, "fallback_tty", "Set the fallback TTY (default is 2). This value gets embedded into the binary") orelse 2;
 
-    default_tty_str = try std.fmt.allocPrint(b.allocator, "{d}", .{default_tty});
-
-    build_options.addOption([]const u8, "config_directory", config_directory);
-    build_options.addOption([]const u8, "prefix_directory", prefix_directory);
     build_options.addOption([]const u8, "version", version_str);
-    build_options.addOption(u8, "tty", default_tty);
-    build_options.addOption(u8, "fallback_tty", fallback_tty);
-    build_options.addOption(bool, "enable_x11_support", enable_x11_support);
 
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
     const exe = b.addExecutable(.{
         .name = "ly",
-        .root_module = b.createModule(.{
-            .root_source_file = b.path("src/main.zig"),
-            .target = target,
-            .optimize = optimize,
-        }),
-        // Here until the native backend matures in terms of performance
-        .use_llvm = true,
+        .root_source_file = .{ .path = "src/main.zig" },
+        .target = target,
+        .optimize = optimize,
     });
 
     const zigini = b.dependency("zigini", .{ .target = target, .optimize = optimize });
@@ -76,25 +38,25 @@ pub fn build(b: *std.Build) !void {
     const clap = b.dependency("clap", .{ .target = target, .optimize = optimize });
     exe.root_module.addImport("clap", clap.module("clap"));
 
-    const termbox_dep = b.dependency("termbox2", .{
-        .target = target,
-        .optimize = optimize,
-    });
-
+    exe.addIncludePath(.{ .path = "include" });
     exe.linkSystemLibrary("pam");
-    if (enable_x11_support) exe.linkSystemLibrary("xcb");
+    exe.linkSystemLibrary("xcb");
     exe.linkLibC();
 
+    // HACK: Only fails with ReleaseSafe, so we'll override it.
     const translate_c = b.addTranslateC(.{
-        .root_source_file = termbox_dep.path("termbox2.h"),
+        .root_source_file = .{ .path = "include/termbox2.h" },
         .target = target,
-        .optimize = optimize,
+        .optimize = if (optimize == .ReleaseSafe) .ReleaseFast else optimize,
     });
     translate_c.defineCMacroRaw("TB_IMPL");
-    translate_c.defineCMacro("TB_OPT_ATTR_W", "32"); // Enable 24-bit color support + styling (32-bit)
     const termbox2 = translate_c.addModule("termbox2");
     exe.root_module.addImport("termbox2", termbox2);
 
+    if (optimize == .ReleaseSafe) {
+        std.debug.print("warn: termbox2 module is being built in ReleaseFast due to a bug.\n", .{});
+    }
+
     b.installArtifact(exe);
 
     const run_cmd = b.addRunArtifact(exe);
@@ -106,266 +68,182 @@ pub fn build(b: *std.Build) !void {
     const run_step = b.step("run", "Run the app");
     run_step.dependOn(&run_cmd.step);
 
-    const installexe_step = b.step("installexe", "Install Ly and the selected init system service");
-    installexe_step.makeFn = Installer(true).make;
+    const installexe_step = b.step("installexe", "Install Ly");
+    installexe_step.makeFn = ExeInstaller(true).make;
     installexe_step.dependOn(b.getInstallStep());
 
-    const installnoconf_step = b.step("installnoconf", "Install Ly and the selected init system service, but not the configuration file");
-    installnoconf_step.makeFn = Installer(false).make;
+    const installnoconf_step = b.step("installnoconf", "Install Ly without its configuration file");
+    installnoconf_step.makeFn = ExeInstaller(false).make;
     installnoconf_step.dependOn(b.getInstallStep());
 
-    const uninstallexe_step = b.step("uninstallexe", "Uninstall Ly and remove the selected init system service");
-    uninstallexe_step.makeFn = Uninstaller(true).make;
+    const installsystemd_step = b.step("installsystemd", "Install the Ly systemd service");
+    installsystemd_step.makeFn = ServiceInstaller(.Systemd).make;
+    installsystemd_step.dependOn(installexe_step);
 
-    const uninstallnoconf_step = b.step("uninstallnoconf", "Uninstall Ly and remove the selected init system service, but keep the configuration directory");
-    uninstallnoconf_step.makeFn = Uninstaller(false).make;
+    const installopenrc_step = b.step("installopenrc", "Install the Ly openrc service");
+    installopenrc_step.makeFn = ServiceInstaller(.Openrc).make;
+    installopenrc_step.dependOn(installexe_step);
+
+    const installrunit_step = b.step("installrunit", "Install the Ly runit service");
+    installrunit_step.makeFn = ServiceInstaller(.Runit).make;
+    installrunit_step.dependOn(installexe_step);
+
+    const uninstallall_step = b.step("uninstallall", "Uninstall Ly and all services");
+    uninstallall_step.makeFn = uninstallall;
 }
 
-pub fn Installer(install_config: bool) type {
+pub fn ExeInstaller(install_conf: bool) type {
     return struct {
-        pub fn make(step: *std.Build.Step, _: std.Build.Step.MakeOptions) !void {
-            const allocator = step.owner.allocator;
-
-            var patch_map = PatchMap.init(allocator);
-            defer patch_map.deinit();
-
-            try patch_map.put("$DEFAULT_TTY", default_tty_str);
-            try patch_map.put("$CONFIG_DIRECTORY", config_directory);
-            try patch_map.put("$PREFIX_DIRECTORY", prefix_directory);
-            try patch_map.put("$EXECUTABLE_NAME", executable_name);
-
-            // The "-a" argument doesn't exist on FreeBSD, so we use "-p"
-            // instead to shutdown the system.
-            try patch_map.put("$PLATFORM_SHUTDOWN_ARG", if (init_system == .freebsd) "-p" else "-a");
-
-            try install_ly(allocator, patch_map, install_config);
-            try install_service(allocator, patch_map);
+        pub fn make(step: *std.Build.Step, progress: *std.Progress.Node) !void {
+            _ = progress;
+            try install_ly(step.owner.allocator, install_conf);
         }
     };
 }
 
-fn install_ly(allocator: std.mem.Allocator, patch_map: PatchMap, install_config: bool) !void {
-    const ly_config_directory = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/ly" });
+const InitSystem = enum {
+    Systemd,
+    Openrc,
+    Runit,
+};
+pub fn ServiceInstaller(comptime init_system: InitSystem) type {
+    return struct {
+        pub fn make(step: *std.Build.Step, progress: *std.Progress.Node) !void {
+            _ = progress;
+            const allocator = step.owner.allocator;
+            switch (init_system) {
+                .Openrc => {
+                    const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/init.d" });
+                    std.fs.cwd().makePath(service_path) catch {};
+                    var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
+                    defer service_dir.close();
 
-    std.fs.cwd().makePath(ly_config_directory) catch {
-        std.debug.print("warn: {s} already exists as a directory.\n", .{ly_config_directory});
+                    try std.fs.cwd().copyFile("res/ly-openrc", service_dir, exe_name, .{ .override_mode = 0o755 });
+                },
+                .Runit => {
+                    const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/sv/ly" });
+                    std.fs.cwd().makePath(service_path) catch {};
+                    var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
+                    defer service_dir.close();
+
+                    const supervise_path = try std.fs.path.join(allocator, &[_][]const u8{ service_path, "supervise" });
+
+                    try std.fs.cwd().copyFile("res/ly-runit-service/conf", service_dir, "conf", .{});
+                    try std.fs.cwd().copyFile("res/ly-runit-service/finish", service_dir, "finish", .{ .override_mode = 0o755 });
+                    try std.fs.cwd().copyFile("res/ly-runit-service/run", service_dir, "run", .{ .override_mode = 0o755 });
+                    try std.fs.cwd().symLink("/run/runit/supervise.ly", supervise_path, .{});
+                },
+                .Systemd => {
+                    const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/lib/systemd/system" });
+                    std.fs.cwd().makePath(service_path) catch {};
+                    var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
+                    defer service_dir.close();
+
+                    try std.fs.cwd().copyFile("res/ly.service", service_dir, "ly.service", .{ .override_mode = 0o644 });
+                },
+            }
+        }
+    };
+}
+
+fn install_ly(allocator: std.mem.Allocator, install_config: bool) !void {
+    std.fs.cwd().makePath(data_directory) catch {
+        std.debug.print("warn: {s} already exists as a directory.\n", .{data_directory});
     };
 
-    const ly_custom_sessions_directory = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/ly/custom-sessions" });
-
-    std.fs.cwd().makePath(ly_custom_sessions_directory) catch {
-        std.debug.print("warn: {s} already exists as a directory.\n", .{ly_custom_sessions_directory});
+    const lang_path = try std.fs.path.join(allocator, &[_][]const u8{ data_directory, "/lang" });
+    std.fs.cwd().makePath(lang_path) catch {
+        std.debug.print("warn: {s} already exists as a directory.\n", .{data_directory});
     };
 
-    const ly_lang_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/ly/lang" });
-    std.fs.cwd().makePath(ly_lang_path) catch {
-        std.debug.print("warn: {s} already exists as a directory.\n", .{ly_lang_path});
-    };
+    var current_dir = std.fs.cwd();
 
     {
-        const exe_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, prefix_directory, "/bin" });
-        std.fs.cwd().makePath(exe_path) catch {
-            if (!std.mem.eql(u8, dest_directory, "")) {
+        const exe_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/bin" });
+        if (!std.mem.eql(u8, dest_directory, "")) {
+            std.fs.cwd().makePath(exe_path) catch {
                 std.debug.print("warn: {s} already exists as a directory.\n", .{exe_path});
-            }
-        };
+            };
+        }
 
         var executable_dir = std.fs.cwd().openDir(exe_path, .{}) catch unreachable;
         defer executable_dir.close();
 
-        try installFile("zig-out/bin/ly", executable_dir, exe_path, executable_name, .{});
+        try current_dir.copyFile("zig-out/bin/ly", executable_dir, exe_name, .{});
     }
 
     {
-        var config_dir = std.fs.cwd().openDir(ly_config_directory, .{}) catch unreachable;
+        var config_dir = std.fs.cwd().openDir(data_directory, .{}) catch unreachable;
         defer config_dir.close();
 
         if (install_config) {
-            const patched_config = try patchFile(allocator, "res/config.ini", patch_map);
-            try installText(patched_config, config_dir, ly_config_directory, "config.ini", .{});
+            try current_dir.copyFile("res/config.ini", config_dir, "config.ini", .{});
         }
-
-        const patched_example_config = try patchFile(allocator, "res/config.ini", patch_map);
-        try installText(patched_example_config, config_dir, ly_config_directory, "config.ini.example", .{});
-
-        const patched_setup = try patchFile(allocator, "res/setup.sh", patch_map);
-        try installText(patched_setup, config_dir, ly_config_directory, "setup.sh", .{ .mode = 0o755 });
+        try current_dir.copyFile("res/xsetup.sh", config_dir, "xsetup.sh", .{});
+        try current_dir.copyFile("res/wsetup.sh", config_dir, "wsetup.sh", .{});
     }
 
     {
-        var custom_sessions_dir = std.fs.cwd().openDir(ly_custom_sessions_directory, .{}) catch unreachable;
-        defer custom_sessions_dir.close();
-
-        const patched_readme = try patchFile(allocator, "res/custom-sessions/README", patch_map);
-        try installText(patched_readme, custom_sessions_dir, ly_custom_sessions_directory, "README", .{});
-    }
-
-    {
-        var lang_dir = std.fs.cwd().openDir(ly_lang_path, .{}) catch unreachable;
+        var lang_dir = std.fs.cwd().openDir(lang_path, .{}) catch unreachable;
         defer lang_dir.close();
 
-        const languages = [_][]const u8{
-            "ar.ini",
-            "cat.ini",
-            "cs.ini",
-            "de.ini",
-            "en.ini",
-            "es.ini",
-            "fr.ini",
-            "it.ini",
-            "ja_JP.ini",
-            "lv.ini",
-            "pl.ini",
-            "pt.ini",
-            "pt_BR.ini",
-            "ro.ini",
-            "ru.ini",
-            "sr.ini",
-            "sv.ini",
-            "tr.ini",
-            "uk.ini",
-            "zh_CN.ini",
-        };
-
-        inline for (languages) |language| {
-            try installFile("res/lang/" ++ language, lang_dir, ly_lang_path, language, .{});
-        }
+        try current_dir.copyFile("res/lang/cat.ini", lang_dir, "cat.ini", .{});
+        try current_dir.copyFile("res/lang/cs.ini", lang_dir, "cs.ini", .{});
+        try current_dir.copyFile("res/lang/de.ini", lang_dir, "de.ini", .{});
+        try current_dir.copyFile("res/lang/en.ini", lang_dir, "en.ini", .{});
+        try current_dir.copyFile("res/lang/es.ini", lang_dir, "es.ini", .{});
+        try current_dir.copyFile("res/lang/fr.ini", lang_dir, "fr.ini", .{});
+        try current_dir.copyFile("res/lang/it.ini", lang_dir, "it.ini", .{});
+        try current_dir.copyFile("res/lang/pl.ini", lang_dir, "pl.ini", .{});
+        try current_dir.copyFile("res/lang/pt.ini", lang_dir, "pt.ini", .{});
+        try current_dir.copyFile("res/lang/pt_BR.ini", lang_dir, "pt_BR.ini", .{});
+        try current_dir.copyFile("res/lang/ro.ini", lang_dir, "ro.ini", .{});
+        try current_dir.copyFile("res/lang/ru.ini", lang_dir, "ru.ini", .{});
+        try current_dir.copyFile("res/lang/sr.ini", lang_dir, "sr.ini", .{});
+        try current_dir.copyFile("res/lang/sv.ini", lang_dir, "sv.ini", .{});
+        try current_dir.copyFile("res/lang/tr.ini", lang_dir, "tr.ini", .{});
+        try current_dir.copyFile("res/lang/uk.ini", lang_dir, "uk.ini", .{});
     }
 
     {
-        const pam_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/pam.d" });
-        std.fs.cwd().makePath(pam_path) catch {
-            if (!std.mem.eql(u8, dest_directory, "")) {
+        const pam_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/pam.d" });
+        if (!std.mem.eql(u8, dest_directory, "")) {
+            std.fs.cwd().makePath(pam_path) catch {
                 std.debug.print("warn: {s} already exists as a directory.\n", .{pam_path});
-            }
-        };
+            };
+        }
 
         var pam_dir = std.fs.cwd().openDir(pam_path, .{}) catch unreachable;
         defer pam_dir.close();
 
-        try installFile(if (init_system == .freebsd) "res/pam.d/ly-freebsd" else "res/pam.d/ly-linux", pam_dir, pam_path, "ly", .{ .override_mode = 0o644 });
+        try current_dir.copyFile("res/pam.d/ly", pam_dir, "ly", .{ .override_mode = 0o644 });
     }
 }
 
-fn install_service(allocator: std.mem.Allocator, patch_map: PatchMap) !void {
-    switch (init_system) {
-        .systemd => {
-            const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, prefix_directory, "/lib/systemd/system" });
-            std.fs.cwd().makePath(service_path) catch {};
-            var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
-            defer service_dir.close();
+pub fn uninstallall(step: *std.Build.Step, progress: *std.Progress.Node) !void {
+    _ = progress;
+    try std.fs.cwd().deleteTree(data_directory);
+    const allocator = step.owner.allocator;
 
-            const patched_service = try patchFile(allocator, "res/ly.service", patch_map);
-            try installText(patched_service, service_dir, service_path, "ly.service", .{ .mode = 0o644 });
-        },
-        .openrc => {
-            const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/init.d" });
-            std.fs.cwd().makePath(service_path) catch {};
-            var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
-            defer service_dir.close();
+    const exe_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/bin/", exe_name });
+    try std.fs.cwd().deleteFile(exe_path);
 
-            const patched_service = try patchFile(allocator, "res/ly-openrc", patch_map);
-            try installText(patched_service, service_dir, service_path, executable_name, .{ .mode = 0o755 });
-        },
-        .runit => {
-            const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/sv/ly" });
-            std.fs.cwd().makePath(service_path) catch {};
-            var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
-            defer service_dir.close();
+    const pam_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/pam.d/ly" });
+    try std.fs.cwd().deleteFile(pam_path);
 
-            const supervise_path = try std.fs.path.join(allocator, &[_][]const u8{ service_path, "supervise" });
+    const systemd_service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/lib/systemd/system/ly.service" });
+    std.fs.cwd().deleteFile(systemd_service_path) catch {
+        std.debug.print("warn: systemd service not found.\n", .{});
+    };
 
-            const patched_conf = try patchFile(allocator, "res/ly-runit-service/conf", patch_map);
-            try installText(patched_conf, service_dir, service_path, "conf", .{});
+    const openrc_service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/init.d/ly" });
+    std.fs.cwd().deleteFile(openrc_service_path) catch {
+        std.debug.print("warn: openrc service not found.\n", .{});
+    };
 
-            try installFile("res/ly-runit-service/finish", service_dir, service_path, "finish", .{ .override_mode = 0o755 });
-
-            const patched_run = try patchFile(allocator, "res/ly-runit-service/run", patch_map);
-            try installText(patched_run, service_dir, service_path, "run", .{ .mode = 0o755 });
-
-            try std.fs.cwd().symLink("/run/runit/supervise.ly", supervise_path, .{});
-            std.debug.print("info: installed symlink /run/runit/supervise.ly\n", .{});
-        },
-        .s6 => {
-            const admin_service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/s6/adminsv/default/contents.d" });
-            std.fs.cwd().makePath(admin_service_path) catch {};
-            var admin_service_dir = std.fs.cwd().openDir(admin_service_path, .{}) catch unreachable;
-            defer admin_service_dir.close();
-
-            const file = try admin_service_dir.createFile("ly-srv", .{});
-            file.close();
-
-            const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/s6/sv/ly-srv" });
-            std.fs.cwd().makePath(service_path) catch {};
-            var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
-            defer service_dir.close();
-
-            const patched_run = try patchFile(allocator, "res/ly-s6/run", patch_map);
-            try installText(patched_run, service_dir, service_path, "run", .{ .mode = 0o755 });
-
-            try installFile("res/ly-s6/type", service_dir, service_path, "type", .{});
-        },
-        .dinit => {
-            const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/dinit.d" });
-            std.fs.cwd().makePath(service_path) catch {};
-            var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
-            defer service_dir.close();
-
-            const patched_service = try patchFile(allocator, "res/ly-dinit", patch_map);
-            try installText(patched_service, service_dir, service_path, "ly", .{});
-        },
-        .sysvinit => {
-            const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, config_directory, "/init.d" });
-            std.fs.cwd().makePath(service_path) catch {};
-            var service_dir = std.fs.cwd().openDir(service_path, .{}) catch unreachable;
-            defer service_dir.close();
-
-            const patched_service = try patchFile(allocator, "res/ly-sysvinit", patch_map);
-            try installText(patched_service, service_dir, service_path, "ly", .{ .mode = 0o755 });
-        },
-        .freebsd => {
-            const exe_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, prefix_directory, "/bin" });
-            var executable_dir = std.fs.cwd().openDir(exe_path, .{}) catch unreachable;
-            defer executable_dir.close();
-
-            const patched_wrapper = try patchFile(allocator, "res/ly-freebsd-wrapper", patch_map);
-            try installText(patched_wrapper, executable_dir, exe_path, "ly_wrapper", .{ .mode = 0o755 });
-        },
-    }
-}
-
-pub fn Uninstaller(uninstall_config: bool) type {
-    return struct {
-        pub fn make(step: *std.Build.Step, _: std.Build.Step.MakeOptions) !void {
-            const allocator = step.owner.allocator;
-
-            if (uninstall_config) {
-                try deleteTree(allocator, config_directory, "/ly", "ly config directory not found");
-            }
-
-            const exe_path = try std.fs.path.join(allocator, &[_][]const u8{ prefix_directory, "/bin/", executable_name });
-            var success = true;
-            std.fs.cwd().deleteFile(exe_path) catch {
-                std.debug.print("warn: ly executable not found\n", .{});
-                success = false;
-            };
-            if (success) std.debug.print("info: deleted {s}\n", .{exe_path});
-
-            try deleteFile(allocator, config_directory, "/pam.d/ly", "ly pam file not found");
-
-            switch (init_system) {
-                .systemd => try deleteFile(allocator, prefix_directory, "/lib/systemd/system/ly.service", "systemd service not found"),
-                .openrc => try deleteFile(allocator, config_directory, "/init.d/ly", "openrc service not found"),
-                .runit => try deleteTree(allocator, config_directory, "/sv/ly", "runit service not found"),
-                .s6 => {
-                    try deleteTree(allocator, config_directory, "/s6/sv/ly-srv", "s6 service not found");
-                    try deleteFile(allocator, config_directory, "/s6/adminsv/default/contents.d/ly-srv", "s6 admin service not found");
-                },
-                .dinit => try deleteFile(allocator, config_directory, "/dinit.d/ly", "dinit service not found"),
-                .sysvinit => try deleteFile(allocator, config_directory, "/init.d/ly", "sysvinit service not found"),
-                .freebsd => try deleteFile(allocator, prefix_directory, "/bin/ly_wrapper", "freebsd wrapper not found"),
-            }
-        }
+    const runit_service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/sv/ly" });
+    std.fs.cwd().deleteTree(runit_service_path) catch {
+        std.debug.print("warn: runit service not found.\n", .{});
     };
 }
 
@@ -404,7 +282,7 @@ fn getVersionStr(b: *std.Build, name: []const u8, version: std.SemanticVersion)
 
             const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
             if (version.order(ancestor_ver) != .gt) {
-                std.debug.print("{s} version '{f}' must be greater than tagged ancestor '{f}'\n", .{ name, version, ancestor_ver });
+                std.debug.print("{s} version '{}' must be greater than tagged ancestor '{}'\n", .{ name, version, ancestor_ver });
                 std.process.exit(1);
             }
 
@@ -423,95 +301,3 @@ fn getVersionStr(b: *std.Build, name: []const u8, version: std.SemanticVersion)
         },
     }
 }
-
-fn installFile(
-    source_file: []const u8,
-    destination_directory: std.fs.Dir,
-    destination_directory_path: []const u8,
-    destination_file: []const u8,
-    options: std.fs.Dir.CopyFileOptions,
-) !void {
-    try std.fs.cwd().copyFile(source_file, destination_directory, destination_file, options);
-    std.debug.print("info: installed {s}/{s}\n", .{ destination_directory_path, destination_file });
-}
-
-fn patchFile(allocator: std.mem.Allocator, source_file: []const u8, patch_map: PatchMap) ![]const u8 {
-    var file = try std.fs.cwd().openFile(source_file, .{});
-    defer file.close();
-
-    const stat = try file.stat();
-
-    var buffer: [4096]u8 = undefined;
-    var reader = file.reader(&buffer);
-    var text = try reader.interface.readAlloc(allocator, stat.size);
-
-    var iterator = patch_map.iterator();
-    while (iterator.next()) |kv| {
-        const new_text = try std.mem.replaceOwned(u8, allocator, text, kv.key_ptr.*, kv.value_ptr.*);
-        allocator.free(text);
-        text = new_text;
-    }
-
-    return text;
-}
-
-fn installText(
-    text: []const u8,
-    destination_directory: std.fs.Dir,
-    destination_directory_path: []const u8,
-    destination_file: []const u8,
-    options: std.fs.File.CreateFlags,
-) !void {
-    var file = try destination_directory.createFile(destination_file, options);
-    defer file.close();
-
-    var buffer: [1024]u8 = undefined;
-    var writer = file.writer(&buffer);
-    try writer.interface.writeAll(text);
-    try writer.interface.flush();
-
-    std.debug.print("info: installed {s}/{s}\n", .{ destination_directory_path, destination_file });
-}
-
-fn deleteFile(
-    allocator: std.mem.Allocator,
-    prefix: []const u8,
-    file: []const u8,
-    warning: []const u8,
-) !void {
-    const path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, prefix, file });
-
-    std.fs.cwd().deleteFile(path) catch |err| {
-        if (err == error.FileNotFound) {
-            std.debug.print("warn: {s}\n", .{warning});
-            return;
-        }
-
-        return err;
-    };
-
-    std.debug.print("info: deleted {s}\n", .{path});
-}
-
-fn deleteTree(
-    allocator: std.mem.Allocator,
-    prefix: []const u8,
-    directory: []const u8,
-    warning: []const u8,
-) !void {
-    const path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, prefix, directory });
-
-    var dir = std.fs.cwd().openDir(path, .{}) catch |err| {
-        if (err == error.FileNotFound) {
-            std.debug.print("warn: {s}\n", .{warning});
-            return;
-        }
-
-        return err;
-    };
-    dir.close();
-
-    try std.fs.cwd().deleteTree(path);
-
-    std.debug.print("info: deleted {s}\n", .{path});
-}

build.zig.zon

@@ -1,20 +1,15 @@
 .{
-    .name = .ly,
-    .version = "1.2.0",
-    .fingerprint = 0xa148ffcc5dc2cb59,
-    .minimum_zig_version = "0.15.0",
+    .name = "ly",
+    .version = "1.0.0",
+    .minimum_zig_version = "0.12.0",
     .dependencies = .{
         .clap = .{
-            .url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.11.0.tar.gz",
-            .hash = "clap-0.11.0-oBajB-HnAQDPCKYzwF7rO3qDFwRcD39Q0DALlTSz5H7e",
+            .url = "https://github.com/Hejsil/zig-clap/archive/8c98e6404b22aafc0184e999d8f068b81cc22fa1.tar.gz",
+            .hash = "122014e73fd712190e109950837b97f6143f02d7e2b6986e1db70b6f4aadb5ba6a0d",
         },
         .zigini = .{
-            .url = "https://github.com/AnErrupTion/zigini/archive/96ca1d9f1a7ec741f07ceb104dae2b3a7bdfd48a.tar.gz",
-            .hash = "zigini-0.3.2-BSkB7WJJAADybd5DGd9MLCp6ikGGUq9wicxsjv0HF1Qc",
-        },
-        .termbox2 = .{
-            .url = "git+https://github.com/AnErrupTion/termbox2?ref=master#290ac6b8225aacfd16851224682b851b65fcb918",
-            .hash = "N-V-__8AAGcUBQAa5vov1Yi_9AXEffFQ1e2KsXaK4dgygRKq",
+            .url = "https://github.com/Kawaii-Ash/zigini/archive/0bba97a12582928e097f4074cc746c43351ba4c8.tar.gz",
+            .hash = "12209b971367b4066d40ecad4728e6fdffc4cc4f19356d424c2de57f5b69ac7a619a",
         },
     },
     .paths = .{""},

changelog.md

@@ -0,0 +1,52 @@
+# Zig Rewrite (Version 1.0.0)
+
+## Config Options
+
+res/config.ini contains all of the available config options and their default values.
+
+### Additions
+
++ `border_fg` has been introduced to change the color of the borders.
++ `term_restore_cursor_cmd` should restore the cursor to it's usual state.
++ `vi_mode` to enable vi keybindings.
++ `sleep_key` and `sleep_cmd`.
++ `numlock` to set numlock on startup.
++ `initial_info_text` allows changing the initial text on the info line.
++ `box_title` to display a title at the top of the main box
+
+Note: `sleep_cmd` is unset by default, meaning it's hidden and has no effect. 
+
+### Changes
+
++ xinitrc can be set to null to hide it.
++ `blank_password` has been renamed to `clear_password`.
++ `save_file` has been deprecated and will be removed in a future version.
+
+### Removals
+
++ `wayland_specifier` has been removed.
+
+## Save File
+
+The save file is now in .ini format and stored in the same directory as the config.
+Older save files will be migrated to the new format.
+
+Example:
+
+```ini
+user = ash
+session_index = 0
+```
+
+## Misc
+
++ Display server name added next to selected session.
++ getty@tty2 has been added as a conflict in res/ly.service, so if it is running, ly should still be able to start.
++ `XDG_CURRENT_DESKTOP` is now set by ly.
++ LANG is no longer set by ly.
++ X Server PID is fetched from /tmp/X{d}.lock to be able to kill the process since it detaches.
++ Non .desktop files are now ignored in sessions directory.
++ PAM auth is now done in a child process. (Fixes some issues with logging out and back in).
++ When ly receives SIGTERM, the terminal is now cleared and existing child processes are cleaned up.
++ Shift+Tab now focuses previous input.
++ Display text in the info line when authenticating.

readme.md

@@ -1,286 +1,207 @@
-# The Ly display manager
 
-![Ly screenshot](.github/screenshot.png "Ly screenshot")
+# Ly - a TUI display manager
+![Ly screenshot](https://user-images.githubusercontent.com/5473047/88958888-65efbf80-d2a1-11ea-8ae5-3f263bce9cce.png "Ly screenshot")
 
-Ly is a lightweight TUI (ncurses-like) display manager for Linux and BSD,
-designed with portability in mind (e.g. it does not require systemd to run).
-
-Join us on Matrix over at [#ly:envs.net](https://matrix.to/#/#ly:envs.net)!
-
-**Note**: Development happens on [Codeberg](https://codeberg.org/fairyglade/ly)
-with a mirror on [GitHub](https://github.com/fairyglade/ly).
+Ly is a lightweight TUI (ncurses-like) display manager for Linux and BSD.
 
 ## Dependencies
-
 - Compile-time:
-  - zig 0.15.x
-  - libc
+  - zig 0.12.0
+  - a C standard library
   - pam
-  - xcb (optional, required by default; needed for X11 support)
+  - xcb
 - Runtime (with default config):
   - xorg
   - xorg-xauth
+  - mcookie
+  - tput
   - shutdown
-  - brightnessctl
 
 ### Debian
-
 ```
-# apt install build-essential libpam0g-dev libxcb-xkb-dev xauth xserver-xorg brightnessctl
+# apt install build-essential libpam0g-dev libxcb-xkb-dev
 ```
 
 ### Fedora
-
 **Warning**: You may encounter issues with SELinux on Fedora.
 It is recommended to add a rule for Ly as it currently does not ship one.
 
 ```
-# dnf install kernel-devel pam-devel libxcb-devel zig xorg-x11-xauth xorg-x11-server brightnessctl
+# dnf install kernel-devel pam-devel libxcb-devel
 ```
 
-### FreeBSD
-
-```
-# pkg install ca_root_nss libxcb git xorg xauth
-```
-
-## Packaging status
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/ly.svg?exclude_unsupported=1)](https://repology.org/project/ly/versions)
-
 ## Support
+The following desktop environments were tested with success:
+ - awesome
+ - bspwm
+ - budgie
+ - cinnamon
+ - deepin
+ - dwl
+ - dwm
+ - enlightenment
+ - gnome
+ - i3
+ - kde
+ - labwc
+ - lxde
+ - lxqt
+ - mate
+ - maxx
+ - pantheon
+ - qtile
+ - spectrwm
+ - sway
+ - windowmaker
+ - xfce
+ - xmonad
 
-Ly has been tested with a wide variety of desktop environments and window
-managers, all of which you can find in the sections below:
+Ly should work with any X desktop environment, and provides
+basic wayland support (sway works very well, for example).
 
-[Wayland environments](#supported-wayland-environments)
-
-[X11 environments](#supported-x11-environments)
-
-## Manually building
-
-The procedure for manually building Ly is pretty standard:
+## systemd?
+Unlike what you may have heard, Ly does not require `systemd`,
+and was even specifically designed not to depend on `logind`.
+You should be able to make it work easily with a better init,
+changing the source code won't be necessary :)
 
+## Cloning and Compiling
+Clone the repository
+```
+$ git clone https://github.com/fairyglade/ly
+```
+
+Change the directory to ly
 ```
-$ git clone https://codeberg.org/fairyglade/ly.git
 $ cd ly
+```
+
+Compile
+```
 $ zig build
 ```
 
-After building, you can (optionally) test Ly in a terminal emulator, although
-authentication will **not** work:
-
+Test in the configured tty (tty2 by default)
+or a terminal emulator (but desktop environments won't start)
 ```
-$ zig build run
+# zig build run
 ```
 
-**Important**: While you can also run Ly in a terminal emulator as root, it is
-**not** recommended either. If you want to properly test Ly, please enable its
-service (as described below) and reboot your machine.
-
-The following sections show how to install Ly for a particular init system.
-Because the procedure is very similar for all of them, the commands will only
-be detailed for the first section (which is about systemd).
-
-**Note**: All following sections will assume you are using LightDM for
-convenience sake.
-
-### systemd
-
-Now, you can install Ly on your system:
-
+Install Ly and the provided systemd service file
 ```
-# zig build installexe -Dinit_system=systemd
+# zig build installsystemd
 ```
 
-**Note**: The `init_system` parameter is optional and defaults to `systemd`.
-
-Note that you also need to disable your current display manager. For example,
-if LightDM is the current display manager, you can execute the following
-command:
-
-```
-# systemctl disable lightdm.service
-```
-
-Then, similarly to the previous command, you need to enable the Ly service:
-
+Enable the service
 ```
 # systemctl enable ly.service
 ```
 
-**Important**: Because Ly runs in a TTY, you **must** disable the TTY service
-that Ly will run on, otherwise bad things will happen. For example, to disable `getty` spawning on TTY 2 (the default TTY on which Ly spawns), you need to
-execute the following command:
-
+If you need to switch between ttys after Ly's start you also have to
+disable getty on Ly's tty to prevent "login" from spawning on top of it
 ```
 # systemctl disable getty@tty2.service
 ```
 
-You can change the TTY Ly will run on by editing the `tty` option in the
-configuration file **and** change which TTY is used in the corresponding
-service file..
-
 ### OpenRC
+**NOTE**: On Gentoo, Ly will disable the `display-manager-init` service in order to run.
 
+Clone, compile and test.
+
+Install Ly and the provided OpenRC service
+```
+# zig build installopenrc
+```
+
+Enable the service
 ```
-# zig build installexe -Dinit_system=openrc
-# rc-update del lightdm
 # rc-update add ly
+```
+
+You can edit which tty Ly will start on by editing the `tty` option in the configuration file.
+
+If you choose a tty that already has a login/getty running (has a basic login prompt),
+then you have to disable getty, so it doesn't respawn on top of ly
+```
 # rc-update del agetty.tty2
 ```
 
-**Note**: On Gentoo specifically, you also **must** comment out the appropriate
-line for the TTY in /etc/inittab.
-
 ### runit
+```
+# zig build installrunit
+# ln -s /etc/sv/ly /var/service/
+```
+
+By default, ly will run on tty2. To change the tty it must be set in `/etc/ly/config.ini`
+
+You should as well disable your existing display manager service if needed, e.g.:
+
+```
+# rm /var/service/lxdm
+```
+
+The agetty service for the tty console where you are running ly should be disabled.
+For instance, if you are running ly on tty2 (that's the default, check your `/etc/ly/config.ini`)
+you should disable the agetty-tty2 service like this:
 
 ```
-# zig build installexe -Dinit_system=runit
-# rm /var/service/lightdm
-# ln -s /etc/sv/ly /var/service/
 # rm /var/service/agetty-tty2
 ```
 
-### s6
-
-```
-# zig build installexe -Dinit_system=s6
-# s6-rc -d change lightdm
-# s6-service add default ly-srv
-# s6-db-reload
-# s6-rc -u change ly-srv
-```
-
-To disable TTY 2, edit `/etc/s6/config/tty2.conf` and set `SPAWN="no"`.
-
-### dinit
-
-```
-# zig build installexe -Dinit_system=dinit
-# dinitctl disable lightdm
-# dinitctl enable ly
-```
-
-To disable TTY 2, go to `/etc/dinit.d/config/console.conf` and modify
-`ACTIVE_CONSOLES`.
-
-### sysvinit
-
-```
-# zig build installexe -Dinit_system=sysvinit
-# update-rc.d lightdm disable
-# update-rc.d ly defaults
-```
-
-To disable TTY 2, go to `/etc/inittab` and comment out the line containing `tty2`.
-
-### FreeBSD
-
-```
-# zig build installexe -Dprefix_directory=/usr/local -Dconfig_directory=/usr/local/etc -Dinit_system=freebsd
-# sysrc lightdm_enable="NO"
-```
-
-To enable Ly, add the following entry to `/etc/gettytab`:
-
-```
-Ly:\
-	:lo=/usr/local/bin/ly_wrapper:\
-	:al=root:
-```
-
-Then, modify the command field of the `ttyv1` terminal entry in `/etc/ttys`
-(TTYs in FreeBSD start at 0):
-
-```
-ttyv1 "/usr/libexec/getty Ly" xterm on secure
-```
-
 ### Updating
-
-You can also install Ly without overrding the current configuration file. This
-is called **updating**. To update, simply run:
+You can also install Ly without copying the system service and the configuration file. That's
+called *updating*. To update, simply run:
 
 ```
 # zig build installnoconf
 ```
 
-You can, of course, still select the init system of your choice when using this
-command.
+If you want to also copy the default config file (but still not the system service), run:
+
+```
+# zig build installexe
+```
+
+## Arch Linux Installation
+You can install ly from the [`[extra]` repos](https://archlinux.org/packages/extra/x86_64/ly/):
+```
+$ sudo pacman -S ly
+```
 
 ## Configuration
-
-You can find all the configuration in `/etc/ly/config.ini`. The file is fully
-commented, and includes the default values.
+You can find all the configuration in `/etc/ly/config.ini`.
+The file is commented, and includes the default values.
 
 ## Controls
+Use the up and down arrow keys to change the current field, and the
+left and right arrow keys to change the target desktop environment
+while on the desktop field (above the login field).
 
-Use the Up/Down arrow keys to change the current field, and the Left/Right
-arrow keys to scroll through the different fields (whether it be the info line,
-the desktop environment, or the username). The info line is where messages and
-errors are displayed.
+## .xinitrc
+If your .xinitrc doesn't work make sure it is executable and includes a shebang.
+This file is supposed to be a shell script! Quoting from xinit's man page:
 
-## A note on .xinitrc
-
-If your `.xinitrc` file doesn't work ,make sure it is executable and includes a
-shebang. This file is supposed to be a shell script! Quoting from `xinit`'s man
-page:
-
-> If no specific client program is given on the command line, xinit will look
-> for a file in the user's home directory called .xinitrc to run as a shell
-> script to start up client programs.
-
-A typical shebang for a shell script looks like this:
+> If no specific client program is given on the command line, xinit will look for a file in the user's home directory called .xinitrc to run as a shell script to start up client programs.
 
+On Arch Linux, the example .xinitrc (/etc/X11/xinit/xinitrc) starts like this:
 ```
 #!/bin/sh
 ```
 
 ## Tips
+The numlock and capslock state is printed in the top-right corner.
+Use the F1 and F2 keys to respectively shutdown and reboot.
+Take a look at your .xsession if X doesn't start, as it can interfere
+(this file is launched with X to configure the display properly).
 
-- The numlock and capslock state is printed in the top-right corner.
-- Use the F1 and F2 keys to respectively shutdown and reboot.
-- Take a look at your `.xsession` file if X doesn't start, as it can interfere
-  (this file is launched with X to configure the display properly).
+## PSX DOOM fire animation
+To enable the famous PSX DOOM fire described by [Fabien Sanglard](http://fabiensanglard.net/doom_fire_psx/index.html),
+just set `animation = doom` in `/etc/ly/config.ini`. You may also
+disable the main box borders with `hide_borders = true`.
 
-## Supported Wayland environments
+## Additional Information
+The name "Ly" is a tribute to the fairy from the game Rayman.
+Ly was tested by oxodao, who is some seriously awesome dude.
 
-- budgie
-- cosmic
-- deepin
-- enlightenment
-- gnome
-- hyprland
-- kde
-- labwc
-- niri
-- pantheon
-- sway
-- weston
-
-## Supported X11 environments
-
-- awesome
-- bspwm
-- budgie
-- cinnamon
-- dwm
-- enlightenment
-- gnome
-- kde
-- leftwm
-- lxde
-- mate
-- maxx
-- pantheon
-- qwm
-- spectrwm
-- windowmaker
-- xfce
-- xmonad
-
-## A final note
-
-The name "Ly" is a tribute to the fairy from the game Rayman. Ly was tested by
-oxodao, who is some seriously awesome dude.
+## Gentoo (OpenRC) installation tip
+To avoid a console spawning on top on Ly, comment out the appropriate line from /etc/inittab (default is 2).

res/config.ini

@@ -1,234 +1,126 @@
-# Ly supports 24-bit true color with styling, which means each color is a 32-bit value.
-# The format is 0xSSRRGGBB, where SS is the styling, RR is red, GG is green, and BB is blue.
-# Here are the possible styling options:
-# TB_BOLD      0x01000000
-# TB_UNDERLINE 0x02000000
-# TB_REVERSE   0x04000000
-# TB_ITALIC    0x08000000
-# TB_BLINK     0x10000000
-# TB_HI_BLACK  0x20000000
-# TB_BRIGHT    0x40000000
-# TB_DIM       0x80000000
-# Programmatically, you'd apply them using the bitwise OR operator (|), but because Ly's
-# configuration doesn't support using it, you have to manually compute the color value.
-# Note that, if you want to use the default color value of the terminal, you can use the
-# special value 0x00000000. This means that, if you want to use black, you *must* use
-# the styling option TB_HI_BLACK (the RGB values are ignored when using this option).
-
-# Allow empty password or not when authenticating
-allow_empty_password = true
-
 # The active animation
-# none     -> Nothing
-# doom     -> PSX DOOM fire
-# matrix   -> CMatrix
-# colormix -> Color mixing shader
-# gameoflife -> John Conway's Game of Life
+# none   -> Nothing (default)
+# doom   -> PSX DOOM fire
+# matrix -> CMatrix
 animation = none
 
-# Stop the animation after some time
-# 0 -> Run forever
-# 1..2e12 -> Stop the animation after this many seconds
-animation_timeout_sec = 0
+# Format string for clock in top right corner (see strftime specification). Example: %c
+clock = null
+
+# Enable/disable big clock
+bigclock = false
 
 # The character used to mask the password
-# You can either type it directly as a UTF-8 character (like *), or use a UTF-32
-# codepoint (for example 0x2022 for a bullet point)
-# If null, the password will be hidden
-# Note: you can use a # by escaping it like so: \#
 asterisk = *
 
-# The number of failed authentications before a special animation is played... ;)
-auth_fails = 10
+# Erase password input on failure
+clear_password = false
 
-# Identifier for battery whose charge to display at top left
-# Primary battery is usually BAT0 or BAT1
-# If set to null, battery status won't be shown
-battery_id = null
+# Enable vi keybindings
+vi_mode = false
+
+# The `fg` and `bg` color settings take a digit 0-8 corresponding to:
+#define TB_DEFAULT 0x00
+#define TB_BLACK   0x01
+#define TB_RED     0x02
+#define TB_GREEN   0x03
+#define TB_YELLOW  0x04
+#define TB_BLUE    0x05
+#define TB_MAGENTA 0x06
+#define TB_CYAN    0x07
+#define TB_WHITE   0x08
+#
+# Setting both to zero makes `bg` black and `fg` white. To set the actual color palette you are encouraged to use another tool
+# such as [mkinitcpio-colors](https://github.com/evanpurkhiser/mkinitcpio-colors). Note that the color palette defined with
+# `mkinitcpio-colors` takes 16 colors (0-15), only values 0-8 are valid for `ly` config and these values do not correspond
+# exactly. For instance, in defining palettes with `mkinitcpio-colors` the order is black, dark red, dark green, brown, dark
+# blue, dark purple, dark cyan, light gray, dark gray, bright red, bright green, yellow, bright blue, bright purple, bright
+# cyan, and white, indexed in that order 0 through 15. For example, the color defined for white (indexed at 15 in the mkinitcpio
+# config) will be used by `ly` for `fg = 8`.
 
 # Background color id
-bg = 0x00000000
+bg = 0
 
-# Change the state and language of the big clock
-# none -> Disabled (default)
-# en   -> English
-# fa   -> Farsi
-bigclock = none
+# Foreground color id
+fg = 8
 
-# Set bigclock to 12-hour notation.
-bigclock_12hr = false
+# Border color
+border_fg = 8
 
-# Set bigclock to show the seconds.
-bigclock_seconds = false
+# Title to show at the top of the main box
+box_title = null
+
+# Initial text to show on the info line (Defaults to hostname)
+initial_info_text = null
 
 # Blank main box background
 # Setting to false will make it transparent
 blank_box = true
 
-# Border foreground color id
-border_fg = 0x00FFFFFF
-
-# Title to show at the top of the main box
-# If set to null, none will be shown
-box_title = null
-
-# Brightness decrease command
-brightness_down_cmd = $PREFIX_DIRECTORY/bin/brightnessctl -q -n s 10%-
-
-# Brightness decrease key, or null to disable
-brightness_down_key = F5
-
-# Brightness increase command
-brightness_up_cmd = $PREFIX_DIRECTORY/bin/brightnessctl -q -n s +10%
-
-# Brightness increase key, or null to disable
-brightness_up_key = F6
-
-# Erase password input on failure
-clear_password = false
-
-# Format string for clock in top right corner (see strftime specification). Example: %c
-# If null, the clock won't be shown
-clock = null
-
-# CMatrix animation foreground color id
-cmatrix_fg = 0x0000FF00
-
-# CMatrix animation character string head color id
-cmatrix_head_col = 0x01FFFFFF
-
-# CMatrix animation minimum codepoint. It uses a 16-bit integer
-# For Japanese characters for example, you can use 0x3000 here
-cmatrix_min_codepoint = 0x21
-
-# CMatrix animation maximum codepoint. It uses a 16-bit integer
-# For Japanese characters for example, you can use 0x30FF here
-cmatrix_max_codepoint = 0x7B
-
-# Color mixing animation first color id
-colormix_col1 = 0x00FF0000
-
-# Color mixing animation second color id
-colormix_col2 = 0x000000FF
-
-# Color mixing animation third color id
-colormix_col3 = 0x20000000
-
-# Custom sessions directory
-# You can specify multiple directories,
-# e.g. $CONFIG_DIRECTORY/ly/custom-sessions:$PREFIX_DIRECTORY/share/custom-sessions
-custom_sessions = $CONFIG_DIRECTORY/ly/custom-sessions
-
-# Input box active by default on startup
-# Available inputs: info_line, session, login, password
-default_input = login
-
-# DOOM animation fire height (1 thru 9)
-doom_fire_height = 6
-
-# DOOM animation fire spread (0 thru 4)
-doom_fire_spread = 2
-
-# DOOM animation custom top color (low intensity flames)
-doom_top_color = 0x009F2707
-
-# DOOM animation custom middle color (medium intensity flames)
-doom_middle_color = 0x00C78F17
-
-# DOOM animation custom bottom color (high intensity flames)
-doom_bottom_color = 0x00FFFFFF
-
-# Error background color id
-error_bg = 0x00000000
-
-# Error foreground color id
-# Default is red and bold
-error_fg = 0x01FF0000
-
-# Foreground color id
-fg = 0x00FFFFFF
-
-# Render true colors (if supported)
-# If false, output will be in eight-color mode
-# All eight-color mode color codes:
-# TB_DEFAULT              0x0000
-# TB_BLACK                0x0001
-# TB_RED                  0x0002
-# TB_GREEN                0x0003
-# TB_YELLOW               0x0004
-# TB_BLUE                 0x0005
-# TB_MAGENTA              0x0006
-# TB_CYAN                 0x0007
-# TB_WHITE                0x0008
-# If full color is off, the styling options still work. The colors are
-# always 32-bit values with the styling in the most significant byte.
-full_color = true
-
-# Game of Life entropy interval (0 = disabled, >0 = add entropy every N generations)
-# 0 -> Pure Conway's Game of Life (will eventually stabilize)
-# 10 -> Add entropy every 10 generations (recommended for continuous activity)
-# 50+ -> Less frequent entropy for more natural evolution
-gameoflife_entropy_interval = 10
-
-# Game of Life animation foreground color id
-gameoflife_fg = 0x0000FF00
-
-# Game of Life frame delay (lower = faster animation, higher = slower)
-# 1-3 -> Very fast animation
-# 6 -> Default smooth animation speed
-# 10+ -> Slower, more contemplative speed
-gameoflife_frame_delay = 6
-
-# Game of Life initial cell density (0.0 to 1.0)
-# 0.1 -> Sparse, minimal activity
-# 0.4 -> Balanced activity (recommended)
-# 0.7+ -> Dense, chaotic patterns
-gameoflife_initial_density = 0.4
-
 # Remove main box borders
 hide_borders = false
 
-# Remove power management command hints
-hide_key_hints = false
-
-# Remove version number from the top left corner
-hide_version_string = false
-
-# Initial text to show on the info line
-# If set to null, the info line defaults to the hostname
-initial_info_text = null
+# Main box margins
+margin_box_h = 2
+margin_box_v = 1
 
 # Input boxes length
 input_len = 34
 
+# Max input sizes
+max_desktop_len = 100
+max_login_len = 255
+max_password_len = 255
+
+# Input box active by default on startup
+# Available inputs: session, login, password
+default_input = login
+
+# Load the saved desktop and username
+load = true
+
+# Save the current desktop and login as defaults
+save = true
+
+# Deprecated - Will be removed in a future version
+# New save files are now loaded from the same directory as the config
+# Currently used to migrate old save files to the new version
+# File in which to save and load the default desktop and login
+save_file = /etc/ly/save
+
+# Remove power management command hints
+hide_key_hints = false
+
+# Specifies the key used for shutdown (F1-F12)
+shutdown_key = F1
+
+# Specifies the key used for restart (F1-F12)
+restart_key = F2
+
+# Specifies the key used for sleep (F1-F12)
+sleep_key = F3
+
+# Command executed when pressing shutdown_key
+shutdown_cmd = /sbin/shutdown -a now
+
+# Command executed when pressing restart_key
+restart_cmd = /sbin/shutdown -r now
+
+# Command executed when pressing sleep key (can be null)
+sleep_cmd = null
+
 # Active language
-# Available languages are found in $CONFIG_DIRECTORY/ly/lang/
+# Available languages are found in /etc/ly/lang/
 lang = en
 
-# Command executed when logging in
-# If null, no command will be executed
-# Important: the code itself must end with `exec "$@"` in order to launch the session!
-# You can also set environment variables in there, they'll persist until logout
-login_cmd = null
+# TTY in use
+tty = 2
 
-# Path for login.defs file (used for listing all local users on the system on
-# Linux)
-login_defs_path = /etc/login.defs
+# Console path
+console_dev = /dev/console
 
-# Command executed when logging out
-# If null, no command will be executed
-# Important: the session will already be terminated when this command is executed, so
-# no need to add `exec "$@"` at the end
-logout_cmd = null
-
-# General log file path
-ly_log = /var/log/ly.log
-
-# Main box horizontal margin
-margin_box_h = 2
-
-# Main box vertical margin
-margin_box_v = 1
+# Default path. If null, ly doesn't set a path.
+path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 
 # Event timeout in milliseconds
 min_refresh_delta = 5
@@ -236,72 +128,35 @@ min_refresh_delta = 5
 # Set numlock on/off at startup
 numlock = false
 
-# Default path
-# If null, ly doesn't set a path
-path = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-# Command executed when pressing restart_key
-restart_cmd = /sbin/shutdown -r now
-
-# Specifies the key used for restart (F1-F12)
-restart_key = F2
-
-# Save the current desktop and login as defaults, and load them on startup
-save = true
-
 # Service name (set to ly to use the provided pam config file)
 service_name = ly
 
-# Session log file path
-# This will contain stdout and stderr of Wayland sessions
-# By default it's saved in the user's home directory
-# Important: due to technical limitations, X11 and shell sessions aren't supported, which
-# means you won't get any logs from those sessions.
-# If null, no session log will be created
-session_log = ly-session.log
+# Terminal reset command (tput is faster)
+term_reset_cmd = /usr/bin/tput reset
 
-# Setup command
-setup_cmd = $CONFIG_DIRECTORY/ly/setup.sh
+# Terminal restore cursor command
+term_restore_cursor_cmd = /usr/bin/tput cnorm
 
-# Command executed when pressing shutdown_key
-shutdown_cmd = /sbin/shutdown $PLATFORM_SHUTDOWN_ARG now
+# Cookie generator
+mcookie_cmd = /usr/bin/mcookie
 
-# Specifies the key used for shutdown (F1-F12)
-shutdown_key = F1
-
-# Command executed when pressing sleep key (can be null)
-sleep_cmd = null
-
-# Specifies the key used for sleep (F1-F12)
-sleep_key = F3
-
-# Center the session name.
-text_in_center = false
-
-# Default vi mode
-# normal   -> normal mode
-# insert   -> insert mode
-vi_default_mode = normal
-
-# Enable vi keybindings
-vi_mode = false
+# Wayland setup command
+wayland_cmd = /etc/ly/wsetup.sh
 
 # Wayland desktop environments
-# You can specify multiple directories,
-# e.g. $PREFIX_DIRECTORY/share/wayland-sessions:$PREFIX_DIRECTORY/local/share/wayland-sessions
-waylandsessions = $PREFIX_DIRECTORY/share/wayland-sessions
+waylandsessions = /usr/share/wayland-sessions
 
-# Xorg server command
-x_cmd = $PREFIX_DIRECTORY/bin/X
-
-# Xorg xauthority edition tool
-xauth_cmd = $PREFIX_DIRECTORY/bin/xauth
-
-# xinitrc
-# If null, the xinitrc session will be hidden
+# xinitrc (hidden if null)
 xinitrc = ~/.xinitrc
 
+# Xorg server command
+x_cmd = /usr/bin/X
+
+# Xorg setup command
+x_cmd_setup = /etc/ly/xsetup.sh
+
+# Xorg xauthority edition tool
+xauth_cmd = /usr/bin/xauth
+
 # Xorg desktop environments
-# You can specify multiple directories,
-# e.g. $PREFIX_DIRECTORY/share/xsessions:$PREFIX_DIRECTORY/local/share/xsessions
-xsessions = $PREFIX_DIRECTORY/share/xsessions
+xsessions = /usr/share/xsessions

res/custom-sessions/README

@@ -1,23 +0,0 @@
-A custom session is just a desktop entry file, like for X11 and Wayland
-sessions. For example:
-
-[Desktop Entry]
-Name=Fish shell
-Exec=$PREFIX_DIRECTORY/bin/fish
-DesktopNames=null
-Terminal=true
-
-The DesktopNames value is optional and sets the XDG_SESSION_DESKTOP and
-XDG_CURRENT_DESKTOP environment variables. If equal to null or if not present,
-XDG_SESSION_DESKTOP and XDG_CURRENT_DESKTOP will not be set. Otherwise, the
-syntax is the same as described in the Freedesktop Desktop Entry Specification.
-
-The Terminal value specifies if standard output and standard error should be
-redirected to the session log file found in Ly's configuration file. If set to
-true, Ly will consider the program is going to run in a TTY, and thus will not
-redirect standard output & error. It is optional and defaults to false.
-
-Finally, do note that, if the Terminal value is set to true, the
-XDG_SESSION_TYPE environment variable will be set to "tty". Otherwise, it will
-be set to "unspecified" (without quotes), which is behavior that at least
-systemd recognizes (see pam_systemd's man page).

res/lang/ar.ini

@@ -1,70 +0,0 @@
-authenticating = جاري المصادقة...
-brightness_down = خفض السطوع
-brightness_up = رفع السطوع
-capslock = capslock
-
-err_alloc = فشل في تخصيص الذاكرة
-err_bounds = out-of-bounds index
-err_brightness_change = فشل في تغيير سطوع الشاشة
-err_chdir = فشل في فتح مجلد المنزل
-
-err_config = فشل في تفسير ملف الإعدادات
-err_dgn_oob = رسالة سجل (Log)
-err_domain = اسم نطاق غير صالح
-err_empty_password = لا يُسمح بكلمة مرور فارغة
-err_envlist = فشل في جلب قائمة المتغيرات البيئية
-
-err_hostname = فشل في جلب اسم المضيف (Hostname)
-
-
-err_mlock = فشل في تأمين ذاكرة كلمة المرور (mlock)
-err_null = مؤشر فارغ (Null pointer)
-err_numlock = فشل في ضبط Num Lock
-err_pam = فشل في معاملة PAM
-err_pam_abort = تم إلغاء معاملة PAM
-err_pam_acct_expired = الحساب منتهي الصلاحية
-err_pam_auth = خطأ في المصادقة (Authentication error)
-err_pam_authinfo_unavail = فشل في الحصول على معلومات المستخدم
-err_pam_authok_reqd = انتهت صلاحية رمز المصادقة (Token)
-err_pam_buf = خطأ في ذاكرة التخزين المؤقت (Buffer)
-err_pam_cred_err = فشل في تعيين بيانات الاعتماد (Credentials)
-err_pam_cred_expired = بيانات الاعتماد منتهية الصلاحية
-err_pam_cred_insufficient = بيانات الاعتماد غير كافية
-err_pam_cred_unavail = فشل في الحصول على بيانات الاعتماد
-err_pam_maxtries = تم بلوغ الحد الأقصى لمحاولات المصادقة
-err_pam_perm_denied = تم رفض الوصول (Permission denied)
-err_pam_session = خطأ في جلسة المستخدم (Session error)
-err_pam_sys = خطأ في النظام (System error)
-err_pam_user_unknown = المستخدم غير موجود
-err_path = فشل في تعيين متغير PATH
-err_perm_dir = فشل في تغيير المجلد الحالي
-err_perm_group = فشل في تخفيض صلاحيات المجموعة (Group permissions)
-err_perm_user = فشل في تخفيض صلاحيات المستخدم (User permissions)
-err_pwnam = فشل في جلب معلومات المستخدم
-err_sleep = فشل في تنفيذ أمر sleep
-
-
-err_tty_ctrl = فشل في نقل تحكم الطرفية (TTY)
-
-err_user_gid = فشل في تعيين معرّف المجموعة (GID) للمستخدم
-err_user_init = فشل في تهيئة بيانات المستخدم
-err_user_uid = فشل في تعيين معرّف المستخدم (UID)
-err_xauth = فشل في تنفيذ أمر xauth
-err_xcb_conn = فشل في الاتصال بمكتبة XCB
-err_xsessions_dir = فشل في العثور على مجلد Xsessions
-err_xsessions_open = فشل في فتح مجلد Xsessions
-insert = ادخال
-login = تسجيل الدخول
-logout = تم تسجيل خروجك
-no_x11_support = تم تعطيل دعم x11 اثناء وقت الـ compile
-normal = عادي
-numlock = numlock
-other = اخر
-password = كلمة السر
-restart = اعادة التشغيل
-shell = shell
-shutdown = ايقاف التشغيل
-sleep = وضع السكون
-wayland = wayland
-x11 = x11
-xinitrc = xinitrc

res/lang/cat.ini

@@ -1,70 +1,45 @@
-authenticating = autenticant...
-brightness_down = abaixar brillantor
-brightness_up = apujar brillantor
 capslock = Bloq Majús
-
-err_alloc = assignació de memòria fallida
-err_bounds = índex fora de límits
-err_brightness_change = error en canviar la brillantor
-err_chdir = error en obrir la carpeta home
-
-
+err_alloc = falla d'assignació de memòria
+err_bounds = índex fora de límit
+err_chdir = error al obrir carpeta home
+err_console_dev = error al accedir a la consola
 err_dgn_oob = missatge de registre
 err_domain = domini invàlid
-
-err_envlist = error en obtenir l'envlist
-
-err_hostname = error en obtenir el nom de l'amfitrió
-
-
-err_mlock = error en bloquejar la memòria de clau
+err_hostname = error al obtenir el nom del host
+err_mlock = error al bloquejar la clau de memòria
 err_null = punter nul
-err_numlock = error en establir el Bloq num
 err_pam = error en la transacció pam
 err_pam_abort = transacció pam avortada
 err_pam_acct_expired = compte expirat
 err_pam_auth = error d'autenticació
-err_pam_authinfo_unavail = error en obtenir la informació de l'usuari
+err_pam_authinfo_unavail = error al obtenir informació de l'usuari
 err_pam_authok_reqd = token expirat
-err_pam_buf = error en la memòria intermèdia
-err_pam_cred_err = error en establir les credencials
+err_pam_buf = error de la memòria intermitja
+err_pam_cred_err = error al establir les credencials
 err_pam_cred_expired = credencials expirades
 err_pam_cred_insufficient = credencials insuficients
-err_pam_cred_unavail = error en obtenir credencials
-err_pam_maxtries = s'ha assolit al nombre màxim d'intents
+err_pam_cred_unavail = error al obtenir credencials
+err_pam_maxtries = s'ha assolit al màxim nombre d'intents
 err_pam_perm_denied = permís denegat
 err_pam_session = error de sessió
 err_pam_sys = error de sistema
 err_pam_user_unknown = usuari desconegut
-err_path = error en establir la ruta
-err_perm_dir = error en canviar el directori actual
-err_perm_group = error en degradar els permisos de grup
-err_perm_user = error en degradar els permisos de l'usuari
-err_pwnam = error en obtenir la informació de l'usuari
-
-
-
-
-
-err_user_gid = error en establir el GID de l'usuari
-err_user_init = error en inicialitzar usuari
-err_user_uid = error en establir l'UID de l'usuari
-err_xauth = error en la comanda xauth
-err_xcb_conn = error en la connexió xcb
-err_xsessions_dir = error en trobar la carpeta de sessions
-err_xsessions_open = error en obrir la carpeta de sessions
-insert = inserir
+err_path = error al establir la ruta
+err_perm_dir = error al canviar de directori actual
+err_perm_group = error al degradar els permisos de grup
+err_perm_user = error al degradar els permisos de l'usuari
+err_pwnam = error al obtenir la informació de l'usuari
+err_user_gid = error al establir el GID de l'usuari
+err_user_init = error al inicialitzar usuari
+err_user_uid = error al establir el UID de l'usuari
+err_xsessions_dir = error al cercar la carpeta de sessions
+err_xsessions_open = error al obrir la carpeta de sessions
 login = iniciar sessió
-logout = sessió tancada
-no_x11_support = el suport per x11 ha estat desactivat en la compilació
-normal = normal
+logout = tancar sessió
 numlock = Bloq Num
-
 password = Clau
 restart = reiniciar
 shell = shell
 shutdown = aturar
-sleep = suspendre
 wayland = wayland
-x11 = x11
 xinitrc = xinitrc

res/lang/cs.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = capslock
-
 err_alloc = alokace paměti selhala
 err_bounds = index je mimo hranice pole
-
 err_chdir = nelze otevřít domovský adresář
-
-
+err_console_dev = chyba při přístupu do konzole
 err_dgn_oob = zpráva protokolu
 err_domain = neplatná doména
-
-
-
 err_hostname = nelze získat název hostitele
-
-
 err_mlock = uzamčení paměti hesel selhalo
 err_null = nulový ukazatel
-
 err_pam = pam transakce selhala
 err_pam_abort = pam transakce přerušena
 err_pam_acct_expired = platnost účtu vypršela
@@ -41,30 +29,17 @@ err_perm_dir = nepodařilo se změnit adresář
 err_perm_group = nepodařilo se snížit skupinová oprávnění
 err_perm_user = nepodařilo se snížit uživatelská oprávnění
 err_pwnam = nelze získat informace o uživateli
-
-
-
-
-
 err_user_gid = nastavení GID uživatele selhalo
 err_user_init = inicializace uživatele selhala
 err_user_uid = nastavení UID uživateli selhalo
-
-
 err_xsessions_dir = nepodařilo se najít složku relací
 err_xsessions_open = nepodařilo se otevřít složku relací
-
 login = uživatel
 logout = odhlášen
-
-
 numlock = numlock
-
 password = heslo
 restart = restartovat
 shell = příkazový řádek
 shutdown = vypnout
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/de.ini

@@ -1,70 +1,45 @@
-authenticating = authentifizieren...
-brightness_down = Helligkeit-
-brightness_up = Helligkeit+
 capslock = Feststelltaste
-
 err_alloc = Speicherzuweisung fehlgeschlagen
-err_bounds = Index ausserhalb des Bereichs
-err_brightness_change = Helligkeitsänderung fehlgeschlagen
-err_chdir = Fehler beim Oeffnen des Home-Ordners
-
-err_config = Fehler beim Verarbeiten der Konfigurationsdatei
-err_dgn_oob = Diagnose-Nachricht
-err_domain = Ungueltige Domain
-err_empty_password = Leeres Passwort nicht zugelassen
-err_envlist = Fehler beim Abrufen der Umgebungs-Variablen
-
-err_hostname = Abrufen des Hostnames fehlgeschlagen
-
-
-err_mlock = Sperren des Passwortspeichers fehlgeschlagen
-err_null = Null Pointer
-err_numlock = Numlock konnte nicht aktiviert werden
-err_pam = PAM-Transaktion fehlgeschlagen
-err_pam_abort = PAM-Transaktion abgebrochen
+err_bounds = Listenindex ist außerhalb des Bereichs
+err_chdir = Fehler beim oeffnen des home-ordners
+err_console_dev = Zugriff auf die Konsole fehlgeschlagen
+err_dgn_oob = Protokoll Nachricht
+err_domain = Unzulaessige domain
+err_hostname = Holen des Hostnames fehlgeschlagen
+err_mlock = Abschließen des Passwortspeichers fehlgeschlagen
+err_null = Null Zeiger
+err_pam = pam Transaktion fehlgeschlagen
+err_pam_abort = pam Transaktion abgebrochen
 err_pam_acct_expired = Benutzerkonto abgelaufen
-err_pam_auth = Authentifizierungsfehler
-err_pam_authinfo_unavail = Abrufen der Benutzerinformationen fehlgeschlagen
-err_pam_authok_reqd = Passwort abgelaufen
+err_pam_auth = Authentifizierungs Fehler
+err_pam_authinfo_unavail = holen der Benutzerinformationen fehlgeschlagen
+err_pam_authok_reqd = Schluessel abgelaufen
 err_pam_buf = Speicherpufferfehler
-err_pam_cred_err = Fehler beim Setzen der Anmeldedaten
+err_pam_cred_err = Fehler beim setzen der Anmeldedaten
 err_pam_cred_expired = Anmeldedaten abgelaufen
 err_pam_cred_insufficient = Anmeldedaten unzureichend
-err_pam_cred_unavail = Fehler beim Abrufen der Anmeldedaten
-err_pam_maxtries = Maximale Versuchsanzahl erreicht
-err_pam_perm_denied = Zugriff verweigert
+err_pam_cred_unavail = Fehler beim holen der Anmeldedaten
+err_pam_maxtries = Maximale Versuche erreicht
+err_pam_perm_denied = Zugriff Verweigert
 err_pam_session = Sitzungsfehler
 err_pam_sys = Systemfehler
 err_pam_user_unknown = Unbekannter Nutzer
-err_path = Fehler beim Setzen des Pfades
-err_perm_dir = Ordnerwechsel fehlgeschlagen
-err_perm_group = Fehler beim Heruntersetzen der Gruppenberechtigungen
-err_perm_user = Fehler beim Heruntersetzen der Nutzerberechtigungen
-err_pwnam = Abrufen der Benutzerinformationen fehlgeschlagen
-err_sleep = Sleep-Befehl fehlgeschlagen
-
-
-err_tty_ctrl = Fehler bei der TTY-Uebergabe
-
-err_user_gid = Fehler beim Setzen der Gruppen-ID
-err_user_init = Nutzer-Initialisierung fehlgeschlagen
-err_user_uid = Setzen der Benutzer-ID fehlgeschlagen
-err_xauth = Xauth-Befehl fehlgeschlagen
-err_xcb_conn = xcb-Verbindung fehlgeschlagen
-err_xsessions_dir = Fehler beim Finden des Sitzungsordners
-err_xsessions_open = Fehler beim Oeffnen des Sitzungsordners
-insert = Einfügen
-login = Nutzer
-logout = Abmelden
-no_x11_support = X11-Support bei Kompilierung deaktiviert
-normal = Normal
-numlock = Numlock
-other = Andere
+err_path = Fehler beim setzen des Pfades
+err_perm_dir = Fehler beim wechseln des Ordners
+err_perm_group = Fehler beim heruntersetzen der Gruppen Berechtigungen
+err_perm_user = Fehler beim heruntersetzen der Nutzer Berechtigungen
+err_pwnam = Holen der Benutzerinformationen fehlgeschlagen
+err_user_gid = Fehler beim setzen der Gruppen Id des Nutzers
+err_user_init = Initialisierung des Nutzers fehlgeschlagen
+err_user_uid = Setzen der Benutzer Id fehlgeschlagen
+err_xsessions_dir = Fehler beim finden des Sitzungsordners
+err_xsessions_open = Fehler beim öffnen des Sitzungsordners
+login = Anmelden
+logout = Abgemeldet
+numlock = Numtaste
 password = Passwort
 restart = Neustarten
-shell = Shell
+shell = shell
 shutdown = Herunterfahren
-sleep = Sleep
 wayland = wayland
-x11 = X11
 xinitrc = xinitrc

res/lang/en.ini

@@ -1,25 +1,16 @@
 authenticating = authenticating...
-brightness_down = decrease brightness
-brightness_up = increase brightness
 capslock = capslock
-custom = custom
 err_alloc = failed memory allocation
 err_bounds = out-of-bounds index
-err_brightness_change = failed to change brightness
 err_chdir = failed to open home folder
-err_clock_too_long = clock string too long
-err_config = unable to parse config file
+err_console_dev = failed to access console
 err_dgn_oob = log message
 err_domain = invalid domain
-err_empty_password = empty password not allowed
 err_envlist = failed to get envlist
-err_get_active_tty = failed to get active tty
 err_hostname = failed to get hostname
-err_lock_state = failed to get lock state
-err_log = failed to open log file
+err_mcookie = mcookie command failed
 err_mlock = failed to lock password memory
 err_null = null pointer
-err_numlock = failed to set numlock
 err_pam = pam transaction failed
 err_pam_abort = pam transaction aborted
 err_pam_acct_expired = account expired
@@ -41,11 +32,7 @@ err_perm_dir = failed to change current directory
 err_perm_group = failed to downgrade group permissions
 err_perm_user = failed to downgrade user permissions
 err_pwnam = failed to get user info
-err_sleep = failed to execute sleep command
-err_battery = failed to load battery status
-err_switch_tty = failed to switch tty
-err_tty_ctrl = tty control transfer failed
-err_no_users = no users found
+err_unknown = an unknown error occurred
 err_user_gid = failed to set user GID
 err_user_init = failed to initialize user
 err_user_uid = failed to set user UID
@@ -56,15 +43,13 @@ err_xsessions_open = failed to open sessions folder
 insert = insert
 login = login
 logout = logged out
-no_x11_support = x11 support disabled at compile-time
 normal = normal
 numlock = numlock
-other = other
 password = password
 restart = reboot
 shell = shell
 shutdown = shutdown
 sleep = sleep
 wayland = wayland
-x11 = x11
 xinitrc = xinitrc
+x11 = x11

res/lang/es.ini

@@ -1,25 +1,13 @@
-authenticating = autenticando...
-brightness_down = bajar brillo
-brightness_up = subir brillo
 capslock = Bloq Mayús
-
 err_alloc = asignación de memoria fallida
 err_bounds = índice fuera de límites
-
 err_chdir = error al abrir la carpeta home
-
-
+err_console_dev = error al acceder a la consola
 err_dgn_oob = mensaje de registro
 err_domain = dominio inválido
-
-
-
 err_hostname = error al obtener el nombre de host
-
-
 err_mlock = error al bloquear la contraseña de memoria
 err_null = puntero nulo
-
 err_pam = error en la transacción pam
 err_pam_abort = transacción pam abortada
 err_pam_acct_expired = cuenta expirada
@@ -41,30 +29,17 @@ err_perm_dir = error al cambiar el directorio actual
 err_perm_group = error al degradar los permisos del grupo
 err_perm_user = error al degradar los permisos del usuario
 err_pwnam = error al obtener la información del usuario
-
-
-
-
-
 err_user_gid = error al establecer el GID del usuario
 err_user_init = error al inicializar usuario
 err_user_uid = error al establecer el UID del usuario
-
-
 err_xsessions_dir = error al buscar la carpeta de sesiones
 err_xsessions_open = error al abrir la carpeta de sesiones
-insert = insertar
-login = usuario
+login = iniciar sesión
 logout = cerrar sesión
-no_x11_support = soporte para x11 deshabilitado en tiempo de compilación
-normal = normal
 numlock = Bloq Num
-other = otro
 password = contraseña
 restart = reiniciar
 shell = shell
 shutdown = apagar
-sleep = suspender
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/fr.ini

@@ -1,31 +1,19 @@
-authenticating = authentification...
-brightness_down = diminuer la luminosité
-brightness_up = augmenter la luminosité
-capslock = verr.maj
-custom = customisé
+capslock = verr.maj
 err_alloc = échec d'allocation mémoire
 err_bounds = indice hors-limite
-err_brightness_change = échec du changement de luminosité
 err_chdir = échec de l'ouverture du répertoire home
-err_clock_too_long = chaîne de formattage de l'horloge trop longue
-err_config = échec de lecture du fichier de configuration
+err_console_dev = échec d'accès à la console
 err_dgn_oob = message
 err_domain = domaine invalide
-err_empty_password = mot de passe vide non autorisé
-err_envlist = échec de lecture de la liste d'environnement
-err_get_active_tty = échec de lecture du terminal actif
 err_hostname = échec de lecture du nom d'hôte
-err_lock_state = échec de lecture de l'état de verrouillage
-err_log = échec de l'ouverture du fichier de journal
 err_mlock = échec du verrouillage mémoire
 err_null = pointeur null
-err_numlock = échec de modification du verr.num
 err_pam = échec de la transaction pam
 err_pam_abort = transaction pam avortée
 err_pam_acct_expired = compte expiré
 err_pam_auth = erreur d'authentification
-err_pam_authinfo_unavail = échec de l'obtention des infos utilisateur
 err_pam_authok_reqd = tiquet expiré
+err_pam_authinfo_unavail = échec de l'obtention des infos utilisateur
 err_pam_buf = erreur de mémoire tampon
 err_pam_cred_err = échec de la modification des identifiants
 err_pam_cred_expired = identifiants expirés
@@ -41,30 +29,17 @@ err_perm_dir = échec de changement de répertoire
 err_perm_group = échec du déclassement des permissions de groupe
 err_perm_user = échec du déclassement des permissions utilisateur
 err_pwnam = échec de lecture des infos utilisateur
-err_sleep = échec de l'exécution de la commande de veille
-err_battery = échec de lecture de l'état de la batterie
-err_switch_tty = échec du changement de terminal
-err_tty_ctrl = échec du transfert de contrôle du terminal
-err_no_users = aucun utilisateur trouvé
 err_user_gid = échec de modification du GID
 err_user_init = échec d'initialisation de l'utilisateur
 err_user_uid = échec de modification du UID
-err_xauth = échec de la commande xauth
-err_xcb_conn = échec de la connexion xcb
 err_xsessions_dir = échec de la recherche du dossier de sessions
 err_xsessions_open = échec de l'ouverture du dossier de sessions
-insert = insertion
 login = identifiant
-logout = déconnecté
-no_x11_support = support pour x11 désactivé lors de la compilation
-normal = normal
+logout = déconnection
 numlock = verr.num
-other = autre
 password = mot de passe
 restart = redémarrer
 shell = shell
 shutdown = éteindre
-sleep = veille
 wayland = wayland
-x11 = x11
 xinitrc = xinitrc

res/lang/it.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = capslock
-
 err_alloc = impossibile allocare memoria
 err_bounds = indice fuori limite
-
 err_chdir = impossibile aprire home directory
-
-
+err_console_dev = impossibile aprire console
 err_dgn_oob = messaggio log
 err_domain = dominio non valido
-
-
-
 err_hostname = impossibile ottenere hostname
-
-
 err_mlock = impossibile ottenere lock per la password in memoria
 err_null = puntatore nullo
-
 err_pam = transazione PAM fallita
 err_pam_abort = transazione PAM interrotta
 err_pam_acct_expired = account scaduto
@@ -41,30 +29,17 @@ err_perm_dir = impossibile cambiare directory corrente
 err_perm_group = impossibile ridurre permessi gruppo
 err_perm_user = impossibile ridurre permessi utente
 err_pwnam = impossibile ottenere dati utente
-
-
-
-
-
 err_user_gid = impossibile impostare GID utente
 err_user_init = impossibile inizializzare utente
 err_user_uid = impossible impostare UID utente
-
-
 err_xsessions_dir = impossibile localizzare cartella sessioni
 err_xsessions_open = impossibile aprire cartella sessioni
-
 login = username
 logout = scollegato
-
-
 numlock = numlock
-
 password = password
 restart = riavvio
 shell = shell
 shutdown = arresto
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/ja_JP.ini

@@ -1,70 +0,0 @@
-authenticating = 認証中...
-brightness_down = 明るさを下げる
-brightness_up = 明るさを上げる
-capslock = CapsLock
-
-err_alloc = メモリ割り当て失敗
-err_bounds = 境界外インデックス
-err_brightness_change = 明るさの変更に失敗しました
-err_chdir = ホームフォルダを開けませんでした
-
-err_config = 設定ファイルを解析できません
-err_dgn_oob = ログメッセージ
-err_domain = 無効なドメイン
-err_empty_password = 空のパスワードは許可されていません
-err_envlist = 環境変数リストの取得に失敗しました
-
-err_hostname = ホスト名の取得に失敗しました
-
-
-err_mlock = パスワードメモリのロックに失敗しました
-err_null = ヌルポインタ
-err_numlock = NumLockの設定に失敗しました
-err_pam = PAMトランザクション失敗
-err_pam_abort = PAMトランザクションが中断されました
-err_pam_acct_expired = アカウントの有効期限が切れています
-err_pam_auth = 認証エラー
-err_pam_authinfo_unavail = ユーザー情報の取得に失敗しました
-err_pam_authok_reqd = トークンの有効期限が切れています
-err_pam_buf = メモリバッファエラー
-err_pam_cred_err = 認証情報の設定に失敗しました
-err_pam_cred_expired = 認証情報の有効期限が切れています
-err_pam_cred_insufficient = 認証情報が不十分です
-err_pam_cred_unavail = 認証情報の取得に失敗しました
-err_pam_maxtries = 最大試行回数に到達しました
-err_pam_perm_denied = アクセスが拒否されました
-err_pam_session = セッションエラー
-err_pam_sys = システムエラー
-err_pam_user_unknown = 不明なユーザー
-err_path = パスの設定に失敗しました
-err_perm_dir = カレントディレクトリの変更に失敗しました
-err_perm_group = グループ権限のダウングレードに失敗しました
-err_perm_user = ユーザー権限のダウングレードに失敗しました
-err_pwnam = ユーザー情報の取得に失敗しました
-err_sleep = スリープコマンドの実行に失敗しました
-
-
-err_tty_ctrl = TTY制御の転送に失敗しました
-
-err_user_gid = ユーザーGIDの設定に失敗しました
-err_user_init = ユーザーの初期化に失敗しました
-err_user_uid = ユーザーUIDの設定に失敗しました
-err_xauth = xauthコマンドの実行に失敗しました
-err_xcb_conn = XCB接続に失敗しました
-err_xsessions_dir = セッションフォルダが見つかりませんでした
-err_xsessions_open = セッションフォルダを開けませんでした
-insert = 挿入
-login = ログイン
-logout = ログアウト済み
-no_x11_support = X11サポートはコンパイル時に無効化されています
-normal = 通常
-numlock = NumLock
-other = その他
-password = パスワード
-restart = 再起動
-shell = シェル
-shutdown = シャットダウン
-sleep = スリープ
-wayland = Wayland
-x11 = X11
-xinitrc = xinitrc

res/lang/lv.ini

@@ -1,71 +0,0 @@
-authenticating = autentificējas...
-brightness_down = samazināt spilgtumu
-brightness_up = palielināt spilgtumu
-capslock = caps lock
-custom = pielāgots
-err_alloc = neizdevās atmiņas piešķiršana
-err_bounds = indekss ārpus robežām
-err_brightness_change = neizdevās mainīt spilgtumu
-err_chdir = neizdevās atvērt mājas mapi
-err_clock_too_long = pulksteņa virkne pārāk gara
-err_config = neizdevās parsēt konfigurācijas failu
-err_dgn_oob = žurnāla ziņojums
-err_domain = nederīgs domēns
-err_empty_password = tukša parole nav atļauta
-err_envlist = neizdevās iegūt vides mainīgo sarakstu
-err_get_active_tty = neizdevās iegūt aktīvo tty
-err_hostname = neizdevās iegūt hostname
-err_lock_state = neizdevās iegūt bloķēšanas stāvokli
-err_log = neizdevās atvērt žurnāla failu
-err_mlock = neizdevās bloķēt paroles atmiņu
-err_null = null rādītājs
-err_numlock = neizdevās iestatīt numlock
-err_pam = pam transakcija neizdevās
-err_pam_abort = pam transakcija pārtraukta
-err_pam_acct_expired = konts novecojis
-err_pam_auth = autentifikācijas kļūda
-err_pam_authinfo_unavail = neizdevās iegūt lietotāja informāciju
-err_pam_authok_reqd = žetons beidzies
-err_pam_buf = atmiņas bufera kļūda
-err_pam_cred_err = neizdevās iestatīt akreditācijas datus
-err_pam_cred_expired = akreditācijas dati novecojuši
-err_pam_cred_insufficient = nepietiekami akreditācijas dati
-err_pam_cred_unavail = neizdevās iegūt akreditācijas datus
-err_pam_maxtries = sasniegts maksimālais mēģinājumu skaits
-err_pam_perm_denied = piekļuve liegta
-err_pam_session = sesijas kļūda
-err_pam_sys = sistēmas kļūda
-err_pam_user_unknown = nezināms lietotājs
-err_path = neizdevās iestatīt ceļu
-err_perm_dir = neizdevās mainīt pašreizējo mapi
-err_perm_group = neizdevās pazemināt grupas atļaujas
-err_perm_user = neizdevās pazemināt lietotāja atļaujas
-err_pwnam = neizdevās iegūt lietotāja informāciju
-err_sleep = neizdevās izpildīt miega komandu
-err_battery = neizdevās ielādēt akumulatora stāvokli
-err_switch_tty = neizdevās pārslēgt tty
-err_tty_ctrl = tty vadības nodošana neizdevās
-err_no_users = lietotāji nav atrasti
-err_user_gid = neizdevās iestatīt lietotāja GID
-err_user_init = neizdevās inicializēt lietotāju
-err_user_uid = neizdevās iestatīt lietotāja UID
-err_xauth = xauth komanda neizdevās
-err_xcb_conn = xcb savienojums neizdevās
-err_xsessions_dir = neizdevās atrast sesiju mapi
-err_xsessions_open = neizdevās atvērt sesiju mapi
-insert = ievietot
-login = lietotājs
-logout = iziet
-no_x11_support = x11 atbalsts atspējots kompilācijas laikā
-normal = parastais
-numlock = numlock
-other = cits
-password = parole
-restart = restartēt
-shell = terminālis
-shutdown = izslēgt
-sleep = snauda
-wayland = wayland
-x11 = x11
-xinitrc = xinitrc
-

res/lang/normalize_lang_files.py

@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-
-from pathlib import Path
-from sys import stderr
-
-
-def process_lang_file(path: Path, lang_keys: list[str]) -> None:
-    # read key-value-pairs from lang file into dict
-    existing_entries = {}
-    with open(path, "r", encoding="UTF-8") as fh:
-        while line := fh.readline():
-            try:
-                key, value = line.split("=", 1)
-                existing_entries[key.strip()] = value.strip()
-            except ValueError:  # line does not contain '='
-                continue
-
-    # re-write current lang file with entries in order of occurence in `lang_keys`
-    # and with empty lines for missing translations
-    with open(path, "w", encoding="UTF-8") as fh:
-        for item in lang_keys:
-            try:
-                fh.write(f"{item} = {existing_entries[item]}\n")
-            except KeyError:  # no translation for `item` yet
-                fh.write("\n")
-
-
-def main() -> None:
-    zig_lang_file = Path(__file__).parent.joinpath("../../src/config/Lang.zig").resolve()
-    if not zig_lang_file.exists():
-        print(f"ERROR: File '{zig_lang_file.as_posix()}' does not exist. Exiting.", file=stderr)
-        exit(1)
-
-    # read "language keys" from `zig_lang_file` into list
-    lang_keys = []
-    with open(zig_lang_file, "r", encoding="UTF-8") as fh:
-        while line := fh.readline():
-            # only process lines that are not empty or no comments
-            if not (line.strip() == "" or line.startswith("//")):
-                lang_keys.append(line.split(":")[0].strip())
-
-    lang_files = [f for f in Path.iterdir(Path(__file__).parent) if f.name.endswith(".ini") and f.is_file()]
-
-    for file in lang_files:
-        process_lang_file(file, lang_keys)
-
-
-if __name__ == "__main__":
-    main()

res/lang/pl.ini

@@ -1,70 +1,45 @@
-authenticating = uwierzytelnianie...
-brightness_down = zmniejsz jasność
-brightness_up = zwiększ jasność
 capslock = capslock
-
 err_alloc = nieudana alokacja pamięci
-err_bounds = indeks poza zakresem
-err_brightness_change = nie udało się zmienić jasności
+err_bounds = indeks poza granicami
 err_chdir = nie udało się otworzyć folderu domowego
-
-err_config = nie można przetworzyć pliku konfiguracyjnego
+err_console_dev = nie udało się uzyskać dostępu do konsoli
 err_dgn_oob = wiadomość loga
 err_domain = niepoprawna domena
-err_empty_password = puste hasło jest niedozwolone
-err_envlist = nie udało się pobrać listy zmiennych środowiskowych
-
 err_hostname = nie udało się uzyskać nazwy hosta
-
-
 err_mlock = nie udało się zablokować pamięci haseł
-err_null = pusty wskaźnik
-err_numlock = nie udało się ustawić numlock
+err_null = wskaźnik zerowy
 err_pam = transakcja pam nieudana
 err_pam_abort = transakcja pam przerwana
 err_pam_acct_expired = konto wygasło
-err_pam_auth = błąd uwierzytelniania
+err_pam_auth = błąd autentyfikacji
 err_pam_authinfo_unavail = nie udało się zdobyć informacji o użytkowniku
 err_pam_authok_reqd = token wygasł
 err_pam_buf = błąd bufora pamięci
-err_pam_cred_err = nie udało się ustawić uwierzytelnienia
+err_pam_cred_err = nie udało się ustawić uwierzytelnienia
 err_pam_cred_expired = uwierzytelnienie wygasło
 err_pam_cred_insufficient = niewystarczające uwierzytelnienie
-err_pam_cred_unavail = nie udało się uzyskać uwierzytelnienia
+err_pam_cred_unavail = nie udało się uzyskać uwierzytelnienia
 err_pam_maxtries = osiągnięto limit prób
-err_pam_perm_denied = odmowa dostępu
+err_pam_perm_denied = brak uprawnień
 err_pam_session = błąd sesji
 err_pam_sys = błąd systemu
 err_pam_user_unknown = nieznany użytkownik
-err_path = nie udało się ustawić ścieżki
-err_perm_dir = nie udało się zmienić obecnego katalogu
-err_perm_group = nie udało się obniżyć uprawnień grupy
-err_perm_user = nie udało się obniżyć uprawnień użytkownika
-err_pwnam = nie udało się uzyskać informacji o użytkowniku
-err_sleep = nie udało się wykonać polecenia sleep
-
-
-err_tty_ctrl = nie udało się przekazać kontroli tty
-
+err_path = nie udało się ustawić ścieżki
+err_perm_dir = nie udało się zmienić obecnego katalogu
+err_perm_group = nie udało się obniżyć uprawnień grupy
+err_perm_user = nie udało się obniżyć uprawnień użytkownika
+err_pwnam = nie udało się uzyskać informacji o użytkowniku
 err_user_gid = nie udało się ustawić GID użytkownika
-err_user_init = nie udało się zainicjalizować użytkownika
+err_user_init = nie udało się zainicjalizować użytkownika
 err_user_uid = nie udało się ustawić UID użytkownika
-err_xauth = polecenie xauth nie powiodło się
-err_xcb_conn = połączenie xcb nie powiodło się
-err_xsessions_dir = nie udało się znaleźć folderu sesji
-err_xsessions_open = nie udało się otworzyć folderu sesji
-insert = wstaw
+err_xsessions_dir = nie udało się znaleźć folderu sesji
+err_xsessions_open = nie udało się otworzyć folderu sesji
 login = login
 logout = wylogowano
-no_x11_support = wsparcie X11 wyłączone podczas kompilacji
-normal = normalny
 numlock = numlock
-other = inny
 password = hasło
 restart = uruchom ponownie
 shell = powłoka
 shutdown = wyłącz
-sleep = uśpij
 wayland = wayland
-x11 = x11
 xinitrc = xinitrc

res/lang/pt.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = capslock
-
 err_alloc = erro na atribuição de memória
 err_bounds = índice fora de limites
-
 err_chdir = erro ao abrir a pasta home
-
-
+err_console_dev = erro ao aceder à consola
 err_dgn_oob = mensagem de registo
 err_domain = domínio inválido
-
-
-
 err_hostname = erro ao obter o nome do host
-
-
 err_mlock = erro de bloqueio de memória
 err_null = ponteiro nulo
-
 err_pam = erro na transação pam
 err_pam_abort = transação pam abortada
 err_pam_acct_expired = conta expirada
@@ -41,30 +29,17 @@ err_perm_dir = erro ao alterar o diretório atual
 err_perm_group = erro ao reduzir as permissões do grupo
 err_perm_user = erro ao reduzir as permissões do utilizador
 err_pwnam = erro ao obter informação do utilizador
-
-
-
-
-
 err_user_gid = erro ao definir o GID do utilizador
 err_user_init = erro ao iniciar o utilizador
 err_user_uid = erro ao definir o UID do utilizador
-
-
 err_xsessions_dir = erro ao localizar a pasta das sessões
 err_xsessions_open = erro ao abrir a pasta das sessões
-
 login = iniciar sessão
 logout = terminar sessão
-
-
 numlock = numlock
-
 password = palavra-passe
 restart = reiniciar
 shell = shell
 shutdown = encerrar
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/pt_BR.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = caixa alta
-
 err_alloc = alocação de memória malsucedida
 err_bounds = índice fora de limites
-
 err_chdir = não foi possível abrir o diretório home
-
-
+err_console_dev = não foi possível acessar o console
 err_dgn_oob = mensagem de log
 err_domain = domínio inválido
-
-
-
 err_hostname = não foi possível obter o nome do host
-
-
 err_mlock = bloqueio da memória de senha malsucedido
 err_null = ponteiro nulo
-
 err_pam = transação pam malsucedida
 err_pam_abort = transação pam abortada
 err_pam_acct_expired = conta expirada
@@ -41,30 +29,17 @@ err_perm_dir = não foi possível alterar o diretório atual
 err_perm_group = não foi possível reduzir as permissões de grupo
 err_perm_user = não foi possível reduzir as permissões de usuário
 err_pwnam = não foi possível obter informações do usuário
-
-
-
-
-
 err_user_gid = não foi possível definir o GID do usuário
 err_user_init = não foi possível iniciar o usuário
 err_user_uid = não foi possível definir o UID do usuário
-
-
 err_xsessions_dir = não foi possível encontrar a pasta das sessões
 err_xsessions_open = não foi possível abrir a pasta das sessões
-
 login = conectar
 logout = desconectado
-
-
 numlock = numlock
-
 password = senha
 restart = reiniciar
 shell = shell
 shutdown = desligar
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/ro.ini

@@ -1,20 +1,8 @@
-
-
-
 capslock = capslock
 
 
 
-
-
-
-
-
-
-
-
-
-
+err_console_dev = nu s-a putut accesa consola
 
 
 
@@ -46,25 +34,12 @@ err_perm_user = nu s-a putut face downgrade permisiunilor de utilizator
 
 
 
-
-
-
-
-
-
-
-
 login = utilizator
 logout = opreşte sesiunea
-
-
 numlock = numlock
-
 password = parolă
 restart = resetează
 shell = shell
 shutdown = opreşte sistemul
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/ru.ini

@@ -1,25 +1,13 @@
-authenticating = аутентификация...
-brightness_down = уменьшить яркость
-brightness_up = увеличить яркость
 capslock = capslock
-
 err_alloc = не удалось выделить память
 err_bounds = за пределами индекса
-err_brightness_change = не удалось изменить яркость
 err_chdir = не удалось открыть домашнюю папку
-
-err_config = не удалось разобрать файл конфигурации
+err_console_dev = не удалось получить доступ к консоли
 err_dgn_oob = отладочное сообщение (log)
 err_domain = неверный домен
-err_empty_password = пустой пароль не допустим
-err_envlist = не удалось получить список переменных среды
-
 err_hostname = не удалось получить имя хоста
-
-
 err_mlock = сбой блокировки памяти
 err_null = нулевой указатель
-
 err_pam = pam транзакция не удалась
 err_pam_abort = pam транзакция прервана
 err_pam_acct_expired = срок действия аккаунта истёк
@@ -41,30 +29,17 @@ err_perm_dir = не удалось изменить текущий катало
 err_perm_group = не удалось понизить права доступа группы
 err_perm_user = не удалось понизить права доступа пользователя
 err_pwnam = не удалось получить информацию о пользователе
-err_sleep = не удалось выполнить команду sleep
-
-err_switch_tty = не удалось переключить tty
-err_tty_ctrl = передача управления tty не удалась
-err_no_users = пользователи не найдены
 err_user_gid = не удалось установить GID пользователя
 err_user_init = не удалось инициализировать пользователя
 err_user_uid = не удалось установить UID пользователя
-err_xauth = команда xauth не выполнена
-err_xcb_conn = ошибка подключения xcb
 err_xsessions_dir = не удалось найти сессионную папку
 err_xsessions_open = не удалось открыть сессионную папку
-
 login = логин
-logout = вышел из системы
-no_x11_support = поддержка x11 отключена во время компиляции
-
+logout = logged out
 numlock = numlock
-other = прочие
 password = пароль
 restart = перезагрузить
-shell = оболочка
+shell = shell
 shutdown = выключить
-sleep = сон
 wayland = wayland
-x11 = x11
 xinitrc = xinitrc

res/lang/sr.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = capslock
-
 err_alloc = neuspijesna alokacija memorije
 err_bounds = izvan granica indeksa
-
 err_chdir = neuspijesno otvaranje home foldera
-
-
+err_console_dev = neuspijesno pristupanje konzoli
 err_dgn_oob = log poruka
 err_domain = nevazeci domen
-
-
-
 err_hostname = neuspijesno trazenje hostname-a
-
-
 err_mlock = neuspijesno zakljucavanje memorije lozinke
 err_null = null pokazivac
-
 err_pam = pam transakcija neuspijesna
 err_pam_abort = pam transakcija prekinuta
 err_pam_acct_expired = nalog istekao
@@ -37,34 +25,21 @@ err_pam_session = greska sesije
 err_pam_sys = greska sistema
 err_pam_user_unknown = nepoznat korisnik
 err_path = neuspjelo postavljanje path-a
-err_perm_dir = neuspjelo mijenjanje foldera
+err_perm_dir = neuspjelo mijenjanje foldera 
 err_perm_group = neuspjesno snizavanje dozvola grupe
 err_perm_user = neuspijesno snizavanje dozvola korisnika
 err_pwnam = neuspijesno skupljanje informacija o korisniku
-
-
-
-
-
 err_user_gid = neuspijesno postavljanje korisničkog GID-a
 err_user_init = neuspijensa inicijalizacija korisnika
 err_user_uid = neuspijesno postavljanje UID-a korisnika
-
-
 err_xsessions_dir = neuspijesno pronalazenje foldera sesija
-err_xsessions_open = neuspijesno otvaranje foldera sesija
-
+err_xsessions_open = neuspijesno otvaranje foldera sesija 
 login = korisnik
 logout = izlogovan
-
-
 numlock = numlock
-
 password = lozinka
 restart = ponovo pokreni
 shell = shell
 shutdown = ugasi
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/sv.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = capslock
-
 err_alloc = misslyckad minnesallokering
 err_bounds = utanför banan index
-
 err_chdir = misslyckades att öppna hemkatalog
-
-
+err_console_dev = misslyckades att komma åt konsol
 err_dgn_oob = loggmeddelande
 err_domain = okänd domän
-
-
-
 err_hostname = misslyckades att hämta värdnamn
-
-
 err_mlock = misslyckades att låsa lösenordsminne
 err_null = nullpekare
-
 err_pam = pam-transaktion misslyckades
 err_pam_abort = pam-transaktion avbröts
 err_pam_acct_expired = konto upphört
@@ -41,30 +29,17 @@ err_perm_dir = misslyckades att ändra aktuell katalog
 err_perm_group = misslyckades att nergradera gruppbehörigheter
 err_perm_user = misslyckades att nergradera användarbehörigheter
 err_pwnam = misslyckades att hämta användarinfo
-
-
-
-
-
 err_user_gid = misslyckades att ställa in användar-GID
 err_user_init = misslyckades att initialisera användaren
 err_user_uid = misslyckades att ställa in användar-UID
-
-
 err_xsessions_dir = misslyckades att hitta sessionskatalog
 err_xsessions_open = misslyckades att öppna sessionskatalog
-
 login = inloggning
 logout = utloggad
-
-
 numlock = numlock
-
 password = lösenord
 restart = starta om
 shell = skal
 shutdown = stäng av
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/tr.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = capslock
-
 err_alloc = basarisiz bellek ayirma
 err_bounds = sinirlarin disinda dizin
-
 err_chdir = ev klasoru acilamadi
-
-
+err_console_dev = konsola erisilemedi
 err_dgn_oob = log mesaji
 err_domain = gecersiz etki alani
-
-
-
 err_hostname = ana bilgisayar adi alinamadi
-
-
 err_mlock = parola bellegi kilitlenemedi
 err_null = bos isaretci hatasi
-
 err_pam = pam islemi basarisiz oldu
 err_pam_abort = pam islemi durduruldu
 err_pam_acct_expired = hesabin suresi dolmus
@@ -41,30 +29,17 @@ err_perm_dir = gecerli dizin degistirilemedi
 err_perm_group = grup izinleri dusurulemedi
 err_perm_user = kullanici izinleri dusurulemedi
 err_pwnam = kullanici bilgileri alinamadi
-
-
-
-
-
 err_user_gid = kullanici icin GID ayarlanamadi
 err_user_init = kullanici oturumu baslatilamadi
 err_user_uid = kullanici icin UID ayarlanamadi
-
-
 err_xsessions_dir = oturumlar klasoru bulunamadi
 err_xsessions_open = oturumlar klasoru acilamadi
-
 login = kullanici
 logout = oturumdan cikis yapildi
-
-
 numlock = numlock
-
 password = sifre
 restart = yeniden baslat
 shell = shell
 shutdown = makineyi kapat
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/uk.ini

@@ -1,25 +1,13 @@
-
-
-
 capslock = capslock
-
 err_alloc = невдале виділення пам'яті
 err_bounds = поза межами індексу
-
 err_chdir = не вдалося відкрити домашній каталог
-
-
+err_console_dev = невдалий доступ до консолі
 err_dgn_oob = повідомлення журналу (log)
 err_domain = недійсний домен
-
-
-
 err_hostname = не вдалося отримати ім'я хосту
-
-
 err_mlock = збій блокування пам'яті
 err_null = нульовий вказівник
-
 err_pam = невдала pam транзакція
 err_pam_abort = pam транзакція перервана
 err_pam_acct_expired = термін дії акаунту вичерпано
@@ -41,30 +29,17 @@ err_perm_dir = не вдалося змінити поточний катало
 err_perm_group = не вдалося понизити права доступу групи
 err_perm_user = не вдалося понизити права доступу користувача
 err_pwnam = не вдалося отримати дані користувача
-
-
-
-
-
 err_user_gid = не вдалося змінити GID користувача
 err_user_init = не вдалося ініціалізувати користувача
 err_user_uid = не вдалося змінити UID користувача
-
-
 err_xsessions_dir = не вдалося знайти каталог сесій
 err_xsessions_open = не вдалося відкрити каталог сесій
-
 login = логін
 logout = вийти
-
-
 numlock = numlock
-
 password = пароль
 restart = перезавантажити
 shell = оболонка
 shutdown = вимкнути
-
 wayland = wayland
-
 xinitrc = xinitrc

res/lang/zh_CN.ini

@@ -1,70 +0,0 @@
-
-
-
-capslock = 大写锁定
-
-err_alloc = 内存分配失败
-err_bounds = 索引越界
-
-err_chdir = 无法打开home文件夹
-
-
-err_dgn_oob = 日志消息
-err_domain = 无效的域
-
-
-
-err_hostname = 获取主机名失败
-
-
-err_mlock = 锁定密码存储器失败
-err_null = 空指针
-
-err_pam = PAM事件失败
-err_pam_abort = PAM事务已中止
-err_pam_acct_expired = 帐户已过期
-err_pam_auth = 身份验证错误
-err_pam_authinfo_unavail = 获取用户信息失败
-err_pam_authok_reqd = 口令已过期
-err_pam_buf = 内存缓冲区错误
-err_pam_cred_err = 设置凭据失败
-err_pam_cred_expired = 凭据已过期
-err_pam_cred_insufficient = 凭据不足
-err_pam_cred_unavail = 无法获取凭据
-err_pam_maxtries = 已达到最大尝试次数限制
-err_pam_perm_denied = 拒绝访问
-err_pam_session = 会话错误
-err_pam_sys = 系统错误
-err_pam_user_unknown = 未知用户
-err_path = 无法设置路径
-err_perm_dir = 更改当前目录失败
-err_perm_group = 组权限降级失败
-err_perm_user = 用户权限降级失败
-err_pwnam = 获取用户信息失败
-
-
-
-
-
-err_user_gid = 设置用户GID失败
-err_user_init = 初始化用户失败
-err_user_uid = 设置用户UID失败
-
-
-err_xsessions_dir = 找不到会话文件夹
-err_xsessions_open = 无法打开会话文件夹
-
-login = 登录
-logout = 注销
-
-
-numlock = 数字锁定
-
-password = 密码
-
-shell = shell
-
-
-wayland = wayland
-x11 = x11
-xinitrc = xinitrc

res/ly-dinit

@@ -1,8 +0,0 @@
-type            = process
-restart         = true
-smooth-recovery = true
-command         = $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME
-depends-on      = login.target
-termsignal      = HUP
-# ly needs access to the console while login.target already occupies it
-options         = shares-console

res/ly-freebsd-wrapper

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# On FreeBSD, even if we override the default login program, getty will still
-# try to append "login -fp root" as arguments to Ly, which is not supported.
-# To avoid this, we use a wrapper script that ignores these arguments before
-# actually executing Ly.
-exec $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME

res/ly-openrc

@@ -19,13 +19,17 @@ then
     commandUL="/sbin/agetty"
 fi
 
+## Get the tty from the conf file
+CONFTTY=$(cat /etc/ly/config.ini | sed -n 's/^tty.*=[^1-9]*// p')
+
 ## The execution vars
-TTY="tty$DEFAULT_TTY"
+# If CONFTTY is empty then default to 2
+TTY="tty${CONFTTY:-2}"
 TERM=linux
 BAUD=38400
 # If we don't have getty then we should have agetty
 command=${commandB:-$commandUL}
-command_args_foreground="-nl $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME $TTY $BAUD $TERM"
+command_args_foreground="-nl /usr/bin/ly $TTY $BAUD $TERM"
 
 depend() {
          after agetty

res/ly-runit-service/conf

@@ -7,4 +7,6 @@ fi
 
 BAUD_RATE=38400
 TERM_NAME=linux
-TTY=tty$DEFAULT_TTY
+
+auxtty=$(/bin/cat /etc/ly/config.ini 2>/dev/null 1| /bin/sed -n 's/\(^[[:space:]]*tty[[:space:]]*=[[:space:]]*\)\([[:digit:]][[:digit:]]*\)\(.*\)/\2/p')
+TTY=tty${auxtty:-2}

res/ly-runit-service/run

@@ -10,4 +10,4 @@ elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
 	GETTY=agetty
 fi
 
-exec setsid ${GETTY} ${GETTY_ARGS} -nl $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME "${TTY}" "${BAUD_RATE}" "${TERM_NAME}"
+exec setsid ${GETTY} ${GETTY_ARGS} -nl /usr/bin/ly "${TTY}" "${BAUD_RATE}" "${TERM_NAME}"

res/ly-s6/run

@@ -1,2 +0,0 @@
-#!/bin/execlineb -P
-exec agetty -L -8 -n -l $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME tty$DEFAULT_TTY 115200

res/ly-s6/type

@@ -1 +0,0 @@
-longrun

res/ly-sysvinit

@@ -1,65 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          ly
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Ly display manager
-# Description:       Starts and stops the Ly display manager
-### END INIT INFO
-#
-# Author:       AnErrupTion <anerruption@disroot.org>
-#
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DAEMON=/usr/bin/ly
-TTY=/dev/tty$DEFAULT_TTY
-PIDFILE=/var/run/ly.pid
-NAME=ly
-DESC="Ly display manager"
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC on $TTY..."
-    if [ -f "$PIDFILE" ]; then
-        log_progress_msg "$DESC is already running"
-        log_end_msg 0
-        return 0
-    fi
-
-    # Ensure TTY exists
-    [ -c "$TTY" ] || {
-        log_failure_msg "$TTY does not exist"
-        return 1
-    }
-
-    start-stop-daemon --start --background --make-pidfile --pidfile $PIDFILE \
-      --chdir / --exec /bin/sh -- -c "exec setsid sh -c 'exec <$TTY >$TTY 2>&1 $DAEMON'"
-    log_end_msg $?
-    ;;
-  stop)
-    log_daemon_msg "Stopping $DESC..."
-    start-stop-daemon --stop --pidfile $PIDFILE --retry 5
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && rm -f "$PIDFILE"
-    log_end_msg $RETVAL
-    ;;
-  restart)
-    echo "Restarting $DESC..."
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-    ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|status}"
-    exit 1
-    ;;
-esac
-
-exit 0

res/ly.service

@@ -1,14 +1,14 @@
 [Unit]
 Description=TUI display manager
 After=systemd-user-sessions.service plymouth-quit-wait.service
-After=getty@tty$DEFAULT_TTY.service
-Conflicts=getty@tty$DEFAULT_TTY.service
+After=getty@tty2.service
+Conflicts=getty@tty2.service
 
 [Service]
 Type=idle
-ExecStart=$PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME
+ExecStart=/usr/bin/ly
 StandardInput=tty
-TTYPath=/dev/tty$DEFAULT_TTY
+TTYPath=/dev/tty2
 TTYReset=yes
 TTYVHangup=yes
 

res/pam.d/ly

@@ -1,7 +1,5 @@
 #%PAM-1.0
 
-# OpenPAM (used in FreeBSD) doesn't support prepending "-" for ignoring missing
-# modules.
 auth       include      login
 account    include      login
 password   include      login

res/pam.d/ly-linux

@@ -1,16 +0,0 @@
-#%PAM-1.0
-
-auth       include      login
--auth      optional     pam_gnome_keyring.so
--auth      optional     pam_kwallet5.so
-
-account    include      login
-
-password   include      login
--password  optional     pam_gnome_keyring.so use_authtok
-
--session   optional     pam_systemd.so       class=greeter
--session   optional     pam_elogind.so
-session    include      login
--session   optional     pam_gnome_keyring.so auto_start
--session   optional     pam_kwallet5.so      auto_start

res/setup.sh

@@ -1,107 +0,0 @@
-#!/bin/sh
-# Shell environment setup after login
-# Copyright (C) 2015-2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-
-# This file is extracted from kde-workspace (kdm/kfrontend/genkdmconf.c)
-# Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org>
-
-# Copyright (C) 2024 The Fairy Glade
-# This work is free. You can redistribute it and/or modify it under the
-# terms of the Do What The Fuck You Want To Public License, Version 2,
-# as published by Sam Hocevar. See the LICENSE file for more details.
-
-# Note that the respective logout scripts are not sourced.
-case $SHELL in
-*/bash)
-    [ -z "$BASH" ] && exec $SHELL "$0" "$@"
-    set +o posix
-    [ -f "$CONFIG_DIRECTORY"/profile ] && . "$CONFIG_DIRECTORY"/profile
-    if [ -f "$HOME"/.bash_profile ]; then
-        . "$HOME"/.bash_profile
-    elif [ -f "$HOME"/.bash_login ]; then
-        . "$HOME"/.bash_login
-    elif [ -f "$HOME"/.profile ]; then
-        . "$HOME"/.profile
-    fi
-    ;;
-*/zsh)
-    [ -z "$ZSH_NAME" ] && exec $SHELL "$0" "$@"
-    [ -d "$CONFIG_DIRECTORY"/zsh ] && zdir="$CONFIG_DIRECTORY"/zsh || zdir="$CONFIG_DIRECTORY"
-    zhome=${ZDOTDIR:-"$HOME"}
-    # zshenv is always sourced automatically.
-    [ -f "$zdir"/zprofile ] && . "$zdir"/zprofile
-    [ -f "$zhome"/.zprofile ] && . "$zhome"/.zprofile
-    [ -f "$zdir"/zlogin ] && . "$zdir"/zlogin
-    [ -f "$zhome"/.zlogin ] && . "$zhome"/.zlogin
-    emulate -R sh
-    ;;
-*/csh|*/tcsh)
-    # [t]cshrc is always sourced automatically.
-    # Note that sourcing csh.login after .cshrc is non-standard.
-    sess_tmp=$(mktemp /tmp/sess-env-XXXXXX)
-    $SHELL -c "if (-f $CONFIG_DIRECTORY/csh.login) source $CONFIG_DIRECTORY/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $sess_tmp"
-    . "$sess_tmp"
-    rm -f "$sess_tmp"
-    ;;
-*/fish)
-    [ -f "$CONFIG_DIRECTORY"/profile ] && . "$CONFIG_DIRECTORY"/profile
-    [ -f "$HOME"/.profile ] && . "$HOME"/.profile
-    sess_tmp=$(mktemp /tmp/sess-env-XXXXXX)
-    $SHELL --login -c "/bin/sh -c 'export -p' > $sess_tmp"
-    . "$sess_tmp"
-    rm -f "$sess_tmp"
-    ;;
-*) # Plain sh, ksh, and anything we do not know.
-    [ -f "$CONFIG_DIRECTORY"/profile ] && . "$CONFIG_DIRECTORY"/profile
-    [ -f "$HOME"/.profile ] && . "$HOME"/.profile
-    ;;
-esac
-
-if [ "$XDG_SESSION_TYPE" = "x11" ]; then
-    [ -f "$CONFIG_DIRECTORY"/xprofile ] && . "$CONFIG_DIRECTORY"/xprofile
-    [ -f "$HOME"/.xprofile ] && . "$HOME"/.xprofile
-
-    # run all system xinitrc shell scripts.
-    if [ -d "$CONFIG_DIRECTORY"/X11/xinit/xinitrc.d ]; then
-        for i in "$CONFIG_DIRECTORY"/X11/xinit/xinitrc.d/* ; do
-            if [ -x "$i" ]; then
-                . "$i"
-            fi
-        done
-    fi
-
-    # Load Xsession scripts
-    # OPTIONFILE, USERXSESSION, USERXSESSIONRC and ALTUSERXSESSION are required
-    # by the scripts to work
-    xsessionddir="$CONFIG_DIRECTORY"/X11/Xsession.d
-    export OPTIONFILE="$CONFIG_DIRECTORY"/X11/Xsession.options
-    export USERXSESSION="$HOME"/.xsession
-    export USERXSESSIONRC="$HOME"/.xsessionrc
-    export ALTUSERXSESSION="$HOME"/.Xsession
-
-    if [ -d "$xsessionddir" ]; then
-        for i in $(ls "$xsessionddir"); do
-            script="$xsessionddir/$i"
-            echo "Loading X session script $script"
-            if [ -r "$script" ] && [ -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
-                . "$script"
-            fi
-        done
-    fi
-
-    if [ -f "$USERXSESSION" ]; then
-        . "$USERXSESSION"
-    fi
-
-    if [ -d "$CONFIG_DIRECTORY"/X11/Xresources ]; then
-        for i in "$CONFIG_DIRECTORY"/X11/Xresources/*; do
-            [ -f "$i" ] && xrdb -merge "$i"
-        done
-    elif [ -f "$CONFIG_DIRECTORY"/X11/Xresources ]; then
-        xrdb -merge "$CONFIG_DIRECTORY"/X11/Xresources
-    fi
-    [ -f "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources
-    [ -f "$XDG_CONFIG_HOME"/X11/Xresources ] && xrdb -merge "$XDG_CONFIG_HOME"/X11/Xresources
-fi
-
-exec "$@"

res/valgrind.supp

@@ -0,0 +1,31 @@
+{
+	pam
+	Memcheck:Leak
+	...
+	obj:/usr/lib/libpam.so.0.84.2
+	...
+}
+
+{
+	termbox
+	Memcheck:Leak
+	...
+	fun:tb_init
+	...
+}
+
+{
+	libc/dynamic
+	Memcheck:Leak
+	...
+	fun:_dl_catch_exception
+	...
+}
+
+{
+	libc/groups
+	Memcheck:Leak
+	...
+	fun:initgroups
+	...
+}

res/wsetup.sh

@@ -0,0 +1,55 @@
+#!/bin/sh
+# wayland-session - run as user
+# Copyright (C) 2015-2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+
+# This file is extracted from kde-workspace (kdm/kfrontend/genkdmconf.c)
+# Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org>
+
+# Note that the respective logout scripts are not sourced.
+case $SHELL in
+  */bash)
+    [ -z "$BASH" ] && exec $SHELL $0 "$@"
+    set +o posix
+    [ -f /etc/profile ] && . /etc/profile
+    if [ -f $HOME/.bash_profile ]; then
+      . $HOME/.bash_profile
+    elif [ -f $HOME/.bash_login ]; then
+      . $HOME/.bash_login
+    elif [ -f $HOME/.profile ]; then
+      . $HOME/.profile
+    fi
+    ;;
+*/zsh)
+    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
+    zhome=${ZDOTDIR:-$HOME}
+    # zshenv is always sourced automatically.
+    [ -f $zdir/zprofile ] && . $zdir/zprofile
+    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
+    [ -f $zdir/zlogin ] && . $zdir/zlogin
+    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
+    emulate -R sh
+    ;;
+  */csh|*/tcsh)
+    # [t]cshrc is always sourced automatically.
+    # Note that sourcing csh.login after .cshrc is non-standard.
+    wlsess_tmp=`mktemp /tmp/wlsess-env-XXXXXX`
+    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $wlsess_tmp"
+    . $wlsess_tmp
+    rm -f $wlsess_tmp
+    ;;
+  */fish)
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
+  *) # Plain sh, ksh, and anything we do not know.
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    ;;
+esac
+
+exec "$@"

res/xsetup.sh

@@ -0,0 +1,104 @@
+#!/bin/sh
+# Xsession - run as user
+# Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+
+# This file is extracted from kde-workspace (kdm/kfrontend/genkdmconf.c)
+# Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org>
+
+# Note that the respective logout scripts are not sourced.
+case $SHELL in
+  */bash)
+    [ -z "$BASH" ] && exec $SHELL $0 "$@"
+    set +o posix
+    [ -f /etc/profile ] && . /etc/profile
+    if [ -f $HOME/.bash_profile ]; then
+      . $HOME/.bash_profile
+    elif [ -f $HOME/.bash_login ]; then
+      . $HOME/.bash_login
+    elif [ -f $HOME/.profile ]; then
+      . $HOME/.profile
+    fi
+    ;;
+*/zsh)
+    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
+    zhome=${ZDOTDIR:-$HOME}
+    # zshenv is always sourced automatically.
+    [ -f $zdir/zprofile ] && . $zdir/zprofile
+    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
+    [ -f $zdir/zlogin ] && . $zdir/zlogin
+    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
+    emulate -R sh
+    ;;
+  */csh|*/tcsh)
+    # [t]cshrc is always sourced automatically.
+    # Note that sourcing csh.login after .cshrc is non-standard.
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
+  */fish)
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
+  *) # Plain sh, ksh, and anything we do not know.
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    ;;
+esac
+
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f $HOME/.xprofile ] && . $HOME/.xprofile
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for i in /etc/X11/xinit/xinitrc.d/* ; do
+  if [ -x "$i" ]; then
+    . "$i"
+  fi
+  done
+fi
+
+# Load Xsession scripts
+# OPTIONFILE, USERXSESSION, USERXSESSIONRC and ALTUSERXSESSION are required
+# by the scripts to work
+xsessionddir="/etc/X11/Xsession.d"
+OPTIONFILE=/etc/X11/Xsession.options
+USERXSESSION=$HOME/.xsession
+USERXSESSIONRC=$HOME/.xsessionrc
+ALTUSERXSESSION=$HOME/.Xsession
+
+if [ -d "$xsessionddir" ]; then
+    for i in `ls $xsessionddir`; do
+        script="$xsessionddir/$i"
+        echo "Loading X session script $script"
+        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+            . "$script"
+        fi
+    done
+fi
+
+if [ -d /etc/X11/Xresources ]; then
+  for i in /etc/X11/Xresources/*; do
+    [ -f $i ] && xrdb -merge $i
+  done
+elif [ -f /etc/X11/Xresources ]; then
+  xrdb -merge /etc/X11/Xresources
+fi
+[ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
+[ -f $XDG_CONFIG_HOME/X11/Xresources ] && xrdb -merge $XDG_CONFIG_HOME/X11/Xresources
+
+if [ -f "$USERXSESSION" ]; then
+  . "$USERXSESSION"
+fi
+
+if [ -z "$*" ]; then
+    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+else
+    exec $@
+fi

src/Environment.zig

@@ -1,23 +0,0 @@
-const enums = @import("enums.zig");
-const ini = @import("zigini");
-
-const DisplayServer = enums.DisplayServer;
-const Ini = ini.Ini;
-
-pub const DesktopEntry = struct {
-    Exec: []const u8 = "",
-    Name: []const u8 = "",
-    DesktopNames: ?[]u8 = null,
-    Terminal: ?bool = null,
-};
-
-pub const Entry = struct { @"Desktop Entry": DesktopEntry = .{} };
-
-entry_ini: ?Ini(Entry) = null,
-name: []const u8 = "",
-xdg_session_desktop: ?[]const u8 = null,
-xdg_desktop_names: ?[]const u8 = null,
-cmd: ?[]const u8 = null,
-specifier: []const u8 = "",
-display_server: DisplayServer = .wayland,
-is_terminal: bool = false,

src/LogFile.zig

@@ -1,51 +0,0 @@
-const std = @import("std");
-
-const LogFile = @This();
-
-path: []const u8,
-could_open_log_file: bool = undefined,
-file: std.fs.File = undefined,
-buffer: []u8,
-file_writer: std.fs.File.Writer = undefined,
-
-pub fn init(path: []const u8, buffer: []u8) !LogFile {
-    var log_file = LogFile{ .path = path, .buffer = buffer };
-    log_file.could_open_log_file = try openLogFile(path, &log_file);
-    return log_file;
-}
-
-pub fn reinit(self: *LogFile) !void {
-    self.could_open_log_file = try openLogFile(self.path, self);
-}
-
-pub fn deinit(self: *LogFile) void {
-    self.file_writer.interface.flush() catch {};
-    self.file.close();
-}
-
-fn openLogFile(path: []const u8, log_file: *LogFile) !bool {
-    var could_open_log_file = true;
-    open_log_file: {
-        log_file.file = std.fs.cwd().openFile(path, .{ .mode = .write_only }) catch std.fs.cwd().createFile(path, .{ .mode = 0o666 }) catch {
-            // If we could neither open an existing log file nor create a new
-            // one, abort.
-            could_open_log_file = false;
-            break :open_log_file;
-        };
-    }
-
-    if (!could_open_log_file) {
-        log_file.file = try std.fs.openFileAbsolute("/dev/null", .{ .mode = .write_only });
-    }
-
-    var log_file_writer = log_file.file.writer(log_file.buffer);
-
-    // Seek to the end of the log file
-    if (could_open_log_file) {
-        const stat = try log_file.file.stat();
-        try log_file_writer.seekTo(stat.size);
-    }
-
-    log_file.file_writer = log_file_writer;
-    return could_open_log_file;
-}

src/SharedError.zig

@@ -9,7 +9,7 @@ const ErrorHandler = packed struct {
 
 const SharedError = @This();
 
-data: []align(std.heap.page_size_min) u8,
+data: []align(std.mem.page_size) u8,
 
 pub fn init() !SharedError {
     const data = try std.posix.mmap(null, @sizeOf(ErrorHandler), std.posix.PROT.READ | std.posix.PROT.WRITE, .{ .TYPE = .SHARED, .ANONYMOUS = true }, -1, 0);

src/UidRange.zig

@@ -1,6 +0,0 @@
-const std = @import("std");
-
-// We set both values to 0 by default so that, in case they aren't present in
-// the login.defs for some reason, then only the root username will be shown
-uid_min: std.posix.uid_t = 0,
-uid_max: std.posix.uid_t = 0,

src/animations/ColorMix.zig

@@ -1,86 +0,0 @@
-const std = @import("std");
-const Animation = @import("../tui/Animation.zig");
-const Cell = @import("../tui/Cell.zig");
-const TerminalBuffer = @import("../tui/TerminalBuffer.zig");
-
-const ColorMix = @This();
-
-const math = std.math;
-const Vec2 = @Vector(2, f32);
-
-const time_scale: f32 = 0.01;
-const palette_len: usize = 12;
-
-fn length(vec: Vec2) f32 {
-    return math.sqrt(vec[0] * vec[0] + vec[1] * vec[1]);
-}
-
-terminal_buffer: *TerminalBuffer,
-frames: u64,
-pattern_cos_mod: f32,
-pattern_sin_mod: f32,
-palette: [palette_len]Cell,
-
-pub fn init(terminal_buffer: *TerminalBuffer, col1: u32, col2: u32, col3: u32) ColorMix {
-    return .{
-        .terminal_buffer = terminal_buffer,
-        .frames = 0,
-        .pattern_cos_mod = terminal_buffer.random.float(f32) * math.pi * 2.0,
-        .pattern_sin_mod = terminal_buffer.random.float(f32) * math.pi * 2.0,
-        .palette = [palette_len]Cell{
-            Cell.init(0x2588, col1, col2),
-            Cell.init(0x2593, col1, col2),
-            Cell.init(0x2592, col1, col2),
-            Cell.init(0x2591, col1, col2),
-            Cell.init(0x2588, col2, col3),
-            Cell.init(0x2593, col2, col3),
-            Cell.init(0x2592, col2, col3),
-            Cell.init(0x2591, col2, col3),
-            Cell.init(0x2588, col3, col1),
-            Cell.init(0x2593, col3, col1),
-            Cell.init(0x2592, col3, col1),
-            Cell.init(0x2591, col3, col1),
-        },
-    };
-}
-
-pub fn animation(self: *ColorMix) Animation {
-    return Animation.init(self, deinit, realloc, draw);
-}
-
-fn deinit(_: *ColorMix) void {}
-
-fn realloc(_: *ColorMix) anyerror!void {}
-
-fn draw(self: *ColorMix) void {
-    self.frames +%= 1;
-    const time: f32 = @as(f32, @floatFromInt(self.frames)) * time_scale;
-
-    for (0..self.terminal_buffer.width) |x| {
-        for (0..self.terminal_buffer.height) |y| {
-            const xi: i32 = @intCast(x);
-            const yi: i32 = @intCast(y);
-            const wi: i32 = @intCast(self.terminal_buffer.width);
-            const hi: i32 = @intCast(self.terminal_buffer.height);
-
-            var uv: Vec2 = .{
-                @as(f32, @floatFromInt(xi * 2 - wi)) / @as(f32, @floatFromInt(self.terminal_buffer.height * 2)),
-                @as(f32, @floatFromInt(yi * 2 - hi)) / @as(f32, @floatFromInt(self.terminal_buffer.height)),
-            };
-
-            var uv2: Vec2 = @splat(uv[0] + uv[1]);
-
-            for (0..3) |_| {
-                uv2 += uv + @as(Vec2, @splat(length(uv)));
-                uv += @as(Vec2, @splat(0.5)) * Vec2{
-                    math.cos(self.pattern_cos_mod + uv2[1] * 0.2 + time * 0.1),
-                    math.sin(self.pattern_sin_mod + uv2[0] - time * 0.1),
-                };
-                uv -= @splat(1.0 * math.cos(uv[0] + uv[1]) - math.sin(uv[0] * 0.7 - uv[1]));
-            }
-
-            const cell = self.palette[@as(usize, @intFromFloat(math.floor(length(uv) * 5.0))) % palette_len];
-            cell.put(x, y);
-        }
-    }
-}

src/animations/Doom.zig

@@ -1,110 +1,84 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const Animation = @import("../tui/Animation.zig");
-const Cell = @import("../tui/Cell.zig");
 const TerminalBuffer = @import("../tui/TerminalBuffer.zig");
+const utils = @import("../tui/utils.zig");
+
+const interop = @import("../interop.zig");
+const termbox = interop.termbox;
 
 const Doom = @This();
 
-pub const STEPS = 12;
-pub const HEIGHT_MAX = 9;
-pub const SPREAD_MAX = 4;
+pub const STEPS = 13;
+pub const FIRE = [_]termbox.tb_cell{
+    utils.initCell(' ', 9, 0),
+    utils.initCell(0x2591, 2, 0), // Red
+    utils.initCell(0x2592, 2, 0), // Red
+    utils.initCell(0x2593, 2, 0), // Red
+    utils.initCell(0x2588, 2, 0), // Red
+    utils.initCell(0x2591, 4, 2), // Yellow
+    utils.initCell(0x2592, 4, 2), // Yellow
+    utils.initCell(0x2593, 4, 2), // Yellow
+    utils.initCell(0x2588, 4, 2), // Yellow
+    utils.initCell(0x2591, 8, 4), // White
+    utils.initCell(0x2592, 8, 4), // White
+    utils.initCell(0x2593, 8, 4), // White
+    utils.initCell(0x2588, 8, 4), // White
+};
 
 allocator: Allocator,
 terminal_buffer: *TerminalBuffer,
 buffer: []u8,
-height: u8,
-spread: u8,
-fire: [STEPS + 1]Cell,
 
-pub fn init(allocator: Allocator, terminal_buffer: *TerminalBuffer, top_color: u32, middle_color: u32, bottom_color: u32, fire_height: u8, fire_spread: u8) !Doom {
+pub fn init(allocator: Allocator, terminal_buffer: *TerminalBuffer) !Doom {
     const buffer = try allocator.alloc(u8, terminal_buffer.width * terminal_buffer.height);
     initBuffer(buffer, terminal_buffer.width);
 
-    const levels =
-        [_]Cell{
-            Cell.init(' ', terminal_buffer.bg, terminal_buffer.bg),
-            Cell.init(0x2591, top_color, terminal_buffer.bg),
-            Cell.init(0x2592, top_color, terminal_buffer.bg),
-            Cell.init(0x2593, top_color, terminal_buffer.bg),
-            Cell.init(0x2588, top_color, terminal_buffer.bg),
-            Cell.init(0x2591, middle_color, top_color),
-            Cell.init(0x2592, middle_color, top_color),
-            Cell.init(0x2593, middle_color, top_color),
-            Cell.init(0x2588, middle_color, top_color),
-            Cell.init(0x2591, bottom_color, middle_color),
-            Cell.init(0x2592, bottom_color, middle_color),
-            Cell.init(0x2593, bottom_color, middle_color),
-            Cell.init(0x2588, bottom_color, middle_color),
-        };
-
     return .{
         .allocator = allocator,
         .terminal_buffer = terminal_buffer,
         .buffer = buffer,
-        .height = @min(HEIGHT_MAX, fire_height),
-        .spread = @min(SPREAD_MAX, fire_spread),
-        .fire = levels,
     };
 }
 
-pub fn animation(self: *Doom) Animation {
-    return Animation.init(self, deinit, realloc, draw);
-}
-
-fn deinit(self: *Doom) void {
+pub fn deinit(self: Doom) void {
     self.allocator.free(self.buffer);
 }
 
-fn realloc(self: *Doom) anyerror!void {
+pub fn realloc(self: *Doom) !void {
     const buffer = try self.allocator.realloc(self.buffer, self.terminal_buffer.width * self.terminal_buffer.height);
     initBuffer(buffer, self.terminal_buffer.width);
     self.buffer = buffer;
 }
 
-fn draw(self: *Doom) void {
+pub fn draw(self: Doom) void {
     for (0..self.terminal_buffer.width) |x| {
-        // We start from 1 so that we always have the topmost line when spreading fire
         for (1..self.terminal_buffer.height) |y| {
-            // Get index of current cell in fire level buffer
-            const from = y * self.terminal_buffer.width + x;
+            const source = y * self.terminal_buffer.width + x;
+            const random = (self.terminal_buffer.random.int(u16) % 7) & 3;
 
-            // Generate random data for fire propagation
-            const rand_loss = self.terminal_buffer.random.intRangeAtMost(u8, 0, HEIGHT_MAX);
-            const rand_spread = self.terminal_buffer.random.intRangeAtMost(u8, 0, self.spread * 2);
+            var dest = (source - @min(source, random)) + 1;
+            if (self.terminal_buffer.width > dest) dest = 0 else dest -= self.terminal_buffer.width;
 
-            // Select semi-random target cell
-            const to = from -| self.terminal_buffer.width + self.spread -| rand_spread;
-            const to_x = to % self.terminal_buffer.width;
-            const to_y = to / self.terminal_buffer.width;
+            const buffer_source = self.buffer[source];
+            const buffer_dest_offset = random & 1;
 
-            // Get fire level of current cell
-            const level_buf_from = self.buffer[from];
+            if (buffer_source < buffer_dest_offset) continue;
 
-            // Choose new fire level and store in level buffer
-            const level_buf_to = level_buf_from -| @intFromBool(rand_loss >= self.height);
-            self.buffer[to] = level_buf_to;
+            var buffer_dest = buffer_source - buffer_dest_offset;
+            if (buffer_dest > 12) buffer_dest = 0;
+            self.buffer[dest] = @intCast(buffer_dest);
 
-            // Send known fire levels to terminal buffer
-            const from_cell = self.fire[level_buf_from];
-            const to_cell = self.fire[level_buf_to];
-            from_cell.put(x, y);
-            to_cell.put(to_x, to_y);
+            self.terminal_buffer.buffer[dest] = FIRE[buffer_dest];
+            self.terminal_buffer.buffer[source] = FIRE[buffer_source];
         }
-
-        // Draw bottom line (fire source)
-        const src_cell = self.fire[STEPS];
-        src_cell.put(x, self.terminal_buffer.height - 1);
     }
 }
 
-fn initBuffer(buffer: []u8, width: usize) void {
+fn initBuffer(buffer: []u8, width: u64) void {
     const length = buffer.len - width;
     const slice_start = buffer[0..length];
     const slice_end = buffer[length..];
 
-    // Initialize the framebuffer in black, except for the "fire source" as the
-    // last color
     @memset(slice_start, 0);
-    @memset(slice_end, STEPS);
+    @memset(slice_end, STEPS - 1);
 }

src/animations/Dummy.zig

@@ -1,14 +0,0 @@
-const std = @import("std");
-const Animation = @import("../tui/Animation.zig");
-
-const Dummy = @This();
-
-pub fn animation(self: *Dummy) Animation {
-    return Animation.init(self, deinit, realloc, draw);
-}
-
-fn deinit(_: *Dummy) void {}
-
-fn realloc(_: *Dummy) anyerror!void {}
-
-fn draw(_: *Dummy) void {}

src/animations/GameOfLife.zig

@@ -1,189 +0,0 @@
-const std = @import("std");
-const Animation = @import("../tui/Animation.zig");
-const Cell = @import("../tui/Cell.zig");
-const TerminalBuffer = @import("../tui/TerminalBuffer.zig");
-
-const Allocator = std.mem.Allocator;
-
-const GameOfLife = @This();
-
-// Visual styles - using block characters like other animations
-const ALIVE_CHAR: u21 = 0x2588; // Full block █
-const DEAD_CHAR: u21 = ' ';
-const NEIGHBOR_DIRS = [_][2]i8{
-    .{ -1, -1 }, .{ -1, 0 }, .{ -1, 1 },
-    .{ 0, -1 },  .{ 0, 1 },  .{ 1, -1 },
-    .{ 1, 0 },   .{ 1, 1 },
-};
-
-allocator: Allocator,
-terminal_buffer: *TerminalBuffer,
-current_grid: []bool,
-next_grid: []bool,
-frame_counter: usize,
-generation: u64,
-fg_color: u32,
-entropy_interval: usize,
-frame_delay: usize,
-initial_density: f32,
-dead_cell: Cell,
-width: usize,
-height: usize,
-
-pub fn init(allocator: Allocator, terminal_buffer: *TerminalBuffer, fg_color: u32, entropy_interval: usize, frame_delay: usize, initial_density: f32) !GameOfLife {
-    const width = terminal_buffer.width;
-    const height = terminal_buffer.height;
-    const grid_size = width * height;
-
-    const current_grid = try allocator.alloc(bool, grid_size);
-    const next_grid = try allocator.alloc(bool, grid_size);
-
-    var game = GameOfLife{
-        .allocator = allocator,
-        .terminal_buffer = terminal_buffer,
-        .current_grid = current_grid,
-        .next_grid = next_grid,
-        .frame_counter = 0,
-        .generation = 0,
-        .fg_color = fg_color,
-        .entropy_interval = entropy_interval,
-        .frame_delay = frame_delay,
-        .initial_density = initial_density,
-        .dead_cell = .{ .ch = DEAD_CHAR, .fg = @intCast(TerminalBuffer.Color.DEFAULT), .bg = terminal_buffer.bg },
-        .width = width,
-        .height = height,
-    };
-
-    // Initialize grid
-    game.initializeGrid();
-
-    return game;
-}
-
-pub fn animation(self: *GameOfLife) Animation {
-    return Animation.init(self, deinit, realloc, draw);
-}
-
-fn deinit(self: *GameOfLife) void {
-    self.allocator.free(self.current_grid);
-    self.allocator.free(self.next_grid);
-}
-
-fn realloc(self: *GameOfLife) anyerror!void {
-    const new_width = self.terminal_buffer.width;
-    const new_height = self.terminal_buffer.height;
-    const new_size = new_width * new_height;
-
-    const current_grid = try self.allocator.realloc(self.current_grid, new_size);
-    const next_grid = try self.allocator.realloc(self.next_grid, new_size);
-
-    self.current_grid = current_grid;
-    self.next_grid = next_grid;
-    self.width = new_width;
-    self.height = new_height;
-
-    self.initializeGrid();
-    self.generation = 0;
-}
-
-fn draw(self: *GameOfLife) void {
-    // Update game state at controlled frame rate
-    self.frame_counter += 1;
-    if (self.frame_counter >= self.frame_delay) {
-        self.frame_counter = 0;
-        self.updateGeneration();
-        self.generation += 1;
-
-        // Add entropy based on configuration (0 = disabled, >0 = interval)
-        if (self.entropy_interval > 0 and self.generation % self.entropy_interval == 0) {
-            self.addEntropy();
-        }
-    }
-
-    // Render with the configured color
-    const alive_cell = Cell{ .ch = ALIVE_CHAR, .fg = self.fg_color, .bg = self.terminal_buffer.bg };
-
-    for (0..self.height) |y| {
-        const row_offset = y * self.width;
-        for (0..self.width) |x| {
-            const cell = if (self.current_grid[row_offset + x]) alive_cell else self.dead_cell;
-            cell.put(x, y);
-        }
-    }
-}
-
-fn updateGeneration(self: *GameOfLife) void {
-    // Conway's Game of Life rules with optimized neighbor counting
-    for (0..self.height) |y| {
-        const row_offset = y * self.width;
-        for (0..self.width) |x| {
-            const index = row_offset + x;
-            const neighbors = self.countNeighborsOptimized(x, y);
-            const is_alive = self.current_grid[index];
-
-            // Optimized rule application
-            self.next_grid[index] = switch (neighbors) {
-                2 => is_alive,
-                3 => true,
-                else => false,
-            };
-        }
-    }
-
-    // Efficient grid swap
-    std.mem.swap([]bool, &self.current_grid, &self.next_grid);
-}
-
-fn countNeighborsOptimized(self: *GameOfLife, x: usize, y: usize) u8 {
-    var count: u8 = 0;
-
-    for (NEIGHBOR_DIRS) |dir| {
-        const neighbor_x = @as(i32, @intCast(x)) + dir[0];
-        const neighbor_y = @as(i32, @intCast(y)) + dir[1];
-        const width_i32: i32 = @intCast(self.width);
-        const height_i32: i32 = @intCast(self.height);
-
-        // Toroidal wrapping with modular arithmetic
-        const wx: usize = @intCast(@mod(neighbor_x + width_i32, width_i32));
-        const wy: usize = @intCast(@mod(neighbor_y + height_i32, height_i32));
-
-        if (self.current_grid[wy * self.width + wx]) {
-            count += 1;
-        }
-    }
-
-    return count;
-}
-
-fn initializeGrid(self: *GameOfLife) void {
-    const total_cells = self.width * self.height;
-
-    // Clear grid
-    @memset(self.current_grid, false);
-    @memset(self.next_grid, false);
-
-    // Random initialization with configurable density
-    for (0..total_cells) |i| {
-        self.current_grid[i] = self.terminal_buffer.random.float(f32) < self.initial_density;
-    }
-}
-
-fn addEntropy(self: *GameOfLife) void {
-    // Add fewer random cells but in clusters for more interesting patterns
-    const clusters = 2;
-    for (0..clusters) |_| {
-        const cx = self.terminal_buffer.random.intRangeAtMost(usize, 1, self.width - 2);
-        const cy = self.terminal_buffer.random.intRangeAtMost(usize, 1, self.height - 2);
-
-        // Small cluster around center point
-        for (0..3) |dy| {
-            for (0..3) |dx| {
-                if (self.terminal_buffer.random.float(f32) < 0.4) {
-                    const x = (cx + dx) % self.width;
-                    const y = (cy + dy) % self.height;
-                    self.current_grid[y * self.width + x] = true;
-                }
-            }
-        }
-    }
-}

src/animations/Matrix.zig

@@ -1,12 +1,16 @@
 const std = @import("std");
-const Animation = @import("../tui/Animation.zig");
-const Cell = @import("../tui/Cell.zig");
+const Allocator = std.mem.Allocator;
+const Random = std.rand.Random;
 const TerminalBuffer = @import("../tui/TerminalBuffer.zig");
 
-const Allocator = std.mem.Allocator;
-const Random = std.Random;
+const interop = @import("../interop.zig");
+const termbox = interop.termbox;
 
-pub const FRAME_DELAY: usize = 8;
+pub const FRAME_DELAY: u64 = 8;
+
+// Allowed codepoints
+pub const MIN_CODEPOINT: isize = 33;
+pub const MAX_CODEPOINT: isize = 123 - MIN_CODEPOINT;
 
 // Characters change mid-scroll
 pub const MID_SCROLL_CHANGE = true;
@@ -14,29 +18,24 @@ pub const MID_SCROLL_CHANGE = true;
 const Matrix = @This();
 
 pub const Dot = struct {
-    value: ?usize,
+    value: isize,
     is_head: bool,
 };
 
 pub const Line = struct {
-    space: usize,
-    length: usize,
-    update: usize,
+    space: isize,
+    length: isize,
+    update: isize,
 };
 
 allocator: Allocator,
 terminal_buffer: *TerminalBuffer,
 dots: []Dot,
 lines: []Line,
-frame: usize,
-count: usize,
-fg: u32,
-head_col: u32,
-min_codepoint: u16,
-max_codepoint: u16,
-default_cell: Cell,
+frame: u64,
+count: u64,
 
-pub fn init(allocator: Allocator, terminal_buffer: *TerminalBuffer, fg: u32, head_col: u32, min_codepoint: u16, max_codepoint: u16) !Matrix {
+pub fn init(allocator: Allocator, terminal_buffer: *TerminalBuffer) !Matrix {
     const dots = try allocator.alloc(Dot, terminal_buffer.width * (terminal_buffer.height + 1));
     const lines = try allocator.alloc(Line, terminal_buffer.width);
 
@@ -49,24 +48,15 @@ pub fn init(allocator: Allocator, terminal_buffer: *TerminalBuffer, fg: u32, hea
         .lines = lines,
         .frame = 3,
         .count = 0,
-        .fg = fg,
-        .head_col = head_col,
-        .min_codepoint = min_codepoint,
-        .max_codepoint = max_codepoint - min_codepoint,
-        .default_cell = .{ .ch = ' ', .fg = fg, .bg = terminal_buffer.bg },
     };
 }
 
-pub fn animation(self: *Matrix) Animation {
-    return Animation.init(self, deinit, realloc, draw);
-}
-
-fn deinit(self: *Matrix) void {
+pub fn deinit(self: Matrix) void {
     self.allocator.free(self.dots);
     self.allocator.free(self.lines);
 }
 
-fn realloc(self: *Matrix) anyerror!void {
+pub fn realloc(self: *Matrix) !void {
     const dots = try self.allocator.realloc(self.dots, self.terminal_buffer.width * (self.terminal_buffer.height + 1));
     const lines = try self.allocator.realloc(self.lines, self.terminal_buffer.width);
 
@@ -76,7 +66,7 @@ fn realloc(self: *Matrix) anyerror!void {
     self.lines = lines;
 }
 
-fn draw(self: *Matrix) void {
+pub fn draw(self: *Matrix) void {
     const buf_height = self.terminal_buffer.height;
     const buf_width = self.terminal_buffer.width;
     self.count += 1;
@@ -85,31 +75,31 @@ fn draw(self: *Matrix) void {
         if (self.frame > 4) self.frame = 1;
         self.count = 0;
 
-        var x: usize = 0;
+        var x: u64 = 0;
         while (x < self.terminal_buffer.width) : (x += 2) {
-            var tail: usize = 0;
+            var tail: u64 = 0;
             var line = &self.lines[x];
             if (self.frame <= line.update) continue;
 
-            if (self.dots[x].value == null and self.dots[self.terminal_buffer.width + x].value == ' ') {
+            if (self.dots[x].value == -1 and self.dots[self.terminal_buffer.width + x].value == ' ') {
                 if (line.space > 0) {
                     line.space -= 1;
                 } else {
-                    const randint = self.terminal_buffer.random.int(u16);
-                    const h = self.terminal_buffer.height;
+                    const randint = self.terminal_buffer.random.int(i16);
+                    const h: isize = @intCast(self.terminal_buffer.height);
                     line.length = @mod(randint, h - 3) + 3;
-                    self.dots[x].value = @mod(randint, self.max_codepoint) + self.min_codepoint;
+                    self.dots[x].value = @mod(randint, MAX_CODEPOINT) + MIN_CODEPOINT;
                     line.space = @mod(randint, h + 1);
                 }
             }
 
-            var y: usize = 0;
+            var y: u64 = 0;
             var first_col = true;
             var seg_len: u64 = 0;
             height_it: while (y <= buf_height) : (y += 1) {
                 var dot = &self.dots[buf_width * y + x];
                 // Skip over spaces
-                while (y <= buf_height and (dot.value == ' ' or dot.value == null)) {
+                while (y <= buf_height and (dot.value == ' ' or dot.value == -1)) {
                     y += 1;
                     if (y > buf_height) break :height_it;
                     dot = &self.dots[buf_width * y + x];
@@ -118,12 +108,12 @@ fn draw(self: *Matrix) void {
                 // Find the head of this column
                 tail = y;
                 seg_len = 0;
-                while (y <= buf_height and dot.value != ' ' and dot.value != null) {
+                while (y <= buf_height and dot.value != ' ' and dot.value != -1) {
                     dot.is_head = false;
                     if (MID_SCROLL_CHANGE) {
-                        const randint = self.terminal_buffer.random.int(u16);
+                        const randint = self.terminal_buffer.random.int(i16);
                         if (@mod(randint, 8) == 0) {
-                            dot.value = @mod(randint, self.max_codepoint) + self.min_codepoint;
+                            dot.value = @mod(randint, MAX_CODEPOINT) + MIN_CODEPOINT;
                         }
                     }
 
@@ -137,52 +127,53 @@ fn draw(self: *Matrix) void {
                     dot = &self.dots[buf_width * y + x];
                 }
 
-                const randint = self.terminal_buffer.random.int(u16);
-                dot.value = @mod(randint, self.max_codepoint) + self.min_codepoint;
+                const randint = self.terminal_buffer.random.int(i16);
+                dot.value = @mod(randint, MAX_CODEPOINT) + MIN_CODEPOINT;
                 dot.is_head = true;
 
                 if (seg_len > line.length or !first_col) {
                     self.dots[buf_width * tail + x].value = ' ';
-                    self.dots[x].value = null;
+                    self.dots[x].value = -1;
                 }
                 first_col = false;
             }
         }
     }
 
-    var x: usize = 0;
+    var x: u64 = 0;
     while (x < buf_width) : (x += 2) {
-        var y: usize = 1;
+        var y: u64 = 1;
         while (y <= self.terminal_buffer.height) : (y += 1) {
             const dot = self.dots[buf_width * y + x];
-            const cell = if (dot.value == null or dot.value == ' ') self.default_cell else Cell{
-                .ch = @intCast(dot.value.?),
-                .fg = if (dot.is_head) self.head_col else self.fg,
-                .bg = self.terminal_buffer.bg,
-            };
+            var fg: u16 = @intCast(termbox.TB_GREEN);
 
-            cell.put(x, y - 1);
-            // Fill background in between columns
-            self.default_cell.put(x + 1, y - 1);
+            if (dot.value == -1 or dot.value == ' ') {
+                _ = termbox.tb_set_cell(@intCast(x), @intCast(y - 1), ' ', fg, termbox.TB_DEFAULT);
+                continue;
+            }
+
+            if (dot.is_head) fg = @intCast(termbox.TB_WHITE | termbox.TB_BOLD);
+            _ = termbox.tb_set_cell(@intCast(x), @intCast(y - 1), @intCast(dot.value), fg, termbox.TB_DEFAULT);
         }
     }
 }
 
-fn initBuffers(dots: []Dot, lines: []Line, width: usize, height: usize, random: Random) void {
-    var y: usize = 0;
+fn initBuffers(dots: []Dot, lines: []Line, width: u64, height: u64, random: Random) void {
+    var y: u64 = 0;
     while (y <= height) : (y += 1) {
-        var x: usize = 0;
+        var x: u64 = 0;
         while (x < width) : (x += 2) {
-            dots[y * width + x].value = null;
+            dots[y * width + x].value = -1;
         }
     }
 
-    var x: usize = 0;
+    var x: u64 = 0;
     while (x < width) : (x += 2) {
         var line = lines[x];
-        line.space = @mod(random.int(u16), height) + 1;
-        line.length = @mod(random.int(u16), height - 3) + 3;
-        line.update = @mod(random.int(u16), 3) + 1;
+        const h: isize = @intCast(height);
+        line.space = @mod(random.int(i16), h) + 1;
+        line.length = @mod(random.int(i16), h - 3) + 3;
+        line.update = @mod(random.int(i16), 3) + 1;
         lines[x] = line;
 
         dots[width + x].value = ' ';

src/auth.zig

@@ -1,56 +1,38 @@
 const std = @import("std");
-const build_options = @import("build_options");
-const builtin = @import("builtin");
 const enums = @import("enums.zig");
-const Environment = @import("Environment.zig");
 const interop = @import("interop.zig");
-const SharedError = @import("SharedError.zig");
-const LogFile = @import("LogFile.zig");
-
-const Md5 = std.crypto.hash.Md5;
+const TerminalBuffer = @import("tui/TerminalBuffer.zig");
+const Desktop = @import("tui/components/Desktop.zig");
+const Text = @import("tui/components/Text.zig");
+const Config = @import("config/Config.zig");
+const Allocator = std.mem.Allocator;
 const utmp = interop.utmp;
-const Utmp = utmp.utmpx;
-
-pub const AuthOptions = struct {
-    tty: u8,
-    service_name: [:0]const u8,
-    path: ?[]const u8,
-    session_log: ?[]const u8,
-    xauth_cmd: []const u8,
-    setup_cmd: []const u8,
-    login_cmd: ?[]const u8,
-    x_cmd: []const u8,
-    session_pid: std.posix.pid_t,
-};
+const Utmp = utmp.utmp;
+const SharedError = @import("SharedError.zig");
 
 var xorg_pid: std.posix.pid_t = 0;
-pub fn xorgSignalHandler(i: c_int) callconv(.c) void {
+pub fn xorgSignalHandler(i: c_int) callconv(.C) void {
     if (xorg_pid > 0) _ = std.c.kill(xorg_pid, i);
 }
 
 var child_pid: std.posix.pid_t = 0;
-pub fn sessionSignalHandler(i: c_int) callconv(.c) void {
+pub fn sessionSignalHandler(i: c_int) callconv(.C) void {
     if (child_pid > 0) _ = std.c.kill(child_pid, i);
 }
 
-pub fn authenticate(allocator: std.mem.Allocator, log_file: *LogFile, options: AuthOptions, current_environment: Environment, login: []const u8, password: []const u8) !void {
+pub fn authenticate(config: Config, current_environment: Desktop.Environment, login: [:0]const u8, password: [:0]const u8) !void {
     var tty_buffer: [3]u8 = undefined;
-    const tty_str = try std.fmt.bufPrint(&tty_buffer, "{d}", .{options.tty});
+    const tty_str = try std.fmt.bufPrintZ(&tty_buffer, "{d}", .{config.tty});
 
     var pam_tty_buffer: [6]u8 = undefined;
-    const pam_tty_str = try std.fmt.bufPrintZ(&pam_tty_buffer, "tty{d}", .{options.tty});
+    const pam_tty_str = try std.fmt.bufPrintZ(&pam_tty_buffer, "tty{d}", .{config.tty});
 
     // Set the XDG environment variables
-    try setXdgEnv(allocator, tty_str, current_environment);
+    setXdgSessionEnv(current_environment.display_server);
+    try setXdgEnv(tty_str, current_environment.xdg_session_desktop, current_environment.xdg_desktop_names orelse "");
 
     // Open the PAM session
-    const login_z = try allocator.dupeZ(u8, login);
-    defer allocator.free(login_z);
-
-    const password_z = try allocator.dupeZ(u8, password);
-    defer allocator.free(password_z);
-
-    var credentials = [_:null]?[*:0]const u8{ login_z, password_z };
+    var credentials = [_:null]?[*:0]const u8{ login, password };
 
     const conv = interop.pam.pam_conv{
         .conv = loginConv,
@@ -58,68 +40,53 @@ pub fn authenticate(allocator: std.mem.Allocator, log_file: *LogFile, options: A
     };
     var handle: ?*interop.pam.pam_handle = undefined;
 
-    var log_writer = &log_file.file_writer.interface;
-
-    try log_writer.writeAll("[pam] starting session\n");
-    var status = interop.pam.pam_start(options.service_name, null, &conv, &handle);
+    var status = interop.pam.pam_start(config.service_name.ptr, null, &conv, &handle);
     if (status != interop.pam.PAM_SUCCESS) return pamDiagnose(status);
     defer _ = interop.pam.pam_end(handle, status);
 
     // Set PAM_TTY as the current TTY. This is required in case it isn't being set by another PAM module
-    try log_writer.writeAll("[pam] setting tty\n");
     status = interop.pam.pam_set_item(handle, interop.pam.PAM_TTY, pam_tty_str.ptr);
     if (status != interop.pam.PAM_SUCCESS) return pamDiagnose(status);
 
     // Do the PAM routine
-    try log_writer.writeAll("[pam] authenticating\n");
     status = interop.pam.pam_authenticate(handle, 0);
     if (status != interop.pam.PAM_SUCCESS) return pamDiagnose(status);
 
-    try log_writer.writeAll("[pam] validating account\n");
     status = interop.pam.pam_acct_mgmt(handle, 0);
     if (status != interop.pam.PAM_SUCCESS) return pamDiagnose(status);
 
-    try log_writer.writeAll("[pam] setting credentials\n");
     status = interop.pam.pam_setcred(handle, interop.pam.PAM_ESTABLISH_CRED);
     if (status != interop.pam.PAM_SUCCESS) return pamDiagnose(status);
     defer status = interop.pam.pam_setcred(handle, interop.pam.PAM_DELETE_CRED);
 
-    try log_writer.writeAll("[pam] opening session\n");
     status = interop.pam.pam_open_session(handle, 0);
     if (status != interop.pam.PAM_SUCCESS) return pamDiagnose(status);
     defer status = interop.pam.pam_close_session(handle, 0);
 
-    var user_entry: interop.UsernameEntry = undefined;
+    var pwd: *interop.passwd = undefined;
     {
-        defer interop.closePasswordDatabase();
+        defer interop.endpwent();
 
         // Get password structure from username
-        user_entry = interop.getUsernameEntry(login_z) orelse return error.GetPasswordNameFailed;
+        pwd = interop.getpwnam(login.ptr) orelse return error.GetPasswordNameFailed;
     }
 
     // Set user shell if it hasn't already been set
-    if (user_entry.shell == null) interop.setUserShell(&user_entry);
+    if (pwd.pw_shell[0] == 0) {
+        interop.setusershell();
+        pwd.pw_shell = interop.getusershell();
+        interop.endusershell();
+    }
 
     var shared_err = try SharedError.init();
     defer shared_err.deinit();
 
-    log_file.deinit();
-
     child_pid = try std.posix.fork();
     if (child_pid == 0) {
-        try log_file.reinit();
-        log_writer = &log_file.file_writer.interface;
-
-        try log_writer.writeAll("starting session\n");
-
-        startSession(log_file, allocator, options, tty_str, user_entry, handle, current_environment) catch |e| {
+        startSession(config, pwd, handle, current_environment) catch |e| {
             shared_err.writeError(e);
-
-            log_file.deinit();
             std.process.exit(1);
         };
-
-        log_file.deinit();
         std.process.exit(0);
     }
 
@@ -128,113 +95,101 @@ pub fn authenticate(allocator: std.mem.Allocator, log_file: *LogFile, options: A
     {
         // If an error occurs here, we can send SIGTERM to the session
         errdefer cleanup: {
-            std.posix.kill(child_pid, std.posix.SIG.TERM) catch break :cleanup;
+            _ = std.posix.kill(child_pid, std.posix.SIG.TERM) catch break :cleanup;
             _ = std.posix.waitpid(child_pid, 0);
         }
 
         // If we receive SIGTERM, forward it to child_pid
         const act = std.posix.Sigaction{
             .handler = .{ .handler = &sessionSignalHandler },
-            .mask = std.posix.sigemptyset(),
+            .mask = std.posix.empty_sigset,
             .flags = 0,
         };
-        std.posix.sigaction(std.posix.SIG.TERM, &act, null);
+        try std.posix.sigaction(std.posix.SIG.TERM, &act, null);
 
-        try addUtmpEntry(&entry, user_entry.username.?, child_pid);
+        try addUtmpEntry(&entry, pwd.pw_name, child_pid);
     }
     // Wait for the session to stop
     _ = std.posix.waitpid(child_pid, 0);
 
-    try log_file.reinit();
-
     removeUtmpEntry(&entry);
 
+    try resetTerminal(pwd.pw_shell, config.term_reset_cmd);
+
     if (shared_err.readError()) |err| return err;
 }
 
 fn startSession(
-    log_file: *LogFile,
-    allocator: std.mem.Allocator,
-    options: AuthOptions,
-    tty_str: []u8,
-    user_entry: interop.UsernameEntry,
+    config: Config,
+    pwd: *interop.passwd,
     handle: ?*interop.pam.pam_handle,
-    current_environment: Environment,
+    current_environment: Desktop.Environment,
 ) !void {
-    // Set the user's GID & PID
-    try interop.setUserContext(allocator, user_entry);
+    const status = interop.initgroups(pwd.pw_name, pwd.pw_gid);
+    if (status != 0) return error.GroupInitializationFailed;
+
+    std.posix.setgid(pwd.pw_gid) catch return error.SetUserGidFailed;
+    std.posix.setuid(pwd.pw_uid) catch return error.SetUserUidFailed;
 
     // Set up the environment
-    try initEnv(allocator, user_entry, options.path);
-
-    // Reset the XDG environment variables
-    try setXdgEnv(allocator, tty_str, current_environment);
+    try initEnv(pwd, config.path);
 
     // Set the PAM variables
     const pam_env_vars: ?[*:null]?[*:0]u8 = interop.pam.pam_getenvlist(handle);
     if (pam_env_vars == null) return error.GetEnvListFailed;
 
     const env_list = std.mem.span(pam_env_vars.?);
-    for (env_list) |env_var| try interop.putEnvironmentVariable(env_var);
-
-    // Change to the user's home directory
-    std.posix.chdir(user_entry.home.?) catch return error.ChangeDirectoryFailed;
-
-    // Signal to the session process to give up control on the TTY
-    std.posix.kill(options.session_pid, std.posix.SIG.CHLD) catch return error.TtyControlTransferFailed;
+    for (env_list) |env_var| _ = interop.putenv(env_var.?);
 
     // Execute what the user requested
+    std.posix.chdirZ(pwd.pw_dir) catch return error.ChangeDirectoryFailed;
+
+    try resetTerminal(pwd.pw_shell, config.term_reset_cmd);
+
     switch (current_environment.display_server) {
-        .wayland, .shell, .custom => try executeCmd(log_file, allocator, user_entry.shell.?, options, current_environment.is_terminal, current_environment.cmd),
-        .xinitrc, .x11 => if (build_options.enable_x11_support) {
+        .wayland => try executeWaylandCmd(pwd.pw_shell, config.wayland_cmd, current_environment.cmd),
+        .shell => try executeShellCmd(pwd.pw_shell),
+        .xinitrc, .x11 => {
             var vt_buf: [5]u8 = undefined;
-            const vt = try std.fmt.bufPrint(&vt_buf, "vt{d}", .{options.tty});
-            try executeX11Cmd(log_file, allocator, user_entry.shell.?, user_entry.home.?, options, current_environment.cmd orelse "", vt);
+            const vt = try std.fmt.bufPrint(&vt_buf, "vt{d}", .{config.tty});
+            try executeX11Cmd(pwd.pw_shell, pwd.pw_dir, config, current_environment.cmd, vt);
         },
     }
 }
 
-fn initEnv(allocator: std.mem.Allocator, entry: interop.UsernameEntry, path_env: ?[]const u8) !void {
-    if (entry.home) |home| {
-        try interop.setEnvironmentVariable(allocator, "HOME", home, true);
-        try interop.setEnvironmentVariable(allocator, "PWD", home, true);
-    } else return error.NoHomeDirectory;
-
-    try interop.setEnvironmentVariable(allocator, "SHELL", entry.shell.?, true);
-    try interop.setEnvironmentVariable(allocator, "USER", entry.username.?, true);
-    try interop.setEnvironmentVariable(allocator, "LOGNAME", entry.username.?, true);
+fn initEnv(pwd: *interop.passwd, path_env: ?[:0]const u8) !void {
+    _ = interop.setenv("HOME", pwd.pw_dir, 1);
+    _ = interop.setenv("PWD", pwd.pw_dir, 1);
+    _ = interop.setenv("SHELL", pwd.pw_shell, 1);
+    _ = interop.setenv("USER", pwd.pw_name, 1);
+    _ = interop.setenv("LOGNAME", pwd.pw_name, 1);
 
     if (path_env) |path| {
-        interop.setEnvironmentVariable(allocator, "PATH", path, true) catch return error.SetPathFailed;
+        const status = interop.setenv("PATH", path, 1);
+        if (status != 0) return error.SetPathFailed;
     }
 }
 
-fn setXdgEnv(allocator: std.mem.Allocator, tty_str: []u8, environment: Environment) !void {
-    try interop.setEnvironmentVariable(allocator, "XDG_SESSION_TYPE", switch (environment.display_server) {
+fn setXdgSessionEnv(display_server: enums.DisplayServer) void {
+    _ = interop.setenv("XDG_SESSION_TYPE", switch (display_server) {
         .wayland => "wayland",
         .shell => "tty",
         .xinitrc, .x11 => "x11",
-        .custom => if (environment.is_terminal) "tty" else "unspecified",
-    }, false);
+    }, 0);
+}
 
-    // The "/run/user/%d" directory is not available on FreeBSD. It is much
-    // better to stick to the defaults and let applications using
-    // XDG_RUNTIME_DIR to fall back to directories inside user's home
-    // directory.
-    if (builtin.os.tag != .freebsd) {
-        const uid = std.posix.getuid();
-        var uid_buffer: [32]u8 = undefined; // No UID can be larger than this
-        const uid_str = try std.fmt.bufPrint(&uid_buffer, "/run/user/{d}", .{uid});
+fn setXdgEnv(tty_str: [:0]u8, desktop_name: [:0]const u8, xdg_desktop_names: [:0]const u8) !void {
+    const uid = interop.getuid();
+    var uid_buffer: [10 + @sizeOf(u32) + 1]u8 = undefined;
+    const uid_str = try std.fmt.bufPrintZ(&uid_buffer, "/run/user/{d}", .{uid});
 
-        try interop.setEnvironmentVariable(allocator, "XDG_RUNTIME_DIR", uid_str, false);
-    }
-
-    if (environment.xdg_desktop_names) |xdg_desktop_names| try interop.setEnvironmentVariable(allocator, "XDG_CURRENT_DESKTOP", xdg_desktop_names, false);
-    try interop.setEnvironmentVariable(allocator, "XDG_SESSION_CLASS", "user", false);
-    try interop.setEnvironmentVariable(allocator, "XDG_SESSION_ID", "1", false);
-    if (environment.xdg_session_desktop) |desktop_name| try interop.setEnvironmentVariable(allocator, "XDG_SESSION_DESKTOP", desktop_name, false);
-    try interop.setEnvironmentVariable(allocator, "XDG_SEAT", "seat0", false);
-    try interop.setEnvironmentVariable(allocator, "XDG_VTNR", tty_str, false);
+    _ = interop.setenv("XDG_CURRENT_DESKTOP", xdg_desktop_names.ptr, 0);
+    _ = interop.setenv("XDG_RUNTIME_DIR", uid_str.ptr, 0);
+    _ = interop.setenv("XDG_SESSION_CLASS", "user", 0);
+    _ = interop.setenv("XDG_SESSION_ID", "1", 0);
+    _ = interop.setenv("XDG_SESSION_DESKTOP", desktop_name.ptr, 0);
+    _ = interop.setenv("XDG_SEAT", "seat0", 0);
+    _ = interop.setenv("XDG_VTNR", tty_str.ptr, 0);
 }
 
 fn loginConv(
@@ -242,7 +197,7 @@ fn loginConv(
     msg: ?[*]?*const interop.pam.pam_message,
     resp: ?*?[*]interop.pam.pam_response,
     appdata_ptr: ?*anyopaque,
-) callconv(.c) c_int {
+) callconv(.C) c_int {
     const message_count: u32 = @intCast(num_msg);
     const messages = msg.?;
 
@@ -265,7 +220,7 @@ fn loginConv(
                     status = interop.pam.PAM_BUF_ERR;
                     break :set_credentials;
                 };
-                response[i].resp = username.?;
+                response[i].resp = username.?.ptr;
             },
             interop.pam.PAM_PROMPT_ECHO_OFF => {
                 const data: [*][*:0]u8 = @ptrCast(@alignCast(appdata_ptr));
@@ -273,7 +228,7 @@ fn loginConv(
                     status = interop.pam.PAM_BUF_ERR;
                     break :set_credentials;
                 };
-                response[i].resp = password.?;
+                response[i].resp = password.?.ptr;
             },
             interop.pam.PAM_ERROR_MSG => {
                 status = interop.pam.PAM_CONV_ERR;
@@ -286,8 +241,8 @@ fn loginConv(
     if (status != interop.pam.PAM_SUCCESS) {
         // Memory is freed by pam otherwise
         allocator.free(response);
-        if (username) |str| allocator.free(str);
-        if (password) |str| allocator.free(str);
+        if (username != null) allocator.free(username.?);
+        if (password != null) allocator.free(password.?);
     } else {
         resp.?.* = response.ptr;
     }
@@ -295,6 +250,17 @@ fn loginConv(
     return status;
 }
 
+fn resetTerminal(shell: [*:0]const u8, term_reset_cmd: [:0]const u8) !void {
+    const pid = try std.posix.fork();
+    if (pid == 0) {
+        const args = [_:null]?[*:0]const u8{ shell, "-c", term_reset_cmd };
+        std.posix.execveZ(shell, &args, std.c.environ) catch {};
+        std.process.exit(1);
+    }
+
+    _ = std.posix.waitpid(pid, 0);
+}
+
 fn getFreeDisplay() !u8 {
     var buf: [15]u8 = undefined;
     var i: u8 = 0;
@@ -311,50 +277,46 @@ fn getXPid(display_num: u8) !i32 {
     const file = try std.fs.openFileAbsolute(file_name, .{});
     defer file.close();
 
-    var file_buffer: [32]u8 = undefined;
-    var file_reader = file.reader(&file_buffer);
-    var reader = &file_reader.interface;
+    var file_buf: [20]u8 = undefined;
+    var fbs = std.io.fixedBufferStream(&file_buf);
 
-    var buffer: [20]u8 = undefined;
-    var writer = std.Io.Writer.fixed(&buffer);
+    _ = try file.reader().streamUntilDelimiter(fbs.writer(), '\n', 20);
+    const line = fbs.getWritten();
 
-    const written = try reader.streamDelimiter(&writer, '\n');
-    return std.fmt.parseInt(i32, std.mem.trim(u8, buffer[0..written], " "), 10);
+    return std.fmt.parseInt(i32, std.mem.trim(u8, line, " "), 10);
 }
 
-fn createXauthFile(pwd: []const u8, buffer: []u8) ![]const u8 {
+fn createXauthFile(pwd: [:0]const u8) ![:0]const u8 {
     var xauth_buf: [100]u8 = undefined;
-    var xauth_dir: []const u8 = undefined;
+    var xauth_dir: [:0]const u8 = undefined;
     const xdg_rt_dir = std.posix.getenv("XDG_RUNTIME_DIR");
     var xauth_file: []const u8 = "lyxauth";
 
-    if (xdg_rt_dir == null) no_rt_dir: {
+    if (xdg_rt_dir == null) {
         const xdg_cfg_home = std.posix.getenv("XDG_CONFIG_HOME");
-        if (xdg_cfg_home == null) no_cfg_home: {
-            xauth_dir = try std.fmt.bufPrint(&xauth_buf, "{s}/.config", .{pwd});
-
-            var dir = std.fs.cwd().openDir(xauth_dir, .{}) catch {
-                // xauth_dir isn't a directory
+        var sb: std.c.Stat = undefined;
+        if (xdg_cfg_home == null) {
+            xauth_dir = try std.fmt.bufPrintZ(&xauth_buf, "{s}/.config", .{pwd});
+            _ = std.c.stat(xauth_dir, &sb);
+            const mode = sb.mode & std.posix.S.IFMT;
+            if (mode == std.posix.S.IFDIR) {
+                xauth_dir = try std.fmt.bufPrintZ(&xauth_buf, "{s}/ly", .{xauth_dir});
+            } else {
                 xauth_dir = pwd;
                 xauth_file = ".lyxauth";
-                break :no_cfg_home;
-            };
-            dir.close();
-
-            // xauth_dir is a directory, use it to store Xauthority
-            xauth_dir = try std.fmt.bufPrint(&xauth_buf, "{s}/ly", .{xauth_dir});
+            }
         } else {
-            xauth_dir = try std.fmt.bufPrint(&xauth_buf, "{s}/ly", .{xdg_cfg_home.?});
+            xauth_dir = try std.fmt.bufPrintZ(&xauth_buf, "{s}/ly", .{xdg_cfg_home.?});
         }
 
-        const file = std.fs.cwd().openFile(xauth_dir, .{}) catch break :no_rt_dir;
-        file.close();
-
-        // xauth_dir is a file, create the parent directory
-        std.posix.mkdir(xauth_dir, 777) catch {
-            xauth_dir = pwd;
-            xauth_file = ".lyxauth";
-        };
+        _ = std.c.stat(xauth_dir, &sb);
+        const mode = sb.mode & std.posix.S.IFMT;
+        if (mode != std.posix.S.IFDIR) {
+            std.posix.mkdir(xauth_dir, 777) catch {
+                xauth_dir = pwd;
+                xauth_file = ".lyxauth";
+            };
+        }
     } else {
         xauth_dir = xdg_rt_dir.?;
     }
@@ -364,70 +326,90 @@ fn createXauthFile(pwd: []const u8, buffer: []u8) ![]const u8 {
     while (xauth_dir[i] == '/') i -= 1;
     const trimmed_xauth_dir = xauth_dir[0 .. i + 1];
 
-    const xauthority: []u8 = try std.fmt.bufPrint(buffer, "{s}/{s}", .{ trimmed_xauth_dir, xauth_file });
-    const file = try std.fs.createFileAbsolute(xauthority, .{});
+    var buf: [256]u8 = undefined;
+    const xauthority: [:0]u8 = try std.fmt.bufPrintZ(&buf, "{s}/{s}", .{ trimmed_xauth_dir, xauth_file });
+    const file = try std.fs.createFileAbsoluteZ(xauthority, .{});
     file.close();
 
     return xauthority;
 }
 
-fn mcookie() [Md5.digest_length * 2]u8 {
-    var buf: [4096]u8 = undefined;
-    std.crypto.random.bytes(&buf);
+pub fn mcookie(shell: [*:0]const u8, cmd: [:0]const u8) ![32]u8 {
+    const pipe = try std.posix.pipe();
+    defer std.posix.close(pipe[1]);
 
-    var out: [Md5.digest_length]u8 = undefined;
-    Md5.hash(&buf, &out, .{});
+    const output = std.fs.File{ .handle = pipe[0] };
+    defer output.close();
 
-    return std.fmt.bytesToHex(&out, .lower);
+    const pid = try std.posix.fork();
+    if (pid == 0) {
+        std.posix.close(pipe[0]);
+
+        std.posix.dup2(pipe[1], std.posix.STDOUT_FILENO) catch std.process.exit(1);
+        std.posix.close(pipe[1]);
+
+        const args = [_:null]?[*:0]const u8{ shell, "-c", cmd };
+        std.posix.execveZ(shell, &args, std.c.environ) catch {};
+        std.process.exit(1);
+    }
+
+    const result = std.posix.waitpid(pid, 0);
+
+    if (result.status != 0) return error.McookieFailed;
+
+    var buf: [32]u8 = undefined;
+    const len = try output.read(&buf);
+    if (len != 32) return error.McookieFailed;
+    return buf;
 }
 
-fn xauth(log_file: *LogFile, allocator: std.mem.Allocator, display_name: []u8, shell: [*:0]const u8, home: []const u8, xauth_buffer: []u8, options: AuthOptions) !void {
-    const xauthority = try createXauthFile(home, xauth_buffer);
-    try interop.setEnvironmentVariable(allocator, "XAUTHORITY", xauthority, true);
-    try interop.setEnvironmentVariable(allocator, "DISPLAY", display_name, true);
+fn xauth(display_name: [:0]u8, shell: [*:0]const u8, pw_dir: [*:0]const u8, xauth_cmd: []const u8, mcookie_cmd: [:0]const u8) !void {
+    var pwd_buf: [100]u8 = undefined;
+    const pwd = try std.fmt.bufPrintZ(&pwd_buf, "{s}", .{pw_dir});
 
-    const magic_cookie = mcookie();
+    const xauthority = try createXauthFile(pwd);
+    _ = interop.setenv("XAUTHORITY", xauthority, 1);
+    _ = interop.setenv("DISPLAY", display_name, 1);
+
+    const mcookie_output = try mcookie(shell, mcookie_cmd);
 
     const pid = try std.posix.fork();
     if (pid == 0) {
         var cmd_buffer: [1024]u8 = undefined;
-        const cmd_str = std.fmt.bufPrintZ(&cmd_buffer, "{s} add {s} . {s}", .{ options.xauth_cmd, display_name, magic_cookie }) catch std.process.exit(1);
-
+        const cmd_str = std.fmt.bufPrintZ(&cmd_buffer, "{s} add {s} . {s}", .{ xauth_cmd, display_name, mcookie_output }) catch std.process.exit(1);
         const args = [_:null]?[*:0]const u8{ shell, "-c", cmd_str };
         std.posix.execveZ(shell, &args, std.c.environ) catch {};
         std.process.exit(1);
     }
 
     const status = std.posix.waitpid(pid, 0);
-    if (status.status != 0) {
-        try log_file.file_writer.interface.print("xauth command failed with status {d}\n", .{status.status});
-        return error.XauthFailed;
-    }
+    if (status.status != 0) return error.XauthFailed;
 }
 
-fn executeX11Cmd(log_file: *LogFile, allocator: std.mem.Allocator, shell: []const u8, home: []const u8, options: AuthOptions, desktop_cmd: []const u8, vt: []const u8) !void {
-    var log_writer = &log_file.file_writer.interface;
-    var xauth_buffer: [256]u8 = undefined;
+fn executeShellCmd(shell: [*:0]const u8) !void {
+    const args = [_:null]?[*:0]const u8{shell};
+    return std.posix.execveZ(shell, &args, std.c.environ);
+}
 
-    try log_writer.writeAll("[x11] getting free display\n");
+fn executeWaylandCmd(shell: [*:0]const u8, wayland_cmd: []const u8, desktop_cmd: []const u8) !void {
+    var cmd_buffer: [1024]u8 = undefined;
+    const cmd_str = try std.fmt.bufPrintZ(&cmd_buffer, "{s} {s}", .{ wayland_cmd, desktop_cmd });
+    const args = [_:null]?[*:0]const u8{ shell, "-c", cmd_str };
+    return std.posix.execveZ(shell, &args, std.c.environ);
+}
+
+fn executeX11Cmd(shell: [*:0]const u8, pw_dir: [*:0]const u8, config: Config, desktop_cmd: []const u8, vt: []const u8) !void {
     const display_num = try getFreeDisplay();
-    var buf: [4]u8 = undefined;
-    const display_name = try std.fmt.bufPrint(&buf, ":{d}", .{display_num});
+    var buf: [5]u8 = undefined;
+    const display_name = try std.fmt.bufPrintZ(&buf, ":{d}", .{display_num});
+    try xauth(display_name, shell, pw_dir, config.xauth_cmd, config.mcookie_cmd);
 
-    const shell_z = try allocator.dupeZ(u8, shell);
-    defer allocator.free(shell_z);
-
-    try log_writer.writeAll("[x11] creating xauth file\n");
-    try xauth(log_file, allocator, display_name, shell_z, home, &xauth_buffer, options);
-
-    try log_writer.writeAll("[x11] starting x server\n");
     const pid = try std.posix.fork();
     if (pid == 0) {
         var cmd_buffer: [1024]u8 = undefined;
-        const cmd_str = std.fmt.bufPrintZ(&cmd_buffer, "{s} {s} {s}", .{ options.x_cmd, display_name, vt }) catch std.process.exit(1);
-
-        const args = [_:null]?[*:0]const u8{ shell_z, "-c", cmd_str };
-        std.posix.execveZ(shell_z, &args, std.c.environ) catch {};
+        const cmd_str = std.fmt.bufPrintZ(&cmd_buffer, "{s} {s} {s}", .{ config.x_cmd, display_name, vt }) catch std.process.exit(1);
+        const args = [_:null]?[*:0]const u8{ shell, "-c", cmd_str };
+        std.posix.execveZ(shell, &args, std.c.environ) catch {};
         std.process.exit(1);
     }
 
@@ -443,125 +425,78 @@ fn executeX11Cmd(log_file: *LogFile, allocator: std.mem.Allocator, shell: []cons
 
     // X Server detaches from the process.
     // PID can be fetched from /tmp/X{d}.lock
-    try log_writer.writeAll("[x11] getting x server pid\n");
     const x_pid = try getXPid(display_num);
 
-    try log_writer.writeAll("[x11] launching environment\n");
     xorg_pid = try std.posix.fork();
     if (xorg_pid == 0) {
         var cmd_buffer: [1024]u8 = undefined;
-        const cmd_str = std.fmt.bufPrintZ(&cmd_buffer, "{s} {s} {s}", .{ options.setup_cmd, options.login_cmd orelse "", desktop_cmd }) catch std.process.exit(1);
-
-        const args = [_:null]?[*:0]const u8{ shell_z, "-c", cmd_str };
-        std.posix.execveZ(shell_z, &args, std.c.environ) catch {};
+        const cmd_str = std.fmt.bufPrintZ(&cmd_buffer, "{s} {s}", .{ config.x_cmd_setup, desktop_cmd }) catch std.process.exit(1);
+        const args = [_:null]?[*:0]const u8{ shell, "-c", cmd_str };
+        std.posix.execveZ(shell, &args, std.c.environ) catch {};
         std.process.exit(1);
     }
 
     // If we receive SIGTERM, clean up by killing the xorg_pid process
     const act = std.posix.Sigaction{
         .handler = .{ .handler = &xorgSignalHandler },
-        .mask = std.posix.sigemptyset(),
+        .mask = std.posix.empty_sigset,
         .flags = 0,
     };
-    std.posix.sigaction(std.posix.SIG.TERM, &act, null);
+    try std.posix.sigaction(std.posix.SIG.TERM, &act, null);
 
     _ = std.posix.waitpid(xorg_pid, 0);
     interop.xcb.xcb_disconnect(xcb);
 
-    // TODO: Find a more robust way to ensure that X has been terminated (pidfds?)
+    std.posix.kill(x_pid, 0) catch return;
     std.posix.kill(x_pid, std.posix.SIG.TERM) catch {};
-    std.Thread.sleep(std.time.ns_per_s * 1); // Wait 1 second before sending SIGKILL
-    std.posix.kill(x_pid, std.posix.SIG.KILL) catch return;
 
-    _ = std.posix.waitpid(x_pid, 0);
+    var status: c_int = 0;
+    _ = std.c.waitpid(x_pid, &status, 0);
 }
 
-fn executeCmd(global_log_file: *LogFile, allocator: std.mem.Allocator, shell: []const u8, options: AuthOptions, is_terminal: bool, exec_cmd: ?[]const u8) !void {
-    var maybe_log_file: ?std.fs.File = null;
-    if (!is_terminal) {
-        // For custom desktop entries, the "Terminal" value here determines if
-        // we redirect standard output & error or not. That is, we redirect only
-        // if it's equal to false (so if it's not running in a TTY).
-        if (options.session_log) |log_path| {
-            maybe_log_file = try redirectStandardStreams(global_log_file, log_path, true);
-        }
-    }
-    defer if (maybe_log_file) |log_file| log_file.close();
-
-    const shell_z = try allocator.dupeZ(u8, shell);
-    defer allocator.free(shell_z);
-
-    var cmd_buffer: [1024]u8 = undefined;
-    const cmd_str = try std.fmt.bufPrintZ(&cmd_buffer, "{s} {s} {s}", .{ options.setup_cmd, options.login_cmd orelse "", exec_cmd orelse shell });
-
-    const args = [_:null]?[*:0]const u8{ shell_z, "-c", cmd_str };
-    return std.posix.execveZ(shell_z, &args, std.c.environ);
-}
-
-fn redirectStandardStreams(global_log_file: *LogFile, session_log: []const u8, create: bool) !std.fs.File {
-    const log_file = if (create) (std.fs.cwd().createFile(session_log, .{ .mode = 0o666 }) catch |err| {
-        try global_log_file.file_writer.interface.print("failed to create new session log file: {s}\n", .{@errorName(err)});
-        return err;
-    }) else (std.fs.cwd().openFile(session_log, .{ .mode = .read_write }) catch |err| {
-        try global_log_file.file_writer.interface.print("failed to open existing session log file: {s}\n", .{@errorName(err)});
-        return err;
-    });
-
-    try std.posix.dup2(std.posix.STDOUT_FILENO, std.posix.STDERR_FILENO);
-    try std.posix.dup2(log_file.handle, std.posix.STDOUT_FILENO);
-
-    return log_file;
-}
-
-fn addUtmpEntry(entry: *Utmp, username: []const u8, pid: c_int) !void {
+fn addUtmpEntry(entry: *Utmp, username: [*:0]const u8, pid: c_int) !void {
     entry.ut_type = utmp.USER_PROCESS;
     entry.ut_pid = pid;
 
-    var buf: [std.fs.max_path_bytes]u8 = undefined;
-    const tty_path = try std.os.getFdPath(std.posix.STDIN_FILENO, &buf);
+    var buf: [4096]u8 = undefined;
+    const ttyname = try std.os.getFdPath(std.posix.STDIN_FILENO, &buf);
 
-    // Get the TTY name (i.e. without the /dev/ prefix)
-    var ttyname_buf: [@sizeOf(@TypeOf(entry.ut_line))]u8 = undefined;
-    _ = try std.fmt.bufPrintZ(&ttyname_buf, "{s}", .{tty_path["/dev/".len..]});
+    var ttyname_buf: [32]u8 = undefined;
+    _ = try std.fmt.bufPrintZ(&ttyname_buf, "{s}", .{ttyname["/dev/".len..]});
 
     entry.ut_line = ttyname_buf;
-    // Get the TTY ID (i.e. without the tty prefix) and truncate it to the size
-    // of ut_id if necessary
-    entry.ut_id = ttyname_buf["tty".len..(@sizeOf(@TypeOf(entry.ut_id)) + "tty".len)].*;
+    entry.ut_id = ttyname_buf["tty".len..7].*;
 
-    var username_buf: [@sizeOf(@TypeOf(entry.ut_user))]u8 = undefined;
+    var username_buf: [32]u8 = undefined;
     _ = try std.fmt.bufPrintZ(&username_buf, "{s}", .{username});
 
     entry.ut_user = username_buf;
 
-    var host: [@sizeOf(@TypeOf(entry.ut_host))]u8 = undefined;
+    var host: [256]u8 = undefined;
     host[0] = 0;
     entry.ut_host = host;
 
-    const time = try interop.getTimeOfDay();
+    var tv: std.c.timeval = undefined;
+    _ = std.c.gettimeofday(&tv, null);
 
     entry.ut_tv = .{
-        .tv_sec = @intCast(time.seconds),
-        .tv_usec = @intCast(time.microseconds),
+        .tv_sec = @intCast(tv.tv_sec),
+        .tv_usec = @intCast(tv.tv_usec),
     };
+    entry.ut_addr_v6[0] = 0;
 
-    // FreeBSD doesn't have this field
-    if (builtin.os.tag == .linux) {
-        entry.ut_addr_v6[0] = 0;
-    }
-
-    utmp.setutxent();
-    _ = utmp.pututxline(entry);
-    utmp.endutxent();
+    utmp.setutent();
+    _ = utmp.pututline(entry);
+    utmp.endutent();
 }
 
 fn removeUtmpEntry(entry: *Utmp) void {
     entry.ut_type = utmp.DEAD_PROCESS;
     entry.ut_line[0] = 0;
     entry.ut_user[0] = 0;
-    utmp.setutxent();
-    _ = utmp.pututxline(entry);
-    utmp.endutxent();
+    utmp.setutent();
+    _ = utmp.pututline(entry);
+    utmp.endutent();
 }
 
 fn pamDiagnose(status: c_int) anyerror {

src/bigclock.zig

@@ -1,58 +1,140 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const interop = @import("interop.zig");
-const enums = @import("enums.zig");
-const Lang = @import("bigclock/Lang.zig");
-const en = @import("bigclock/en.zig");
-const fa = @import("bigclock/fa.zig");
-const Cell = @import("tui/Cell.zig");
+const utils = @import("tui/utils.zig");
 
-const Bigclock = enums.Bigclock;
-pub const WIDTH = Lang.WIDTH;
-pub const HEIGHT = Lang.HEIGHT;
-pub const SIZE = Lang.SIZE;
+const termbox = interop.termbox;
 
-pub fn clockCell(animate: bool, char: u8, fg: u32, bg: u32, bigclock: Bigclock) ![SIZE]Cell {
-    var cells: [SIZE]Cell = undefined;
+const X: u32 = if (builtin.os.tag == .linux or builtin.os.tag.isBSD()) 0x2593 else '#';
+const O: u32 = 0;
 
-    const time = try interop.getTimeOfDay();
-    const clock_chars = toBigNumber(if (animate and char == ':' and @divTrunc(time.microseconds, 500000) != 0) ' ' else char, bigclock);
-    for (0..cells.len) |i| cells[i] = Cell.init(clock_chars[i], fg, bg);
+pub const WIDTH = 5;
+pub const HEIGHT = 5;
+pub const SIZE = WIDTH * HEIGHT;
+
+// zig fmt: off
+const ZERO = [_]u21{
+    X,X,X,X,X,
+    X,X,O,X,X,
+    X,X,O,X,X,
+    X,X,O,X,X,
+    X,X,X,X,X,
+};
+const ONE = [_]u21{
+    O,O,O,X,X,
+    O,O,O,X,X,
+    O,O,O,X,X,
+    O,O,O,X,X,
+    O,O,O,X,X,
+};
+const TWO = [_]u21{
+    X,X,X,X,X,
+    O,O,O,X,X,
+    X,X,X,X,X,
+    X,X,O,O,O,
+    X,X,X,X,X,
+};
+const THREE = [_]u21{
+    X,X,X,X,X,
+    O,O,O,X,X,
+    X,X,X,X,X,
+    O,O,O,X,X,
+    X,X,X,X,X,
+};
+const FOUR = [_]u21{
+    X,X,O,X,X,
+    X,X,O,X,X,
+    X,X,X,X,X,
+    O,O,O,X,X,
+    O,O,O,X,X,
+};
+const FIVE = [_]u21{
+    X,X,X,X,X,
+    X,X,O,O,O,
+    X,X,X,X,X,
+    O,O,O,X,X,
+    X,X,X,X,X,
+};
+const SIX = [_]u21{
+    X,X,X,X,X,
+    X,X,O,O,O,
+    X,X,X,X,X,
+    X,X,O,X,X,
+    X,X,X,X,X,
+};
+const SEVEN = [_]u21{
+    X,X,X,X,X,
+    O,O,O,X,X,
+    O,O,O,X,X,
+    O,O,O,X,X,
+    O,O,O,X,X,
+};
+const EIGHT = [_]u21{
+    X,X,X,X,X,
+    X,X,O,X,X,
+    X,X,X,X,X,
+    X,X,O,X,X,
+    X,X,X,X,X,
+};
+const NINE = [_]u21{
+    X,X,X,X,X,
+    X,X,O,X,X,
+    X,X,X,X,X,
+    O,O,O,X,X,
+    X,X,X,X,X,
+};
+const S = [_]u21{
+    O,O,O,O,O,
+    O,O,X,O,O,
+    O,O,O,O,O,
+    O,O,X,O,O,
+    O,O,O,O,O,
+};
+const E = [_]u21{
+    O,O,O,O,O,
+    O,O,O,O,O,
+    O,O,O,O,O,
+    O,O,O,O,O,
+    O,O,O,O,O,
+};
+// zig fmt: on
+
+pub fn clockCell(animate: bool, char: u8, fg: u8, bg: u8) [SIZE]termbox.tb_cell {
+    var cells: [SIZE]termbox.tb_cell = undefined;
+
+    var tv: std.c.timeval = undefined;
+    _ = std.c.gettimeofday(&tv, null);
+
+    const clock_chars = toBigNumber(if (animate and char == ':' and @divTrunc(tv.tv_usec, 500000) != 0) ' ' else char);
+    for (0..cells.len) |i| cells[i] = utils.initCell(clock_chars[i], fg, bg);
 
     return cells;
 }
 
-pub fn alphaBlit(x: usize, y: usize, tb_width: usize, tb_height: usize, cells: [SIZE]Cell) void {
+pub fn alphaBlit(buffer: [*]termbox.tb_cell, x: u64, y: u64, tb_width: u64, tb_height: u64, cells: [SIZE]termbox.tb_cell) void {
     if (x + WIDTH >= tb_width or y + HEIGHT >= tb_height) return;
 
     for (0..HEIGHT) |yy| {
         for (0..WIDTH) |xx| {
             const cell = cells[yy * WIDTH + xx];
-            cell.put(x + xx, y + yy);
+            if (cell.ch != 0) buffer[(y + yy) * tb_width + (x + xx)] = cell;
         }
     }
 }
 
-fn toBigNumber(char: u8, bigclock: Bigclock) [SIZE]u21 {
-    const locale_chars = switch (bigclock) {
-        .fa => fa.locale_chars,
-        .en => en.locale_chars,
-        .none => unreachable,
-    };
+fn toBigNumber(char: u8) []const u21 {
     return switch (char) {
-        '0' => locale_chars.ZERO,
-        '1' => locale_chars.ONE,
-        '2' => locale_chars.TWO,
-        '3' => locale_chars.THREE,
-        '4' => locale_chars.FOUR,
-        '5' => locale_chars.FIVE,
-        '6' => locale_chars.SIX,
-        '7' => locale_chars.SEVEN,
-        '8' => locale_chars.EIGHT,
-        '9' => locale_chars.NINE,
-        'p', 'P' => locale_chars.P,
-        'a', 'A' => locale_chars.A,
-        'm', 'M' => locale_chars.M,
-        ':' => locale_chars.S,
-        else => locale_chars.E,
+        '0' => &ZERO,
+        '1' => &ONE,
+        '2' => &TWO,
+        '3' => &THREE,
+        '4' => &FOUR,
+        '5' => &FIVE,
+        '6' => &SIX,
+        '7' => &SEVEN,
+        '8' => &EIGHT,
+        '9' => &NINE,
+        ':' => &S,
+        else => &E,
     };
 }

src/bigclock/Lang.zig

@@ -1,28 +0,0 @@
-const interop = @import("../interop.zig");
-
-pub const WIDTH = 5;
-pub const HEIGHT = 5;
-pub const SIZE = WIDTH * HEIGHT;
-
-pub const X: u32 = if (interop.supportsUnicode()) 0x2593 else '#';
-pub const O: u32 = 0;
-
-// zig fmt: off
-pub const LocaleChars = struct {
-    ZERO:   [SIZE]u21,
-    ONE:    [SIZE]u21,
-    TWO:    [SIZE]u21,
-    THREE:  [SIZE]u21,
-    FOUR:   [SIZE]u21,
-    FIVE:   [SIZE]u21,
-    SIX:    [SIZE]u21,
-    SEVEN:  [SIZE]u21,
-    EIGHT:  [SIZE]u21,
-    NINE:   [SIZE]u21,
-    S:      [SIZE]u21,
-    E:      [SIZE]u21,
-    P:      [SIZE]u21,
-    A:      [SIZE]u21,
-    M:      [SIZE]u21,
-};
-// zig fmt: on

src/bigclock/en.zig

@@ -1,115 +0,0 @@
-const Lang = @import("Lang.zig");
-
-const LocaleChars = Lang.LocaleChars;
-const X = Lang.X;
-const O = Lang.O;
-
-// zig fmt: off
-pub const locale_chars = LocaleChars{
-    .ZERO = [_]u21{
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,O,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-    },
-    .ONE = [_]u21{
-        O,O,O,X,X,
-        O,O,O,X,X,
-        O,O,O,X,X,
-        O,O,O,X,X,
-        O,O,O,X,X,
-    },
-    .TWO = [_]u21{
-        X,X,X,X,X,
-        O,O,O,X,X,
-        X,X,X,X,X,
-        X,X,O,O,O,
-        X,X,X,X,X,
-    },
-    .THREE = [_]u21{
-        X,X,X,X,X,
-        O,O,O,X,X,
-        X,X,X,X,X,
-        O,O,O,X,X,
-        X,X,X,X,X,
-    },
-    .FOUR = [_]u21{
-        X,X,O,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-        O,O,O,X,X,
-        O,O,O,X,X,
-    },
-    .FIVE = [_]u21{
-        X,X,X,X,X,
-        X,X,O,O,O,
-        X,X,X,X,X,
-        O,O,O,X,X,
-        X,X,X,X,X,
-    },
-    .SIX = [_]u21{
-        X,X,X,X,X,
-        X,X,O,O,O,
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-    },
-    .SEVEN = [_]u21{
-        X,X,X,X,X,
-        O,O,O,X,X,
-        O,O,O,X,X,
-        O,O,O,X,X,
-        O,O,O,X,X,
-    },
-    .EIGHT = [_]u21{
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-    },
-    .NINE = [_]u21{
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-        O,O,O,X,X,
-        X,X,X,X,X,
-    },
-    .S = [_]u21{
-        O,O,O,O,O,
-        O,O,X,O,O,
-        O,O,O,O,O,
-        O,O,X,O,O,
-        O,O,O,O,O,
-    },
-    .E = [_]u21{
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-    },
-    .P = [_]u21{
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-        X,X,O,O,O,
-        X,X,O,O,O,
-    },
-    .A = [_]u21{
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,X,X,X,
-        X,X,O,X,X,
-        X,X,O,X,X,
-    },
-    .M = [_]u21{
-        X,X,X,X,X,
-        X,O,X,O,X,
-        X,O,X,O,X,
-        X,O,O,O,X,
-        X,O,O,O,X,
-    },
-};
-// zig fmt: on

src/bigclock/fa.zig

@@ -1,115 +0,0 @@
-const Lang = @import("Lang.zig");
-
-const LocaleChars = Lang.LocaleChars;
-const X = Lang.X;
-const O = Lang.O;
-
-// zig fmt: off
-pub const locale_chars = LocaleChars{
-    .ZERO = [_]u21{
-        O,O,O,O,O,
-        O,O,X,O,O,
-        O,X,O,X,O,
-        O,O,X,O,O,
-        O,O,O,O,O,
-    },
-    .ONE = [_]u21{
-        O,O,X,O,O,
-        O,X,X,O,O,
-        O,O,X,O,O,
-        O,O,X,O,O,
-        O,O,X,O,O,
-    },
-    .TWO = [_]u21{
-        O,X,O,X,O,
-        O,X,X,X,O,
-        O,X,O,O,O,
-        O,X,O,O,O,
-        O,X,O,O,O,
-    },
-    .THREE = [_]u21{
-        X,O,X,O,X,
-        X,X,X,X,X,
-        X,O,O,O,O,
-        X,O,O,O,O,
-        X,O,O,O,O,
-    },
-    .FOUR = [_]u21{
-        O,X,O,X,X,
-        O,X,X,O,O,
-        O,X,X,X,X,
-        O,X,O,O,O,
-        O,X,O,O,O,
-    },
-    .FIVE = [_]u21{
-        O,O,X,X,O,
-        O,X,O,O,X,
-        X,O,O,O,X,
-        X,O,X,O,X,
-        O,X,O,X,O,
-    },
-    .SIX = [_]u21{
-        O,X,X,O,O,
-        O,X,O,O,X,
-        O,O,X,O,O,
-        O,X,O,O,O,
-        X,O,O,O,O,
-    },
-    .SEVEN = [_]u21{
-        X,O,O,O,X,
-        X,O,O,O,X,
-        O,X,O,X,O,
-        O,X,O,X,O,
-        O,O,X,O,O,
-    },
-    .EIGHT = [_]u21{
-        O,O,O,X,O,
-        O,O,X,O,X,
-        O,O,X,O,X,
-        O,X,O,O,X,
-        O,X,O,O,X,
-    },
-    .NINE = [_]u21{
-        O,X,X,X,O,
-        O,X,O,X,O,
-        O,X,X,X,O,
-        O,O,O,X,O,
-        O,O,O,X,O,
-    },
-    .P = [_]u21{
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-    },
-    .A = [_]u21{
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-    },
-    .M = [_]u21{
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-    },
-    .S = [_]u21{
-        O,O,O,O,O,
-        O,O,X,O,O,
-        O,O,O,O,O,
-        O,O,X,O,O,
-        O,O,O,O,O,
-    },
-    .E = [_]u21{
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-        O,O,O,O,O,
-    },
-};
-// zig fmt: on

src/config/Config.zig

@@ -3,80 +3,51 @@ const enums = @import("../enums.zig");
 
 const Animation = enums.Animation;
 const Input = enums.Input;
-const ViMode = enums.ViMode;
-const Bigclock = enums.Bigclock;
 
-allow_empty_password: bool = true,
 animation: Animation = .none,
-animation_timeout_sec: u12 = 0,
-asterisk: ?u32 = '*',
-auth_fails: u64 = 10,
-battery_id: ?[]const u8 = null,
-bg: u32 = 0x00000000,
-bigclock: Bigclock = .none,
-bigclock_12hr: bool = false,
-bigclock_seconds: bool = false,
+asterisk: u8 = '*',
+bg: u8 = 0,
+bigclock: bool = false,
 blank_box: bool = true,
-border_fg: u32 = 0x00FFFFFF,
+border_fg: u8 = 8,
 box_title: ?[]const u8 = null,
-brightness_down_cmd: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl -q -n s 10%-",
-brightness_down_key: ?[]const u8 = "F5",
-brightness_up_cmd: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl -q -n s +10%",
-brightness_up_key: ?[]const u8 = "F6",
 clear_password: bool = false,
 clock: ?[:0]const u8 = null,
-cmatrix_fg: u32 = 0x0000FF00,
-cmatrix_head_col: u32 = 0x01FFFFFF,
-cmatrix_min_codepoint: u16 = 0x21,
-cmatrix_max_codepoint: u16 = 0x7B,
-colormix_col1: u32 = 0x00FF0000,
-colormix_col2: u32 = 0x000000FF,
-colormix_col3: u32 = 0x20000000,
-custom_sessions: []const u8 = build_options.config_directory ++ "/ly/custom-sessions",
+console_dev: [:0]const u8 = "/dev/console",
 default_input: Input = .login,
-doom_fire_height: u8 = 6,
-doom_fire_spread: u8 = 2,
-doom_top_color: u32 = 0x00FF0000,
-doom_middle_color: u32 = 0x00FFFF00,
-doom_bottom_color: u32 = 0x00FFFFFF,
-error_bg: u32 = 0x00000000,
-error_fg: u32 = 0x01FF0000,
-fg: u32 = 0x00FFFFFF,
-full_color: bool = true,
-gameoflife_fg: u32 = 0x0000FF00,
-gameoflife_entropy_interval: usize = 10,
-gameoflife_frame_delay: usize = 6,
-gameoflife_initial_density: f32 = 0.4,
+fg: u8 = 8,
 hide_borders: bool = false,
 hide_key_hints: bool = false,
-hide_version_string: bool = false,
 initial_info_text: ?[]const u8 = null,
 input_len: u8 = 34,
 lang: []const u8 = "en",
-login_cmd: ?[]const u8 = null,
-login_defs_path: []const u8 = "/etc/login.defs",
-logout_cmd: ?[]const u8 = null,
-ly_log: []const u8 = "/var/log/ly.log",
+load: bool = true,
 margin_box_h: u8 = 2,
 margin_box_v: u8 = 1,
+max_desktop_len: u8 = 100,
+max_login_len: u8 = 255,
+max_password_len: u8 = 255,
+mcookie_cmd: [:0]const u8 = "/usr/bin/mcookie",
 min_refresh_delta: u16 = 5,
 numlock: bool = false,
-path: ?[]const u8 = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+path: ?[:0]const u8 = "/sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
 restart_cmd: []const u8 = "/sbin/shutdown -r now",
 restart_key: []const u8 = "F2",
 save: bool = true,
+save_file: []const u8 = "/etc/ly/save",
 service_name: [:0]const u8 = "ly",
-session_log: ?[]const u8 = "ly-session.log",
-setup_cmd: []const u8 = build_options.config_directory ++ "/ly/setup.sh",
 shutdown_cmd: []const u8 = "/sbin/shutdown -a now",
 shutdown_key: []const u8 = "F1",
 sleep_cmd: ?[]const u8 = null,
 sleep_key: []const u8 = "F3",
-text_in_center: bool = false,
-vi_default_mode: ViMode = .normal,
+term_reset_cmd: [:0]const u8 = "/usr/bin/tput reset",
+term_restore_cursor_cmd: []const u8 = "/usr/bin/tput cnorm",
+tty: u8 = 2,
 vi_mode: bool = false,
-waylandsessions: []const u8 = build_options.prefix_directory ++ "/share/wayland-sessions",
-x_cmd: []const u8 = build_options.prefix_directory ++ "/bin/X",
-xauth_cmd: []const u8 = build_options.prefix_directory ++ "/bin/xauth",
+wayland_cmd: []const u8 = build_options.data_directory ++ "/wsetup.sh",
+waylandsessions: []const u8 = "/usr/share/wayland-sessions",
+x_cmd: []const u8 = "/usr/bin/X",
 xinitrc: ?[]const u8 = "~/.xinitrc",
-xsessions: []const u8 = build_options.prefix_directory ++ "/share/xsessions",
+x_cmd_setup: []const u8 = build_options.data_directory ++ "/xsetup.sh",
+xauth_cmd: []const u8 = "/usr/bin/xauth",
+xsessions: []const u8 = "/usr/share/xsessions",

src/config/Lang.zig

@@ -1,30 +1,16 @@
-//
-// NOTE: After editing this file, please run `/res/lang/normalize_lang_files.py`
-//       to update all the language files accordingly.
-//
-
 authenticating: []const u8 = "authenticating...",
-brightness_down: []const u8 = "decrease brightness",
-brightness_up: []const u8 = "increase brightness",
 capslock: []const u8 = "capslock",
-custom: []const u8 = "custom",
 err_alloc: []const u8 = "failed memory allocation",
 err_bounds: []const u8 = "out-of-bounds index",
-err_brightness_change: []const u8 = "failed to change brightness",
 err_chdir: []const u8 = "failed to open home folder",
-err_clock_too_long: []const u8 = "clock string too long",
-err_config: []const u8 = "unable to parse config file",
+err_console_dev: []const u8 = "failed to access console",
 err_dgn_oob: []const u8 = "log message",
 err_domain: []const u8 = "invalid domain",
-err_empty_password: []const u8 = "empty password not allowed",
 err_envlist: []const u8 = "failed to get envlist",
-err_get_active_tty: []const u8 = "failed to get active tty",
 err_hostname: []const u8 = "failed to get hostname",
-err_lock_state: []const u8 = "failed to get lock state",
-err_log: []const u8 = "failed to open log file",
+err_mcookie: []const u8 = "mcookie command failed",
 err_mlock: []const u8 = "failed to lock password memory",
 err_null: []const u8 = "null pointer",
-err_numlock: []const u8 = "failed to set numlock",
 err_pam: []const u8 = "pam transaction failed",
 err_pam_abort: []const u8 = "pam transaction aborted",
 err_pam_acct_expired: []const u8 = "account expired",
@@ -46,11 +32,7 @@ err_perm_dir: []const u8 = "failed to change current directory",
 err_perm_group: []const u8 = "failed to downgrade group permissions",
 err_perm_user: []const u8 = "failed to downgrade user permissions",
 err_pwnam: []const u8 = "failed to get user info",
-err_sleep: []const u8 = "failed to execute sleep command",
-err_battery: []const u8 = "failed to load battery status",
-err_switch_tty: []const u8 = "failed to switch tty",
-err_tty_ctrl: []const u8 = "tty control transfer failed",
-err_no_users: []const u8 = "no users found",
+err_unknown: []const u8 = "an unknown error occurred",
 err_user_gid: []const u8 = "failed to set user GID",
 err_user_init: []const u8 = "failed to initialize user",
 err_user_uid: []const u8 = "failed to set user UID",
@@ -59,17 +41,16 @@ err_xcb_conn: []const u8 = "xcb connection failed",
 err_xsessions_dir: []const u8 = "failed to find sessions folder",
 err_xsessions_open: []const u8 = "failed to open sessions folder",
 insert: []const u8 = "insert",
-login: []const u8 = "login",
+login: []const u8 = "login:",
 logout: []const u8 = "logged out",
-no_x11_support: []const u8 = "x11 support disabled at compile-time",
 normal: []const u8 = "normal",
 numlock: []const u8 = "numlock",
 other: []const u8 = "other",
-password: []const u8 = "password",
+password: []const u8 = "password:",
 restart: []const u8 = "reboot",
 shell: [:0]const u8 = "shell",
 shutdown: []const u8 = "shutdown",
 sleep: []const u8 = "sleep",
 wayland: []const u8 = "wayland",
-x11: []const u8 = "x11",
 xinitrc: [:0]const u8 = "xinitrc",
+x11: []const u8 = "x11",

src/config/OldSave.zig

@@ -1,2 +0,0 @@
-user: ?[]const u8 = null,
-session_index: ?usize = null,

src/config/Save.zig

@@ -0,0 +1,2 @@
+user: ?[]const u8 = null,
+session_index: ?u64 = null,

src/config/SavedUsers.zig

@@ -1,22 +0,0 @@
-const std = @import("std");
-
-const SavedUsers = @This();
-
-const User = struct {
-    username: []const u8,
-    session_index: usize,
-};
-
-user_list: std.ArrayList(User),
-last_username_index: ?usize,
-
-pub fn init() SavedUsers {
-    return .{
-        .user_list = .empty,
-        .last_username_index = null,
-    };
-}
-
-pub fn deinit(self: *SavedUsers, allocator: std.mem.Allocator) void {
-    self.user_list.deinit(allocator);
-}

src/config/migrator.zig

@@ -1,245 +1,42 @@
-// The migrator ensures compatibility with older configuration files
-// Properties removed or changed since 0.6.0
-// Color codes interpreted differently since 1.1.0
+// The migrator ensures compatibility with <=0.6.0 configuration files
 
 const std = @import("std");
 const ini = @import("zigini");
-const Config = @import("Config.zig");
-const OldSave = @import("OldSave.zig");
-const SavedUsers = @import("SavedUsers.zig");
-const TerminalBuffer = @import("../tui/TerminalBuffer.zig");
-
-const Color = TerminalBuffer.Color;
-const Styling = TerminalBuffer.Styling;
-
-const color_properties = [_][]const u8{
-    "bg",
-    "border_fg",
-    "cmatrix_fg",
-    "colormix_col1",
-    "colormix_col2",
-    "colormix_col3",
-    "error_bg",
-    "error_fg",
-    "fg",
-};
-
-var set_color_properties =
-    [_]bool{ false, false, false, false, false, false, false, false, false };
-
-const removed_properties = [_][]const u8{
-    "wayland_specifier",
-    "max_desktop_len",
-    "max_login_len",
-    "max_password_len",
-    "mcookie_cmd",
-    "term_reset_cmd",
-    "term_restore_cursor_cmd",
-    "x_cmd_setup",
-    "wayland_cmd",
-    "console_dev",
-    "load",
-};
-
-var temporary_allocator = std.heap.page_allocator;
-
-pub var auto_eight_colors: bool = true;
-
-pub var maybe_animate: ?bool = null;
-pub var maybe_save_file: ?[]const u8 = null;
+const Save = @import("Save.zig");
 
 pub fn configFieldHandler(_: std.mem.Allocator, field: ini.IniField) ?ini.IniField {
-    if (std.mem.eql(u8, field.key, "animate")) {
-        // The option doesn't exist anymore, but we save its value for "animation"
-        maybe_animate = std.mem.eql(u8, field.value, "true");
-
-        return null;
-    }
-
-    if (std.mem.eql(u8, field.key, "animation")) {
-        // The option now uses a string (which then gets converted into an enum) instead of an integer
-        // It also combines the previous "animate" and "animation" options
-        const animation = std.fmt.parseInt(u8, field.value, 10) catch return field;
-        var mapped_field = field;
-
-        mapped_field.value = switch (animation) {
-            0 => "doom",
-            1 => "matrix",
-            else => "none",
-        };
-
-        return mapped_field;
-    }
-
-    inline for (color_properties, &set_color_properties) |property, *status| {
-        if (std.mem.eql(u8, field.key, property)) {
-            // Color has been set; it won't be overwritten if we default to eight-color output
-            status.* = true;
-
-            // These options now uses a 32-bit RGB value instead of an arbitrary 16-bit integer
-            // If they're all using eight-color codes, we start in eight-color mode
-            const color = std.fmt.parseInt(u16, field.value, 0) catch {
-                auto_eight_colors = false;
-                return field;
-            };
-
-            const color_no_styling = color & 0x00FF;
-            const styling_only = color & 0xFF00;
-
-            // If color is "greater" than TB_WHITE, or the styling is "greater" than TB_DIM,
-            // we have an invalid color, so do not use eight-color mode
-            if (color_no_styling > 0x0008 or styling_only > 0x8000) auto_eight_colors = false;
-
-            return field;
-        }
-    }
+    var mapped_field = field;
 
     if (std.mem.eql(u8, field.key, "blank_password")) {
-        // The option has simply been renamed
-        var mapped_field = field;
         mapped_field.key = "clear_password";
-
-        return mapped_field;
     }
 
-    if (std.mem.eql(u8, field.key, "default_input")) {
-        // The option now uses a string (which then gets converted into an enum) instead of an integer
-        const default_input = std.fmt.parseInt(u8, field.value, 10) catch return field;
-        var mapped_field = field;
-
-        mapped_field.value = switch (default_input) {
-            0 => "session",
-            1 => "login",
-            2 => "password",
-            else => "login",
-        };
-
-        return mapped_field;
-    }
-
-    if (std.mem.eql(u8, field.key, "save_file")) {
-        // The option doesn't exist anymore, but we save its value for migration later on
-        maybe_save_file = temporary_allocator.dupe(u8, field.value) catch return null;
-
-        return null;
-    }
-
-    inline for (removed_properties) |property| {
-        if (std.mem.eql(u8, field.key, property)) {
-            // The options don't exist anymore
-            return null;
-        }
-    }
-
-    if (std.mem.eql(u8, field.key, "bigclock")) {
-        // The option now uses a string (which then gets converted into an enum) instead of an boolean
-        // It also includes the ability to change active bigclock's language
-        var mapped_field = field;
-
-        if (std.mem.eql(u8, field.value, "true")) {
-            mapped_field.value = "en";
-        } else if (std.mem.eql(u8, field.value, "false")) {
-            mapped_field.value = "none";
-        }
-
-        return mapped_field;
-    }
-
-    if (std.mem.eql(u8, field.key, "full_color")) {
-        // If color mode is defined, definitely don't set it automatically
-        auto_eight_colors = false;
-        return field;
-    }
-
-    return field;
+    return mapped_field;
 }
 
-// This is the stuff we only handle after reading the config.
-// For example, the "animate" field could come after "animation"
-pub fn lateConfigFieldHandler(config: *Config) void {
-    if (maybe_animate) |animate| {
-        if (!animate) config.*.animation = .none;
-    }
-
-    if (auto_eight_colors) {
-        // Valid config file predates true-color mode
-        // Will use eight-color output instead
-        config.full_color = false;
-
-        // We cannot rely on Config defaults when in eight-color mode,
-        // because they will appear as undesired colors.
-        // Instead set color properties to matching eight-color codes
-        config.doom_top_color = Color.ECOL_RED;
-        config.doom_middle_color = Color.ECOL_YELLOW;
-        config.doom_bottom_color = Color.ECOL_WHITE;
-        config.cmatrix_head_col = Styling.BOLD | Color.ECOL_WHITE;
-
-        // These may be in the config, so only change those which were not set
-        if (!set_color_properties[0]) config.bg = Color.DEFAULT;
-        if (!set_color_properties[1]) config.border_fg = Color.ECOL_WHITE;
-        if (!set_color_properties[2]) config.cmatrix_fg = Color.ECOL_GREEN;
-        if (!set_color_properties[3]) config.colormix_col1 = Color.ECOL_RED;
-        if (!set_color_properties[4]) config.colormix_col2 = Color.ECOL_BLUE;
-        if (!set_color_properties[5]) config.colormix_col3 = Color.ECOL_BLACK;
-        if (!set_color_properties[6]) config.error_bg = Color.DEFAULT;
-        if (!set_color_properties[7]) config.error_fg = Styling.BOLD | Color.ECOL_RED;
-        if (!set_color_properties[8]) config.fg = Color.ECOL_WHITE;
-    }
-}
-
-pub fn tryMigrateFirstSaveFile(user_buf: *[32]u8) OldSave {
-    var save = OldSave{};
-
-    if (maybe_save_file) |path| {
-        defer temporary_allocator.free(path);
-
-        var file = std.fs.openFileAbsolute(path, .{}) catch return save;
-        defer file.close();
-
-        var file_buffer: [64]u8 = undefined;
-        var file_reader = file.reader(&file_buffer);
-        var reader = &file_reader.interface;
-
-        var user_writer = std.Io.Writer.fixed(user_buf);
-        var written = reader.streamDelimiter(&user_writer, '\n') catch return save;
-        if (written > 0) save.user = user_buf[0..written];
-
-        var session_buf: [20]u8 = undefined;
-        var session_writer = std.Io.Writer.fixed(&session_buf);
-        written = reader.streamDelimiter(&session_writer, '\n') catch return save;
-
-        var session_index: ?usize = null;
-        if (written > 0) {
-            session_index = std.fmt.parseUnsigned(usize, session_buf[0..written], 10) catch return save;
-        }
-        save.session_index = session_index;
+pub fn tryMigrateSaveFile(user_buf: *[32]u8, path: []const u8) Save {
+    var save = Save{};
+
+    var file = std.fs.openFileAbsolute(path, .{}) catch return save;
+    defer file.close();
+
+    const reader = file.reader();
+
+    var user_fbs = std.io.fixedBufferStream(user_buf);
+    reader.streamUntilDelimiter(user_fbs.writer(), '\n', 32) catch return save;
+    const user = user_fbs.getWritten();
+    if (user.len > 0) save.user = user;
+
+    var session_buf: [20]u8 = undefined;
+    var session_fbs = std.io.fixedBufferStream(&session_buf);
+    reader.streamUntilDelimiter(session_fbs.writer(), '\n', 20) catch {};
+
+    const session_index_str = session_fbs.getWritten();
+    var session_index: ?u64 = null;
+    if (session_index_str.len > 0) {
+        session_index = std.fmt.parseUnsigned(u64, session_index_str, 10) catch return save;
     }
+    save.session_index = session_index;
 
     return save;
 }
-
-pub fn tryMigrateIniSaveFile(allocator: std.mem.Allocator, save_ini: *ini.Ini(OldSave), path: []const u8, saved_users: *SavedUsers, usernames: [][]const u8) !bool {
-    var old_save_file_exists = true;
-
-    var user_buf: [32]u8 = undefined;
-    const save = save_ini.readFileToStruct(path, .{
-        .fieldHandler = null,
-        .comment_characters = "#",
-    }) catch no_save_file: {
-        old_save_file_exists = false;
-        break :no_save_file tryMigrateFirstSaveFile(&user_buf);
-    };
-
-    if (!old_save_file_exists) return false;
-
-    // Add all other users to the list
-    for (usernames, 0..) |username, i| {
-        if (save.user) |user| {
-            if (std.mem.eql(u8, user, username)) saved_users.last_username_index = i;
-        }
-
-        try saved_users.user_list.append(allocator, .{ .username = username, .session_index = save.session_index orelse 0 });
-    }
-
-    return true;
-}

src/enums.zig

@@ -2,8 +2,6 @@ pub const Animation = enum {
     none,
     doom,
     matrix,
-    colormix,
-    gameoflife,
 };
 
 pub const DisplayServer = enum {
@@ -11,23 +9,10 @@ pub const DisplayServer = enum {
     shell,
     xinitrc,
     x11,
-    custom,
 };
 
 pub const Input = enum {
-    info_line,
     session,
     login,
     password,
 };
-
-pub const ViMode = enum {
-    normal,
-    insert,
-};
-
-pub const Bigclock = enum {
-    none,
-    en,
-    fa,
-};

src/interop.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const UidRange = @import("UidRange.zig");
+const Allocator = std.mem.Allocator;
 
 pub const termbox = @import("termbox2");
 
@@ -9,380 +9,111 @@ pub const pam = @cImport({
 });
 
 pub const utmp = @cImport({
-    @cInclude("utmpx.h");
+    @cInclude("utmp.h");
 });
 
-// Exists for X11 support only
 pub const xcb = @cImport({
     @cInclude("xcb/xcb.h");
 });
 
-const pwd = @cImport({
-    @cInclude("pwd.h");
-    // We include a FreeBSD-specific header here since login_cap.h references
-    // the passwd struct directly, so we can't import it separately
-    if (builtin.os.tag == .freebsd) {
-        @cInclude("sys/types.h");
-        @cInclude("login_cap.h");
-    }
-});
+pub const c_size = u64;
+pub const c_uid = u32;
+pub const c_gid = u32;
+pub const c_time = c_long;
+pub const tm = extern struct {
+    tm_sec: c_int,
+    tm_min: c_int,
+    tm_hour: c_int,
+    tm_mday: c_int,
+    tm_mon: c_int,
+    tm_year: c_int,
+    tm_wday: c_int,
+    tm_yday: c_int,
+    tm_isdst: c_int,
+};
+pub const passwd = extern struct {
+    pw_name: [*:0]u8,
+    pw_passwd: [*:0]u8,
 
-const stdlib = @cImport({
-    @cInclude("stdlib.h");
-});
-
-const unistd = @cImport({
-    @cInclude("unistd.h");
-});
-
-const grp = @cImport({
-    @cInclude("grp.h");
-});
-
-const system_time = @cImport({
-    @cInclude("sys/time.h");
-});
-
-const time = @cImport({
-    @cInclude("time.h");
-});
-
-pub const TimeOfDay = struct {
-    seconds: i64,
-    microseconds: i64,
+    pw_uid: c_uid,
+    pw_gid: c_gid,
+    pw_gecos: [*:0]u8,
+    pw_dir: [*:0]u8,
+    pw_shell: [*:0]u8,
 };
 
-pub const UsernameEntry = struct {
-    username: ?[]const u8,
-    uid: std.posix.uid_t,
-    gid: std.posix.gid_t,
-    home: ?[]const u8,
-    shell: ?[]const u8,
-    passwd_struct: [*c]pwd.passwd,
-};
+pub const VT_ACTIVATE: c_int = 0x5606;
+pub const VT_WAITACTIVE: c_int = 0x5607;
 
-// Contains the platform-specific code
-fn PlatformStruct() type {
-    return switch (builtin.os.tag) {
-        .linux => struct {
-            pub const kd = @cImport({
-                @cInclude("sys/kd.h");
-            });
+pub const KDGETLED: c_int = 0x4B31;
+pub const KDSETLED: c_int = 0x4B32;
+pub const KDGKBLED: c_int = 0x4B64;
+pub const KDSKBLED: c_int = 0x4B65;
 
-            pub const vt = @cImport({
-                @cInclude("sys/vt.h");
-            });
+pub const LED_NUM: c_int = 0x02;
+pub const LED_CAP: c_int = 0x04;
 
-            pub const LedState = c_char;
-            pub const get_led_state = kd.KDGKBLED;
-            pub const set_led_state = kd.KDSKBLED;
-            pub const numlock_led = kd.K_NUMLOCK;
-            pub const capslock_led = kd.K_CAPSLOCK;
-            pub const vt_activate = vt.VT_ACTIVATE;
-            pub const vt_waitactive = vt.VT_WAITACTIVE;
+pub const K_NUMLOCK: c_int = 0x02;
+pub const K_CAPSLOCK: c_int = 0x04;
 
-            pub fn setUserContextImpl(username: [*:0]const u8, entry: UsernameEntry) !void {
-                const status = grp.initgroups(username, @intCast(entry.gid));
-                if (status != 0) return error.GroupInitializationFailed;
+pub extern "c" fn localtime(timer: *const c_time) *tm;
+pub extern "c" fn strftime(str: [*:0]u8, maxsize: c_size, format: [*:0]const u8, timeptr: *const tm) c_size;
+pub extern "c" fn setenv(name: [*:0]const u8, value: [*:0]const u8, overwrite: c_int) c_int;
+pub extern "c" fn putenv(name: [*:0]u8) c_int;
+pub extern "c" fn getuid() c_uid;
+pub extern "c" fn getpwnam(name: [*:0]const u8) ?*passwd;
+pub extern "c" fn endpwent() void;
+pub extern "c" fn setusershell() void;
+pub extern "c" fn getusershell() [*:0]u8;
+pub extern "c" fn endusershell() void;
+pub extern "c" fn initgroups(user: [*:0]const u8, group: c_gid) c_int;
 
-                std.posix.setgid(@intCast(entry.gid)) catch return error.SetUserGidFailed;
-                std.posix.setuid(@intCast(entry.uid)) catch return error.SetUserUidFailed;
-            }
-
-            // Procedure:
-            // 1. Open /proc/self/stat to retrieve the tty_nr field
-            // 2. Parse the tty_nr field to extract the major and minor device
-            //    numbers
-            // 3. Then, read every /sys/class/tty/[dir]/dev, where [dir] is
-            //    every sub-directory
-            // 4. Finally, compare the major and minor device numbers with the
-            //    extracted values. If they correspond, parse [dir] to get the
-            //    TTY ID
-            pub fn getActiveTtyImpl(allocator: std.mem.Allocator) !u8 {
-                var file_buffer: [256]u8 = undefined;
-                var tty_major: u16 = undefined;
-                var tty_minor: u16 = undefined;
-
-                {
-                    var file = try std.fs.openFileAbsolute("/proc/self/stat", .{});
-                    defer file.close();
-
-                    var reader = file.reader(&file_buffer);
-                    var buffer: [1024]u8 = undefined;
-                    const read = try readBuffer(&reader.interface, &buffer);
-
-                    var iterator = std.mem.splitScalar(u8, buffer[0..read], ' ');
-                    var fields: [52][]const u8 = undefined;
-                    var index: usize = 0;
-
-                    while (iterator.next()) |field| {
-                        fields[index] = field;
-                        index += 1;
-                    }
-
-                    const tty_nr = try std.fmt.parseInt(u16, fields[6], 10);
-                    tty_major = tty_nr / 256;
-                    tty_minor = tty_nr % 256;
-                }
-
-                var directory = try std.fs.openDirAbsolute("/sys/class/tty", .{ .iterate = true });
-                defer directory.close();
-
-                var iterator = directory.iterate();
-                while (try iterator.next()) |entry| {
-                    const path = try std.fmt.allocPrint(allocator, "/sys/class/tty/{s}/dev", .{entry.name});
-                    defer allocator.free(path);
-
-                    var file = try std.fs.openFileAbsolute(path, .{});
-                    defer file.close();
-
-                    var reader = file.reader(&file_buffer);
-                    var buffer: [16]u8 = undefined;
-                    const read = try readBuffer(&reader.interface, &buffer);
-
-                    var device_iterator = std.mem.splitScalar(u8, buffer[0..(read - 1)], ':');
-                    const device_major_str = device_iterator.next() orelse continue;
-                    const device_minor_str = device_iterator.next() orelse continue;
-
-                    const device_major = try std.fmt.parseInt(u8, device_major_str, 10);
-                    const device_minor = try std.fmt.parseInt(u8, device_minor_str, 10);
-
-                    if (device_major == tty_major and device_minor == tty_minor) {
-                        const tty_id_str = entry.name["tty".len..];
-                        return try std.fmt.parseInt(u8, tty_id_str, 10);
-                    }
-                }
-
-                return error.NoTtyFound;
-            }
-
-            // This is very bad parsing, but we only need to get 2 values..
-            // and the format of the file seems to be standard? So this should
-            // be fine...
-            pub fn getUserIdRange(allocator: std.mem.Allocator, file_path: []const u8) !UidRange {
-                const login_defs_file = try std.fs.cwd().openFile(file_path, .{});
-                defer login_defs_file.close();
-
-                const login_defs_buffer = try login_defs_file.readToEndAlloc(allocator, std.math.maxInt(u16));
-                defer allocator.free(login_defs_buffer);
-
-                var iterator = std.mem.splitScalar(u8, login_defs_buffer, '\n');
-                var uid_range = UidRange{};
-
-                while (iterator.next()) |line| {
-                    const trimmed_line = std.mem.trim(u8, line, " \n\r\t");
-
-                    if (std.mem.startsWith(u8, trimmed_line, "UID_MIN")) {
-                        uid_range.uid_min = try parseValue(std.posix.uid_t, "UID_MIN", trimmed_line);
-                    } else if (std.mem.startsWith(u8, trimmed_line, "UID_MAX")) {
-                        uid_range.uid_max = try parseValue(std.posix.uid_t, "UID_MAX", trimmed_line);
-                    }
-                }
-
-                return uid_range;
-            }
-
-            fn parseValue(comptime T: type, name: []const u8, buffer: []const u8) !T {
-                var iterator = std.mem.splitAny(u8, buffer, " \t");
-                var maybe_value: ?T = null;
-
-                while (iterator.next()) |slice| {
-                    // Skip the slice if it's empty (whitespace) or is the name of the
-                    // property (e.g. UID_MIN or UID_MAX)
-                    if (slice.len == 0 or std.mem.eql(u8, slice, name)) continue;
-                    maybe_value = std.fmt.parseInt(T, slice, 10) catch continue;
-                }
-
-                return maybe_value orelse error.ValueNotFound;
-            }
-
-            fn readBuffer(reader: *std.Io.Reader, buffer: []u8) !usize {
-                var bytes_read: usize = 0;
-                var byte: u8 = try reader.takeByte();
-
-                while (byte != 0 and bytes_read < buffer.len) {
-                    buffer[bytes_read] = byte;
-                    bytes_read += 1;
-                    byte = reader.takeByte() catch break;
-                }
-
-                return bytes_read;
-            }
-        },
-        .freebsd => struct {
-            pub const kbio = @cImport({
-                @cInclude("sys/kbio.h");
-            });
-
-            pub const consio = @cImport({
-                @cInclude("sys/consio.h");
-            });
-
-            pub const LedState = c_int;
-            pub const get_led_state = kbio.KDGETLED;
-            pub const set_led_state = kbio.KDSETLED;
-            pub const numlock_led = kbio.LED_NUM;
-            pub const capslock_led = kbio.LED_CAP;
-            pub const vt_activate = consio.VT_ACTIVATE;
-            pub const vt_waitactive = consio.VT_WAITACTIVE;
-
-            pub fn setUserContextImpl(username: [*:0]const u8, entry: UsernameEntry) !void {
-                // FreeBSD has initgroups() in unistd
-                const status = unistd.initgroups(username, @intCast(entry.gid));
-                if (status != 0) return error.GroupInitializationFailed;
-
-                // FreeBSD sets the GID and UID with setusercontext()
-                const result = pwd.setusercontext(null, entry.passwd_struct, @intCast(entry.uid), pwd.LOGIN_SETALL);
-                if (result != 0) return error.SetUserUidFailed;
-            }
-
-            pub fn getActiveTtyImpl(_: std.mem.Allocator) !u8 {
-                return error.FeatureUnimplemented;
-            }
-
-            pub fn getUserIdRange(_: std.mem.Allocator, _: []const u8) !UidRange {
-                return .{
-                    // Hardcoded default values chosen from
-                    // /usr/src/usr.sbin/pw/pw_conf.c
-                    .uid_min = 1000,
-                    .uid_max = 32000,
-                };
-            }
-        },
-        else => @compileError("Unsupported target: " ++ builtin.os.tag),
-    };
-}
-
-const platform_struct = PlatformStruct();
-
-pub fn supportsUnicode() bool {
-    return builtin.os.tag == .linux or builtin.os.tag == .freebsd;
-}
-
-pub fn timeAsString(buf: [:0]u8, format: [:0]const u8) []u8 {
+pub fn timeAsString(buf: [:0]u8, format: [:0]const u8) ![]u8 {
     const timer = std.time.timestamp();
-    const tm_info = time.localtime(&timer);
-    const len = time.strftime(buf, buf.len, format, tm_info);
+    const tm_info = localtime(&timer);
+
+    const len = strftime(buf, buf.len, format, tm_info);
+    if (len < 0) return error.CannotGetFormattedTime;
 
     return buf[0..len];
 }
 
-pub fn getTimeOfDay() !TimeOfDay {
-    var tv: system_time.timeval = undefined;
-    const status = system_time.gettimeofday(&tv, null);
-
-    if (status != 0) return error.FailedToGetTimeOfDay;
-
-    return .{
-        .seconds = @intCast(tv.tv_sec),
-        .microseconds = @intCast(tv.tv_usec),
-    };
-}
-
-pub fn getActiveTty(allocator: std.mem.Allocator) !u8 {
-    return platform_struct.getActiveTtyImpl(allocator);
-}
-
-pub fn switchTty(tty: u8) !void {
-    var status = std.c.ioctl(std.posix.STDIN_FILENO, platform_struct.vt_activate, tty);
-    if (status != 0) return error.FailedToActivateTty;
-
-    status = std.c.ioctl(std.posix.STDIN_FILENO, platform_struct.vt_waitactive, tty);
-    if (status != 0) return error.FailedToWaitForActiveTty;
-}
-
-pub fn getLockState() !struct {
+pub fn getLockState(console_dev: [:0]const u8) !struct {
     numlock: bool,
     capslock: bool,
 } {
-    var led: platform_struct.LedState = undefined;
-    const status = std.c.ioctl(std.posix.STDIN_FILENO, platform_struct.get_led_state, &led);
-    if (status != 0) return error.FailedToGetLockState;
+    const fd = std.c.open(console_dev, .{ .ACCMODE = .RDONLY });
+    if (fd < 0) return error.CannotOpenConsoleDev;
+    defer _ = std.c.close(fd);
+
+    var numlock = false;
+    var capslock = false;
+
+    if (builtin.os.tag.isBSD()) {
+        var led: c_int = undefined;
+        _ = std.c.ioctl(fd, KDGETLED, &led);
+        numlock = (led & LED_NUM) != 0;
+        capslock = (led & LED_CAP) != 0;
+    } else {
+        var led: c_char = undefined;
+        _ = std.c.ioctl(fd, KDGKBLED, &led);
+        numlock = (led & K_NUMLOCK) != 0;
+        capslock = (led & K_CAPSLOCK) != 0;
+    }
 
     return .{
-        .numlock = (led & platform_struct.numlock_led) != 0,
-        .capslock = (led & platform_struct.capslock_led) != 0,
+        .numlock = numlock,
+        .capslock = capslock,
     };
 }
 
 pub fn setNumlock(val: bool) !void {
-    var led: platform_struct.LedState = undefined;
-    var status = std.c.ioctl(std.posix.STDIN_FILENO, platform_struct.get_led_state, &led);
-    if (status != 0) return error.FailedToGetNumlock;
+    var led: c_char = undefined;
+    _ = std.c.ioctl(0, KDGKBLED, &led);
 
-    const numlock = (led & platform_struct.numlock_led) != 0;
+    const numlock = (led & K_NUMLOCK) != 0;
     if (numlock != val) {
-        status = std.c.ioctl(std.posix.STDIN_FILENO, platform_struct.set_led_state, led ^ platform_struct.numlock_led);
+        const status = std.c.ioctl(std.posix.STDIN_FILENO, KDSKBLED, led ^ K_NUMLOCK);
         if (status != 0) return error.FailedToSetNumlock;
     }
 }
-
-pub fn setUserContext(allocator: std.mem.Allocator, entry: UsernameEntry) !void {
-    const username_z = try allocator.dupeZ(u8, entry.username.?);
-    defer allocator.free(username_z);
-
-    return platform_struct.setUserContextImpl(username_z.ptr, entry);
-}
-
-pub fn setUserShell(entry: *UsernameEntry) void {
-    unistd.setusershell();
-
-    const shell = unistd.getusershell();
-    entry.shell = std.mem.span(shell);
-
-    unistd.endusershell();
-}
-
-pub fn setEnvironmentVariable(allocator: std.mem.Allocator, name: []const u8, value: []const u8, replace: bool) !void {
-    const name_z = try allocator.dupeZ(u8, name);
-    defer allocator.free(name_z);
-
-    const value_z = try allocator.dupeZ(u8, value);
-    defer allocator.free(value_z);
-
-    const status = stdlib.setenv(name_z.ptr, value_z.ptr, @intFromBool(replace));
-    if (status != 0) return error.SetEnvironmentVariableFailed;
-}
-
-pub fn putEnvironmentVariable(name_and_value: [*c]u8) !void {
-    const status = stdlib.putenv(name_and_value);
-    if (status != 0) return error.PutEnvironmentVariableFailed;
-}
-
-pub fn getNextUsernameEntry() ?UsernameEntry {
-    const entry = pwd.getpwent();
-    if (entry == null) return null;
-
-    return .{
-        .username = if (entry.*.pw_name) |name| std.mem.span(name) else null,
-        .uid = @intCast(entry.*.pw_uid),
-        .gid = @intCast(entry.*.pw_gid),
-        .home = if (entry.*.pw_dir) |dir| std.mem.span(dir) else null,
-        .shell = if (entry.*.pw_shell) |shell| std.mem.span(shell) else null,
-        .passwd_struct = entry,
-    };
-}
-
-pub fn getUsernameEntry(username: [:0]const u8) ?UsernameEntry {
-    const entry = pwd.getpwnam(username);
-    if (entry == null) return null;
-
-    return .{
-        .username = if (entry.*.pw_name) |name| std.mem.span(name) else null,
-        .uid = @intCast(entry.*.pw_uid),
-        .gid = @intCast(entry.*.pw_gid),
-        .home = if (entry.*.pw_dir) |dir| std.mem.span(dir) else null,
-        .shell = if (entry.*.pw_shell) |shell| std.mem.span(shell) else null,
-        .passwd_struct = entry,
-    };
-}
-
-pub fn closePasswordDatabase() void {
-    pwd.endpwent();
-}
-
-// This is very bad parsing, but we only need to get 2 values... and the format
-// of the file doesn't seem to be standard? So this should be fine...
-pub fn getUserIdRange(allocator: std.mem.Allocator, file_path: []const u8) !UidRange {
-    return platform_struct.getUserIdRange(allocator, file_path);
-}

src/tui/Animation.zig

@@ -1,61 +0,0 @@
-const Animation = @This();
-
-const VTable = struct {
-    deinit_fn: *const fn (ptr: *anyopaque) void,
-    realloc_fn: *const fn (ptr: *anyopaque) anyerror!void,
-    draw_fn: *const fn (ptr: *anyopaque) void,
-};
-
-pointer: *anyopaque,
-vtable: VTable,
-
-pub fn init(
-    pointer: anytype,
-    comptime deinit_fn: fn (ptr: @TypeOf(pointer)) void,
-    comptime realloc_fn: fn (ptr: @TypeOf(pointer)) anyerror!void,
-    comptime draw_fn: fn (ptr: @TypeOf(pointer)) void,
-) Animation {
-    const Pointer = @TypeOf(pointer);
-    const Impl = struct {
-        pub fn deinitImpl(ptr: *anyopaque) void {
-            const impl: Pointer = @ptrCast(@alignCast(ptr));
-            return @call(.always_inline, deinit_fn, .{impl});
-        }
-
-        pub fn reallocImpl(ptr: *anyopaque) anyerror!void {
-            const impl: Pointer = @ptrCast(@alignCast(ptr));
-            return @call(.always_inline, realloc_fn, .{impl});
-        }
-
-        pub fn drawImpl(ptr: *anyopaque) void {
-            const impl: Pointer = @ptrCast(@alignCast(ptr));
-            return @call(.always_inline, draw_fn, .{impl});
-        }
-
-        const vtable = VTable{
-            .deinit_fn = deinitImpl,
-            .realloc_fn = reallocImpl,
-            .draw_fn = drawImpl,
-        };
-    };
-
-    return .{
-        .pointer = pointer,
-        .vtable = Impl.vtable,
-    };
-}
-
-pub fn deinit(self: *Animation) void {
-    const impl: @TypeOf(self.pointer) = @ptrCast(@alignCast(self.pointer));
-    return @call(.auto, self.vtable.deinit_fn, .{impl});
-}
-
-pub fn realloc(self: *Animation) anyerror!void {
-    const impl: @TypeOf(self.pointer) = @ptrCast(@alignCast(self.pointer));
-    return @call(.auto, self.vtable.realloc_fn, .{impl});
-}
-
-pub fn draw(self: *Animation) void {
-    const impl: @TypeOf(self.pointer) = @ptrCast(@alignCast(self.pointer));
-    return @call(.auto, self.vtable.draw_fn, .{impl});
-}

src/tui/Cell.zig

@@ -1,23 +0,0 @@
-const interop = @import("../interop.zig");
-
-const termbox = interop.termbox;
-
-const Cell = @This();
-
-ch: u32,
-fg: u32,
-bg: u32,
-
-pub fn init(ch: u32, fg: u32, bg: u32) Cell {
-    return .{
-        .ch = ch,
-        .fg = fg,
-        .bg = bg,
-    };
-}
-
-pub fn put(self: Cell, x: usize, y: usize) void {
-    if (self.ch == 0) return;
-
-    _ = termbox.tb_set_cell(@intCast(x), @intCast(y), self.ch, self.fg, self.bg);
-}

src/tui/TerminalBuffer.zig

@@ -1,6 +1,8 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const interop = @import("../interop.zig");
-const Cell = @import("Cell.zig");
+const utils = @import("utils.zig");
+const Config = @import("../config/Config.zig");
 
 const Random = std.Random;
 
@@ -8,52 +10,13 @@ const termbox = interop.termbox;
 
 const TerminalBuffer = @This();
 
-pub const InitOptions = struct {
-    fg: u32,
-    bg: u32,
-    border_fg: u32,
-    margin_box_h: u8,
-    margin_box_v: u8,
-    input_len: u8,
-};
-
-pub const Styling = struct {
-    pub const BOLD = termbox.TB_BOLD;
-    pub const UNDERLINE = termbox.TB_UNDERLINE;
-    pub const REVERSE = termbox.TB_REVERSE;
-    pub const ITALIC = termbox.TB_ITALIC;
-    pub const BLINK = termbox.TB_BLINK;
-    pub const HI_BLACK = termbox.TB_HI_BLACK;
-    pub const BRIGHT = termbox.TB_BRIGHT;
-    pub const DIM = termbox.TB_DIM;
-};
-
-pub const Color = struct {
-    pub const DEFAULT = 0x00000000;
-    pub const TRUE_BLACK = Styling.HI_BLACK;
-    pub const TRUE_RED = 0x00FF0000;
-    pub const TRUE_GREEN = 0x0000FF00;
-    pub const TRUE_YELLOW = 0x00FFFF00;
-    pub const TRUE_BLUE = 0x000000FF;
-    pub const TRUE_MAGENTA = 0x00FF00FF;
-    pub const TRUE_CYAN = 0x0000FFFF;
-    pub const TRUE_WHITE = 0x00FFFFFF;
-    pub const ECOL_BLACK = 1;
-    pub const ECOL_RED = 2;
-    pub const ECOL_GREEN = 3;
-    pub const ECOL_YELLOW = 4;
-    pub const ECOL_BLUE = 5;
-    pub const ECOL_MAGENTA = 6;
-    pub const ECOL_CYAN = 7;
-    pub const ECOL_WHITE = 8;
-};
-
 random: Random,
-width: usize,
-height: usize,
-fg: u32,
-bg: u32,
-border_fg: u32,
+width: u64,
+height: u64,
+buffer: [*]termbox.tb_cell,
+fg: u8,
+bg: u8,
+border_fg: u8,
 box_chars: struct {
     left_up: u32,
     left_down: u32,
@@ -64,24 +27,24 @@ box_chars: struct {
     left: u32,
     right: u32,
 },
-labels_max_length: usize,
-box_x: usize,
-box_y: usize,
-box_width: usize,
-box_height: usize,
+labels_max_length: u64,
+box_x: u64,
+box_y: u64,
+box_width: u64,
+box_height: u64,
 margin_box_v: u8,
 margin_box_h: u8,
-blank_cell: Cell,
 
-pub fn init(options: InitOptions, labels_max_length: usize, random: Random) TerminalBuffer {
+pub fn init(config: Config, labels_max_length: u64, random: Random) TerminalBuffer {
     return .{
         .random = random,
         .width = @intCast(termbox.tb_width()),
         .height = @intCast(termbox.tb_height()),
-        .fg = options.fg,
-        .bg = options.bg,
-        .border_fg = options.border_fg,
-        .box_chars = if (interop.supportsUnicode()) .{
+        .buffer = termbox.tb_cell_buffer(),
+        .fg = config.fg,
+        .bg = config.bg,
+        .border_fg = config.border_fg,
+        .box_chars = if (builtin.os.tag == .linux or builtin.os.tag.isBSD()) .{
             .left_up = 0x250C,
             .left_down = 0x2514,
             .right_up = 0x2510,
@@ -103,46 +66,35 @@ pub fn init(options: InitOptions, labels_max_length: usize, random: Random) Term
         .labels_max_length = labels_max_length,
         .box_x = 0,
         .box_y = 0,
-        .box_width = (2 * options.margin_box_h) + options.input_len + 1 + labels_max_length,
-        .box_height = 7 + (2 * options.margin_box_v),
-        .margin_box_v = options.margin_box_v,
-        .margin_box_h = options.margin_box_h,
-        .blank_cell = Cell.init(' ', options.fg, options.bg),
+        .box_width = (2 * config.margin_box_h) + config.input_len + 1 + labels_max_length,
+        .box_height = 7 + (2 * config.margin_box_v),
+        .margin_box_v = config.margin_box_v,
+        .margin_box_h = config.margin_box_h,
     };
 }
 
 pub fn cascade(self: TerminalBuffer) bool {
-    var changed = false;
-    var y = self.height - 2;
+    var changes = false;
 
+    var y = self.height - 2;
     while (y > 0) : (y -= 1) {
         for (0..self.width) |x| {
-            var cell: ?*termbox.tb_cell = undefined;
-            var cell_under: ?*termbox.tb_cell = undefined;
+            const c: u8 = @truncate(self.buffer[(y - 1) * self.width + x].ch);
+            if (std.ascii.isWhitespace(c)) continue;
 
-            _ = termbox.tb_get_cell(@intCast(x), @intCast(y - 1), 1, &cell);
-            _ = termbox.tb_get_cell(@intCast(x), @intCast(y), 1, &cell_under);
+            const c_under: u8 = @truncate(self.buffer[y * self.width + x].ch);
+            if (!std.ascii.isWhitespace(c_under)) continue;
 
-            // This shouldn't happen under normal circumstances, but because
-            // this is a *secret* animation, there's no need to care that much
-            if (cell == null or cell_under == null) continue;
-
-            const char: u8 = @truncate(cell.?.ch);
-            if (std.ascii.isWhitespace(char)) continue;
-
-            const char_under: u8 = @truncate(cell_under.?.ch);
-            if (!std.ascii.isWhitespace(char_under)) continue;
-
-            changed = true;
+            changes = true;
 
             if ((self.random.int(u16) % 10) > 7) continue;
 
-            _ = termbox.tb_set_cell(@intCast(x), @intCast(y), cell.?.ch, cell.?.fg, cell.?.bg);
-            _ = termbox.tb_set_cell(@intCast(x), @intCast(y - 1), ' ', cell_under.?.fg, cell_under.?.bg);
+            self.buffer[y * self.width + x] = self.buffer[(y - 1) * self.width + x];
+            self.buffer[(y - 1) * self.width + x].ch = ' ';
         }
     }
 
-    return changed;
+    return changes;
 }
 
 pub fn drawBoxCenter(self: *TerminalBuffer, show_borders: bool, blank_box: bool) void {
@@ -161,93 +113,76 @@ pub fn drawBoxCenter(self: *TerminalBuffer, show_borders: bool, blank_box: bool)
         _ = termbox.tb_set_cell(@intCast(x1 - 1), @intCast(y2), self.box_chars.left_down, self.border_fg, self.bg);
         _ = termbox.tb_set_cell(@intCast(x2), @intCast(y2), self.box_chars.right_down, self.border_fg, self.bg);
 
-        var c1 = Cell.init(self.box_chars.top, self.border_fg, self.bg);
-        var c2 = Cell.init(self.box_chars.bottom, self.border_fg, self.bg);
+        var c1 = utils.initCell(self.box_chars.top, self.border_fg, self.bg);
+        var c2 = utils.initCell(self.box_chars.bottom, self.border_fg, self.bg);
 
         for (0..self.box_width) |i| {
-            c1.put(x1 + i, y1 - 1);
-            c2.put(x1 + i, y2);
+            _ = utils.putCell(@intCast(x1 + i), @intCast(y1 - 1), &c1);
+            _ = utils.putCell(@intCast(x1 + i), @intCast(y2), &c2);
         }
 
         c1.ch = self.box_chars.left;
         c2.ch = self.box_chars.right;
 
         for (0..self.box_height) |i| {
-            c1.put(x1 - 1, y1 + i);
-            c2.put(x2, y1 + i);
+            _ = utils.putCell(@intCast(x1 - 1), @intCast(y1 + i), &c1);
+            _ = utils.putCell(@intCast(x2), @intCast(y1 + i), &c2);
         }
     }
 
     if (blank_box) {
+        const blank = utils.initCell(' ', self.fg, self.bg);
+
         for (0..self.box_height) |y| {
             for (0..self.box_width) |x| {
-                self.blank_cell.put(x1 + x, y1 + y);
+                _ = utils.putCell(@intCast(x1 + x), @intCast(y1 + y), &blank);
             }
         }
     }
 }
 
 pub fn calculateComponentCoordinates(self: TerminalBuffer) struct {
-    start_x: usize,
-    x: usize,
-    y: usize,
-    full_visible_length: usize,
-    visible_length: usize,
+    x: u64,
+    y: u64,
+    visible_length: u64,
 } {
-    const start_x = self.box_x + self.margin_box_h;
-    const x = start_x + self.labels_max_length + 1;
+    const x = self.box_x + self.margin_box_h + self.labels_max_length + 1;
     const y = self.box_y + self.margin_box_v;
-    const full_visible_length = self.box_x + self.box_width - self.margin_box_h - start_x;
     const visible_length = self.box_x + self.box_width - self.margin_box_h - x;
 
     return .{
-        .start_x = start_x,
         .x = x,
         .y = y,
-        .full_visible_length = full_visible_length,
         .visible_length = visible_length,
     };
 }
 
-pub fn drawLabel(self: TerminalBuffer, text: []const u8, x: usize, y: usize) void {
-    drawColorLabel(text, x, y, self.fg, self.bg);
-}
-
-pub fn drawColorLabel(text: []const u8, x: usize, y: usize, fg: u32, bg: u32) void {
+pub fn drawLabel(self: TerminalBuffer, text: []const u8, x: u64, y: u64) void {
     const yc: c_int = @intCast(y);
     const utf8view = std.unicode.Utf8View.init(text) catch return;
     var utf8 = utf8view.iterator();
 
-    var i: c_int = @intCast(x);
-    while (utf8.nextCodepoint()) |codepoint| : (i += termbox.tb_wcwidth(codepoint)) {
-        _ = termbox.tb_set_cell(i, yc, codepoint, fg, bg);
+    var i = x;
+    while (utf8.nextCodepoint()) |codepoint| : (i += 1) {
+        _ = termbox.tb_set_cell(@intCast(i), yc, codepoint, self.fg, self.bg);
     }
 }
 
-pub fn drawConfinedLabel(self: TerminalBuffer, text: []const u8, x: usize, y: usize, max_length: usize) void {
+pub fn drawConfinedLabel(self: TerminalBuffer, text: []const u8, x: u64, y: u64, max_length: u64) void {
     const yc: c_int = @intCast(y);
     const utf8view = std.unicode.Utf8View.init(text) catch return;
     var utf8 = utf8view.iterator();
 
-    var i: c_int = @intCast(x);
-    while (utf8.nextCodepoint()) |codepoint| : (i += termbox.tb_wcwidth(codepoint)) {
-        if (i - @as(c_int, @intCast(x)) >= max_length) break;
-        _ = termbox.tb_set_cell(i, yc, codepoint, self.fg, self.bg);
+    var i: usize = 0;
+    while (utf8.nextCodepoint()) |codepoint| : (i += 1) {
+        if (i >= max_length) break;
+        _ = termbox.tb_set_cell(@intCast(i + x), yc, codepoint, self.fg, self.bg);
     }
 }
 
-pub fn drawCharMultiple(self: TerminalBuffer, char: u32, x: usize, y: usize, length: usize) void {
-    const cell = Cell.init(char, self.fg, self.bg);
-    for (0..length) |xx| cell.put(x + xx, y);
-}
+pub fn drawCharMultiple(self: TerminalBuffer, char: u8, x: u64, y: u64, length: u64) void {
+    const yc: c_int = @intCast(y);
+    const cell = utils.initCell(char, self.fg, self.bg);
 
-// Every codepoint is assumed to have a width of 1.
-// Since Ly is normally running in a TTY, this should be fine.
-pub fn strWidth(str: []const u8) !u8 {
-    const utf8view = try std.unicode.Utf8View.init(str);
-    var utf8 = utf8view.iterator();
-    var i: c_int = 0;
-    while (utf8.nextCodepoint()) |codepoint| i += termbox.tb_wcwidth(codepoint);
-
-    return @intCast(i);
+    for (0..length) |xx| _ = utils.putCell(@intCast(x + xx), yc, &cell);
 }

src/tui/components/Desktop.zig

@@ -0,0 +1,223 @@
+const std = @import("std");
+const enums = @import("../../enums.zig");
+const interop = @import("../../interop.zig");
+const TerminalBuffer = @import("../TerminalBuffer.zig");
+const Ini = @import("zigini").Ini;
+const Lang = @import("../../config/Lang.zig");
+
+const Allocator = std.mem.Allocator;
+const EnvironmentList = std.ArrayList(Environment);
+
+const DisplayServer = enums.DisplayServer;
+
+const termbox = interop.termbox;
+
+const Desktop = @This();
+
+pub const Environment = struct {
+    entry_ini: ?Ini(Entry) = null,
+    name: [:0]const u8 = "",
+    xdg_session_desktop: [:0]const u8 = "",
+    xdg_desktop_names: ?[:0]const u8 = "",
+    cmd: []const u8 = "",
+    specifier: []const u8 = "",
+    display_server: DisplayServer = .wayland,
+};
+
+const DesktopEntry = struct {
+    Exec: []const u8 = "",
+    Name: [:0]const u8 = "",
+    DesktopNames: ?[]const u8 = null,
+};
+
+pub const Entry = struct { @"Desktop Entry": DesktopEntry = DesktopEntry{} };
+
+allocator: Allocator,
+buffer: *TerminalBuffer,
+environments: EnvironmentList,
+current: u64,
+visible_length: u64,
+x: u64,
+y: u64,
+lang: Lang,
+
+pub fn init(allocator: Allocator, buffer: *TerminalBuffer, max_length: u64, lang: Lang) !Desktop {
+    return .{
+        .allocator = allocator,
+        .buffer = buffer,
+        .environments = try EnvironmentList.initCapacity(allocator, max_length),
+        .current = 0,
+        .visible_length = 0,
+        .x = 0,
+        .y = 0,
+        .lang = lang,
+    };
+}
+
+pub fn deinit(self: Desktop) void {
+    for (self.environments.items) |*environment| {
+        if (environment.entry_ini) |*entry_ini| entry_ini.deinit();
+        if (environment.xdg_desktop_names) |desktop_name| self.allocator.free(desktop_name);
+        self.allocator.free(environment.xdg_session_desktop);
+    }
+
+    self.environments.deinit();
+}
+
+pub fn position(self: *Desktop, x: u64, y: u64, visible_length: u64) void {
+    self.x = x;
+    self.y = y;
+    self.visible_length = visible_length;
+}
+
+pub fn addEnvironment(self: *Desktop, entry: DesktopEntry, xdg_session_desktop: []const u8, display_server: DisplayServer) !void {
+    var xdg_desktop_names: ?[:0]const u8 = null;
+    if (entry.DesktopNames) |desktop_names| {
+        const desktop_names_z = try self.allocator.dupeZ(u8, desktop_names);
+        for (desktop_names_z) |*c| {
+            if (c.* == ';') c.* = ':';
+        }
+        xdg_desktop_names = desktop_names_z;
+    }
+
+    errdefer {
+        if (xdg_desktop_names) |desktop_names| self.allocator.free(desktop_names);
+    }
+
+    const session_desktop = try self.allocator.dupeZ(u8, xdg_session_desktop);
+    errdefer self.allocator.free(session_desktop);
+
+    try self.environments.append(.{
+        .entry_ini = null,
+        .name = entry.Name,
+        .xdg_session_desktop = session_desktop,
+        .xdg_desktop_names = xdg_desktop_names,
+        .cmd = entry.Exec,
+        .specifier = switch (display_server) {
+            .wayland => self.lang.wayland,
+            .x11 => self.lang.x11,
+            else => self.lang.other,
+        },
+        .display_server = display_server,
+    });
+
+    self.current = self.environments.items.len - 1;
+}
+
+pub fn addEnvironmentWithIni(self: *Desktop, entry_ini: Ini(Entry), xdg_session_desktop: []const u8, display_server: DisplayServer) !void {
+    const entry = entry_ini.data.@"Desktop Entry";
+    var xdg_desktop_names: ?[:0]const u8 = null;
+    if (entry.DesktopNames) |desktop_names| {
+        const desktop_names_z = try self.allocator.dupeZ(u8, desktop_names);
+        for (desktop_names_z) |*c| {
+            if (c.* == ';') c.* = ':';
+        }
+        xdg_desktop_names = desktop_names_z;
+    }
+
+    errdefer {
+        if (xdg_desktop_names) |desktop_names| self.allocator.free(desktop_names);
+    }
+
+    const session_desktop = try self.allocator.dupeZ(u8, xdg_session_desktop);
+    errdefer self.allocator.free(session_desktop);
+
+    try self.environments.append(.{
+        .entry_ini = entry_ini,
+        .name = entry.Name,
+        .xdg_session_desktop = session_desktop,
+        .xdg_desktop_names = xdg_desktop_names,
+        .cmd = entry.Exec,
+        .specifier = switch (display_server) {
+            .wayland => self.lang.wayland,
+            .x11 => self.lang.x11,
+            else => self.lang.other,
+        },
+        .display_server = display_server,
+    });
+
+    self.current = self.environments.items.len - 1;
+}
+
+pub fn crawl(self: *Desktop, path: []const u8, display_server: DisplayServer) !void {
+    var iterable_directory = std.fs.openDirAbsolute(path, .{ .iterate = true }) catch return;
+    defer iterable_directory.close();
+
+    var iterator = iterable_directory.iterate();
+    while (try iterator.next()) |item| {
+        if (!std.mem.eql(u8, std.fs.path.extension(item.name), ".desktop")) continue;
+
+        const entry_path = try std.fmt.allocPrint(self.allocator, "{s}/{s}", .{ path, item.name });
+        defer self.allocator.free(entry_path);
+        var entry_ini = Ini(Entry).init(self.allocator);
+        _ = try entry_ini.readFileToStruct(entry_path, "#", null);
+        errdefer entry_ini.deinit();
+
+        var xdg_session_desktop: []const u8 = undefined;
+        const maybe_desktop_names = entry_ini.data.@"Desktop Entry".DesktopNames;
+        if (maybe_desktop_names) |desktop_names| {
+            xdg_session_desktop = std.mem.sliceTo(desktop_names, ';');
+        } else {
+            // if DesktopNames is empty, we'll take the name of the session file
+            xdg_session_desktop = std.fs.path.stem(item.name);
+        }
+
+        try self.addEnvironmentWithIni(entry_ini, xdg_session_desktop, display_server);
+    }
+}
+
+pub fn handle(self: *Desktop, maybe_event: ?*termbox.tb_event, insert_mode: bool) void {
+    if (maybe_event) |event| blk: {
+        if (event.type != termbox.TB_EVENT_KEY) break :blk;
+
+        switch (event.key) {
+            termbox.TB_KEY_ARROW_LEFT, termbox.TB_KEY_CTRL_H => self.goLeft(),
+            termbox.TB_KEY_ARROW_RIGHT, termbox.TB_KEY_CTRL_L => self.goRight(),
+            else => {
+                if (!insert_mode) {
+                    switch (event.ch) {
+                        'h' => self.goLeft(),
+                        'l' => self.goRight(),
+                        else => {},
+                    }
+                }
+            },
+        }
+    }
+
+    _ = termbox.tb_set_cursor(@intCast(self.x + 2), @intCast(self.y));
+}
+
+pub fn draw(self: Desktop) void {
+    const environment = self.environments.items[self.current];
+
+    const length = @min(environment.name.len, self.visible_length - 3);
+    if (length == 0) return;
+
+    const x = self.buffer.box_x + self.buffer.margin_box_h;
+    const y = self.buffer.box_y + self.buffer.margin_box_v + 2;
+    self.buffer.drawLabel(environment.specifier, x, y);
+
+    _ = termbox.tb_set_cell(@intCast(self.x), @intCast(self.y), '<', self.buffer.fg, self.buffer.bg);
+    _ = termbox.tb_set_cell(@intCast(self.x + self.visible_length - 1), @intCast(self.y), '>', self.buffer.fg, self.buffer.bg);
+
+    self.buffer.drawLabel(environment.name, self.x + 2, self.y);
+}
+
+fn goLeft(self: *Desktop) void {
+    if (self.current == 0) {
+        self.current = self.environments.items.len - 1;
+        return;
+    }
+
+    self.current -= 1;
+}
+
+fn goRight(self: *Desktop) void {
+    if (self.current == self.environments.items.len - 1) {
+        self.current = 0;
+        return;
+    }
+
+    self.current += 1;
+}

src/tui/components/InfoLine.zig

@@ -1,45 +1,28 @@
 const std = @import("std");
+const utils = @import("../utils.zig");
 const TerminalBuffer = @import("../TerminalBuffer.zig");
-const generic = @import("generic.zig");
-
-const Allocator = std.mem.Allocator;
-
-const MessageLabel = generic.CyclableLabel(Message, Message);
 
 const InfoLine = @This();
 
-const Message = struct {
-    width: u8,
-    text: []const u8,
-    bg: u32,
-    fg: u32,
-};
+text: []const u8 = "",
+width: u8 = 0,
 
-label: MessageLabel,
-
-pub fn init(allocator: Allocator, buffer: *TerminalBuffer) InfoLine {
-    return .{
-        .label = MessageLabel.init(allocator, buffer, drawItem, null, null),
-    };
+pub fn setText(self: *InfoLine, text: []const u8) !void {
+    self.width = if (text.len > 0) try utils.strWidth(text) else 0;
+    self.text = text;
 }
 
-pub fn deinit(self: *InfoLine) void {
-    self.label.deinit();
+pub fn draw(self: InfoLine, buffer: TerminalBuffer) void {
+    if (self.width > 0 and buffer.box_width > self.width) {
+        const label_y = buffer.box_y + buffer.margin_box_v;
+        const x = buffer.box_x + ((buffer.box_width - self.width) / 2);
+
+        buffer.drawLabel(self.text, x, label_y);
+    }
 }
 
-pub fn addMessage(self: *InfoLine, text: []const u8, bg: u32, fg: u32) !void {
-    if (text.len == 0) return;
-
-    try self.label.addItem(.{
-        .width = try TerminalBuffer.strWidth(text),
-        .text = text,
-        .bg = bg,
-        .fg = fg,
-    });
-}
-
-pub fn clearRendered(allocator: Allocator, buffer: TerminalBuffer) !void {
-    // Draw over the area
+pub fn clearRendered(allocator: std.mem.Allocator, buffer: TerminalBuffer) !void {
+    // draw over the area
     const y = buffer.box_y + buffer.margin_box_v;
     const spaces = try allocator.alloc(u8, buffer.box_width);
     defer allocator.free(spaces);
@@ -48,13 +31,3 @@ pub fn clearRendered(allocator: Allocator, buffer: TerminalBuffer) !void {
 
     buffer.drawLabel(spaces, buffer.box_x, y);
 }
-
-fn drawItem(label: *MessageLabel, message: Message, _: usize, _: usize) bool {
-    if (message.width == 0 or label.buffer.box_width <= message.width) return false;
-
-    const x = label.buffer.box_x + ((label.buffer.box_width - message.width) / 2);
-    label.first_char_x = x + message.width;
-
-    TerminalBuffer.drawColorLabel(message.text, x, label.y, message.fg, message.bg);
-    return true;
-}

src/tui/components/Session.zig

@@ -1,55 +0,0 @@
-const std = @import("std");
-const TerminalBuffer = @import("../TerminalBuffer.zig");
-const enums = @import("../../enums.zig");
-const Environment = @import("../../Environment.zig");
-const generic = @import("generic.zig");
-const UserList = @import("UserList.zig");
-
-const Allocator = std.mem.Allocator;
-const DisplayServer = enums.DisplayServer;
-
-const Env = struct {
-    environment: Environment,
-    index: usize,
-};
-const EnvironmentLabel = generic.CyclableLabel(Env, *UserList);
-
-const Session = @This();
-
-label: EnvironmentLabel,
-
-pub fn init(allocator: Allocator, buffer: *TerminalBuffer, user_list: *UserList) Session {
-    return .{
-        .label = EnvironmentLabel.init(allocator, buffer, drawItem, sessionChanged, user_list),
-    };
-}
-
-pub fn deinit(self: *Session) void {
-    for (self.label.list.items) |*env| {
-        if (env.environment.entry_ini) |*entry_ini| entry_ini.deinit();
-    }
-
-    self.label.deinit();
-}
-
-pub fn addEnvironment(self: *Session, environment: Environment) !void {
-    try self.label.addItem(.{ .environment = environment, .index = self.label.list.items.len });
-}
-
-fn sessionChanged(env: Env, maybe_user_list: ?*UserList) void {
-    if (maybe_user_list) |user_list| {
-        user_list.label.list.items[user_list.label.current].session_index.* = env.index;
-    }
-}
-
-fn drawItem(label: *EnvironmentLabel, env: Env, x: usize, y: usize) bool {
-    const length = @min(env.environment.name.len, label.visible_length - 3);
-    if (length == 0) return false;
-
-    const nx = if (label.text_in_center) (label.x + (label.visible_length - env.environment.name.len) / 2) else (label.x + 2);
-    label.first_char_x = nx + env.environment.name.len;
-
-    label.buffer.drawLabel(env.environment.specifier, x, y);
-    label.buffer.drawLabel(env.environment.name, nx, label.y);
-    return true;
-}

src/tui/components/Text.zig

@@ -1,9 +1,10 @@
 const std = @import("std");
 const interop = @import("../../interop.zig");
 const TerminalBuffer = @import("../TerminalBuffer.zig");
+const utils = @import("../utils.zig");
 
 const Allocator = std.mem.Allocator;
-const DynamicString = std.ArrayListUnmanaged(u8);
+const DynamicString = std.ArrayList(u8);
 
 const termbox = interop.termbox;
 
@@ -12,17 +13,15 @@ const Text = @This();
 allocator: Allocator,
 buffer: *TerminalBuffer,
 text: DynamicString,
-end: usize,
-cursor: usize,
-visible_start: usize,
-visible_length: usize,
-x: usize,
-y: usize,
-masked: bool,
-maybe_mask: ?u32,
+end: u64,
+cursor: u64,
+visible_start: u64,
+visible_length: u64,
+x: u64,
+y: u64,
 
-pub fn init(allocator: Allocator, buffer: *TerminalBuffer, masked: bool, maybe_mask: ?u32) Text {
-    const text: DynamicString = .empty;
+pub fn init(allocator: Allocator, buffer: *TerminalBuffer, max_length: u64) !Text {
+    const text = try DynamicString.initCapacity(allocator, max_length);
 
     return .{
         .allocator = allocator,
@@ -34,16 +33,14 @@ pub fn init(allocator: Allocator, buffer: *TerminalBuffer, masked: bool, maybe_m
         .visible_length = 0,
         .x = 0,
         .y = 0,
-        .masked = masked,
-        .maybe_mask = maybe_mask,
     };
 }
 
-pub fn deinit(self: *Text) void {
-    self.text.deinit(self.allocator);
+pub fn deinit(self: Text) void {
+    self.text.deinit();
 }
 
-pub fn position(self: *Text, x: usize, y: usize, visible_length: usize) void {
+pub fn position(self: *Text, x: u64, y: u64, visible_length: u64) void {
     self.x = x;
     self.y = y;
     self.visible_length = visible_length;
@@ -81,25 +78,10 @@ pub fn handle(self: *Text, maybe_event: ?*termbox.tb_event, insert_mode: bool) !
         }
     }
 
-    if (self.masked and self.maybe_mask == null) {
-        _ = termbox.tb_set_cursor(@intCast(self.x), @intCast(self.y));
-        return;
-    }
-
     _ = termbox.tb_set_cursor(@intCast(self.x + (self.cursor - self.visible_start)), @intCast(self.y));
 }
 
 pub fn draw(self: Text) void {
-    if (self.masked) {
-        if (self.maybe_mask) |mask| {
-            const length = @min(self.text.items.len, self.visible_length - 1);
-            if (length == 0) return;
-
-            self.buffer.drawCharMultiple(mask, self.x, self.y, length);
-        }
-        return;
-    }
-
     const length = @min(self.text.items.len, self.visible_length);
     if (length == 0) return;
 
@@ -114,6 +96,13 @@ pub fn draw(self: Text) void {
     self.buffer.drawLabel(visible_slice, self.x, self.y);
 }
 
+pub fn drawMasked(self: Text, mask: u8) void {
+    const length = @min(self.text.items.len, self.visible_length - 1);
+    if (length == 0) return;
+
+    self.buffer.drawCharMultiple(mask, self.x, self.y, length);
+}
+
 pub fn clear(self: *Text) void {
     self.text.clearRetainingCapacity();
     self.end = 0;
@@ -153,7 +142,7 @@ fn backspace(self: *Text) void {
 fn write(self: *Text, char: u8) !void {
     if (char == 0) return;
 
-    try self.text.insert(self.allocator, self.cursor, char);
+    try self.text.insert(self.cursor, char);
 
     self.end += 1;
     self.goRight();

src/tui/components/UserList.zig

@@ -1,83 +0,0 @@
-const std = @import("std");
-const TerminalBuffer = @import("../TerminalBuffer.zig");
-const generic = @import("generic.zig");
-const Session = @import("Session.zig");
-const SavedUsers = @import("../../config/SavedUsers.zig");
-
-const StringList = std.ArrayListUnmanaged([]const u8);
-const Allocator = std.mem.Allocator;
-
-pub const User = struct {
-    name: []const u8,
-    session_index: *usize,
-    allocated_index: bool,
-};
-const UserLabel = generic.CyclableLabel(User, *Session);
-
-const UserList = @This();
-
-label: UserLabel,
-
-pub fn init(allocator: Allocator, buffer: *TerminalBuffer, usernames: StringList, saved_users: *SavedUsers, session: *Session) !UserList {
-    var userList = UserList{
-        .label = UserLabel.init(allocator, buffer, drawItem, usernameChanged, session),
-    };
-
-    for (usernames.items) |username| {
-        if (username.len == 0) continue;
-
-        var maybe_session_index: ?*usize = null;
-        for (saved_users.user_list.items) |*saved_user| {
-            if (std.mem.eql(u8, username, saved_user.username)) {
-                maybe_session_index = &saved_user.session_index;
-                break;
-            }
-        }
-
-        var allocated_index = false;
-        if (maybe_session_index == null) {
-            maybe_session_index = try allocator.create(usize);
-            maybe_session_index.?.* = 0;
-            allocated_index = true;
-        }
-
-        try userList.label.addItem(.{
-            .name = username,
-            .session_index = maybe_session_index.?,
-            .allocated_index = allocated_index,
-        });
-    }
-
-    return userList;
-}
-
-pub fn deinit(self: *UserList) void {
-    for (self.label.list.items) |user| {
-        if (user.allocated_index) {
-            self.label.allocator.destroy(user.session_index);
-        }
-    }
-
-    self.label.deinit();
-}
-
-pub fn getCurrentUsername(self: UserList) []const u8 {
-    return self.label.list.items[self.label.current].name;
-}
-
-fn usernameChanged(user: User, maybe_session: ?*Session) void {
-    if (maybe_session) |session| {
-        session.label.current = user.session_index.*;
-    }
-}
-
-fn drawItem(label: *UserLabel, user: User, _: usize, _: usize) bool {
-    const length = @min(user.name.len, label.visible_length - 3);
-    if (length == 0) return false;
-
-    const x = if (label.text_in_center) (label.x + (label.visible_length - user.name.len) / 2) else (label.x + 2);
-    label.first_char_x = x + user.name.len;
-
-    label.buffer.drawLabel(user.name, x, label.y);
-    return true;
-}

src/tui/components/generic.zig

@@ -1,117 +0,0 @@
-const std = @import("std");
-const interop = @import("../../interop.zig");
-const TerminalBuffer = @import("../TerminalBuffer.zig");
-
-pub fn CyclableLabel(comptime ItemType: type, comptime ChangeItemType: type) type {
-    return struct {
-        const Allocator = std.mem.Allocator;
-        const ItemList = std.ArrayListUnmanaged(ItemType);
-        const DrawItemFn = *const fn (*Self, ItemType, usize, usize) bool;
-        const ChangeItemFn = *const fn (ItemType, ?ChangeItemType) void;
-
-        const termbox = interop.termbox;
-
-        const Self = @This();
-
-        allocator: Allocator,
-        buffer: *TerminalBuffer,
-        list: ItemList,
-        current: usize,
-        visible_length: usize,
-        x: usize,
-        y: usize,
-        first_char_x: usize,
-        text_in_center: bool,
-        draw_item_fn: DrawItemFn,
-        change_item_fn: ?ChangeItemFn,
-        change_item_arg: ?ChangeItemType,
-
-        pub fn init(allocator: Allocator, buffer: *TerminalBuffer, draw_item_fn: DrawItemFn, change_item_fn: ?ChangeItemFn, change_item_arg: ?ChangeItemType) Self {
-            return .{
-                .allocator = allocator,
-                .buffer = buffer,
-                .list = .empty,
-                .current = 0,
-                .visible_length = 0,
-                .x = 0,
-                .y = 0,
-                .first_char_x = 0,
-                .text_in_center = false,
-                .draw_item_fn = draw_item_fn,
-                .change_item_fn = change_item_fn,
-                .change_item_arg = change_item_arg,
-            };
-        }
-
-        pub fn deinit(self: *Self) void {
-            self.list.deinit(self.allocator);
-        }
-
-        pub fn position(self: *Self, x: usize, y: usize, visible_length: usize, text_in_center: ?bool) void {
-            self.x = x;
-            self.y = y;
-            self.visible_length = visible_length;
-            self.first_char_x = x + 2;
-            if (text_in_center) |value| {
-                self.text_in_center = value;
-            }
-        }
-
-        pub fn addItem(self: *Self, item: ItemType) !void {
-            try self.list.append(self.allocator, item);
-            self.current = self.list.items.len - 1;
-        }
-
-        pub fn handle(self: *Self, maybe_event: ?*termbox.tb_event, insert_mode: bool) void {
-            if (maybe_event) |event| blk: {
-                if (event.type != termbox.TB_EVENT_KEY) break :blk;
-
-                switch (event.key) {
-                    termbox.TB_KEY_ARROW_LEFT, termbox.TB_KEY_CTRL_H => self.goLeft(),
-                    termbox.TB_KEY_ARROW_RIGHT, termbox.TB_KEY_CTRL_L => self.goRight(),
-                    else => {
-                        if (!insert_mode) {
-                            switch (event.ch) {
-                                'h' => self.goLeft(),
-                                'l' => self.goRight(),
-                                else => {},
-                            }
-                        }
-                    },
-                }
-            }
-
-            _ = termbox.tb_set_cursor(@intCast(self.first_char_x), @intCast(self.y));
-        }
-
-        pub fn draw(self: *Self) void {
-            if (self.list.items.len == 0) return;
-
-            const current_item = self.list.items[self.current];
-            const x = self.buffer.box_x + self.buffer.margin_box_h;
-            const y = self.buffer.box_y + self.buffer.margin_box_v + 2;
-
-            const continue_drawing = @call(.auto, self.draw_item_fn, .{ self, current_item, x, y });
-            if (!continue_drawing) return;
-
-            _ = termbox.tb_set_cell(@intCast(self.x), @intCast(self.y), '<', self.buffer.fg, self.buffer.bg);
-            _ = termbox.tb_set_cell(@intCast(self.x + self.visible_length - 1), @intCast(self.y), '>', self.buffer.fg, self.buffer.bg);
-        }
-
-        fn goLeft(self: *Self) void {
-            self.current = if (self.current == 0) self.list.items.len - 1 else self.current - 1;
-
-            if (self.change_item_fn) |change_item_fn| {
-                @call(.auto, change_item_fn, .{ self.list.items[self.current], self.change_item_arg });
-            }
-        }
-
-        fn goRight(self: *Self) void {
-            self.current = if (self.current == self.list.items.len - 1) 0 else self.current + 1;
-
-            if (self.change_item_fn) |change_item_fn| {
-                @call(.auto, change_item_fn, .{ self.list.items[self.current], self.change_item_arg });
-            }
-        }
-    };
-}

src/tui/utils.zig

@@ -0,0 +1,26 @@
+const std = @import("std");
+const interop = @import("../interop.zig");
+
+const termbox = interop.termbox;
+
+pub fn initCell(ch: u32, fg: u16, bg: u16) termbox.tb_cell {
+    return .{
+        .ch = ch,
+        .fg = fg,
+        .bg = bg,
+    };
+}
+
+pub fn putCell(x: i32, y: i32, cell: *const termbox.tb_cell) c_int {
+    return termbox.tb_set_cell(x, y, cell.ch, cell.fg, cell.bg);
+}
+
+// Every codepoint is assumed to have a width of 1.
+// Since ly should be running in a tty, this should be fine.
+pub fn strWidth(str: []const u8) !u8 {
+    const utf8view = try std.unicode.Utf8View.init(str);
+    var utf8 = utf8view.iterator();
+    var i: u8 = 0;
+    while (utf8.nextCodepoint()) |_| i += 1;
+    return i;
+}