ce93188a4a
* add units support (POINT, PIXEL, SPACE) for polybar - add a size_with_unit struct - add a geometry_format_values struct - move dpi initialisation from renderer.cpp to bar.cpp - add a string to size_with_unit converter - add point support (with pt) - add pixel support (with px) * Fix unit test compilation * clang-format * Better names The old names didn't really capture the purpose of the structs and function. space_type -> spacing_type space_size -> spacing_val size_type -> extent_type geometry -> extent_val geometry_format_values -> percentage_with_offset * Remove parse_size_with_unit No longer needed. The convert<spacing_val> function in config.cpp already does all the work for us and always setting the type to pixel was wrong. In addition, line-size should not be of type spacing_val but extent_val. * Cleanup I tried to address most of my comments on the old PR * Fix renderer width calculation We can't just blindly add the x difference to the width because for example the width should increase if x < width and the increase keeps x < width. Similarly, we can't just add the offset to the width. * Rename geom_format_to_pixels to percentage_with_offset_to_pixel * Cleanup * Apply suggested changes from Patrick on GitHub Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/bar.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/config.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/builder.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/builder.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * config: Use stod for parsing percentage * Use stof instead of strtof * units: Fix test edge cases * Remove unnecessary clang-format toggle * Use percentage_with_offset for margin-{top,bottom} * Support negative extent values * Rename unit to units and create a cpp file * Move percentage_with_offset_to_pixel unit test to units * Add unit tests for units_utils * Clarify when and how negative spacing/extent is allowed Negative spacing is never allowed and produces a config error. Extents allow negative values in theory, but only a few use-cases accept it. Only the extent value used for the `%{O}` tag and the offset value in percentage_with_offset can be negative. Everything else is capped below at 0. The final pixel value of percentage_with_offset also caps below at 0. * Fix parsing errors not being caught in config * Print a proper error message for uncaught exceptions * Cleanup module::get_output All changes preserve the existing semantics * Stop using remove_trailing_space in module::get_output Instead, we first check if the current tag is built, and only if it is, the spacing is prepended. * Remove unused imports * Restore old behavior If there are two tags and the second one isn't built (module::build returns false), the space in between them is removed. For example in the mpd module: format-online = <toggle> <label-song> foo If mpd is not running, the mpd module will return false when trying to build the `<label-song>` tag. If we don't remove the space between `<toggle>` and `<label-song>`, we end up with two spaces between `<toggle>` and `foo`. This change is to match the old behavior where at least one trailing space character was removed from the builder. * Add changelog entry * Remove unused setting * Use percentage with offset for tray-offset Co-authored-by: Jérôme BOULMIER <jerome.boulmier@outlook.fr> Co-authored-by: Joe Groocock <github@frebib.net>
134 lines
3.3 KiB
C++
134 lines
3.3 KiB
C++
#pragma once
|
|
|
|
#include <cairo/cairo.h>
|
|
|
|
#include <bitset>
|
|
#include <memory>
|
|
|
|
#include "cairo/fwd.hpp"
|
|
#include "common.hpp"
|
|
#include "components/renderer_interface.hpp"
|
|
#include "components/types.hpp"
|
|
#include "events/signal_fwd.hpp"
|
|
#include "events/signal_receiver.hpp"
|
|
#include "x11/extensions/fwd.hpp"
|
|
#include "x11/types.hpp"
|
|
|
|
POLYBAR_NS
|
|
|
|
// fwd {{{
|
|
class connection;
|
|
class config;
|
|
class logger;
|
|
class background_manager;
|
|
class bg_slice;
|
|
// }}}
|
|
|
|
using std::map;
|
|
|
|
struct alignment_block {
|
|
cairo_pattern_t* pattern;
|
|
/**
|
|
* The x-position where the next thing will be rendered.
|
|
*/
|
|
double x;
|
|
double y;
|
|
/**
|
|
* The total width of this block.
|
|
*
|
|
* This is always >= x, but may be larger because a negative offset may
|
|
* decrease x, but the width doesn't change.
|
|
*/
|
|
double width;
|
|
};
|
|
|
|
class renderer : public renderer_interface,
|
|
public signal_receiver<SIGN_PRIORITY_RENDERER, signals::ui::request_snapshot> {
|
|
public:
|
|
using make_type = unique_ptr<renderer>;
|
|
static make_type make(const bar_settings& bar, tags::action_context& action_ctxt);
|
|
|
|
explicit renderer(connection& conn, signal_emitter& sig, const config&, const logger& logger, const bar_settings& bar,
|
|
background_manager& background_manager, tags::action_context& action_ctxt);
|
|
~renderer();
|
|
|
|
xcb_window_t window() const;
|
|
|
|
void begin(xcb_rectangle_t rect);
|
|
void end();
|
|
void flush();
|
|
|
|
void render_offset(const tags::context& ctxt, const extent_val offset) override;
|
|
void render_text(const tags::context& ctxt, const string&&) override;
|
|
|
|
void change_alignment(const tags::context& ctxt) override;
|
|
|
|
double get_x(const tags::context& ctxt) const override;
|
|
|
|
double get_alignment_start(const alignment align) const override;
|
|
|
|
protected:
|
|
void fill_background();
|
|
void fill_overline(rgba color, double x, double w);
|
|
void fill_underline(rgba color, double x, double w);
|
|
void fill_borders();
|
|
void draw_offset(rgba color, double x, double w);
|
|
|
|
double block_x(alignment a) const;
|
|
double block_y(alignment a) const;
|
|
double block_w(alignment a) const;
|
|
double block_h(alignment a) const;
|
|
|
|
void increase_x(double dx);
|
|
|
|
void flush(alignment a);
|
|
void highlight_clickable_areas();
|
|
|
|
bool on(const signals::ui::request_snapshot& evt) override;
|
|
|
|
protected:
|
|
struct reserve_area {
|
|
edge side{edge::NONE};
|
|
unsigned int size{0U};
|
|
};
|
|
|
|
private:
|
|
connection& m_connection;
|
|
signal_emitter& m_sig;
|
|
const config& m_conf;
|
|
const logger& m_log;
|
|
const bar_settings& m_bar;
|
|
std::shared_ptr<bg_slice> m_background;
|
|
|
|
int m_depth{32};
|
|
xcb_window_t m_window;
|
|
xcb_colormap_t m_colormap;
|
|
xcb_visualtype_t* m_visual;
|
|
xcb_gcontext_t m_gcontext;
|
|
xcb_pixmap_t m_pixmap;
|
|
|
|
xcb_rectangle_t m_rect{0, 0, 0U, 0U};
|
|
reserve_area m_cleararea{};
|
|
|
|
// bool m_autosize{false};
|
|
|
|
unique_ptr<cairo::context> m_context;
|
|
unique_ptr<cairo::xcb_surface> m_surface;
|
|
map<alignment, alignment_block> m_blocks;
|
|
cairo_pattern_t* m_cornermask{};
|
|
|
|
cairo_operator_t m_comp_bg{CAIRO_OPERATOR_SOURCE};
|
|
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};
|
|
bool m_pseudo_transparency{false};
|
|
|
|
alignment m_align;
|
|
|
|
bool m_fixedcenter;
|
|
string m_snapshot_dst;
|
|
};
|
|
|
|
POLYBAR_NS_END
|