summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCyril Andreatta <cyril@andreatta.ch>2014-10-07 15:47:58 +0200
committerMichael Stapelberg <michael@stapelberg.de>2014-10-07 18:52:01 +0200
commit8e22f3839ddafcc434bc63f0b6483fb570150883 (patch)
treea3b1b07a51d99ffaab0bdb7fe5ccef47bb6008e1 /src
parent8a57208b1d98fbb384e5084816bd36b980fbc7f6 (diff)
Created three individual Strings for each battery status (charging, dicharching, full)
Replaced hard coded status strings (CHR, BAT, FULL) in print_battery_info.c with user defined strings. The new strings are 'status_chr', 'status_bat' and 'status_full' and can be set in i3status.conf. e.g. status_chr = "⚡ CHR" If any of the new status strings is omitted the standard strings (CHR, BAT, FULL) are used.
Diffstat (limited to 'src')
-rw-r--r--src/print_battery_info.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index 6b39c12..28b94ec 100644
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -27,16 +27,13 @@
#include <sys/envsys.h>
#endif
-#define BATT_STATUS_NAME(status) \
- (status == CS_CHARGING ? "CHR" : \
- (status == CS_DISCHARGING ? "BAT" : "FULL"))
/*
* Get battery information from /sys. Note that it uses the design capacity to
* calculate the percentage, not the last full capacity, so you can see how
* worn off your battery is.
*
*/
-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, bool hide_seconds) {
+void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds) {
time_t empty_time;
struct tm *empty_tm;
char buf[1024];
@@ -65,6 +62,10 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
sprintf(batpath, path, number);
INSTANCE(batpath);
+#define BATT_STATUS_NAME(status) \
+ (status == CS_CHARGING ? status_chr : \
+ (status == CS_DISCHARGING ? status_bat : status_full))
+
#if defined(LINUX)
if (!slurp(batpath, buf, sizeof(buf))) {
OUTPUT_FULL_TEXT(format_down);