patch for FULL battery by peter.ebden git-svn-id: http://tint2.googlecode.com/svn/trunk@240 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
lorthiois@bbsoft.fr lorthiois@bbsoft.fr@121b4492-b84c-0410-8b4c-0d4edfb3f3cc
2 files changed,
18 insertions(+),
3 deletions(-)
M
src/battery/battery.c
→
src/battery/battery.c
@@ -145,7 +145,11 @@ fclose(fp);
update_battery(&battery_state); snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage); - snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes); + if(battery_state.state == BATTERY_FULL) { + strcpy(buf_bat_time, "Full"); + } else { + snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes); + } get_text_size(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, panel->area.height, buf_bat_percentage, strlen(buf_bat_percentage)); get_text_size(bat2_font_desc, &bat_time_height_ink, &bat_time_height, panel->area.height, buf_bat_time, strlen(buf_bat_time));@@ -206,6 +210,7 @@
battery_state.state = BATTERY_UNKNOWN; if(strcasecmp(tmp, "Charging\n")==0) battery_state.state = BATTERY_CHARGING; if(strcasecmp(tmp, "Discharging\n")==0) battery_state.state = BATTERY_DISCHARGING; + if(strcasecmp(tmp, "Full\n")==0) battery_state.state = BATTERY_FULL; if(current_now > 0) { switch(battery_state.state) {@@ -236,6 +241,11 @@ if (battery_low_cmd) system(battery_low_cmd);
} battery_state.percentage = new_percentage; + + // clamp percentage to 100 in case battery is misreporting that its current charge is more than its max + if(battery_state.percentage > 100) { + battery_state.percentage = 100; + } }@@ -281,7 +291,11 @@ percentage_width = time_width = 0;
battery->area.redraw = 1; snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage); - snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes); + if(battery_state.state == BATTERY_FULL) { + strcpy(buf_bat_time, "Full"); + } else { + snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes); + } // vertical panel doen't adjust width if (!panel_horizontal) return;
M
src/battery/battery.h
→
src/battery/battery.h
@@ -30,7 +30,8 @@
enum chargestate { BATTERY_UNKNOWN, BATTERY_CHARGING, - BATTERY_DISCHARGING + BATTERY_DISCHARGING, + BATTERY_FULL }; typedef struct battime {