nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use simpler battery blink method

Browse source
This commit is contained in:
Chris Lee 2019-03-09 12:33:52 +01:00
parent da75999832
commit 89c02d3912
1 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/battery/battery.c
View file

@ -63,7 +63,6 @@ char *battery_dwheel_command;
gboolean battery_found; gboolean battery_found;
gboolean battery_warn; gboolean battery_warn;
gboolean battery_warn_red; gboolean battery_warn_red;
Background *battery_warn_bg;
char *battery_sys_prefix = (char *)""; char *battery_sys_prefix = (char *)"";
@ -84,7 +83,6 @@ void default_battery()
INIT_TIMER(battery_blink_timer); INIT_TIMER(battery_blink_timer);
battery_warn = FALSE; battery_warn = FALSE;
battery_warn_red = 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;
@ -138,7 +136,6 @@ void cleanup_battery()
destroy_timer(&battery_timer); destroy_timer(&battery_timer);
destroy_timer(&battery_blink_timer); destroy_timer(&battery_blink_timer);
battery_found = FALSE; battery_found = FALSE;
free_and_null(battery_warn_bg);
battery_os_free(); battery_os_free();
} }
@ -330,30 +327,8 @@ void blink_battery(void *arg)
if (!battery_enabled) if (!battery_enabled)
return; return;
battery_warn_red = battery_warn ? !battery_warn_red : FALSE; 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.alpha = 1.0;
battery_warn_bg->border.color.alpha = 1.0;
}
if (battery_warn_red) {
battery_warn_bg->fill_color.rgb[0] = 0.6;
battery_warn_bg->fill_color.rgb[1] = 0.1;
battery_warn_bg->fill_color.rgb[2] = 0.1;
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;
} else {
battery_warn_bg->fill_color.rgb[0] = 0.9;
battery_warn_bg->fill_color.rgb[1] = 0.7;
battery_warn_bg->fill_color.rgb[2] = 0.1;
battery_warn_bg->border.color.rgb[0] = 0.7;
battery_warn_bg->border.color.rgb[1] = 0.5;
battery_warn_bg->border.color.rgb[2] = 0.1;
}
for (int i = 0; i < num_panels; i++) { for (int i = 0; i < num_panels; i++) {
if (panels[i].battery.area.on_screen) { if (panels[i].battery.area.on_screen) {
panels[i].battery.area.bg = battery_warn_bg;
schedule_redraw(&panels[i].battery.area); schedule_redraw(&panels[i].battery.area);
} }
} }
@ -490,6 +465,12 @@ void draw_battery(void *obj, cairo_t *c)
{ {
Battery *battery = (Battery *)obj; Battery *battery = (Battery *)obj;
Panel *panel = (Panel *)battery->area.panel; Panel *panel = (Panel *)battery->area.panel;
if (battery_warn && battery_warn_red) {
cairo_set_source_rgb(c, 0.7, 0.3, 0);
cairo_set_line_width(c, 0);
cairo_rectangle(c, 0, 0, battery->area.width, battery->area.height);
cairo_fill(c);
}
draw_text_area(&battery->area, draw_text_area(&battery->area,
c, c,
buf_bat_line1, buf_bat_line1,