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

Added format_down option for battery if no battery is available.

Browse Source
This commit is contained in:
Christoph Göttschkes 2013-03-07 21:21:54 +01:00 committed by Michael Stapelberg
parent d62e10c56d
commit 5e0b8812bf
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
i3status.c
View File

@ -230,6 +230,7 @@ int main(int argc, char *argv[]) {
cfg_opt_t battery_opts[] = { cfg_opt_t battery_opts[] = {
CFG_STR("format", "%status %percentage %remaining", CFGF_NONE), CFG_STR("format", "%status %percentage %remaining", CFGF_NONE),
CFG_STR("format_down", "No battery", CFGF_NONE),
CFG_STR("path", "/sys/class/power_supply/BAT%d/uevent", CFGF_NONE), CFG_STR("path", "/sys/class/power_supply/BAT%d/uevent", CFGF_NONE),
CFG_INT("low_threshold", 30, CFGF_NONE), CFG_INT("low_threshold", 30, CFGF_NONE),
CFG_STR("threshold_type", "time", CFGF_NONE), CFG_STR("threshold_type", "time", CFGF_NONE),
@ -444,7 +445,7 @@ int main(int argc, char *argv[]) {
CASE_SEC_TITLE("battery") { CASE_SEC_TITLE("battery") {
SEC_OPEN_MAP("battery"); SEC_OPEN_MAP("battery");
print_battery_info(json_gen, buffer, atoi(title), cfg_getstr(sec, "path"), cfg_getstr(sec, "format"), cfg_getint(sec, "low_threshold"), cfg_getstr(sec, "threshold_type"), cfg_getbool(sec, "last_full_capacity"), cfg_getbool(sec, "integer_battery_capacity")); print_battery_info(json_gen, buffer, atoi(title), cfg_getstr(sec, "path"), cfg_getstr(sec, "format"), cfg_getstr(sec, "format_down"), cfg_getint(sec, "low_threshold"), cfg_getstr(sec, "threshold_type"), cfg_getbool(sec, "last_full_capacity"), cfg_getbool(sec, "integer_battery_capacity"));
SEC_CLOSE_MAP; SEC_CLOSE_MAP;
} }

2
include/i3status.h
View File

@ -142,7 +142,7 @@ void set_timezone(const char *tz);
void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down); void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down);
void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format); void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format);
void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity); void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity);
void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t); void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t);
void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t); void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t);
const char *get_ip_addr(); const char *get_ip_addr();

1
man/i3status.man
View File

@ -72,6 +72,7 @@ ethernet eth0 {
battery 0 { battery 0 {
format = "%status %percentage %remaining %emptytime" format = "%status %percentage %remaining %emptytime"
format_down = "No battery"
path = "/sys/class/power_supply/BAT%d/uevent" path = "/sys/class/power_supply/BAT%d/uevent"
low_threshold = 10 low_threshold = 10
} }

14
src/print_battery_info.c
View File

@ -30,7 +30,7 @@
* worn off your battery is. * worn off your battery is.
* *
*/ */
void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity) { void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity) {
time_t empty_time; time_t empty_time;
struct tm *empty_tm; struct tm *empty_tm;
char buf[1024]; char buf[1024];
@ -61,7 +61,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
static char batpath[512]; static char batpath[512];
sprintf(batpath, path, number); sprintf(batpath, path, number);
if (!slurp(batpath, buf, sizeof(buf))) { if (!slurp(batpath, buf, sizeof(buf))) {
OUTPUT_FULL_TEXT("No battery"); OUTPUT_FULL_TEXT(format_down);
return; return;
} }
@ -123,7 +123,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
} }
if ((full_design == -1) || (remaining == -1)) { if ((full_design == -1) || (remaining == -1)) {
OUTPUT_FULL_TEXT("No battery"); OUTPUT_FULL_TEXT(format_down);
return; return;
} }
@ -196,19 +196,19 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
size_t sysctl_size = sizeof(sysctl_rslt); size_t sysctl_size = sizeof(sysctl_rslt);
if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { if (sysctlbyname(BATT_LIFE, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
OUTPUT_FULL_TEXT("No battery"); OUTPUT_FULL_TEXT(format_down);
return; return;
} }
present_rate = sysctl_rslt; present_rate = sysctl_rslt;
if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) { if (sysctlbyname(BATT_TIME, &sysctl_rslt, &sysctl_size, NULL, 0) != 0) {
OUTPUT_FULL_TEXT("No battery"); OUTPUT_FULL_TEXT(format_down);
return; return;
} }
remaining = sysctl_rslt; remaining = sysctl_rslt;
if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL,0) != 0) { if (sysctlbyname(BATT_STATE, &sysctl_rslt, &sysctl_size, NULL,0) != 0) {
OUTPUT_FULL_TEXT("No battery"); OUTPUT_FULL_TEXT(format_down);
return; return;
} }
@ -257,7 +257,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
/* Don't bother to go further if there's no battery present. */ /* Don't bother to go further if there's no battery present. */
if ((apm_info.battery_state == APM_BATTERY_ABSENT) || if ((apm_info.battery_state == APM_BATTERY_ABSENT) ||
(apm_info.battery_state == APM_BATT_UNKNOWN)) { (apm_info.battery_state == APM_BATT_UNKNOWN)) {
OUTPUT_FULL_TEXT("No battery"); OUTPUT_FULL_TEXT(format_down);
return; return;
} }