2019-10-27 21:06:25 +00:00
|
|
|
#include "utils/color.hpp"
|
|
|
|
|
2020-12-17 19:37:28 +00:00
|
|
|
#include <algorithm>
|
|
|
|
|
2019-10-27 21:06:25 +00:00
|
|
|
POLYBAR_NS
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Takes a hex string as input and brings it into a normalized form
|
|
|
|
*
|
|
|
|
* The input can either be only an alpha channel #AA
|
|
|
|
* or any of these forms: #RGB, #ARGB, #RRGGBB, #AARRGGBB
|
|
|
|
*
|
|
|
|
* Colors without alpha channel will get an alpha channel of FF
|
|
|
|
* The input does not have to start with '#'
|
|
|
|
*
|
2022-02-20 20:40:48 +00:00
|
|
|
* @returns Empty string for malformed input, either AA for the alpha only
|
2019-10-27 21:06:25 +00:00
|
|
|
* input or an 8 character string of the expanded form AARRGGBB
|
|
|
|
*/
|
|
|
|
static string normalize_hex(string hex) {
|
|
|
|
if (hex.length() == 0) {
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
|
|
|
// We remove the hash because it makes processing easier
|
|
|
|
if (hex[0] == '#') {
|
|
|
|
hex.erase(0, 1);
|
|
|
|
}
|
|
|
|
|
2020-12-17 19:37:28 +00:00
|
|
|
// Check that only valid characters are used
|
|
|
|
if (!std::all_of(hex.cbegin(), hex.cend(), isxdigit)) {
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
2019-10-27 21:06:25 +00:00
|
|
|
if (hex.length() == 2) {
|
|
|
|
// We only have an alpha channel
|
|
|
|
return hex;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hex.length() == 3) {
|
2019-10-27 23:40:59 +00:00
|
|
|
// RGB -> FRGB
|
2019-10-27 21:06:25 +00:00
|
|
|
hex.insert(0, 1, 'f');
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hex.length() == 4) {
|
|
|
|
// ARGB -> AARRGGBB
|
|
|
|
hex = {hex[0], hex[0], hex[1], hex[1], hex[2], hex[2], hex[3], hex[3]};
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hex.length() == 6) {
|
|
|
|
// RRGGBB -> FFRRGGBB
|
|
|
|
hex.insert(0, 2, 'f');
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hex.length() != 8) {
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
|
|
|
return hex;
|
|
|
|
}
|
|
|
|
|
2020-12-17 19:37:28 +00:00
|
|
|
rgba::rgba() : m_value(0), m_type(type::NONE) {}
|
|
|
|
rgba::rgba(uint32_t value, enum type type) : m_value(value), m_type(type) {}
|
2019-10-27 21:06:25 +00:00
|
|
|
rgba::rgba(string hex) {
|
|
|
|
hex = normalize_hex(hex);
|
|
|
|
|
|
|
|
if (hex.length() == 0) {
|
|
|
|
m_value = 0;
|
2020-12-17 19:37:28 +00:00
|
|
|
m_type = type::NONE;
|
2019-10-27 21:06:25 +00:00
|
|
|
} else if (hex.length() == 2) {
|
|
|
|
m_value = std::strtoul(hex.c_str(), nullptr, 16) << 24;
|
2020-12-17 19:37:28 +00:00
|
|
|
m_type = type::ALPHA_ONLY;
|
2019-10-27 21:06:25 +00:00
|
|
|
} else {
|
|
|
|
m_value = std::strtoul(hex.c_str(), nullptr, 16);
|
2020-12-17 19:37:28 +00:00
|
|
|
m_type = type::ARGB;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
rgba::operator string() const {
|
|
|
|
char s[10];
|
2020-11-27 19:46:04 +00:00
|
|
|
size_t len = snprintf(s, 10, "#%08x", m_value);
|
2019-10-27 21:06:25 +00:00
|
|
|
return string(s, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool rgba::operator==(const rgba& other) const {
|
|
|
|
if (m_type != other.m_type) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (m_type) {
|
2020-12-17 19:37:28 +00:00
|
|
|
case type::NONE:
|
2019-10-27 21:06:25 +00:00
|
|
|
return true;
|
2020-12-17 19:37:28 +00:00
|
|
|
case type::ARGB:
|
2019-10-27 21:06:25 +00:00
|
|
|
return m_value == other.m_value;
|
2020-12-17 19:37:28 +00:00
|
|
|
case type::ALPHA_ONLY:
|
2020-11-27 20:05:50 +00:00
|
|
|
return alpha_i() == other.alpha_i();
|
2019-10-27 21:06:25 +00:00
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add units support (POINT, PIXEL, SPACE) (#2578)
* 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>
2022-02-20 20:08:57 +00:00
|
|
|
bool rgba::operator!=(const rgba& other) const {
|
|
|
|
return !(*this == other);
|
|
|
|
}
|
|
|
|
|
2019-10-27 21:06:25 +00:00
|
|
|
rgba::operator uint32_t() const {
|
|
|
|
return m_value;
|
|
|
|
}
|
|
|
|
|
Add units support (POINT, PIXEL, SPACE) (#2578)
* 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>
2022-02-20 20:08:57 +00:00
|
|
|
rgba::operator bool() const {
|
|
|
|
return has_color();
|
|
|
|
}
|
|
|
|
|
2020-11-27 19:35:31 +00:00
|
|
|
uint32_t rgba::value() const {
|
|
|
|
return this->m_value;
|
|
|
|
}
|
|
|
|
|
2021-02-23 08:53:54 +00:00
|
|
|
enum rgba::type rgba::get_type() const {
|
2020-11-27 19:35:31 +00:00
|
|
|
return m_type;
|
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
double rgba::alpha_d() const {
|
|
|
|
return alpha_i() / 255.0;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
double rgba::red_d() const {
|
|
|
|
return red_i() / 255.0;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
double rgba::green_d() const {
|
|
|
|
return green_i() / 255.0;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
double rgba::blue_d() const {
|
|
|
|
return blue_i() / 255.0;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
uint8_t rgba::alpha_i() const {
|
2019-10-27 21:39:02 +00:00
|
|
|
return (m_value >> 24) & 0xFF;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
uint8_t rgba::red_i() const {
|
2019-10-27 21:39:02 +00:00
|
|
|
return (m_value >> 16) & 0xFF;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
uint8_t rgba::green_i() const {
|
2019-10-27 21:39:02 +00:00
|
|
|
return (m_value >> 8) & 0xFF;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 20:05:50 +00:00
|
|
|
uint8_t rgba::blue_i() const {
|
2019-10-27 21:39:02 +00:00
|
|
|
return m_value & 0xFF;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool rgba::has_color() const {
|
2020-12-17 19:37:28 +00:00
|
|
|
return m_type != type::NONE;
|
2019-10-27 21:06:25 +00:00
|
|
|
}
|
|
|
|
|
2019-10-27 23:40:59 +00:00
|
|
|
/**
|
2020-12-01 13:49:41 +00:00
|
|
|
* Applies the alpha channel of this color to the given color.
|
2019-10-27 23:40:59 +00:00
|
|
|
*/
|
2020-12-01 13:49:41 +00:00
|
|
|
rgba rgba::apply_alpha_to(rgba other) const {
|
|
|
|
uint32_t val = (other.value() & 0x00FFFFFF) | (((uint32_t)alpha_i()) << 24);
|
2020-11-27 19:35:31 +00:00
|
|
|
return rgba(val, m_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2020-12-01 13:49:41 +00:00
|
|
|
* If this is an ALPHA_ONLY color, applies this alpha channel to the other
|
|
|
|
* color, otherwise just returns this.
|
|
|
|
*
|
2022-02-20 20:40:48 +00:00
|
|
|
* @returns the new color if this is ALPHA_ONLY or a copy of this otherwise.
|
2020-11-27 19:35:31 +00:00
|
|
|
*/
|
2020-12-01 13:49:41 +00:00
|
|
|
rgba rgba::try_apply_alpha_to(rgba other) const {
|
2020-12-17 19:37:28 +00:00
|
|
|
if (m_type == type::ALPHA_ONLY) {
|
2020-12-01 13:49:41 +00:00
|
|
|
return apply_alpha_to(other);
|
2020-11-27 19:35:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return *this;
|
2019-10-27 23:40:59 +00:00
|
|
|
}
|
|
|
|
|
2019-10-27 21:06:25 +00:00
|
|
|
string color_util::simplify_hex(string hex) {
|
|
|
|
// convert #ffrrggbb to #rrggbb
|
|
|
|
if (hex.length() == 9 && std::toupper(hex[1]) == 'F' && std::toupper(hex[2]) == 'F') {
|
|
|
|
hex.erase(1, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
// convert #rrggbb to #rgb
|
|
|
|
if (hex.length() == 7) {
|
|
|
|
if (hex[1] == hex[2] && hex[3] == hex[4] && hex[5] == hex[6]) {
|
|
|
|
hex = {'#', hex[1], hex[3], hex[5]};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return hex;
|
|
|
|
}
|
|
|
|
|
|
|
|
POLYBAR_NS_END
|