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

refactor(renderer): Cleanup

Browse source
This commit is contained in:
Michael Carlberg 2017-01-25 23:36:34 +01:00
parent 09808e99f9
commit 8138a12381
7 changed files with 92 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/components/bar.hpp
View file

@ -85,7 +85,7 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
event_timer m_buttonpress{0L, 5L};
event_timer m_doubleclick{0L, 150L};
double m_anim_step{0};
double m_anim_step{0.0};
};
POLYBAR_NS_END

14
include/components/renderer.hpp
View file

@ -44,11 +44,13 @@ class renderer
xcb_window_t window() const;
const vector<action_block> actions() const;
void begin();
void begin(xcb_rectangle_t rect);
void end();
void flush();
#if 0
void reserve_space(edge side, unsigned int w);
#endif
void fill_background();
void fill_overline(double x, double w);
void fill_underline(double x, double w);
@ -108,11 +110,11 @@ class renderer
unique_ptr<cairo::xcb_surface> m_surface;
map<alignment, alignment_block> m_blocks;
int m_comp_bg{0};
int m_comp_fg{0};
int m_comp_ol{0};
int m_comp_ul{0};
int m_comp_border{0};
cairo_operator_t m_comp_bg{CAIRO_OPERATOR_OVER};
cairo_operator_t m_comp_fg{CAIRO_OPERATOR_OVER};
cairo_operator_t m_comp_ol{CAIRO_OPERATOR_OVER};
cairo_operator_t m_comp_ul{CAIRO_OPERATOR_OVER};
cairo_operator_t m_comp_border{CAIRO_OPERATOR_OVER};
alignment m_align;
std::bitset<3> m_attr;

5
include/events/signal.hpp
View file

