2019-10-27 21:41:18 +00:00
|
|
|
#include "modules/meta/base.hpp"
|
|
|
|
|
2016-11-25 12:55:15 +00:00
|
|
|
#include <utility>
|
|
|
|
|
2016-11-25 07:42:31 +00:00
|
|
|
#include "components/builder.hpp"
|
2016-12-02 21:31:45 +00:00
|
|
|
#include "drawtypes/label.hpp"
|
2016-11-20 22:04:31 +00:00
|
|
|
|
|
|
|
POLYBAR_NS
|
|
|
|
|
|
|
|
namespace modules {
|
|
|
|
// module_format {{{
|
|
|
|
|
|
|
|
string module_format::decorate(builder* builder, string output) {
|
2016-12-27 03:03:46 +00:00
|
|
|
if (output.empty()) {
|
|
|
|
builder->flush();
|
|
|
|
return "";
|
|
|
|
}
|
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
|
|
|
if (offset) {
|
2016-11-20 22:04:31 +00:00
|
|
|
builder->offset(offset);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
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
|
|
|
if (margin) {
|
|
|
|
builder->spacing(margin);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (bg.has_color()) {
|
2016-11-20 22:04:31 +00:00
|
|
|
builder->background(bg);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (fg.has_color()) {
|
2022-03-14 21:11:46 +00:00
|
|
|
builder->foreground(fg);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (ul.has_color()) {
|
2016-11-20 22:04:31 +00:00
|
|
|
builder->underline(ul);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (ol.has_color()) {
|
2016-11-20 22:04:31 +00:00
|
|
|
builder->overline(ol);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (font > 0) {
|
2019-01-13 21:10:34 +00:00
|
|
|
builder->font(font);
|
|
|
|
}
|
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
|
|
|
if (padding) {
|
|
|
|
builder->spacing(padding);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2016-11-20 22:04:31 +00:00
|
|
|
|
2017-09-23 06:40:31 +00:00
|
|
|
builder->node(prefix);
|
|
|
|
|
2019-10-27 21:41:18 +00:00
|
|
|
if (bg.has_color()) {
|
2017-09-23 06:40:31 +00:00
|
|
|
builder->background(bg);
|
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (fg.has_color()) {
|
2022-03-14 21:11:46 +00:00
|
|
|
builder->foreground(fg);
|
2017-09-23 06:40:31 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (ul.has_color()) {
|
2017-09-23 06:40:31 +00:00
|
|
|
builder->underline(ul);
|
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (ol.has_color()) {
|
2017-09-23 06:40:31 +00:00
|
|
|
builder->overline(ol);
|
|
|
|
}
|
|
|
|
|
2022-03-14 17:39:34 +00:00
|
|
|
builder->node(output);
|
2017-09-23 06:40:31 +00:00
|
|
|
builder->node(suffix);
|
2016-11-20 22:04:31 +00:00
|
|
|
|
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
|
|
|
if (padding) {
|
|
|
|
builder->spacing(padding);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (font > 0) {
|
2019-01-13 21:10:34 +00:00
|
|
|
builder->font_close();
|
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (ol.has_color()) {
|
2016-11-20 22:04:31 +00:00
|
|
|
builder->overline_close();
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (ul.has_color()) {
|
2016-11-20 22:04:31 +00:00
|
|
|
builder->underline_close();
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (fg.has_color()) {
|
2022-03-14 21:11:46 +00:00
|
|
|
builder->foreground_close();
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2019-10-27 21:41:18 +00:00
|
|
|
if (bg.has_color()) {
|
2016-11-20 22:04:31 +00:00
|
|
|
builder->background_close();
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
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
|
|
|
if (margin) {
|
|
|
|
builder->spacing(margin);
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2016-11-20 22:04:31 +00:00
|
|
|
|
|
|
|
return builder->flush();
|
|
|
|
}
|
|
|
|
|
|
|
|
// }}}
|
|
|
|
// module_formatter {{{
|
|
|
|
|
2020-12-02 14:55:13 +00:00
|
|
|
void module_formatter::add_value(string&& name, string&& value, vector<string>&& tags, vector<string>&& whitelist) {
|
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
|
|
|
const auto formatdef = [&](const string& param, const auto& fallback) {
|
|
|
|
return m_conf.get("settings", "format-" + param, fallback);
|
|
|
|
};
|
2017-01-26 00:50:01 +00:00
|
|
|
|
2016-11-20 22:04:31 +00:00
|
|
|
auto format = make_unique<module_format>();
|
2020-12-02 14:55:13 +00:00
|
|
|
format->value = move(value);
|
2017-01-26 00:50:01 +00:00
|
|
|
format->fg = m_conf.get(m_modname, name + "-foreground", formatdef("foreground", format->fg));
|
|
|
|
format->bg = m_conf.get(m_modname, name + "-background", formatdef("background", format->bg));
|
|
|
|
format->ul = m_conf.get(m_modname, name + "-underline", formatdef("underline", format->ul));
|
|
|
|
format->ol = m_conf.get(m_modname, name + "-overline", formatdef("overline", format->ol));
|
|
|
|
format->ulsize = m_conf.get(m_modname, name + "-underline-size", formatdef("underline-size", format->ulsize));
|
|
|
|
format->olsize = m_conf.get(m_modname, name + "-overline-size", formatdef("overline-size", format->olsize));
|
|
|
|
format->spacing = m_conf.get(m_modname, name + "-spacing", formatdef("spacing", format->spacing));
|
|
|
|
format->padding = m_conf.get(m_modname, name + "-padding", formatdef("padding", format->padding));
|
|
|
|
format->margin = m_conf.get(m_modname, name + "-margin", formatdef("margin", format->margin));
|
|
|
|
format->offset = m_conf.get(m_modname, name + "-offset", formatdef("offset", format->offset));
|
2019-01-13 21:10:34 +00:00
|
|
|
format->font = m_conf.get(m_modname, name + "-font", formatdef("font", format->font));
|
2016-11-20 22:04:31 +00:00
|
|
|
format->tags.swap(tags);
|
|
|
|
|
2016-12-02 21:31:45 +00:00
|
|
|
try {
|
|
|
|
format->prefix = load_label(m_conf, m_modname, name + "-prefix");
|
|
|
|
} catch (const key_error& err) {
|
|
|
|
// prefix not defined
|
|
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
|
|
format->suffix = load_label(m_conf, m_modname, name + "-suffix");
|
|
|
|
} catch (const key_error& err) {
|
|
|
|
// suffix not defined
|
|
|
|
}
|
|
|
|
|
2017-01-11 00:42:55 +00:00
|
|
|
vector<string> tag_collection;
|
|
|
|
tag_collection.reserve(format->tags.size() + whitelist.size());
|
|
|
|
tag_collection.insert(tag_collection.end(), format->tags.begin(), format->tags.end());
|
|
|
|
tag_collection.insert(tag_collection.end(), whitelist.begin(), whitelist.end());
|
|
|
|
|
|
|
|
size_t start, end;
|
|
|
|
while ((start = value.find('<')) != string::npos && (end = value.find('>', start)) != string::npos) {
|
|
|
|
if (start > 0) {
|
|
|
|
value.erase(0, start);
|
|
|
|
end -= start;
|
|
|
|
start = 0;
|
|
|
|
}
|
|
|
|
string tag{value.substr(start, end + 1)};
|
|
|
|
if (find(tag_collection.begin(), tag_collection.end(), tag) == tag_collection.end()) {
|
2016-12-31 03:32:11 +00:00
|
|
|
throw undefined_format_tag(tag + " is not a valid format tag for \"" + name + "\"");
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2017-01-11 00:42:55 +00:00
|
|
|
value.erase(0, tag.size());
|
2016-11-20 22:04:31 +00:00
|
|
|
}
|
|
|
|
|
2016-12-27 03:03:46 +00:00
|
|
|
m_formats.insert(make_pair(move(name), move(format)));
|
2016-11-20 22:04:31 +00:00
|
|
|
}
|
|
|
|
|
2020-12-02 14:55:13 +00:00
|
|
|
void module_formatter::add(string name, string fallback, vector<string>&& tags, vector<string>&& whitelist) {
|
2020-12-03 10:54:11 +00:00
|
|
|
string value = m_conf.get(m_modname, name, move(fallback));
|
|
|
|
add_value(move(name), move(value), forward<vector<string>>(tags), forward<vector<string>>(whitelist));
|
2020-12-02 14:55:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void module_formatter::add_optional(string name, vector<string>&& tags, vector<string>&& whitelist) {
|
|
|
|
if (m_conf.has(m_modname, name)) {
|
2020-12-03 10:54:11 +00:00
|
|
|
string value = m_conf.get(m_modname, name);
|
|
|
|
add_value(move(name), move(value), move(tags), move(whitelist));
|
2020-12-02 14:55:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-25 12:55:15 +00:00
|
|
|
bool module_formatter::has(const string& tag, const string& format_name) {
|
2016-11-20 22:04:31 +00:00
|
|
|
auto format = m_formats.find(format_name);
|
2016-11-25 12:55:15 +00:00
|
|
|
if (format == m_formats.end()) {
|
2020-12-03 10:46:09 +00:00
|
|
|
return false;
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2016-11-20 22:04:31 +00:00
|
|
|
return format->second->value.find(tag) != string::npos;
|
|
|
|
}
|
|
|
|
|
2016-11-25 12:55:15 +00:00
|
|
|
bool module_formatter::has(const string& tag) {
|
|
|
|
for (auto&& format : m_formats) {
|
|
|
|
if (format.second->value.find(tag) != string::npos) {
|
2016-11-20 22:04:31 +00:00
|
|
|
return true;
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
|
|
|
}
|
2016-11-20 22:04:31 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-12-02 14:55:13 +00:00
|
|
|
bool module_formatter::has_format(const string& format_name) {
|
|
|
|
return m_formats.find(format_name) != m_formats.end();
|
|
|
|
}
|
|
|
|
|
2016-11-25 12:55:15 +00:00
|
|
|
shared_ptr<module_format> module_formatter::get(const string& format_name) {
|
2016-11-20 22:04:31 +00:00
|
|
|
auto format = m_formats.find(format_name);
|
2016-11-25 12:55:15 +00:00
|
|
|
if (format == m_formats.end()) {
|
2016-11-20 22:04:31 +00:00
|
|
|
throw undefined_format("Format \"" + format_name + "\" has not been added");
|
2016-11-25 12:55:15 +00:00
|
|
|
}
|
2016-11-20 22:04:31 +00:00
|
|
|
return format->second;
|
|
|
|
}
|
|
|
|
|
|
|
|
// }}}
|
2022-03-14 17:39:34 +00:00
|
|
|
} // namespace modules
|
2016-11-20 22:04:31 +00:00
|
|
|
|
|
|
|
POLYBAR_NS_END
|