mirror of
https://github.com/polybar/polybar.git
synced 2024-11-11 13:50:56 -05:00
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>
79 lines
2 KiB
C++
79 lines
2 KiB
C++
#pragma once
|
|
|
|
#include <utility>
|
|
|
|
#include "components/config.hpp"
|
|
#include "modules/meta/timer_module.hpp"
|
|
#include "settings.hpp"
|
|
|
|
POLYBAR_NS
|
|
|
|
namespace modules {
|
|
/**
|
|
* Filesystem structure
|
|
*/
|
|
struct fs_mount {
|
|
string mountpoint;
|
|
bool mounted = false;
|
|
|
|
string type;
|
|
string fsname;
|
|
|
|
uint64_t bytes_free{0ULL};
|
|
uint64_t bytes_used{0ULL};
|
|
uint64_t bytes_avail{0ULL};
|
|
uint64_t bytes_total{0ULL};
|
|
|
|
int percentage_free{0};
|
|
int percentage_used{0};
|
|
|
|
explicit fs_mount(string mountpoint, bool mounted = false) : mountpoint(move(mountpoint)), mounted(mounted) {}
|
|
};
|
|
|
|
using fs_mount_t = unique_ptr<fs_mount>;
|
|
|
|
/**
|
|
* Module used to display filesystem stats.
|
|
*/
|
|
class fs_module : public timer_module<fs_module> {
|
|
public:
|
|
explicit fs_module(const bar_settings&, string);
|
|
|
|
bool update();
|
|
string get_format() const;
|
|
string get_output();
|
|
bool build(builder* builder, const string& tag) const;
|
|
|
|
static constexpr auto TYPE = "internal/fs";
|
|
|
|
private:
|
|
static constexpr auto FORMAT_MOUNTED = "format-mounted";
|
|
static constexpr auto FORMAT_WARN = "format-warn";
|
|
static constexpr auto FORMAT_UNMOUNTED = "format-unmounted";
|
|
static constexpr auto TAG_LABEL_MOUNTED = "<label-mounted>";
|
|
static constexpr auto TAG_LABEL_UNMOUNTED = "<label-unmounted>";
|
|
static constexpr auto TAG_LABEL_WARN = "<label-warn>";
|
|
static constexpr auto TAG_BAR_USED = "<bar-used>";
|
|
static constexpr auto TAG_BAR_FREE = "<bar-free>";
|
|
static constexpr auto TAG_RAMP_CAPACITY = "<ramp-capacity>";
|
|
|
|
label_t m_labelmounted;
|
|
label_t m_labelunmounted;
|
|
label_t m_labelwarn;
|
|
progressbar_t m_barused;
|
|
progressbar_t m_barfree;
|
|
ramp_t m_rampcapacity;
|
|
|
|
vector<string> m_mountpoints;
|
|
vector<fs_mount_t> m_mounts;
|
|
bool m_fixed{false};
|
|
bool m_remove_unmounted{false};
|
|
spacing_val m_spacing{spacing_type::SPACE, 2U};
|
|
int m_perc_used_warn{90};
|
|
|
|
// used while formatting output
|
|
size_t m_index{0_z};
|
|
};
|
|
} // namespace modules
|
|
|
|
POLYBAR_NS_END
|