From 74b6e340f2be27f82b4dcfc95fab47cbc0a5843b Mon Sep 17 00:00:00 2001
From: Aaron Marcher <info@nulltime.net>
Date: Tue, 13 Sep 2016 21:05:49 +0200
Subject: lol, battery_perc() is even simpler, fuck this shit :D
---
slstatus.c | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/slstatus.c b/slstatus.c
index bf3c826..f61e987 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -98,36 +98,19 @@ smprintf(const char *fmt, ...)
static char *
battery_perc(const char *battery)
{
- int now, full;
+ int perc;
FILE *fp;
- ccat(3, "/sys/class/power_supply/", battery, "/energy_now");
- fp = fopen(concat, "r");
- if (fp == NULL) {
- ccat(4, "/sys/class/power_supply/", battery, "/charge_now");
- fp = fopen(concat, "r");
- if (fp == NULL) {
- warn("Error opening battery file: %s", concat);
- return smprintf(UNKNOWN_STR);
- }
- }
- fscanf(fp, "%i", &now);
- fclose(fp);
-
- ccat(3, "/sys/class/power_supply/", battery, "/energy_full");
+ ccat(3, "/sys/class/power_supply/", battery, "/capacity");
fp = fopen(concat, "r");
if (fp == NULL) {
- ccat(4, "/sys/class/power_supply/", battery, "/charge_full");
- fp = fopen(concat, "r");
- if (fp == NULL) {
- warn("Error opening battery file: %s", concat);
- return smprintf(UNKNOWN_STR);
- }
+ warn("Error opening battery file: %s", concat);
+ return smprintf(UNKNOWN_STR);
}
- fscanf(fp, "%i", &full);
+ fscanf(fp, "%i", &perc);
fclose(fp);
- return smprintf("%d%%", now / (full / 100));
+ return smprintf("%d%%", perc);
}
static char *
--
cgit v1.2.3