Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clock: add weeks-numbering option for configurable CW calculation

Browse Source 
The iso8601 flag previously controlled both the calendar grid layout
and the week number format as a coupled boolean. This adds a new
weeks-numbering option (iso/monday/sunday) that explicitly overrides
just the week number calculation method, independent of iso8601 and
locale settings. Existing behaviour is fully preserved when the option
is not set.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Thomas Beyer
2026-03-20 11:43:17 +01:00
co-authored by Claude Sonnet 4.6
parent ab7bfdb297
commit 86d516c74d
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/clock.cpp
+29 -6
View File
@@ -81,6 +81,20 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
iso8601Calendar_ = config_[kCldPlaceholder]["iso8601"].asBool();
}
if (config_[kCldPlaceholder]["weeks-numbering"].isString()) {
const std::string wn{config_[kCldPlaceholder]["weeks-numbering"].asString()};
const std::map<std::string, WeekNumbering> wnModes{{"iso", WeekNumbering::ISO},
{"monday", WeekNumbering::MONDAY},
{"sunday", WeekNumbering::SUNDAY}};
if (wnModes.find(wn) != wnModes.end())
weekNumbering_ = wnModes.at(wn);
else
spdlog::warn(
"Clock calendar configuration weeks-numbering \"{}\" is not recognized. "
"Locale default is used instead",
wn);
}
if (config_[kCldPlaceholder]["weeks-pos"].isString()) {
if (config_[kCldPlaceholder]["weeks-pos"].asString() == "left") cldWPos_ = WS::LEFT;
if (config_[kCldPlaceholder]["weeks-pos"].asString() == "right") cldWPos_ = WS::RIGHT;
@@ -104,18 +118,27 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
cldBaseDay_ = year_month_day{floor<days>(local_time)}.day();
} else
fmtMap_.insert({3, "{}"});
const auto weekFmt = [this]() -> std::string {
switch (weekNumbering_) {
case WeekNumbering::ISO:
return "{:%V}";
case WeekNumbering::MONDAY:
return "{:%W}";
case WeekNumbering::SUNDAY:
return "{:%U}";
default:
return iso8601Calendar_ ? "{:%V}"
: ((first_day_of_week() == Monday) ? "{:%W}" : "{:%U}");
}
}();
if (config_[kCldPlaceholder]["format"]["weeks"].isString() && cldWPos_ != WS::HIDDEN) {
const auto defaultFmt =
iso8601Calendar_ ? "{:%V}" : ((first_day_of_week() == Monday) ? "{:%W}" : "{:%U}");
fmtMap_.insert({4, std::regex_replace(config_[kCldPlaceholder]["format"]["weeks"].asString(),
std::regex("\\{\\}"), defaultFmt)});
std::regex("\\{\\}"), weekFmt)});
Glib::ustring tmp{std::regex_replace(fmtMap_[4], std::regex("</?[^>]+>|\\{.*\\}"), "")};
cldWnLen_ += tmp.size();
} else {
if (cldWPos_ != WS::HIDDEN) {
const auto defaultFmt =
iso8601Calendar_ ? "{:%V}" : ((first_day_of_week() == Monday) ? "{:%W}" : "{:%U}");
fmtMap_.insert({4, defaultFmt});
fmtMap_.insert({4, weekFmt});
} else {
cldWnLen_ = 0;
}