blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: prefer default fmt date formatting unless timezone specified

This commit is contained in:
Alex 2020-05-22 18:52:26 +02:00
parent c5bbedfabb
commit cef5b27b48
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/modules/clock.cpp
View File

@ -1,4 +1,7 @@
#include "modules/clock.hpp" #include "modules/clock.hpp"
#include <time.h>
#include <sstream> #include <sstream>
#include <type_traits> #include <type_traits>
#ifdef HAVE_LANGINFO_1STDAY #ifdef HAVE_LANGINFO_1STDAY
@ -9,9 +12,7 @@
using waybar::modules::waybar_time; using waybar::modules::waybar_time;
waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config) waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
: ALabel(config, "clock", id, "{:%H:%M}", 60) : ALabel(config, "clock", id, "{:%H:%M}", 60), fixed_time_zone_(false) {
, fixed_time_zone_(false)
{
if (config_["timezone"].isString()) { if (config_["timezone"].isString()) {
time_zone_ = date::locate_zone(config_["timezone"].asString()); time_zone_ = date::locate_zone(config_["timezone"].asString());
fixed_time_zone_ = true; fixed_time_zone_ = true;
@ -37,18 +38,27 @@ auto waybar::modules::Clock::update() -> void {
// Time zone can change. Be sure to pick that. // Time zone can change. Be sure to pick that.
time_zone_ = date::current_zone(); time_zone_ = date::current_zone();
} }
auto now = std::chrono::system_clock::now(); auto now = std::chrono::system_clock::now();
waybar_time wtime = {locale_, waybar_time wtime = {locale_,
date::make_zoned(time_zone_, date::floor<std::chrono::seconds>(now))}; date::make_zoned(time_zone_, date::floor<std::chrono::seconds>(now))};
auto text = fmt::format(format_, wtime); if (!fixed_time_zone_) {
label_.set_markup(text); // As date dep is not fully compatible, prefer fmt
tzset();
auto localtime = fmt::localtime(std::chrono::system_clock::to_time_t(now));
auto text = fmt::format(format_, localtime);
label_.set_markup(text);
} else {
auto text = fmt::format(format_, wtime);
label_.set_markup(text);
}
if (tooltipEnabled()) { if (tooltipEnabled()) {
if (config_["tooltip-format"].isString()) { if (config_["tooltip-format"].isString()) {
const auto calendar = calendar_text(wtime); const auto calendar = calendar_text(wtime);
auto tooltip_format = config_["tooltip-format"].asString(); auto tooltip_format = config_["tooltip-format"].asString();
auto tooltip_text = fmt::format(tooltip_format, wtime, fmt::arg("calendar", calendar)); auto tooltip_text = fmt::format(tooltip_format, wtime, fmt::arg("calendar", calendar));
label_.set_tooltip_markup(tooltip_text); label_.set_tooltip_markup(tooltip_text);
} else { } else {
label_.set_tooltip_markup(text); label_.set_tooltip_markup(text);
@ -66,19 +76,19 @@ auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::str
} }
const date::year_month ym(ymd.year(), ymd.month()); const date::year_month ym(ymd.year(), ymd.month());
const auto curr_day = ymd.day(); const auto curr_day = ymd.day();
std::stringstream os; std::stringstream os;
const auto first_dow = first_day_of_week(); const auto first_dow = first_day_of_week();
weekdays_header(first_dow, os); weekdays_header(first_dow, os);
// First week prefixed with spaces if needed. // First week prefixed with spaces if needed.
auto wd = date::weekday(ym/1); auto wd = date::weekday(ym / 1);
auto empty_days = (wd - first_dow).count(); auto empty_days = (wd - first_dow).count();
if (empty_days > 0) { if (empty_days > 0) {
os << std::string(empty_days * 3 - 1, ' '); os << std::string(empty_days * 3 - 1, ' ');
} }
auto last_day = (ym/date::literals::last).day(); auto last_day = (ym / date::literals::last).day();
for (auto d = date::day(1); d <= last_day; ++d, ++wd) { for (auto d = date::day(1); d <= last_day; ++d, ++wd) {
if (wd != first_dow) { if (wd != first_dow) {
os << ' '; os << ' ';
@ -98,12 +108,13 @@ auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::str
return result; return result;
} }
auto waybar::modules::Clock::weekdays_header(const date::weekday& first_dow, std::ostream& os) -> void { auto waybar::modules::Clock::weekdays_header(const date::weekday& first_dow, std::ostream& os)
-> void {
auto wd = first_dow; auto wd = first_dow;
do { do {
if (wd != first_dow) os << ' '; if (wd != first_dow) os << ' ';
Glib::ustring wd_ustring(date::format(locale_, "%a", wd)); Glib::ustring wd_ustring(date::format(locale_, "%a", wd));
auto wd_len = wd_ustring.length(); auto wd_len = wd_ustring.length();
if (wd_len > 2) { if (wd_len > 2) {
wd_ustring = wd_ustring.substr(0, 2); wd_ustring = wd_ustring.substr(0, 2);
wd_len = 2; wd_len = 2;
@ -125,13 +136,13 @@ using deleting_unique_ptr = std::unique_ptr<T, deleter_from_fn<fn>>;
// Computations done similarly to Linux cal utility. // Computations done similarly to Linux cal utility.
auto waybar::modules::Clock::first_day_of_week() -> date::weekday { auto waybar::modules::Clock::first_day_of_week() -> date::weekday {
#ifdef HAVE_LANGINFO_1STDAY #ifdef HAVE_LANGINFO_1STDAY
deleting_unique_ptr<std::remove_pointer<locale_t>::type, freelocale> deleting_unique_ptr<std::remove_pointer<locale_t>::type, freelocale> posix_locale{
posix_locale{newlocale(LC_ALL, locale_.name().c_str(), nullptr)}; newlocale(LC_ALL, locale_.name().c_str(), nullptr)};
if (posix_locale) { if (posix_locale) {
const int i = (std::intptr_t) nl_langinfo_l(_NL_TIME_WEEK_1STDAY, posix_locale.get()); const int i = (std::intptr_t)nl_langinfo_l(_NL_TIME_WEEK_1STDAY, posix_locale.get());
auto ymd = date::year(i / 10000)/(i / 100 % 100)/(i % 100); auto ymd = date::year(i / 10000) / (i / 100 % 100) / (i % 100);
auto wd = date::weekday(ymd); auto wd = date::weekday(ymd);
uint8_t j = *nl_langinfo_l(_NL_TIME_FIRST_WEEKDAY, posix_locale.get()); uint8_t j = *nl_langinfo_l(_NL_TIME_FIRST_WEEKDAY, posix_locale.get());
return wd + date::days(j - 1); return wd + date::days(j - 1);
} }
#endif #endif