marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

battery: split up %remaining into %percentage and %remaining (Thanks shatter)

Browse Source
This commit is contained in:
Michael Stapelberg 2009-10-16 22:21:05 +02:00
parent 5fc2a8a38e
commit e4bd4bd2a3
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3status.c
View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[]) {
}; };
cfg_opt_t battery_opts[] = { cfg_opt_t battery_opts[] = {
CFG_STR("format", "%status %remaining", CFGF_NONE), CFG_STR("format", "%status %percentage %remaining", CFGF_NONE),
CFG_BOOL("last_full_capacity", false, CFGF_NONE), CFG_BOOL("last_full_capacity", false, CFGF_NONE),
CFG_END() CFG_END()
}; };

2
i3status.conf
View File

@ -26,7 +26,7 @@ ethernet eth0 {
} }
battery 0 { battery 0 {
format = "%status %remaining" format = "%status %percentage %remaining"
} }
run_watch DHCP { run_watch DHCP {

2
man/i3status.man
View File

@ -66,7 +66,7 @@ ethernet eth0 {
} }
battery 0 { battery 0 {
format = "%status %remaining" format = "%status %percentage %remaining"
} }
run_watch DHCP { run_watch DHCP {

22
src/print_battery_info.c
View File

@ -19,6 +19,7 @@
void print_battery_info(int number, const char *format, bool last_full_capacity) { void print_battery_info(int number, const char *format, bool last_full_capacity) {
char buf[1024]; char buf[1024];
char statusbuf[16]; char statusbuf[16];
char percentagebuf[16];
char remainingbuf[256]; char remainingbuf[256];
const char *walk, *last; const char *walk, *last;
int full_design = -1, int full_design = -1,
@ -27,6 +28,7 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
charging_status_t status = CS_DISCHARGING; charging_status_t status = CS_DISCHARGING;
memset(statusbuf, '\0', sizeof(statusbuf)); memset(statusbuf, '\0', sizeof(statusbuf));
memset(percentagebuf, '\0', sizeof(percentagebuf));
memset(remainingbuf, '\0', sizeof(remainingbuf)); memset(remainingbuf, '\0', sizeof(remainingbuf));
#if defined(LINUX) #if defined(LINUX)
@ -78,6 +80,9 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
(status == CS_CHARGING ? "CHR" : (status == CS_CHARGING ? "CHR" :
(status == CS_DISCHARGING ? "BAT" : "FULL"))); (status == CS_DISCHARGING ? "BAT" : "FULL")));
(void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%",
(((float)remaining / (float)full_design) * 100));
if (present_rate > 0) { if (present_rate > 0) {
float remaining_time; float remaining_time;
int seconds, hours, minutes; int seconds, hours, minutes;
@ -93,11 +98,8 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
minutes = seconds / 60; minutes = seconds / 60;
seconds -= (minutes * 60); seconds -= (minutes * 60);
(void)snprintf(remainingbuf, sizeof(remainingbuf), "%.02f%% %02d:%02d:%02d", (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
(((float)remaining / (float)full_design) * 100),
max(hours, 0), max(minutes, 0), max(seconds, 0)); max(hours, 0), max(minutes, 0), max(seconds, 0));
} else {
(void)snprintf(remainingbuf, sizeof(remainingbuf), "%.02f%%", (((float)remaining / (float)full_design) * 100));
} }
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
int state; int state;
@ -135,17 +137,16 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
(status == CS_CHARGING ? "CHR" : (status == CS_CHARGING ? "CHR" :
(status == CS_DISCHARGING ? "BAT" : "FULL"))); (status == CS_DISCHARGING ? "BAT" : "FULL")));
(void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%",
present_rate);
if (state == 1) { if (state == 1) {
int hours, minutes; int hours, minutes;
minutes = remaining; minutes = remaining;
hours = minutes / 60; hours = minutes / 60;
minutes -= (hours * 60); minutes -= (hours * 60);
(void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d%% %02dh%02d", (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02dh%02d",
present_rate,
max(hours, 0), max(minutes, 0)); max(hours, 0), max(minutes, 0));
} else {
(void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d%%",
present_rate);
} }
#endif #endif
@ -158,6 +159,9 @@ void print_battery_info(int number, const char *format, bool last_full_capacity)
if (strncmp(walk+1, "status", strlen("status")) == 0) { if (strncmp(walk+1, "status", strlen("status")) == 0) {
printf("%s", statusbuf); printf("%s", statusbuf);
walk += strlen("status"); 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) { } else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) {
printf("%s", remainingbuf); printf("%s", remainingbuf);
walk += strlen("remaining"); walk += strlen("remaining");