From 718dd4afae5f9e04ee22873797b995e4c7e17a33 Mon Sep 17 00:00:00 2001
From: Josh Jones <contact@joshjones.uk>
Date: Sun, 4 Feb 2024 15:41:39 +0100
Subject: [PATCH 1/3] add ordinal date toolbar format specifier to clock module

---
 include/modules/clock.hpp |  6 ++++++
 src/modules/clock.cpp     | 44 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index d6aabaa0..8b597c4e 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -8,6 +8,7 @@ namespace waybar::modules {
 
 const std::string kCldPlaceholder{"calendar"};
 const std::string kTZPlaceholder{"tz_list"};
+const std::string kOrdPlaceholder{"ordinal_date"};
 
 enum class CldMode { MONTH, YEAR };
 enum class WS { LEFT, RIGHT, HIDDEN };
@@ -57,6 +58,11 @@ class Clock final : public ALabel {
   std::string tzText_{""};                // time zones text to print
   util::SleeperThread thread_;
 
+  // ordinal date in tooltip
+  const bool ordInTooltip_;
+  std::string ordText_{""};
+  auto get_ordinal_date(const year_month_day& today) -> std::string;
+
   auto getTZtext(sys_seconds now) -> std::string;
   auto first_day_of_week() -> weekday;
   // Module actions
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 495dfab3..6b1975ba 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -2,8 +2,10 @@
 
 #include <spdlog/spdlog.h>
 
+#include <chrono>
 #include <iomanip>
 #include <regex>
+#include <sstream>
 
 #include "util/ustring_clen.hpp"
 
@@ -20,7 +22,8 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
       tlpFmt_{(config_["tooltip-format"].isString()) ? config_["tooltip-format"].asString() : ""},
       cldInTooltip_{tlpFmt_.find("{" + kCldPlaceholder + "}") != std::string::npos},
       tzInTooltip_{tlpFmt_.find("{" + kTZPlaceholder + "}") != std::string::npos},
-      tzCurrIdx_{0} {
+      tzCurrIdx_{0},
+      ordInTooltip_{tlpFmt_.find("{" + kOrdPlaceholder + "}") != std::string::npos} {
   tlpText_ = tlpFmt_;
 
   if (config_["timezones"].isArray() && !config_["timezones"].empty()) {
@@ -126,6 +129,7 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
   };
 }
 
+
 auto waybar::modules::Clock::update() -> void {
   auto tz{tzList_[tzCurrIdx_] ?: current_zone()};
   const zoned_time now{tz, floor<seconds>(system_clock::now())};
@@ -140,11 +144,13 @@ auto waybar::modules::Clock::update() -> void {
 
     if (tzInTooltip_) tzText_ = getTZtext(now.get_sys_time());
     if (cldInTooltip_) cldText_ = get_calendar(today, shiftedDay, tz);
-    if (tzInTooltip_ || cldInTooltip_) {
+    if (ordInTooltip_) ordText_ = get_ordinal_date(shiftedDay);
+    if (tzInTooltip_ || cldInTooltip_ || ordInTooltip_) {
       // std::vformat doesn't support named arguments.
       tlpText_ = std::regex_replace(tlpFmt_, std::regex("\\{" + kTZPlaceholder + "\\}"), tzText_);
       tlpText_ =
           std::regex_replace(tlpText_, std::regex("\\{" + kCldPlaceholder + "\\}"), cldText_);
+      tlpText_ = std::regex_replace(tlpText_, std::regex("\\{" + kOrdPlaceholder + "\\}"), ordText_);
     }
 
     tlpText_ = fmt_lib::vformat(locale_, tlpText_, fmt_lib::make_format_args(shiftedNow));
@@ -437,3 +443,37 @@ auto waybar::modules::Clock::first_day_of_week() -> weekday {
 #endif
   return Sunday;
 }
+
+auto waybar::modules::Clock::get_ordinal_date(const year_month_day& today) -> std::string {
+  auto day = static_cast<unsigned int>(today.day());
+  switch (day) {
+    case 11:
+      return "11th";
+    case 12:
+      return "12th";
+    case 13:
+      return "13th";
+  }
+
+  std::stringstream res;
+  res << day;
+  if (day >= 11 && day <= 13) {
+    res << "th";
+    return res.str();
+  }
+
+  switch (day % 10) {
+    case 1:
+      res << "st";
+      break;
+    case 2:
+      res << "nd";
+      break;
+    case 3:
+      res << "rd";
+      break;
+    default:
+      res << "th";
+  }
+  return res.str();
+}
\ No newline at end of file

From e02cb9cfb91fc607862967cac0d982f51cf2afb4 Mon Sep 17 00:00:00 2001
From: Josh Jones <contact@joshjones.uk>
Date: Sun, 4 Feb 2024 15:49:14 +0100
Subject: [PATCH 2/3] add ordinal format specifier to man clock

---
 man/waybar-clock.5.scd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/waybar-clock.5.scd b/man/waybar-clock.5.scd
index fc079338..e8ef7bed 100644
--- a/man/waybar-clock.5.scd
+++ b/man/waybar-clock.5.scd
@@ -157,6 +157,7 @@ View all valid format options in *strftime(3)* or have a look https://en.cpprefe
 
 - *{calendar}*: Current month calendar
 - *{tz_list}*: List of time in the rest timezones, if more than one timezone is set in the config
+- *{ordinal_date}*: The current day in (English) ordinal form, e.g. 21st
 
 # EXAMPLES
 

From 1fa1045af97879093d19c96248ea3bd14cb4865c Mon Sep 17 00:00:00 2001
From: Josh Jones <contact@joshjones.uk>
Date: Sun, 4 Feb 2024 16:11:39 +0100
Subject: [PATCH 3/3] remove duplicated segment

---
 src/modules/clock.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 6b1975ba..e83cbef0 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -446,15 +446,6 @@ auto waybar::modules::Clock::first_day_of_week() -> weekday {
 
 auto waybar::modules::Clock::get_ordinal_date(const year_month_day& today) -> std::string {
   auto day = static_cast<unsigned int>(today.day());
-  switch (day) {
-    case 11:
-      return "11th";
-    case 12:
-      return "12th";
-    case 13:
-      return "13th";
-  }
-
   std::stringstream res;
   res << day;
   if (day >= 11 && day <= 13) {