blink battery when low (issue #723)

This commit is contained in:
Chris Lee 2019-02-20 23:38:17 +01:00
parent 15d2570a3e
commit 00f0bbd354
3 changed files with 59 additions and 3 deletions

View file

@ -1,7 +1,8 @@
2018-12-31 master 2019-02-17 master
- Fix spacing around icons in executor without text in vertical panels (issue #716) - Fix spacing around icons in executor without text in vertical panels (issue #716)
- Fix Bug: Clock Only Updates Every Minute With Format %s (issue #724) - Fix Bug: Clock Only Updates Every Minute With Format %s (issue #724)
- Fix markup drawing when font shadow enabled (issue #709) - Fix markup drawing when font shadow enabled (issue #709)
- Blink battery when low (issue #723)
2018-08-05 16.6.1 2018-08-05 16.6.1
- Fix packaging regression for debian (issue #715) - Fix packaging regression for debian (issue #715)

View file

@ -42,6 +42,7 @@ gboolean battery_enabled;
gboolean battery_tooltip_enabled; gboolean battery_tooltip_enabled;
int percentage_hide; int percentage_hide;
static Timer battery_timer; static Timer battery_timer;
static Timer battery_blink_timer;
#define BATTERY_BUF_SIZE 256 #define BATTERY_BUF_SIZE 256
static char buf_bat_line1[BATTERY_BUF_SIZE]; static char buf_bat_line1[BATTERY_BUF_SIZE];
@ -60,6 +61,9 @@ char *battery_rclick_command;
char *battery_uwheel_command; char *battery_uwheel_command;
char *battery_dwheel_command; char *battery_dwheel_command;
gboolean battery_found; gboolean battery_found;
gboolean battery_warn;
gboolean battery_warn_red;
Background *battery_warn_bg;
char *battery_sys_prefix = (char *)""; char *battery_sys_prefix = (char *)"";
@ -77,6 +81,10 @@ void default_battery()
battery_low_cmd_sent = FALSE; battery_low_cmd_sent = FALSE;
battery_full_cmd_sent = FALSE; battery_full_cmd_sent = FALSE;
INIT_TIMER(battery_timer); INIT_TIMER(battery_timer);
INIT_TIMER(battery_blink_timer);
battery_warn = FALSE;
battery_warn_red = FALSE;
battery_warn_bg = NULL;
bat1_has_font = FALSE; bat1_has_font = FALSE;
bat1_font_desc = NULL; bat1_font_desc = NULL;
bat1_format = NULL; bat1_format = NULL;
@ -128,7 +136,9 @@ void cleanup_battery()
free(ac_disconnected_cmd); free(ac_disconnected_cmd);
ac_disconnected_cmd = NULL; ac_disconnected_cmd = NULL;
destroy_timer(&battery_timer); destroy_timer(&battery_timer);
destroy_timer(&battery_blink_timer);
battery_found = FALSE; battery_found = FALSE;
free_and_null(battery_warn_bg);
battery_os_free(); battery_os_free();
} }
@ -310,6 +320,33 @@ void battery_default_font_changed()
schedule_panel_redraw(); schedule_panel_redraw();
} }
void blink_battery(void *arg)
{
if (!battery_enabled)
return;
battery_warn_red = battery_warn ? !battery_warn_red : FALSE;
if (battery_warn_red && !battery_warn_bg) {
battery_warn_bg = calloc(1, sizeof(*battery_warn_bg));
*battery_warn_bg = *panel_config.battery.area.bg;
battery_warn_bg->fill_color.rgb[0] = 0.8;
battery_warn_bg->fill_color.rgb[1] = 0.1;
battery_warn_bg->fill_color.rgb[2] = 0.1;
battery_warn_bg->fill_color.alpha = 1.0;
battery_warn_bg->border.color.rgb[0] = 0.5;
battery_warn_bg->border.color.rgb[1] = 0.0;
battery_warn_bg->border.color.rgb[2] = 0.0;
battery_warn_bg->border.color.alpha = 1.0;
}
for (int i = 0; i < num_panels; i++) {
if (panels[i].battery.area.on_screen) {
panels[i].battery.area.bg = battery_warn_red ?
battery_warn_bg :
panel_config.battery.area.bg;
schedule_redraw(&panels[i].battery.area);
}
}
}
void update_battery_tick(void *arg) void update_battery_tick(void *arg)
{ {
if (!battery_enabled) if (!battery_enabled)
@ -320,6 +357,7 @@ void update_battery_tick(void *arg)
gboolean old_ac_connected = battery_state.ac_connected; gboolean old_ac_connected = battery_state.ac_connected;
int16_t old_hours = battery_state.time.hours; int16_t old_hours = battery_state.time.hours;
int8_t old_minutes = battery_state.time.minutes; int8_t old_minutes = battery_state.time.minutes;
gboolean old_warn = battery_warn;
if (!battery_found) { if (!battery_found) {
init_battery(); init_battery();
@ -357,6 +395,19 @@ void update_battery_tick(void *arg)
battery_full_cmd_sent = FALSE; battery_full_cmd_sent = FALSE;
} }
if (!battery_blink_timer.enabled_) {
if (battery_state.percentage < battery_low_status &&
battery_state.state == BATTERY_DISCHARGING) {
change_timer(&battery_blink_timer, true, 10, 1000, blink_battery, 0);
}
} else {
if (battery_state.percentage > battery_low_status ||
battery_state.state != BATTERY_DISCHARGING) {
stop_timer(&battery_blink_timer);
battery_warn = FALSE;
}
}
for (int i = 0; i < num_panels; i++) { for (int i = 0; i < num_panels; i++) {
// Show/hide if needed // Show/hide if needed
if (!battery_found) { if (!battery_found) {
@ -370,8 +421,11 @@ void update_battery_tick(void *arg)
// Redraw if needed // Redraw if needed
if (panels[i].battery.area.on_screen) { if (panels[i].battery.area.on_screen) {
if (old_found != battery_found || old_percentage != battery_state.percentage || if (old_found != battery_found || old_percentage != battery_state.percentage ||
old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) { old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes ||
old_warn != battery_warn) {
panels[i].battery.area.resize_needed = TRUE; panels[i].battery.area.resize_needed = TRUE;
if (!battery_warn)
panels[i].battery.area.bg = panel_config.battery.area.bg;
schedule_panel_redraw(); schedule_panel_redraw();
} }
} }

View file

@ -845,7 +845,8 @@ void taskbar_update_thumbnails(void *arg)
c; c;
c = c->next) { c = c->next) {
Task *t = (Task *)c->data; Task *t = (Task *)c->data;
if ((mode == THUMB_MODE_ALL && t->current_state == TASK_ACTIVE && !g_list_find(taskbar_thumbnail_jobs_done, t)) || (mode == THUMB_MODE_ACTIVE_WINDOW && t->current_state == TASK_ACTIVE) || if ((mode == THUMB_MODE_ALL && t->current_state == TASK_ACTIVE && !g_list_find(taskbar_thumbnail_jobs_done, t)) ||
(mode == THUMB_MODE_ACTIVE_WINDOW && t->current_state == TASK_ACTIVE) ||
(mode == THUMB_MODE_TOOLTIP_WINDOW && g_tooltip.mapped && g_tooltip.area == &t->area)) { (mode == THUMB_MODE_TOOLTIP_WINDOW && g_tooltip.mapped && g_tooltip.area == &t->area)) {
task_refresh_thumbnail(t); task_refresh_thumbnail(t);
if (mode == THUMB_MODE_ALL) if (mode == THUMB_MODE_ALL)