From d34c3a801c3ab73eb70b02dc0bea25b4ae1bb81d Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 May 2019 12:27:10 +0200 Subject: [PATCH 1/4] fix(Network): less updates --- src/modules/network.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index cca1d50..586cca2 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -25,7 +25,6 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf ifname_ = ifname; getInterfaceAddress(); } - dp.emit(); worker(); } @@ -461,14 +460,12 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->linked_ = true; net->ifname_ = ifname; net->ifid_ = rtif->ifi_index; - net->dp.emit(); } // Check for valid interface if (rtif->ifi_index == static_cast(net->ifid_)) { // Get Iface and WIFI info - net->thread_timer_.wake_up(); net->getInterfaceAddress(); - net->dp.emit(); + net->thread_timer_.wake_up(); } } else if (nh->nlmsg_type == RTM_DELADDR) { auto rtif = static_cast(NLMSG_DATA(nh)); @@ -499,10 +496,11 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { // Check for a new interface and get info auto new_iface = net->getPreferredIface(); if (new_iface != -1) { - net->thread_timer_.wake_up(); net->getInterfaceAddress(); + net->thread_timer_.wake_up(); + } else { + net->dp.emit(); } - net->dp.emit(); } } return NL_SKIP; From 3e1c77d1588b8c72e6f2203f16af9f927dd7a3d0 Mon Sep 17 00:00:00 2001 From: RX14 Date: Fri, 17 May 2019 17:53:38 +0100 Subject: [PATCH 2/4] Add option to disable scroll wraparound on workspaces --- src/modules/sway/workspaces.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index a623b41..231b336 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -215,7 +215,7 @@ bool Workspaces::handleScroll(GdkEventScroll *e) { const std::string Workspaces::getCycleWorkspace(std::vector::iterator it, bool prev) const { - if (prev && it == workspaces_.begin()) { + if (prev && it == workspaces_.begin() && !config_["disable-scroll-wraparound"].asBool()) { return (*(--workspaces_.end()))["name"].asString(); } if (prev && it != workspaces_.begin()) @@ -223,7 +223,11 @@ const std::string Workspaces::getCycleWorkspace(std::vector::iterat else if (!prev && it != workspaces_.end()) ++it; if (!prev && it == workspaces_.end()) { - return (*(workspaces_.begin()))["name"].asString(); + if (config_["disable-scroll-wraparound"].asBool()) { + --it; + } else { + return (*(workspaces_.begin()))["name"].asString(); + } } return (*it)["name"].asString(); } From 4865a9ad6c89a8a3e0e5b478d7ea2a4ba5f3d42e Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 May 2019 13:57:35 +0200 Subject: [PATCH 3/4] fix(network): reset frequency --- include/modules/network.hpp | 2 +- src/modules/network.cpp | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 3afae57..77438a3 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -38,7 +38,7 @@ class Network : public ALabel { void parseSignal(struct nlattr**); void parseFreq(struct nlattr**); bool associatedOrJoined(struct nlattr**); - bool checkInterface(int if_index, std::string name); + bool checkInterface(struct ifinfomsg *rtif, std::string name); int getPreferredIface(); auto getInfo() -> void; bool wildcardMatch(const std::string& pattern, const std::string& text); diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 586cca2..1779596 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -25,6 +25,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf ifname_ = ifname; getInterfaceAddress(); } + dp.emit(); worker(); } @@ -131,7 +132,7 @@ void waybar::modules::Network::worker() { auto waybar::modules::Network::update() -> void { std::string connectiontype; - std::string tooltip_format = ""; + std::string tooltip_format; if (config_["tooltip-format"].isString()) { tooltip_format = config_["tooltip-format"].asString(); } @@ -198,7 +199,8 @@ auto waybar::modules::Network::update() -> void { fmt::arg("ipaddr", ipaddr_), fmt::arg("cidr", cidr_), fmt::arg("frequency", frequency_), - fmt::arg("icon", getIcon(signal_strength_, connectiontype))); + fmt::arg("icon", getIcon(signal_strength_, + connectiontype))); label_.set_tooltip_text(tooltip_text); } else { label_.set_tooltip_text(text); @@ -397,7 +399,7 @@ int waybar::modules::Network::netlinkResponse(void *resp, uint32_t resplen, uint return ret; } -bool waybar::modules::Network::checkInterface(int if_index, std::string name) { +bool waybar::modules::Network::checkInterface(struct ifinfomsg *rtif, std::string name) { if (config_["interface"].isString()) { return config_["interface"].asString() == name || wildcardMatch(config_["interface"].asString(), name); @@ -405,9 +407,9 @@ bool waybar::modules::Network::checkInterface(int if_index, std::string name) { auto external_iface = getExternalInterface(); if (external_iface == -1) { // Try with lastest working external iface - return last_ext_iface_ == if_index; + return last_ext_iface_ == rtif->ifi_index; } - return external_iface == if_index; + return external_iface == rtif->ifi_index; } int waybar::modules::Network::getPreferredIface() { @@ -456,7 +458,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { char ifname[IF_NAMESIZE]; if_indextoname(rtif->ifi_index, ifname); // Auto detected network can also be assigned here - if (net->checkInterface(rtif->ifi_index, ifname) && net->ifid_ == -1) { + if (net->ifid_ == -1 && net->checkInterface(rtif, ifname)) { net->linked_ = true; net->ifname_ = ifname; net->ifid_ = rtif->ifi_index; @@ -481,7 +483,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { char ifname[IF_NAMESIZE]; if_indextoname(rtif->ifi_index, ifname); // Check for valid interface - if (net->checkInterface(rtif->ifi_index, ifname) && rtif->ifi_flags & IFF_RUNNING) { + if (rtif->ifi_flags & IFF_RUNNING && net->checkInterface(rtif, ifname)) { net->linked_ = true; net->ifname_ = ifname; net->ifid_ = rtif->ifi_index; @@ -493,6 +495,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->essid_.clear(); net->signal_strength_dbm_ = 0; net->signal_strength_ = 0; + net->frequency_ = 0; // Check for a new interface and get info auto new_iface = net->getPreferredIface(); if (new_iface != -1) { From aa385e28b6c2c6e8e261b6b108f3635e86796b01 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 May 2019 15:32:40 +0200 Subject: [PATCH 4/4] refactor: execute update on idle --- src/bar.cpp | 13 ++++++++----- src/modules/network.cpp | 41 ++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/bar.cpp b/src/bar.cpp index dd7b880..09d7335 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -272,11 +272,14 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos) { modules_right_.emplace_back(module); } module->dp.connect([module, &name] { - try { - module->update(); - } catch (const std::exception& e) { - std::cerr << name.asString() + ": " + e.what() << std::endl; - } + // Fix https://github.com/Alexays/Waybar/issues/320, proper way? + Glib::signal_idle().connect_once([module, &name] { + try { + module->update(); + } catch (const std::exception& e) { + std::cerr << name.asString() + ": " + e.what() << std::endl; + } + }); }); } catch (const std::exception& e) { std::cerr << e.what() << std::endl; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 1779596..9c1dc84 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -42,8 +42,6 @@ waybar::modules::Network::~Network() { nl_socket_drop_membership(ev_sock_, RTNLGRP_LINK); nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV4_IFADDR); nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV6_IFADDR); - nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV4_ROUTE); - nl_socket_drop_membership(ev_sock_, RTNLGRP_IPV6_ROUTE); nl_close(ev_sock_); nl_socket_free(ev_sock_); } @@ -64,8 +62,6 @@ void waybar::modules::Network::createInfoSocket() { nl_socket_add_membership(ev_sock_, RTNLGRP_LINK); nl_socket_add_membership(ev_sock_, RTNLGRP_IPV4_IFADDR); nl_socket_add_membership(ev_sock_, RTNLGRP_IPV6_IFADDR); - nl_socket_add_membership(ev_sock_, RTNLGRP_IPV4_ROUTE); - nl_socket_add_membership(ev_sock_, RTNLGRP_IPV6_ROUTE); efd_ = epoll_create1(EPOLL_CLOEXEC); if (efd_ < 0) { throw std::runtime_error("Can't create epoll"); @@ -108,9 +104,12 @@ void waybar::modules::Network::createEventSocket() { void waybar::modules::Network::worker() { thread_timer_ = [this] { - if (ifid_ > 0) { - getInfo(); - dp.emit(); + { + std::lock_guard lock(mutex_); + if (ifid_ > 0) { + getInfo(); + dp.emit(); + } } thread_timer_.sleep_for(interval_); }; @@ -131,11 +130,9 @@ void waybar::modules::Network::worker() { } auto waybar::modules::Network::update() -> void { - std::string connectiontype; - std::string tooltip_format; - if (config_["tooltip-format"].isString()) { - tooltip_format = config_["tooltip-format"].asString(); - } + std::string connectiontype; + std::string tooltip_format; + std::lock_guard lock(mutex_); if (ifid_ <= 0 || !linked_) { if (config_["format-disconnected"].isString()) { default_format_ = config_["format-disconnected"].asString(); @@ -187,8 +184,13 @@ auto waybar::modules::Network::update() -> void { fmt::arg("cidr", cidr_), fmt::arg("frequency", frequency_), fmt::arg("icon", getIcon(signal_strength_, connectiontype))); - label_.set_markup(text); + if (text != label_.get_label()) { + label_.set_markup(text); + } if (tooltipEnabled()) { + if (tooltip_format.empty() && config_["tooltip-format"].isString()) { + tooltip_format = config_["tooltip-format"].asString(); + } if (!tooltip_format.empty()) { auto tooltip_text = fmt::format(tooltip_format, fmt::arg("essid", essid_), @@ -199,10 +201,11 @@ auto waybar::modules::Network::update() -> void { fmt::arg("ipaddr", ipaddr_), fmt::arg("cidr", cidr_), fmt::arg("frequency", frequency_), - fmt::arg("icon", getIcon(signal_strength_, - connectiontype))); - label_.set_tooltip_text(tooltip_text); - } else { + fmt::arg("icon", getIcon(signal_strength_, connectiontype))); + if (label_.get_tooltip_text() != text) { + label_.set_tooltip_text(tooltip_text); + } + } else if (label_.get_tooltip_text() != text) { label_.set_tooltip_text(text); } } @@ -464,7 +467,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->ifid_ = rtif->ifi_index; } // Check for valid interface - if (rtif->ifi_index == static_cast(net->ifid_)) { + if (rtif->ifi_index == net->ifid_) { // Get Iface and WIFI info net->getInterfaceAddress(); net->thread_timer_.wake_up(); @@ -472,7 +475,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { } else if (nh->nlmsg_type == RTM_DELADDR) { auto rtif = static_cast(NLMSG_DATA(nh)); // Check for valid interface - if (rtif->ifi_index == static_cast(net->ifid_)) { + if (rtif->ifi_index == net->ifid_) { net->ipaddr_.clear(); net->netmask_.clear(); net->cidr_ = 0;