X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_battery_info.c;h=6ee89896cfed8c0e226e7a9bb77dcc2e19bc354d;hb=3471ff39f865a450444774237c435bceaaac1c01;hp=c4b15b1864abba806c09f013855bcffc32e87a1d;hpb=5fc2a8a38e37ba4d2e55f8fba75a051e1a88ccc8;p=i3%2Fi3status

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index c4b15b1..6ee8989 100644
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -1,4 +1,5 @@
 // vim:ts=8:expandtab
+#include <time.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -16,10 +17,14 @@
  * worn off your battery is.
  *
  */
-void print_battery_info(int number, const char *format, bool last_full_capacity) {
+void print_battery_info(int number, const char *path, const char *format, bool last_full_capacity) {
+        time_t empty_time;
+        struct tm *empty_tm;
         char buf[1024];
         char statusbuf[16];
+        char percentagebuf[16];
         char remainingbuf[256];
+        char emptytimebuf[256];
         const char *walk, *last;
         int full_design = -1,
             remaining = -1,
@@ -27,11 +32,13 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
         charging_status_t status = CS_DISCHARGING;
 
         memset(statusbuf, '\0', sizeof(statusbuf));
+        memset(percentagebuf, '\0', sizeof(percentagebuf));
         memset(remainingbuf, '\0', sizeof(remainingbuf));
+        memset(emptytimebuf, '\0', sizeof(emptytimebuf));
 
 #if defined(LINUX)
         static char batpath[512];
-        sprintf(batpath, "/sys/class/power_supply/BAT%d/uevent", number);
+        sprintf(batpath, path, number);
         if (!slurp(batpath, buf, sizeof(buf))) {
                 printf("No battery");
                 return;
@@ -51,6 +58,8 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
                         remaining = atoi(walk+1);
                 else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW"))
                         present_rate = atoi(walk+1);
+                else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW"))
+                        present_rate = atoi(walk+1);
                 else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging"))
                         status = CS_CHARGING;
                 else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Full"))
@@ -78,26 +87,34 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
                         (status == CS_CHARGING ? "CHR" :
                          (status == CS_DISCHARGING ? "BAT" : "FULL")));
 
+        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%",
+                       (((float)remaining / (float)full_design) * 100));
+
         if (present_rate > 0) {
                 float remaining_time;
-                int seconds, hours, minutes;
+                int seconds, hours, minutes, seconds_remaining;
                 if (status == CS_CHARGING)
                         remaining_time = ((float)full_design - (float)remaining) / (float)present_rate;
                 else if (status == CS_DISCHARGING)
                         remaining_time = ((float)remaining / (float)present_rate);
                 else remaining_time = 0;
 
-                seconds = (int)(remaining_time * 3600.0);
-                hours = seconds / 3600;
-                seconds -= (hours * 3600);
+                seconds_remaining = (int)(remaining_time * 3600.0);
+
+                hours = seconds_remaining / 3600;
+                seconds = seconds_remaining - (hours * 3600);
                 minutes = seconds / 60;
                 seconds -= (minutes * 60);
 
-                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%.02f%% %02d:%02d:%02d",
-                        (((float)remaining / (float)full_design) * 100),
+                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
                         max(hours, 0), max(minutes, 0), max(seconds, 0));
-        } else {
-                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%.02f%%", (((float)remaining / (float)full_design) * 100));
+
+                empty_time = time(NULL);
+                empty_time += seconds_remaining;
+                empty_tm = localtime(&empty_time);
+
+                (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d:%02d",
+                        max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0), max(empty_tm->tm_sec, 0));
         }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
         int state;
@@ -135,17 +152,16 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
                         (status == CS_CHARGING ? "CHR" :
                          (status == CS_DISCHARGING ? "BAT" : "FULL")));
 
+        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%",
+                       present_rate);
+
         if (state == 1) {
                 int hours, minutes;
                 minutes = remaining;
                 hours = minutes / 60;
                 minutes -= (hours * 60);
-                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d%% %02dh%02d",
-                               present_rate,
+                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02dh%02d",
                                max(hours, 0), max(minutes, 0));
-        } else {
-                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d%%",
-                               present_rate);
         }
 #endif
 
@@ -158,9 +174,15 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
                 if (strncmp(walk+1, "status", strlen("status")) == 0) {
                         printf("%s", statusbuf);
                         walk += strlen("status");
+                } else if (strncmp(walk+1, "percentage", strlen("percentage")) == 0) {
+                        printf("%s", percentagebuf);
+                        walk += strlen("percentage");
                 } else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) {
                         printf("%s", remainingbuf);
                         walk += strlen("remaining");
+                } else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) {
+                        printf("%s", emptytimebuf);
+                        walk += strlen("emptytime");
                 }
         }
 }