tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add timezone support to clock module (closes #223)

Browse Source
This commit is contained in:
Michael Cordover
2020-01-20 18:47:15 -05:00
committed by Michael Cordover
parent 99dde1aff8
commit 3130a57622
5 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/clock.cpp
View File

@ -1,5 +1,5 @@
#include "modules/clock.hpp"
#include <time.h>
#include <date/tz.h>
waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
: ALabel(config, "clock", id, "{:%H:%M}", 60) {
@ -14,8 +14,14 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
auto waybar::modules::Clock::update() -> void {
tzset(); // Update timezone information
auto now = std::chrono::system_clock::now();
auto localtime = fmt::localtime(std::chrono::system_clock::to_time_t(now));
const date::time_zone* zone;
auto now = std::chrono::floor<std::chrono::seconds>(std::chrono::system_clock::now());
if (config_["timezone"].isString()) {
zone = date::locate_zone(config_["timezone"].asString());
} else {
zone = date::current_zone();
}
auto localtime = date::make_zoned(zone, now);
auto text = fmt::format(format_, localtime);
label_.set_markup(text);
@ -29,3 +35,23 @@ auto waybar::modules::Clock::update() -> void {
}
}
}
template <typename ZonedTimeInner>
struct fmt::formatter<date::zoned_time<ZonedTimeInner>> {
std::string *format_string;
constexpr auto parse(format_parse_context& ctx) {
format_string = new std::string[1];
auto it = ctx.begin(), end = ctx.end();
while (it != (end - 1)) {
*format_string += *it++;
}
return it;
}
template <typename FormatContext>
auto format(const date::zoned_time<ZonedTimeInner>& d, FormatContext& ctx) {
return format_to(ctx.out(), "{}", date::format(*format_string, d));
}
};