Add battery_remaining function on OpenBSD

Implementation of a battery_remaining function which returns the
remaining battery time in HH:MM format. Linux function still needs
implementation.
Move common code to load_apm_power_info

diff --git a/components/battery.c b/components/battery.c
index 807a7e6..152777e 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -45,40 +45,56 @@
                }
                return (i == LEN(map)) ? "?" : map[i].symbol;
        }
                }
                return (i == LEN(map)) ? "?" : map[i].symbol;
        }

+
+       const char *
+       battery_remaining(const char *bat)
+       {
+               /* TODO: Implement */
+               return NULL;
+       }

 #elif defined(__OpenBSD__)
        #include <fcntl.h>
        #include <machine/apmvar.h>
        #include <sys/ioctl.h>
        #include <unistd.h>
 
 #elif defined(__OpenBSD__)
        #include <fcntl.h>
        #include <machine/apmvar.h>
        #include <sys/ioctl.h>
        #include <unistd.h>
 

-       const char *
-       battery_perc(const char *unused)
+       static int
+       load_apm_power_info(struct apm_power_info *apm_info)

        {
        {

-               struct apm_power_info apm_info;

                int fd;
 
                fd = open("/dev/apm", O_RDONLY);
                if (fd < 0) {
                        warn("open '/dev/apm':");
                int fd;
 
                fd = open("/dev/apm", O_RDONLY);
                if (fd < 0) {
                        warn("open '/dev/apm':");

-                       return NULL;
+                       return 0;

                }
 
                }
 

-               if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
+               memset(apm_info, 0, sizeof(struct apm_power_info));
+               if (ioctl(fd, APM_IOC_GETPOWER, apm_info) < 0) {

                        warn("ioctl 'APM_IOC_GETPOWER':");
                        close(fd);
                        warn("ioctl 'APM_IOC_GETPOWER':");
                        close(fd);

-                       return NULL;
+                       return 0;
+               }
+               return close(fd), 1;
+       }
+
+       const char *
+       battery_perc(const char *unused)
+       {
+               struct apm_power_info apm_info;
+
+               if (load_apm_power_info(&apm_info)) {
+                       return bprintf("%d", apm_info.battery_life);

                }
                }

-               close(fd);

 
 

-               return bprintf("%d", apm_info.battery_life);
+               return NULL;

        }
 
        const char *
        battery_state(const char *unused)
        {
        }
 
        const char *
        battery_state(const char *unused)
        {

-               int fd;
-               size_t i;

                struct apm_power_info apm_info;
                struct apm_power_info apm_info;

+               size_t i;

                struct {
                        unsigned int state;
                        char *symbol;
                struct {
                        unsigned int state;
                        char *symbol;


@@ -87,24 +103,28 @@
                        { APM_AC_OFF,     "-" },
                };
 
                        { APM_AC_OFF,     "-" },
                };
 

-               fd = open("/dev/apm", O_RDONLY);
-               if (fd < 0) {
-                       warn("open '/dev/apm':");
-                       return NULL;
+               if (load_apm_power_info(&apm_info)) {
+                       for (i = 0; i < LEN(map); i++) {
+                               if (map[i].state == apm_info.ac_state) {
+                                       break;
+                               }
+                       }
+                       return (i == LEN(map)) ? "?" : map[i].symbol;

                }
 
                }
 

-               if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-                       warn("ioctl 'APM_IOC_GETPOWER':");
-                       close(fd);
-                       return NULL;
-               }
-               close(fd);
+               return NULL;
+       }

 
 

-               for (i = 0; i < LEN(map); i++) {
-                       if (map[i].state == apm_info.ac_state) {
-                               break;
-                       }
+       const char *
+       battery_remaining(const char *unused)
+       {
+               struct apm_power_info apm_info;
+
+               if (load_apm_power_info(&apm_info)) {
+                       return bprintf("%u:%02u", apm_info.minutes_left / 60,
+                                      apm_info.minutes_left % 60);

                }
                }

-               return (i == LEN(map)) ? "?" : map[i].symbol;
+
+               return NULL;

        }
 #endif
        }
 #endif

diff --git a/config.def.h b/config.def.h
index 9dcd5d6..82a5df5 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -16,6 +16,8 @@ static const char unknown_str[] = "n/a";
  *                                                      NULL on OpenBSD
  * battery_state        battery charging state          battery name (BAT0)
  *                                                      NULL on OpenBSD
  *                                                      NULL on OpenBSD
  * battery_state        battery charging state          battery name (BAT0)
  *                                                      NULL on OpenBSD

+ * battery_remaining   battery remaining HH:MM         battery name (BAT0)
+ *                                                     NULL on OpenBSD

  * cpu_perc             cpu usage in percent            NULL
  * cpu_freq             cpu frequency in MHz            NULL
  * datetime             date and time                   format string (%F %T)
  * cpu_perc             cpu usage in percent            NULL
  * cpu_freq             cpu frequency in MHz            NULL
  * datetime             date and time                   format string (%F %T)

diff --git a/slstatus.h b/slstatus.h
index 6a25209..abe28d3 100644 (file)
--- a/slstatus.h
+++ b/slstatus.h
@@ -3,6 +3,7 @@
 /* battery */
 const char *battery_perc(const char *);
 const char *battery_state(const char *);
 /* battery */
 const char *battery_perc(const char *);
 const char *battery_state(const char *);

+const char *battery_remaining(const char*);

 
 /* cpu */
 const char *cpu_freq(void);
 
 /* cpu */
 const char *cpu_freq(void);