Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00
Code Issues Releases Activity

Improve behaviour of $pb_battery.

Browse Source
This commit is contained in:
Brenden Matthews 2008-12-13 20:55:45 -07:00
parent 7c23916e02
commit 650be03fd4
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
2008-12-14
* Fix disk_protect for linux-2.6.27 (and hopefully above)
* Improve behaviour of $pb_battery
2008-12-09
* Add an option to timed_thread_test() to not wait for the interval period

26
src/linux.c
View File

@ -1996,6 +1996,9 @@ void get_powerbook_batt_info(char *buffer, size_t n, int i)
if (pmu_battery_fp == NULL) {
pmu_battery_fp = open_file(batt_path, &rep);
if (pmu_battery_fp == NULL) {
return;
}
}
if (pmu_battery_fp != NULL) {
@ -2020,6 +2023,9 @@ void get_powerbook_batt_info(char *buffer, size_t n, int i)
}
if (pmu_info_fp == NULL) {
pmu_info_fp = open_file(info_path, &rep);
if (pmu_info_fp == NULL) {
return;
}
}
if (pmu_info_fp != NULL) {
@ -2037,19 +2043,24 @@ void get_powerbook_batt_info(char *buffer, size_t n, int i)
}
/* update status string */
if ((ac && !(flags & PMU_BATT_PRESENT))) {
strcpy(pb_battery_info[PB_BATT_STATUS], "AC");
strncpy(pb_battery_info[PB_BATT_STATUS], "AC", sizeof(pb_battery_info[PB_BATT_STATUS]));
} else if (ac && (flags & PMU_BATT_PRESENT)
&& !(flags & PMU_BATT_CHARGING)) {
strcpy(pb_battery_info[PB_BATT_STATUS], "charged");
strncpy(pb_battery_info[PB_BATT_STATUS], "charged", sizeof(pb_battery_info[PB_BATT_STATUS]));
} else if ((flags & PMU_BATT_PRESENT) && (flags & PMU_BATT_CHARGING)) {
strcpy(pb_battery_info[PB_BATT_STATUS], "charging");
strncpy(pb_battery_info[PB_BATT_STATUS], "charging", sizeof(pb_battery_info[PB_BATT_STATUS]));
} else {
strcpy(pb_battery_info[PB_BATT_STATUS], "discharging");
strncpy(pb_battery_info[PB_BATT_STATUS], "discharging", sizeof(pb_battery_info[PB_BATT_STATUS]));
}
/* update percentage string */
if (timeval == 0) {
pb_battery_info[PB_BATT_PERCENT][0] = 0;
if (timeval == 0 && ac && (flags & PMU_BATT_PRESENT)
&& !(flags & PMU_BATT_CHARGING)) {
snprintf(pb_battery_info[PB_BATT_PERCENT],
sizeof(pb_battery_info[PB_BATT_PERCENT]), "100%%");
} else if (timeval == 0) {
snprintf(pb_battery_info[PB_BATT_PERCENT],
sizeof(pb_battery_info[PB_BATT_PERCENT]), "unknown");
} else {
snprintf(pb_battery_info[PB_BATT_PERCENT],
sizeof(pb_battery_info[PB_BATT_PERCENT]), "%d%%",
@ -2058,7 +2069,8 @@ void get_powerbook_batt_info(char *buffer, size_t n, int i)
/* update time string */
if (timeval == 0) { /* fully charged or battery not present */
pb_battery_info[PB_BATT_TIME][0] = 0;
snprintf(pb_battery_info[PB_BATT_TIME],
sizeof(pb_battery_info[PB_BATT_TIME]), "unknown");
} else if (timeval < 60 * 60) { /* don't show secs */
format_seconds_short(pb_battery_info[PB_BATT_TIME],
sizeof(pb_battery_info[PB_BATT_TIME]), timeval);