srctree

Gregory Mullen parent 2cd35efe 44a6b77d
OMFG zig... why are you the way that you are?!

src/battery.zig added: 22, removed: 22, total 0
@@ -19,7 +19,7 @@ fn read(self: *Battery) !void {
var file = try std.fs.openFileAbsolute("/sys/class/power_supply/BAT1/capacity", .{});
defer file.close();
var buffer: [10]u8 = undefined;
var count = try file.read(&buffer);
const count = try file.read(&buffer);
self.capacity = try std.fmt.parseInt(u8, buffer[0 .. count - 1], 10);
}
 
@@ -45,6 +45,6 @@ pub fn format(self: Battery, comptime fmt: []const u8, _: std.fmt.FormatOptions,
return out.print("Battery {}% {s}", .{ self.capacity, time });
}
const color: ?Pango.Color = if (self.capacity < 20) Pango.Color.Red else null;
var p = Pango.Pango(Battery).init(self, color);
const p = Pango.Pango(Battery).init(self, color);
return out.print("{}", .{p});
}
 
src/datetime.zig added: 22, removed: 22, total 0
@@ -120,7 +120,7 @@ pub fn fromEpochTz(sts: i64, tz: ?i16) !DateTime {
self.years = yearsFrom(ts);
self.weekday = @truncate((ts / 60 / 60 / 24 + 4) % 7);
 
var days = 719162 + ts / 60 / 60 / 24 - daysAtYear(self.years);
const days = 719162 + ts / 60 / 60 / 24 - daysAtYear(self.years);
const both = monthsFrom(self.years, days);
self.months = both[0];
self.days = @truncate(both[1] + 1);
@@ -129,13 +129,13 @@ pub fn fromEpochTz(sts: i64, tz: ?i16) !DateTime {
}
 
pub fn fromEpoch(sts: i64) !DateTime {
var ts = try fromEpochTz(sts, null);
const ts = try fromEpochTz(sts, null);
return ts;
}
 
/// Accepts a Unix Epoch int as a string of numbers
pub fn fromEpochStr(str: []const u8) !DateTime {
var int = try std.fmt.parseInt(i64, str, 10);
const int = try std.fmt.parseInt(i64, str, 10);
return fromEpoch(int);
}
 
@@ -147,8 +147,8 @@ pub fn tzToMinutes(tzstr: []const u8) !i16 {
 
/// Accepts a Unix Epoch int as a string of numbers and timezone in -HHMM format
pub fn fromEpochTzStr(str: []const u8, tzstr: []const u8) !DateTime {
var epoch = try std.fmt.parseInt(i64, str, 10);
var tz = try tzToMinutes(tzstr);
const epoch = try std.fmt.parseInt(i64, str, 10);
const tz = try tzToMinutes(tzstr);
return fromEpochTz(epoch, tz);
}
 
 
src/main.zig added: 22, removed: 22, total 0
@@ -56,7 +56,7 @@ fn dateOffset(os: i16) DateTime {
var date_buffer: [1024]u8 = undefined;
fn date(_: ?Click) anyerror!Body {
return Body{
.full_text = try std.fmt.bufPrint(&date_buffer, "{}", .{dateOffset(-8)}),
.full_text = try std.fmt.bufPrint(&date_buffer, "{}", .{dateOffset(-7)}),
.name = "datetime",
.instance = "datetime_0",
};
@@ -88,7 +88,7 @@ fn bl(click: ?Click) !Body {
 
var bat_buffer: [1024]u8 = undefined;
fn battery(_: ?Click) !Body {
var bat = try Battery.init();
const bat = try Battery.init();
//try bat.update(std.time.timestamp());
return Body{
.full_text = try std.fmt.bufPrint(&bat_buffer, "{}", .{bat}),
@@ -131,7 +131,7 @@ fn toClick(a: Allocator, str: []const u8) !Click {
}
 
test toClick {
var a = std.testing.allocator;
const a = std.testing.allocator;
//_ = try toClick(a, "{}");
_ = try toClick(a,
\\
@@ -156,14 +156,14 @@ pub fn main() !void {
var fba = std.heap.FixedBufferAllocator.init(&buffer);
var a = fba.allocator();
 
var stdin = std.io.getStdIn();
const stdin = std.io.getStdIn();
_ = stdin;
 
const stdout_file = std.io.getStdOut().writer();
var bw = std.io.bufferedWriter(stdout_file);
const stdout = bw.writer();
 
var header = Header{};
const header = Header{};
const opt = .{ .emit_null_optional_fields = false };
try std.json.stringify(header, opt, stdout);
_ = try bw.write("\n[");
@@ -177,12 +177,12 @@ pub fn main() !void {
//var list: [builders.len + 1]Body = undefined;
var list: []Body = try a.alloc(Body, builders.len + 1);
 
const err_mask = std.os.POLL.ERR | std.os.POLL.NVAL | std.os.POLL.HUP;
const err_mask = std.posix.POLL.ERR | std.posix.POLL.NVAL | std.posix.POLL.HUP;
var buf: [0x5000]u8 = undefined;
var str: []const u8 = buf[0..0];
var poll_fd = [_]std.os.pollfd{.{
var poll_fd = [_]std.posix.pollfd{.{
.fd = 0,
.events = std.os.POLL.IN,
.events = std.posix.POLL.IN,
.revents = undefined,
}};
 
@@ -191,7 +191,7 @@ pub fn main() !void {
list.len = builders.len;
 
for (0..100) |_| {
if (std.os.poll(&poll_fd, 10) catch unreachable > 0) {
if (std.posix.poll(&poll_fd, 10) catch unreachable > 0) {
miss = 0;
break;
}
@@ -199,9 +199,9 @@ pub fn main() !void {
miss = @min(20, miss +| 1);
}
var click: ?Click = null;
var parsed: ?std.json.Parsed(Click) = null;
if (poll_fd[0].revents & std.os.POLL.IN != 0) {
const amt = std.os.read(0, &buf) catch unreachable;
const parsed: ?std.json.Parsed(Click) = null;
if (poll_fd[0].revents & std.posix.POLL.IN != 0) {
const amt = std.posix.read(0, &buf) catch unreachable;
std.debug.assert(amt <= buf.len);
const start: usize = if (amt > 1 and buf[0] == ',') 1 else 0;
str = buf[start..amt];