Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch for FULL battery by peter.ebden

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@240 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-10-28 10:58:12 +00:00
parent 654c244532
commit d0799e91dd
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/battery/battery.c
View File

@@ -145,7 +145,11 @@ void init_battery_panel(void *p)
update_battery(&battery_state); update_battery(&battery_state);
snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage); 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(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)); 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 @@ void update_battery() {
battery_state.state = BATTERY_UNKNOWN; battery_state.state = BATTERY_UNKNOWN;
if(strcasecmp(tmp, "Charging\n")==0) battery_state.state = BATTERY_CHARGING; 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, "Discharging\n")==0) battery_state.state = BATTERY_DISCHARGING;
if(strcasecmp(tmp, "Full\n")==0) battery_state.state = BATTERY_FULL;
if(current_now > 0) { if(current_now > 0) {
switch(battery_state.state) { switch(battery_state.state) {
@@ -236,6 +241,11 @@ void update_battery() {
} }
battery_state.percentage = new_percentage; 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 @@ void resize_battery(void *obj)
battery->area.redraw = 1; battery->area.redraw = 1;
snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage); 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 // vertical panel doen't adjust width
if (!panel_horizontal) return; if (!panel_horizontal) return;

3
src/battery/battery.h
View File

@@ -30,7 +30,8 @@ typedef struct Battery {
enum chargestate { enum chargestate {
BATTERY_UNKNOWN, BATTERY_UNKNOWN,
BATTERY_CHARGING, BATTERY_CHARGING,
BATTERY_DISCHARGING BATTERY_DISCHARGING,
BATTERY_FULL
}; };
typedef struct battime { typedef struct battime {