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

adding a new keyword 'on-click-copy' that accepts a bool and copies to clipboard on true'

Browse Source
This commit is contained in:
Skyfrei
2026-03-24 20:12:30 +01:00
parent be2ad4a858
commit fff1495efb
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ALabel.hpp
+1
View File
@@ -26,6 +26,7 @@ class ALabel : public AModule {
std::string default_format_; std::string default_format_;
bool handleToggle(GdkEventButton* const& e) override; bool handleToggle(GdkEventButton* const& e) override;
void copyToClipboard(const std::string&);
virtual std::string getState(uint8_t value, bool lesser = false); virtual std::string getState(uint8_t value, bool lesser = false);
std::map<std::string, GtkMenuItem*> submenus_; std::map<std::string, GtkMenuItem*> submenus_;
include/AModule.hpp
+2 -1
View File
@@ -78,7 +78,8 @@ class AModule : public IModule {
{std::make_pair(9, GdkEventType::GDK_BUTTON_PRESS), "on-click-forward"}, {std::make_pair(9, GdkEventType::GDK_BUTTON_PRESS), "on-click-forward"},
{std::make_pair(9, GdkEventType::GDK_BUTTON_RELEASE), "on-click-forward-release"}, {std::make_pair(9, GdkEventType::GDK_BUTTON_RELEASE), "on-click-forward-release"},
{std::make_pair(9, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-forward"}, {std::make_pair(9, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click-forward"},
{std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"}}; {std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click-forward"},
{std::make_pair(10, GdkEventType::GDK_BUTTON_PRESS), "on-click-copy"}};
}; };
} // namespace waybar } // namespace waybar
src/ALabel.cpp
+9 -2
View File
@@ -116,8 +116,7 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st
} }
submenus_[key] = GTK_MENU_ITEM(item); submenus_[key] = GTK_MENU_ITEM(item);
menuActionsMap_[key] = it->asString(); menuActionsMap_[key] = it->asString();
g_signal_connect(submenus_[key], "activate", g_signal_connect(submenus_[key], "activate", G_CALLBACK(handleGtkMenuEvent),
G_CALLBACK(handleGtkMenuEvent),
(gpointer)g_strdup(menuActionsMap_[key].c_str())); (gpointer)g_strdup(menuActionsMap_[key].c_str()));
} }
g_object_unref(builder); g_object_unref(builder);
@@ -190,6 +189,10 @@ std::string ALabel::getIcon(uint16_t percentage, const std::vector<std::string>&
return ""; return "";
} }
void ALabel::copyToClipboard(const std::string& literal) {
Gtk::Clipboard::get()->set_text(literal);
}
bool waybar::ALabel::handleToggle(GdkEventButton* const& e) { bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
if (config_["format-alt-click"].isUInt() && e->button == config_["format-alt-click"].asUInt()) { if (config_["format-alt-click"].isUInt() && e->button == config_["format-alt-click"].asUInt()) {
alt_ = !alt_; alt_ = !alt_;
@@ -199,6 +202,10 @@ bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
format_ = default_format_; format_ = default_format_;
} }
} }
if (config_["on-click-copy"].isBool() && config_["on-click-copy"].asBool()) {
copyToClipboard(label_.get_text());
}
return AModule::handleToggle(e); return AModule::handleToggle(e);
} }
src/AModule.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
std::find_if(eventMap_.cbegin(), eventMap_.cend(), [&config](const auto& eventEntry) { std::find_if(eventMap_.cbegin(), eventMap_.cend(), [&config](const auto& eventEntry) {
// True if there is any non-release type event // True if there is any non-release type event
return eventEntry.first.second != GdkEventType::GDK_BUTTON_RELEASE && return eventEntry.first.second != GdkEventType::GDK_BUTTON_RELEASE &&
config[eventEntry.second].isString(); (config[eventEntry.second].isString() || config[eventEntry.second].isBool());
}) != eventMap_.cend(); }) != eventMap_.cend();
if (enable_click || hasUserEvents) { if (enable_click || hasUserEvents) {