Merge pull request #1007 from nullobsi/fullwidth-length

[calendar] CJK locale formatting

include/util/ustring_clen.hpp

@@ -0,0 +1,5 @@
+#pragma once
+#include <glibmm/ustring.h>
+
+// calculate column width of ustring
+int ustring_clen(const Glib::ustring &str);

meson.build

@@ -147,6 +147,7 @@ src_files = files(
     'src/main.cpp',
     'src/bar.cpp',
     'src/client.cpp',
+    'src/util/ustring_clen.cpp'
 )
 
 if is_linux

src/modules/clock.cpp

@@ -5,6 +5,7 @@
 
 #include <sstream>
 #include <type_traits>
+#include "util/ustring_clen.hpp"
 #ifdef HAVE_LANGINFO_1STDAY
 #include <langinfo.h>
 #include <locale.h>
@@ -154,12 +155,14 @@ auto waybar::modules::Clock::weekdays_header(const date::weekday& first_dow, std
   do {
     if (wd != first_dow) os << ' ';
     Glib::ustring wd_ustring(date::format(locale_, "%a", wd));
+    auto clen = ustring_clen(wd_ustring);
     auto wd_len = wd_ustring.length();
-    if (wd_len > 2) {
-      wd_ustring = wd_ustring.substr(0, 2);
-      wd_len = 2;
+    while (clen > 2) {
+      wd_ustring = wd_ustring.substr(0, wd_len-1);
+      wd_len--;
+      clen = ustring_clen(wd_ustring);
     }
-    const std::string pad(2 - wd_len, ' ');
+    const std::string pad(2 - clen, ' ');
     os << pad << wd_ustring;
   } while (++wd != first_dow);
   os << "\n";

src/util/ustring_clen.cpp

@@ -0,0 +1,9 @@
+#include "util/ustring_clen.hpp"
+
+int ustring_clen(const Glib::ustring &str){
+  int total = 0;
+  for (auto i = str.begin(); i != str.end(); ++i) {
+    total += g_unichar_iswide(*i) + 1;
+  }
+  return total;
+}