@ -93,6 +93,9 @@ namespace signals {
struct ready : public detail::base_signal<ready> {
using base_type::base_type;
};
struct changed : public detail::base_signal<changed> {
using base_type::base_type;
};
struct tick : public detail::base_signal<tick> {
using base_type::base_type;
};
@ -117,7 +120,7 @@ namespace signals {
}
namespace ui_tray {
struct mapped_clients : public detail::value_signal<mapped_clients, size_t> {
struct mapped_clients : public detail::value_signal<mapped_clients, unsigned int> {
using base_type::base_type;
};
}

1
include/events/signal_fwd.hpp
View file

@ -29,6 +29,7 @@ namespace signals {
}
namespace ui {
struct ready;
struct changed;
struct tick;
struct button_press;
struct visibility_change;

25
src/components/bar.cpp
View file

@ -320,17 +320,22 @@ void bar::parse(string&& data, bool force) {
m_lastinput = data;
m_log.info("Redrawing bar window");
m_renderer->begin();
auto rect = m_opts.inner_area();
if (m_tray && !m_tray->settings().detached && m_tray->settings().configured_slots) {
if (m_tray->settings().align == alignment::LEFT) {
m_renderer->reserve_space(edge::LEFT, m_tray->settings().configured_w);
} else if (m_tray->settings().align == alignment::RIGHT) {
m_renderer->reserve_space(edge::RIGHT, m_tray->settings().configured_w);
if (m_tray && m_tray->settings().configured_slots) {
auto trayalign = m_tray->settings().align;
auto traywidth = m_tray->settings().configured_w;
if (trayalign == alignment::LEFT) {
rect.x += traywidth;
rect.width -= traywidth;
} else if (trayalign == alignment::RIGHT) {
rect.width -= traywidth;
}
}
m_log.info("Redrawing bar window");
m_renderer->begin(rect);
try {
m_parser->parse(settings(), data);
} catch (const parser_error& err) {
@ -659,7 +664,7 @@ bool bar::on(const signals::eventqueue::start&) {
reconfigure_pos();
m_log.trace("bar: Draw empty bar");
m_renderer->begin();
m_renderer->begin(m_opts.inner_area());
m_renderer->end();
m_sig.emit(signals::ui::ready{});
@ -681,7 +686,7 @@ bool bar::on(const signals::ui::unshade_window&) {
m_opts.shade_pos.y = m_opts.pos.y;
double distance{static_cast<double>(m_opts.shade_size.h - m_connection.get_geometry(m_opts.window)->height)};
double steptime{25.0 / 10.0};
double steptime{25.0 / 2.0};
m_anim_step = distance / steptime / 2.0;
m_taskqueue->defer_unique("window-shade", 25ms,
@ -720,7 +725,7 @@ bool bar::on(const signals::ui::shade_window&) {
}
double distance{static_cast<double>(m_connection.get_geometry(m_opts.window)->height - m_opts.shade_size.h)};
double steptime{25.0 / 10.0};
double steptime{25.0 / 2.0};
m_anim_step = distance / steptime / 2.0;
m_taskqueue->defer_unique("window-shade", 25ms,

6
src/components/config.cpp
View file

@ -1,6 +1,7 @@
#include <climits>
#include <fstream>
#include "cairo/utils.hpp"
#include "components/config.hpp"
#include "utils/color.hpp"
#include "utils/env.hpp"
@ -286,4 +287,9 @@ rgba config::convert(string&& value) const {
// clang-format on
}
template <>
cairo_operator_t config::convert(string&& value) const {
return cairo::utils::str2operator(forward<string>(value), CAIRO_OPERATOR_OVER);
}
POLYBAR_NS_END

105
src/components/renderer.cpp
View file

@ -140,7 +140,7 @@ renderer::renderer(
}
}
m_log.info("renderer: DPI is %.1fx%.1f", dpi_x, dpi_y);
m_log.info("Using DPI = %gx%g", dpi_x, dpi_y);
auto fonts = m_conf.get_list<string>(m_conf.section(), "font", {});
if (fonts.empty()) {
@ -163,11 +163,11 @@ renderer::renderer(
}
}
m_comp_bg = cairo::utils::str2operator(m_conf.get("settings", "compositing-background", ""s), CAIRO_OPERATOR_OVER);
m_comp_fg = cairo::utils::str2operator(m_conf.get("settings", "compositing-foreground", ""s), CAIRO_OPERATOR_OVER);
m_comp_ol = cairo::utils::str2operator(m_conf.get("settings", "compositing-overline", ""s), CAIRO_OPERATOR_OVER);
m_comp_ul = cairo::utils::str2operator(m_conf.get("settings", "compositing-underline", ""s), CAIRO_OPERATOR_OVER);
m_comp_border = cairo::utils::str2operator(m_conf.get("settings", "compositing-border", ""s), CAIRO_OPERATOR_OVER);
m_comp_bg = m_conf.get<cairo_operator_t>("settings", "compositing-background", m_comp_bg);
m_comp_fg = m_conf.get<cairo_operator_t>("settings", "compositing-foreground", m_comp_fg);
m_comp_ol = m_conf.get<cairo_operator_t>("settings", "compositing-overline", m_comp_ol);
m_comp_ul = m_conf.get<cairo_operator_t>("settings", "compositing-underline", m_comp_ul);
m_comp_border = m_conf.get<cairo_operator_t>("settings", "compositing-border", m_comp_border);
m_fixedcenter = m_conf.get(m_conf.section(), "fixed-center", true);
}
@ -196,14 +196,14 @@ const vector<action_block> renderer::actions() const {
/**
* Begin render routine
*/
void renderer::begin() {
m_log.trace_x("renderer: begin");
void renderer::begin(xcb_rectangle_t rect) {
m_log.trace_x("renderer: begin (geom=%ix%i+%i+%i)", rect.width, rect.height, rect.x, rect.y);
// Reset state
m_rect = rect;
m_actions.clear();
m_attr.reset();
m_align = alignment::NONE;
m_rect = m_bar.inner_area();
// Reset colors
m_bg = 0;
@ -261,7 +261,7 @@ void renderer::end() {
m_context->pop(&m_blocks[m_align].pattern);
for (auto&& b : m_blocks) {
if (block_w(b.first) != 0.0) {
if (block_w(b.first) && b.second.pattern != nullptr) {
flush(b.first);
}
}
@ -271,20 +271,22 @@ void renderer::end() {
m_surface->flush();
flush();
m_sig.emit(signals::ui::changed{});
}
/**
* Flush contents of given alignment block
*/
void renderer::flush(alignment a) {
m_log.trace_x("renderer: flush(%i)", static_cast<int>(a));
double x = static_cast<int>(block_x(a) + 0.5);
double y = static_cast<int>(block_y(a) + 0.5);
double w = static_cast<int>(block_w(a) + 0.5);
double h = static_cast<int>(block_h(a) + 0.5);
double xw = x + w;
m_log.trace_x("renderer: flush(%i geom=%gx%g+%g+%g)", static_cast<int>(a), w, h, x, y);
m_surface->flush();
m_context->save();
{
@ -317,10 +319,9 @@ void renderer::flush(alignment a) {
m_context->paint();
}
m_surface->flush();
m_context->destroy(&m_blocks[a].pattern);
}
m_context->restore();
m_context->destroy(&m_blocks[a].pattern);
}
/**
@ -404,9 +405,7 @@ double renderer::block_h(alignment) const {
return m_rect.height;
}
/**
* Reserve space at given edge
*/
#if 0
void renderer::reserve_space(edge side, unsigned int w) {
m_log.trace_x("renderer: reserve_space(%i, %i)", static_cast<int>(side), w);
@ -438,13 +437,14 @@ void renderer::reserve_space(edge side, unsigned int w) {
break;
}
}
#endif
/**
* Fill background color
*/
void renderer::fill_background() {
m_context->save();
*m_context << static_cast<cairo_operator_t>(m_comp_bg);
*m_context << m_comp_bg;
if (!m_bar.background_steps.empty()) {
m_log.trace_x("renderer: gradient background (steps=%lu)", m_bar.background_steps.size());
@ -470,7 +470,7 @@ void renderer::fill_overline(double x, double w) {
if (m_bar.overline.size && m_attr.test(static_cast<int>(attribute::OVERLINE))) {
m_log.trace_x("renderer: overline(x=%f, w=%f)", x, w);
m_context->save();
*m_context << static_cast<cairo_operator_t>(m_comp_ol);
*m_context << m_comp_ol;
*m_context << m_ol;
*m_context << cairo::rect{x, static_cast<double>(m_rect.y), w, static_cast<double>(m_bar.overline.size)};
m_context->fill();
@ -485,7 +485,7 @@ void renderer::fill_underline(double x, double w) {
if (m_bar.underline.size && m_attr.test(static_cast<int>(attribute::UNDERLINE))) {
m_log.trace_x("renderer: underline(x=%f, w=%f)", x, w);
m_context->save();
*m_context << static_cast<cairo_operator_t>(m_comp_ul);
*m_context << m_comp_ul;
*m_context << m_ul;
*m_context << cairo::rect{x, static_cast<double>(m_rect.y + m_rect.height - m_bar.underline.size), w,
static_cast<double>(m_bar.underline.size)};
@ -499,35 +499,43 @@ void renderer::fill_underline(double x, double w) {
*/
void renderer::fill_borders() {
m_context->save();
*m_context << static_cast<cairo_operator_t>(m_comp_border);
*m_context << m_comp_border;
cairo::rect top{0.0, 0.0, 0.0, 0.0};
top.x += m_bar.borders.at(edge::LEFT).size;
top.w += m_bar.size.w - m_bar.borders.at(edge::LEFT).size - m_bar.borders.at(edge::TOP).size;
top.h += m_bar.borders.at(edge::TOP).size;
m_log.trace_x("renderer: border T(%.0f, #%08x)", top.h, m_bar.borders.at(edge::TOP).color);
(*m_context << top << m_bar.borders.at(edge::TOP).color).fill();
if (m_bar.borders.at(edge::TOP).size) {
cairo::rect top{0.0, 0.0, 0.0, 0.0};
top.x += m_bar.borders.at(edge::LEFT).size;
top.w += m_bar.size.w - m_bar.borders.at(edge::LEFT).size - m_bar.borders.at(edge::TOP).size;
top.h += m_bar.borders.at(edge::TOP).size;
m_log.trace_x("renderer: border T(%.0f, #%08x)", top.h, m_bar.borders.at(edge::TOP).color);
(*m_context << top << m_bar.borders.at(edge::TOP).color).fill();
}
cairo::rect bottom{0.0, 0.0, 0.0, 0.0};
bottom.x += m_bar.borders.at(edge::LEFT).size;
bottom.y += m_bar.size.h - m_bar.borders.at(edge::BOTTOM).size;
bottom.w += m_bar.size.w - m_bar.borders.at(edge::LEFT).size - m_bar.borders.at(edge::RIGHT).size;
bottom.h += m_bar.borders.at(edge::BOTTOM).size;
m_log.trace_x("renderer: border B(%.0f, #%08x)", bottom.h, m_bar.borders.at(edge::BOTTOM).color);
(*m_context << bottom << m_bar.borders.at(edge::BOTTOM).color).fill();
if (m_bar.borders.at(edge::BOTTOM).size) {
cairo::rect bottom{0.0, 0.0, 0.0, 0.0};
bottom.x += m_bar.borders.at(edge::LEFT).size;
bottom.y += m_bar.size.h - m_bar.borders.at(edge::BOTTOM).size;
bottom.w += m_bar.size.w - m_bar.borders.at(edge::LEFT).size - m_bar.borders.at(edge::RIGHT).size;
bottom.h += m_bar.borders.at(edge::BOTTOM).size;
m_log.trace_x("renderer: border B(%.0f, #%08x)", bottom.h, m_bar.borders.at(edge::BOTTOM).color);
(*m_context << bottom << m_bar.borders.at(edge::BOTTOM).color).fill();
}
cairo::rect left{0.0, 0.0, 0.0, 0.0};
left.w += m_bar.borders.at(edge::LEFT).size;
left.h += m_bar.size.h;
m_log.trace_x("renderer: border L(%.0f, #%08x)", left.w, m_bar.borders.at(edge::LEFT).color);
(*m_context << left << m_bar.borders.at(edge::LEFT).color).fill();
if (m_bar.borders.at(edge::LEFT).size) {
cairo::rect left{0.0, 0.0, 0.0, 0.0};
left.w += m_bar.borders.at(edge::LEFT).size;
left.h += m_bar.size.h;
m_log.trace_x("renderer: border L(%.0f, #%08x)", left.w, m_bar.borders.at(edge::LEFT).color);
(*m_context << left << m_bar.borders.at(edge::LEFT).color).fill();
}
cairo::rect right{0.0, 0.0, 0.0, 0.0};
right.x += m_bar.size.w - m_bar.borders.at(edge::RIGHT).size;
right.w += m_bar.borders.at(edge::RIGHT).size;
right.h += m_bar.size.h;
m_log.trace_x("renderer: border R(%.0f, #%08x)", right.w, m_bar.borders.at(edge::RIGHT).color);
(*m_context << right << m_bar.borders.at(edge::RIGHT).color).fill();
if (m_bar.borders.at(edge::RIGHT).size) {
cairo::rect right{0.0, 0.0, 0.0, 0.0};
right.x += m_bar.size.w - m_bar.borders.at(edge::RIGHT).size;
right.w += m_bar.borders.at(edge::RIGHT).size;
right.h += m_bar.size.h;
m_log.trace_x("renderer: border R(%.0f, #%08x)", right.w, m_bar.borders.at(edge::RIGHT).color);
(*m_context << right << m_bar.borders.at(edge::RIGHT).color).fill();
}
m_context->restore();
}
@ -548,20 +556,21 @@ void renderer::draw_text(const string& contents) {
block.font = m_font;
block.bg = 0;
block.bg_rect = cairo::rect{0.0, 0.0, 0.0, 0.0};
block.bg_operator = 0;
block.bg_operator = m_comp_bg;
block.x_advance = &m_blocks[m_align].x;
block.y_advance = &m_blocks[m_align].y;
if (m_bg && m_bg != m_bar.background) {
block.bg = m_bg;
block.bg_operator = static_cast<cairo_operator_t>(m_comp_bg);
block.bg_operator = m_comp_bg;
block.bg_rect.x = m_rect.x;
block.bg_rect.y = m_rect.y;
block.bg_rect.h = m_rect.height;
}
m_context->save();
*m_context << origin;
*m_context << static_cast<cairo_operator_t>(m_comp_fg);
*m_context << m_comp_fg;
*m_context << m_fg;
*m_context << block;
m_context->restore();