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

Merge pull request #2940 from alebastr/clock

This commit is contained in:
Alexis Rouillard 2024-02-20 08:02:08 +01:00 committed by GitHub
parent a118af0d1b f885baba61
commit 536933ca24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util/date.hpp
View File

@ -30,10 +30,6 @@ template <typename T>
inline auto format(const std::locale& loc, const char* spec, const T& arg) { inline auto format(const std::locale& loc, const char* spec, const T& arg) {
return date::format(loc, std::regex_replace(spec, std::regex("\\{:L|\\}"), ""), arg); return date::format(loc, std::regex_replace(spec, std::regex("\\{:L|\\}"), ""), arg);
} }
constexpr decltype(auto) operator""d(unsigned long long d) noexcept {
return date::operator""_d(d); // very verbose, but it works
}
#endif #endif
} // namespace date } // namespace date

15
src/modules/clock.cpp
View File

@ -130,7 +130,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
} }
auto waybar::modules::Clock::update() -> void { auto waybar::modules::Clock::update() -> void {
auto tz{tzList_[tzCurrIdx_] ?: current_zone()}; const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : current_zone();
const zoned_time now{tz, floor<seconds>(system_clock::now())}; const zoned_time now{tz, floor<seconds>(system_clock::now())};
label_.set_markup(fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(now))); label_.set_markup(fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(now)));
@ -167,7 +167,8 @@ auto waybar::modules::Clock::getTZtext(sys_seconds now) -> std::string {
std::stringstream os; std::stringstream os;
for (size_t tz_idx{0}; tz_idx < tzList_.size(); ++tz_idx) { for (size_t tz_idx{0}; tz_idx < tzList_.size(); ++tz_idx) {
if (static_cast<int>(tz_idx) == tzCurrIdx_) continue; if (static_cast<int>(tz_idx) == tzCurrIdx_) continue;
auto zt{zoned_time{tzList_[tz_idx], now}}; const auto* tz = tzList_[tz_idx] != nullptr ? tzList_[tz_idx] : current_zone();
auto zt{zoned_time{tz, now}};
os << fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(zt)) << '\n'; os << fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(zt)) << '\n';
} }
@ -220,22 +221,22 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
} }
// Print first week prefixed with spaces if necessary // Print first week prefixed with spaces if necessary
case 2: { case 2: {
auto d{day{1}};
auto wd{weekday{ym / 1}}; auto wd{weekday{ym / 1}};
os << std::string((wd - firstdow).count() * 3, ' '); os << std::string((wd - firstdow).count() * 3, ' ');
if (currDate != ym / 1d) if (currDate != ym / d)
os << date::format(*locale_, "{:L%e}", 1d); os << date::format(*locale_, "{:L%e}", d);
else else
os << "{today}"; os << "{today}";
auto d{2d};
while (++wd != firstdow) { while (++wd != firstdow) {
++d;
if (currDate != ym / d) if (currDate != ym / d)
os << date::format(*locale_, " {:L%e}", d); os << date::format(*locale_, " {:L%e}", d);
else else
os << " {today}"; os << " {today}";
++d;
} }
break; break;
} }