[hackers] [slstatus] Support energy_now/power_now in battery_remaining || David Demelier

From: <git_AT_suckless.org>
Date: Sun, 20 May 2018 22:15:11 +0200 (CEST)

commit f386a03a20ca3de30f761dba52d9d7196e3544e4
Author: David Demelier <markand_AT_malikania.fr>
AuthorDate: Sun May 20 09:42:16 2018 +0200
Commit: Aaron Marcher <me_AT_drkhsh.at>
CommitDate: Sun May 20 22:12:44 2018 +0200

    Support energy_now/power_now in battery_remaining
    
    On some laptops (mostly thinkpads), the remaining time may be
    expressed in µWh using energy_now and power_now files rather than µAh
    for charge_now and current_now.
    
    Add pick function to conditionally select appropriate one.

diff --git a/components/battery.c b/components/battery.c
index 5031608..5d7a385 100644
--- a/components/battery.c
+++ b/components/battery.c
_AT_@ -7,6 +7,26 @@
 
 #if defined(__linux__)
         #include <limits.h>
+ #include <unistd.h>
+
+ #define CHARGE_NOW "/sys/class/power_supply/%s/charge_now"
+ #define ENERGY_NOW "/sys/class/power_supply/%s/energy_now"
+ #define CURRENT_NOW "/sys/class/power_supply/%s/current_now"
+ #define POWER_NOW "/sys/class/power_supply/%s/power_now"
+
+ static const char *
+ pick(const char *bat, const char *f1, const char *f2, char *path, size_t length)
+ {
+ if (esnprintf(path, length, f1, bat) > 0 && access(path, R_OK) == 0) {
+ return f1;
+ }
+
+ if (esnprintf(path, length, f2, bat) > 0 && access(path, R_OK) == 0) {
+ return f2;
+ }
+
+ return NULL;
+ }
 
         const char *
         battery_perc(const char *bat)
_AT_@ -72,21 +92,14 @@
                         return NULL;
                 }
 
+ if (pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof (path)) == NULL ||
+ pscanf(path, "%d", &charge_now) < 0) {
+ return NULL;
+ }
+
                 if (!strcmp(state, "Discharging")) {
- if (esnprintf(path, sizeof(path),
- "/sys/class/power_supply/%s/charge_now",
- bat) < 0) {
- return NULL;
- }
- if (pscanf(path, "%d", &charge_now) != 1) {
- return NULL;
- }
- if (esnprintf(path, sizeof(path),
- "/sys/class/power_supply/%s/current_now",
- bat) < 0) {
- return NULL;
- }
- if (pscanf(path, "%d", &current_now) != 1) {
+ if (pick(bat, CURRENT_NOW, POWER_NOW, path, sizeof (path)) == NULL ||
+ pscanf(path, "%d", &current_now) < 0) {
                                 return NULL;
                         }
 
Received on Sun May 20 2018 - 22:15:11 CEST