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

Merge pull request #3255 from LukashonakV/ISSUE#2240 

Fix Clock. Tooltip calendar text overflows(#2240)
master
Alexis Rouillard 2024-05-28 09:08:31 +02:00 committed by GitHub
parent af7945197e b288fdf8c1
commit d4413f5fa6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/modules/clock.hpp
View File

@ -21,10 +21,12 @@ class Clock final : public ALabel {
auto doAction(const std::string&) -> void override; auto doAction(const std::string&) -> void override;
private: private:
const std::locale locale_; const std::locale m_locale_;
// tooltip // tooltip
const std::string tlpFmt_; const std::string m_tlpFmt_;
std::string tlpText_{""}; // tooltip text to print std::string m_tlpText_{""}; // tooltip text to print
const Glib::RefPtr<Gtk::Label> m_tooltip_; // tooltip as a separate Gtk::Label
bool query_tlp_cb(int, int, bool, const Glib::RefPtr<Gtk::Tooltip>& tooltip);
// Calendar // Calendar
const bool cldInTooltip_; // calendar in tooltip const bool cldInTooltip_; // calendar in tooltip
/* /*

74
src/modules/clock.cpp
View File

@ -1,5 +1,6 @@
#include "modules/clock.hpp" #include "modules/clock.hpp"
#include <gtkmm/tooltip.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <chrono> #include <chrono>
@ -18,13 +19,14 @@ namespace fmt_lib = waybar::util::date::format;
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, false, false, true), : ALabel(config, "clock", id, "{:%H:%M}", 60, false, false, true),
locale_{std::locale(config_["locale"].isString() ? config_["locale"].asString() : "")}, m_locale_{std::locale(config_["locale"].isString() ? config_["locale"].asString() : "")},
tlpFmt_{(config_["tooltip-format"].isString()) ? config_["tooltip-format"].asString() : ""}, m_tlpFmt_{(config_["tooltip-format"].isString()) ? config_["tooltip-format"].asString() : ""},
cldInTooltip_{tlpFmt_.find("{" + kCldPlaceholder + "}") != std::string::npos}, m_tooltip_{new Gtk::Label()},
tzInTooltip_{tlpFmt_.find("{" + kTZPlaceholder + "}") != std::string::npos}, cldInTooltip_{m_tlpFmt_.find("{" + kCldPlaceholder + "}") != std::string::npos},
tzInTooltip_{m_tlpFmt_.find("{" + kTZPlaceholder + "}") != std::string::npos},
tzCurrIdx_{0}, tzCurrIdx_{0},
ordInTooltip_{tlpFmt_.find("{" + kOrdPlaceholder + "}") != std::string::npos} { ordInTooltip_{m_tlpFmt_.find("{" + kOrdPlaceholder + "}") != std::string::npos} {
tlpText_ = tlpFmt_; m_tlpText_ = m_tlpFmt_;
if (config_["timezones"].isArray() && !config_["timezones"].empty()) { if (config_["timezones"].isArray() && !config_["timezones"].empty()) {
for (const auto& zone_name : config_["timezones"]) { for (const auto& zone_name : config_["timezones"]) {
@ -124,17 +126,26 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
} }
} }
label_.set_has_tooltip(true);
label_.signal_query_tooltip().connect(sigc::mem_fun(*this, &Clock::query_tlp_cb));
thread_ = [this] { thread_ = [this] {
dp.emit(); dp.emit();
thread_.sleep_for(interval_ - system_clock::now().time_since_epoch() % interval_); thread_.sleep_for(interval_ - system_clock::now().time_since_epoch() % interval_);
}; };
} }
bool waybar::modules::Clock::query_tlp_cb(int, int, bool,
const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
tooltip->set_custom(*m_tooltip_.get());
return true;
}
auto waybar::modules::Clock::update() -> void { auto waybar::modules::Clock::update() -> void {
const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : local_zone(); const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : local_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(m_locale_, format_, fmt_lib::make_format_args(now)));
if (tooltipEnabled()) { if (tooltipEnabled()) {
const year_month_day today{floor<days>(now.get_local_time())}; const year_month_day today{floor<days>(now.get_local_time())};
@ -147,18 +158,19 @@ auto waybar::modules::Clock::update() -> void {
if (ordInTooltip_) ordText_ = get_ordinal_date(shiftedDay); if (ordInTooltip_) ordText_ = get_ordinal_date(shiftedDay);
if (tzInTooltip_ || cldInTooltip_ || ordInTooltip_) { if (tzInTooltip_ || cldInTooltip_ || ordInTooltip_) {
// std::vformat doesn't support named arguments. // std::vformat doesn't support named arguments.
tlpText_ = std::regex_replace(tlpFmt_, std::regex("\\{" + kTZPlaceholder + "\\}"), tzText_); m_tlpText_ =
tlpText_ = std::regex_replace(m_tlpFmt_, std::regex("\\{" + kTZPlaceholder + "\\}"), tzText_);
std::regex_replace(tlpText_, std::regex("\\{" + kCldPlaceholder + "\\}"), cldText_); m_tlpText_ =
tlpText_ = std::regex_replace(m_tlpText_, std::regex("\\{" + kCldPlaceholder + "\\}"), cldText_);
std::regex_replace(tlpText_, std::regex("\\{" + kOrdPlaceholder + "\\}"), ordText_); m_tlpText_ =
std::regex_replace(m_tlpText_, std::regex("\\{" + kOrdPlaceholder + "\\}"), ordText_);
} else { } else {
tlpText_ = tlpFmt_; m_tlpText_ = m_tlpFmt_;
} }
tlpText_ = fmt_lib::vformat(locale_, tlpText_, fmt_lib::make_format_args(shiftedNow)); m_tlpText_ = fmt_lib::vformat(m_locale_, m_tlpText_, fmt_lib::make_format_args(shiftedNow));
m_tooltip_->set_markup(m_tlpText_);
label_.set_tooltip_markup(tlpText_); label_.trigger_tooltip_query();
} }
ALabel::update(); ALabel::update();
@ -172,7 +184,7 @@ auto waybar::modules::Clock::getTZtext(sys_seconds now) -> std::string {
if (static_cast<int>(tz_idx) == tzCurrIdx_) continue; if (static_cast<int>(tz_idx) == tzCurrIdx_) continue;
const auto* tz = tzList_[tz_idx] != nullptr ? tzList_[tz_idx] : local_zone(); const auto* tz = tzList_[tz_idx] != nullptr ? tzList_[tz_idx] : local_zone();
auto zt{zoned_time{tz, now}}; auto zt{zoned_time{tz, now}};
os << fmt_lib::vformat(locale_, format_, fmt_lib::make_format_args(zt)) << '\n'; os << fmt_lib::vformat(m_locale_, format_, fmt_lib::make_format_args(zt)) << '\n';
} }
return os.str(); return os.str();
@ -190,13 +202,13 @@ auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow, const unsi
} }
auto getCalendarLine(const year_month_day& currDate, const year_month ym, const unsigned line, auto getCalendarLine(const year_month_day& currDate, const year_month ym, const unsigned line,
const weekday& firstdow, const std::locale* const locale_) -> std::string { const weekday& firstdow, const std::locale* const m_locale_) -> std::string {
std::ostringstream os; std::ostringstream os;
switch (line) { switch (line) {
// Print month and year title // Print month and year title
case 0: { case 0: {
os << date::format(*locale_, "{:L%B %Y}", ym); os << date::format(*m_locale_, "{:L%B %Y}", ym);
break; break;
} }
// Print weekday names title // Print weekday names title
@ -206,7 +218,7 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
Glib::ustring::size_type wdLen{0}; Glib::ustring::size_type wdLen{0};
int clen{0}; int clen{0};
do { do {
wdStr = date::format(*locale_, "{:L%a}", wd); wdStr = date::format(*m_locale_, "{:L%a}", wd);
clen = ustring_clen(wdStr); clen = ustring_clen(wdStr);
wdLen = wdStr.length(); wdLen = wdStr.length();
while (clen > 2) { while (clen > 2) {
@ -229,7 +241,7 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
os << std::string((wd - firstdow).count() * 3, ' '); os << std::string((wd - firstdow).count() * 3, ' ');
if (currDate != ym / d) if (currDate != ym / d)
os << date::format(*locale_, "{:L%e}", d); os << date::format(*m_locale_, "{:L%e}", d);
else else
os << "{today}"; os << "{today}";
@ -237,7 +249,7 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
++d; ++d;
if (currDate != ym / d) if (currDate != ym / d)
os << date::format(*locale_, " {:L%e}", d); os << date::format(*m_locale_, " {:L%e}", d);
else else
os << " {today}"; os << " {today}";
} }
@ -252,13 +264,13 @@ auto getCalendarLine(const year_month_day& currDate, const year_month ym, const
auto wd{firstdow}; auto wd{firstdow};
if (currDate != ym / d) if (currDate != ym / d)
os << date::format(*locale_, "{:L%e}", d); os << date::format(*m_locale_, "{:L%e}", d);
else else
os << "{today}"; os << "{today}";
while (++wd != firstdow && ++d <= dlast) { while (++wd != firstdow && ++d <= dlast) {
if (currDate != ym / d) if (currDate != ym / d)
os << date::format(*locale_, " {:L%e}", d); os << date::format(*m_locale_, " {:L%e}", d);
else else
os << " {today}"; os << " {today}";
} }
@ -328,7 +340,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
if (line > 1) { if (line > 1) {
if (line < ml[(unsigned)ymTmp.month() - 1u]) { if (line < ml[(unsigned)ymTmp.month() - 1u]) {
os << fmt_lib::vformat( os << fmt_lib::vformat(
locale_, fmtMap_[4], m_locale_, fmtMap_[4],
fmt_lib::make_format_args( fmt_lib::make_format_args(
(line == 2) (line == 2)
? static_cast<const date::zoned_seconds&&>( ? static_cast<const date::zoned_seconds&&>(
@ -344,7 +356,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
os << Glib::ustring::format((cldWPos_ != WS::LEFT || line == 0) ? std::left : std::right, os << Glib::ustring::format((cldWPos_ != WS::LEFT || line == 0) ? std::left : std::right,
std::setfill(L' '), std::setfill(L' '),
std::setw(cldMonColLen_ + ((line < 2) ? cldWnLen_ : 0)), std::setw(cldMonColLen_ + ((line < 2) ? cldWnLen_ : 0)),
getCalendarLine(today, ymTmp, line, firstdow, &locale_)); getCalendarLine(today, ymTmp, line, firstdow, &m_locale_));
// Week numbers on the right // Week numbers on the right
if (cldWPos_ == WS::RIGHT && line > 0) { if (cldWPos_ == WS::RIGHT && line > 0) {
@ -352,7 +364,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
if (line < ml[(unsigned)ymTmp.month() - 1u]) if (line < ml[(unsigned)ymTmp.month() - 1u])
os << ' ' os << ' '
<< fmt_lib::vformat( << fmt_lib::vformat(
locale_, fmtMap_[4], m_locale_, fmtMap_[4],
fmt_lib::make_format_args( fmt_lib::make_format_args(
(line == 2) ? static_cast<const date::zoned_seconds&&>( (line == 2) ? static_cast<const date::zoned_seconds&&>(
zoned_seconds{tz, local_days{ymTmp / 1}}) zoned_seconds{tz, local_days{ymTmp / 1}})
@ -368,7 +380,7 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
// Apply user's formats // Apply user's formats
if (line < 2) if (line < 2)
tmp << fmt_lib::vformat( tmp << fmt_lib::vformat(
locale_, fmtMap_[line], m_locale_, fmtMap_[line],
fmt_lib::make_format_args(static_cast<const std::string_view&&>(os.str()))); fmt_lib::make_format_args(static_cast<const std::string_view&&>(os.str())));
else else
tmp << os.str(); tmp << os.str();
@ -380,10 +392,10 @@ auto waybar::modules::Clock::get_calendar(const year_month_day& today, const yea
} }
os << std::regex_replace( os << std::regex_replace(
fmt_lib::vformat(locale_, fmtMap_[2], fmt_lib::vformat(m_locale_, fmtMap_[2],
fmt_lib::make_format_args(static_cast<const std::string_view&&>(tmp.str()))), fmt_lib::make_format_args(static_cast<const std::string_view&&>(tmp.str()))),
std::regex("\\{today\\}"), std::regex("\\{today\\}"),
fmt_lib::vformat(locale_, fmtMap_[3], fmt_lib::vformat(m_locale_, fmtMap_[3],
fmt_lib::make_format_args( fmt_lib::make_format_args(
static_cast<const std::string_view&&>(date::format("{:L%e}", d))))); static_cast<const std::string_view&&>(date::format("{:L%e}", d)))));
@ -450,7 +462,7 @@ using deleting_unique_ptr = std::unique_ptr<T, deleter_from_fn<fn>>;
auto waybar::modules::Clock::first_day_of_week() -> weekday { auto waybar::modules::Clock::first_day_of_week() -> weekday {
#ifdef HAVE_LANGINFO_1STDAY #ifdef HAVE_LANGINFO_1STDAY
deleting_unique_ptr<std::remove_pointer<locale_t>::type, freelocale> posix_locale{ deleting_unique_ptr<std::remove_pointer<locale_t>::type, freelocale> posix_locale{
newlocale(LC_ALL, locale_.name().c_str(), nullptr)}; newlocale(LC_ALL, m_locale_.name().c_str(), nullptr)};
if (posix_locale) { if (posix_locale) {
const auto i{(int)((std::intptr_t)nl_langinfo_l(_NL_TIME_WEEK_1STDAY, posix_locale.get()))}; const auto i{(int)((std::intptr_t)nl_langinfo_l(_NL_TIME_WEEK_1STDAY, posix_locale.get()))};
const weekday wd{year_month_day{year(i / 10000) / month(i / 100 % 100) / day(i % 100)}}; const weekday wd{year_month_day{year(i / 10000) / month(i / 100 % 100) / day(i % 100)}};