ceos/ly
1
0
Fork 0
mirror of https://codeberg.org/fairyglade/ly.git synced 2026-08-09 07:09:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove use of @cImport()

Browse source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion 2026-07-05 21:17:10 +02:00
commit aea71fee18
No known key found for this signature in database
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ly-core/build.zig
View file

@ -45,6 +45,7 @@ pub fn build(b: *std.Build) void {
} else if (target.result.os.tag == .freebsd) {
addCImport(b, mod, translate_c, target, optimize, "kbio", "#include <sys/kbio.h>");
addCImport(b, mod, translate_c, target, optimize, "consio", "#include <sys/consio.h>");
addCImport(b, mod, translate_c, target, optimize, "sysctl", "#include <sys/sysctl.h>");
}
const mod_tests = b.addTest(.{

3
ly-core/src/interop.zig
View file

@ -13,6 +13,9 @@ pub const utmp = @import("utmp");
// Exists for X11 support only
pub const xcb = @import("xcb");
// FreeBSD only
pub const sysctl = @import("sysctl");
pub const TimeOfDay = struct {
seconds: i64,
microseconds: i64,

1
res/config.ini
View file

@ -49,6 +49,7 @@ auth_fails = 10
# 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
# Unused on FreeBSD (a sysctl is used there)
battery_id = null
# Automatic login configuration

4
src/main.zig
View file

@ -43,8 +43,6 @@ const DisplayServer = @import("enums.zig").DisplayServer;
const Environment = @import("Environment.zig");
const Entry = Environment.Entry;
const sysctl = if (builtin.os.tag == .freebsd) @cImport(@cInclude("sys/sysctl.h")) else struct {};
const ly_version_str = "Ly version " ++ build_options.version;
var session_pid: std.posix.pid_t = -1;
@ -2323,7 +2321,7 @@ fn getBatteryPercentage(io: std.Io, battery_id: []const u8) !u8 {
var capacity: c_int = -1;
var size: usize = @sizeOf(c_int);
const ret = sysctl.sysctlbyname("hw.acpi.battery.life", &capacity, &size, null, 0);
const ret = interop.sysctl.sysctlbyname("hw.acpi.battery.life", &capacity, &size, null, 0);
if (ret != 0) return error.SysctlFailed;
if (capacity < 0 or capacity > 100) return error.InvalidBatteryCapacity;