pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(battery): implement animation-discharging

Browse Source
This commit is contained in:
Christoph Schiessl 2018-04-23 20:24:02 +02:00 committed by Patrick Ziegler
parent ee5dfbbf59
commit 2a9d5db179
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/battery.hpp
View File

@ -67,6 +67,7 @@ namespace modules {
static constexpr const char* FORMAT_FULL{"format-full"}; static constexpr const char* FORMAT_FULL{"format-full"};
static constexpr const char* TAG_ANIMATION_CHARGING{"<animation-charging>"}; static constexpr const char* TAG_ANIMATION_CHARGING{"<animation-charging>"};
static constexpr const char* TAG_ANIMATION_DISCHARGING{"<animation-discharging>"};
static constexpr const char* TAG_BAR_CAPACITY{"<bar-capacity>"}; static constexpr const char* TAG_BAR_CAPACITY{"<bar-capacity>"};
static constexpr const char* TAG_RAMP_CAPACITY{"<ramp-capacity>"}; static constexpr const char* TAG_RAMP_CAPACITY{"<ramp-capacity>"};
static constexpr const char* TAG_LABEL_CHARGING{"<label-charging>"}; static constexpr const char* TAG_LABEL_CHARGING{"<label-charging>"};
@ -84,6 +85,7 @@ namespace modules {
label_t m_label_discharging; label_t m_label_discharging;
label_t m_label_full; label_t m_label_full;
animation_t m_animation_charging; animation_t m_animation_charging;
animation_t m_animation_discharging;
progressbar_t m_bar_capacity; progressbar_t m_bar_capacity;
ramp_t m_ramp_capacity; ramp_t m_ramp_capacity;

20
src/modules/battery.cpp
View File

@ -114,13 +114,16 @@ namespace modules {
// Add formats and elements // Add formats and elements
m_formatter->add(FORMAT_CHARGING, TAG_LABEL_CHARGING, m_formatter->add(FORMAT_CHARGING, TAG_LABEL_CHARGING,
{TAG_BAR_CAPACITY, TAG_RAMP_CAPACITY, TAG_ANIMATION_CHARGING, TAG_LABEL_CHARGING}); {TAG_BAR_CAPACITY, TAG_RAMP_CAPACITY, TAG_ANIMATION_CHARGING, TAG_LABEL_CHARGING});
m_formatter->add( m_formatter->add(FORMAT_DISCHARGING, TAG_LABEL_DISCHARGING,
FORMAT_DISCHARGING, TAG_LABEL_DISCHARGING, {TAG_BAR_CAPACITY, TAG_RAMP_CAPACITY, TAG_LABEL_DISCHARGING}); {TAG_BAR_CAPACITY, TAG_RAMP_CAPACITY, TAG_ANIMATION_DISCHARGING, TAG_LABEL_DISCHARGING});
m_formatter->add(FORMAT_FULL, TAG_LABEL_FULL, {TAG_BAR_CAPACITY, TAG_RAMP_CAPACITY, TAG_LABEL_FULL}); m_formatter->add(FORMAT_FULL, TAG_LABEL_FULL, {TAG_BAR_CAPACITY, TAG_RAMP_CAPACITY, TAG_LABEL_FULL});
if (m_formatter->has(TAG_ANIMATION_CHARGING, FORMAT_CHARGING)) { if (m_formatter->has(TAG_ANIMATION_CHARGING, FORMAT_CHARGING)) {
m_animation_charging = load_animation(m_conf, name(), TAG_ANIMATION_CHARGING); m_animation_charging = load_animation(m_conf, name(), TAG_ANIMATION_CHARGING);
} }
if (m_formatter->has(TAG_ANIMATION_DISCHARGING, FORMAT_DISCHARGING)) {
m_animation_discharging = load_animation(m_conf, name(), TAG_ANIMATION_DISCHARGING);
}
if (m_formatter->has(TAG_BAR_CAPACITY)) { if (m_formatter->has(TAG_BAR_CAPACITY)) {
m_bar_capacity = load_progressbar(m_bar, m_conf, name(), TAG_BAR_CAPACITY); m_bar_capacity = load_progressbar(m_bar, m_conf, name(), TAG_BAR_CAPACITY);
} }
@ -256,6 +259,8 @@ namespace modules {
bool battery_module::build(builder* builder, const string& tag) const { bool battery_module::build(builder* builder, const string& tag) const {
if (tag == TAG_ANIMATION_CHARGING) { if (tag == TAG_ANIMATION_CHARGING) {
builder->node(m_animation_charging->get()); builder->node(m_animation_charging->get());
} else if (tag == TAG_ANIMATION_DISCHARGING) {
builder->node(m_animation_discharging->get());
} else if (tag == TAG_BAR_CAPACITY) { } else if (tag == TAG_BAR_CAPACITY) {
builder->node(m_bar_capacity->output(m_percentage)); builder->node(m_bar_capacity->output(m_percentage));
} else if (tag == TAG_RAMP_CAPACITY) { } else if (tag == TAG_RAMP_CAPACITY) {
@ -327,21 +332,26 @@ namespace modules {
} }
/** /**
* Subthread runner that emit update events * Subthread runner that emit update events to refresh <animation-charging>
* to refresh <animation-charging> in case it is used. * or <animation-discharging> in case they are used. Note, that it is ok to
* use a single thread, because the two animations are never shown at the
* same time.
*/ */
void battery_module::subthread() { void battery_module::subthread() {
chrono::duration<double> dur{0.0}; chrono::duration<double> dur{0.0};
if (m_animation_charging) { if (m_animation_charging) {
dur += chrono::milliseconds{m_animation_charging->framerate()}; dur += chrono::milliseconds{m_animation_charging->framerate()};
} else if (m_animation_discharging) {
dur += chrono::milliseconds{m_animation_discharging->framerate()};
} else { } else {
dur += 1s; dur += 1s;
} }
while (running()) { while (running()) {
for (int i = 0; running() && i < dur.count(); ++i) { for (int i = 0; running() && i < dur.count(); ++i) {
if (m_state == battery_module::state::CHARGING) { if (m_state == battery_module::state::CHARGING ||
m_state == battery_module::state::DISCHARGING) {
broadcast(); broadcast();
} }
sleep(dur); sleep(dur);