From 6e7f22ac3ada6e27facee84fcbe2b3973eadbe1d Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 27 May 2020 09:10:38 +0200 Subject: [PATCH 001/355] fix: cancel thread and fix window close --- include/AModule.hpp | 6 +++-- include/bar.hpp | 2 +- include/modules/network.hpp | 2 -- include/util/rfkill.hpp | 4 +-- include/util/sleeper_thread.hpp | 5 ++++ src/AModule.cpp | 5 ++-- src/bar.cpp | 2 +- src/client.cpp | 3 ++- src/modules/mpd.cpp | 30 ++++++++++----------- src/modules/network.cpp | 47 --------------------------------- src/util/rfkill.cpp | 35 +++++++++++------------- 11 files changed, 47 insertions(+), 94 deletions(-) diff --git a/include/AModule.hpp b/include/AModule.hpp index f7cc484e..c9f1ae21 100644 --- a/include/AModule.hpp +++ b/include/AModule.hpp @@ -4,14 +4,15 @@ #include #include #include + #include "IModule.hpp" namespace waybar { class AModule : public IModule { public: - AModule(const Json::Value &, const std::string &, const std::string &, - bool enable_click = false, bool enable_scroll = false); + AModule(const Json::Value &, const std::string &, const std::string &, bool enable_click = false, + bool enable_scroll = false); virtual ~AModule(); virtual auto update() -> void; virtual operator Gtk::Widget &(); @@ -24,6 +25,7 @@ class AModule : public IModule { SCROLL_DIR getScrollDir(GdkEventScroll *e); bool tooltipEnabled(); + const std::string name_; const Json::Value &config_; Gtk::EventBox event_box_; diff --git a/include/bar.hpp b/include/bar.hpp index fb0cd592..63f0e221 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -34,10 +34,10 @@ class Bar { struct waybar_output *output; Json::Value config; - Gtk::Window window; struct wl_surface * surface; bool visible = true; bool vertical = false; + Gtk::Window window; private: static constexpr const char *MIN_HEIGHT_MSG = diff --git a/include/modules/network.hpp b/include/modules/network.hpp index edb5aa68..a0156fbc 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -52,8 +52,6 @@ class Network : public ALabel { struct sockaddr_nl nladdr_ = {0}; struct nl_sock* sock_ = nullptr; struct nl_sock* ev_sock_ = nullptr; - int efd_; - int ev_fd_; int nl80211_id_; std::mutex mutex_; diff --git a/include/util/rfkill.hpp b/include/util/rfkill.hpp index 5dbf3ced..ac3d406b 100644 --- a/include/util/rfkill.hpp +++ b/include/util/rfkill.hpp @@ -5,7 +5,7 @@ namespace waybar::util { class Rfkill { - public:; + public: Rfkill(enum rfkill_type rfkill_type); ~Rfkill() = default; void waitForEvent(); @@ -13,7 +13,7 @@ class Rfkill { private: enum rfkill_type rfkill_type_; - int state_ = 0; + int state_ = 0; }; } // namespace waybar::util diff --git a/include/util/sleeper_thread.hpp b/include/util/sleeper_thread.hpp index 642d47d4..9adbe8f7 100644 --- a/include/util/sleeper_thread.hpp +++ b/include/util/sleeper_thread.hpp @@ -59,6 +59,11 @@ class SleeperThread { do_run_ = false; } condvar_.notify_all(); + auto handle = thread_.native_handle(); + if (handle != 0) { + // TODO: find a proper way to terminate thread... + pthread_cancel(handle); + } } ~SleeperThread() { diff --git a/src/AModule.cpp b/src/AModule.cpp index 3066bfc1..10bd0775 100644 --- a/src/AModule.cpp +++ b/src/AModule.cpp @@ -6,7 +6,7 @@ namespace waybar { AModule::AModule(const Json::Value& config, const std::string& name, const std::string& id, bool enable_click, bool enable_scroll) - : config_(std::move(config)) { + : name_(std::move(name)), config_(std::move(config)) { // configure events' user commands if (config_["on-click"].isString() || config_["on-click-middle"].isString() || config_["on-click-backward"].isString() || config_["on-click-forward"].isString() || @@ -23,11 +23,12 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std:: AModule::~AModule() { for (const auto& pid : pid_) { if (pid != -1) { - kill(-pid, 9); + killpg(pid, SIGTERM); } } } + auto AModule::update() -> void { // Run user-provided update handler if configured if (config_["on-update"].isString()) { diff --git a/src/bar.cpp b/src/bar.cpp index 431a5642..b2e84da4 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -10,8 +10,8 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) : output(w_output), config(w_config), - window{Gtk::WindowType::WINDOW_TOPLEVEL}, surface(nullptr), + window{Gtk::WindowType::WINDOW_TOPLEVEL}, layer_surface_(nullptr), anchor_(ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP), left_(Gtk::ORIENTATION_HORIZONTAL, 0), diff --git a/src/client.cpp b/src/client.cpp index dee28a40..316e7ec6 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -145,7 +145,8 @@ void waybar::Client::handleMonitorRemoved(Glib::RefPtr monitor) { for (auto it = bars.begin(); it != bars.end();) { if ((*it)->output->monitor == monitor) { auto output_name = (*it)->output->name; - (*it)->window.close(); + (*it)->window.hide(); + gtk_app->remove_window((*it)->window); it = bars.erase(it); spdlog::info("Bar removed from output: {}", output_name); } else { diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp index af831239..19009cd3 100644 --- a/src/modules/mpd.cpp +++ b/src/modules/mpd.cpp @@ -63,22 +63,20 @@ auto waybar::modules::MPD::update() -> void { std::thread waybar::modules::MPD::event_listener() { return std::thread([this] { - while (true) { - try { - if (connection_ == nullptr) { - // Retry periodically if no connection - dp.emit(); - std::this_thread::sleep_for(interval_); - } else { - waitForEvent(); - dp.emit(); - } - } catch (const std::exception& e) { - if (strcmp(e.what(), "Connection to MPD closed") == 0) { - spdlog::debug("{}: {}", module_name_, e.what()); - } else { - spdlog::warn("{}: {}", module_name_, e.what()); - } + try { + if (connection_ == nullptr) { + // Retry periodically if no connection + dp.emit(); + std::this_thread::sleep_for(interval_); + } else { + waitForEvent(); + dp.emit(); + } + } catch (const std::exception& e) { + if (strcmp(e.what(), "Connection to MPD closed") == 0) { + spdlog::debug("{}: {}", module_name_, e.what()); + } else { + spdlog::warn("{}: {}", module_name_, e.what()); } } }); diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 0639d3e4..a288c6a0 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -81,8 +81,6 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf : ALabel(config, "network", id, "{ifname}", 60), ifid_(-1), family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET), - efd_(-1), - ev_fd_(-1), cidr_(-1), signal_strength_dbm_(0), signal_strength_(0), @@ -117,14 +115,6 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf } waybar::modules::Network::~Network() { - if (ev_fd_ > -1) { - eventfd_write(ev_fd_, 1); - std::this_thread::sleep_for(std::chrono::milliseconds(150)); - close(ev_fd_); - } - if (efd_ > -1) { - close(efd_); - } if (ev_sock_ != nullptr) { nl_socket_drop_membership(ev_sock_, RTNLGRP_LINK); if (family_ == AF_INET) { @@ -156,30 +146,6 @@ void waybar::modules::Network::createEventSocket() { } else { nl_socket_add_membership(ev_sock_, RTNLGRP_IPV6_IFADDR); } - efd_ = epoll_create1(EPOLL_CLOEXEC); - if (efd_ < 0) { - throw std::runtime_error("Can't create epoll"); - } - { - ev_fd_ = eventfd(0, EFD_NONBLOCK); - struct epoll_event event; - memset(&event, 0, sizeof(event)); - event.events = EPOLLIN | EPOLLET; - event.data.fd = ev_fd_; - if (epoll_ctl(efd_, EPOLL_CTL_ADD, ev_fd_, &event) == -1) { - throw std::runtime_error("Can't add epoll event"); - } - } - { - auto fd = nl_socket_get_fd(ev_sock_); - struct epoll_event event; - memset(&event, 0, sizeof(event)); - event.events = EPOLLIN | EPOLLET | EPOLLRDHUP; - event.data.fd = fd; - if (epoll_ctl(efd_, EPOLL_CTL_ADD, fd, &event) == -1) { - throw std::runtime_error("Can't add epoll event"); - } - } } void waybar::modules::Network::createInfoSocket() { @@ -218,19 +184,6 @@ void waybar::modules::Network::worker() { } } }; - thread_ = [this] { - std::array events{}; - - int ec = epoll_wait(efd_, events.data(), EPOLL_MAX, -1); - if (ec > 0) { - for (auto i = 0; i < ec; i++) { - if (events[i].data.fd != nl_socket_get_fd(ev_sock_) || nl_recvmsgs_default(ev_sock_) < 0) { - thread_.stop(); - break; - } - } - } - }; } const std::string waybar::modules::Network::getNetworkState() const { diff --git a/src/util/rfkill.cpp b/src/util/rfkill.cpp index df77598b..f987f4cc 100644 --- a/src/util/rfkill.cpp +++ b/src/util/rfkill.cpp @@ -3,11 +3,11 @@ * Copyright 2009 Johannes Berg * Copyright 2009 Marcel Holtmann * Copyright 2009 Tim Gardner - * + * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -17,24 +17,24 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include "util/rfkill.hpp" -#include -#include -#include -#include + #include +#include +#include #include +#include + #include +#include #include -waybar::util::Rfkill::Rfkill(const enum rfkill_type rfkill_type) - : rfkill_type_(rfkill_type) { -} +waybar::util::Rfkill::Rfkill(const enum rfkill_type rfkill_type) : rfkill_type_(rfkill_type) {} void waybar::util::Rfkill::waitForEvent() { struct rfkill_event event; - struct pollfd p; - ssize_t len; - int fd, n; + struct pollfd p; + ssize_t len; + int fd, n; fd = open("/dev/rfkill", O_RDONLY); if (fd < 0) { @@ -53,8 +53,7 @@ void waybar::util::Rfkill::waitForEvent() { break; } - if (n == 0) - continue; + if (n == 0) continue; len = read(fd, &event, sizeof(event)); if (len < 0) { @@ -67,17 +66,13 @@ void waybar::util::Rfkill::waitForEvent() { continue; } - if(event.type == rfkill_type_ && event.op == RFKILL_OP_CHANGE) { + if (event.type == rfkill_type_ && event.op == RFKILL_OP_CHANGE) { state_ = event.soft || event.hard; break; } } close(fd); - return; } - -bool waybar::util::Rfkill::getState() const { - return state_; -} +bool waybar::util::Rfkill::getState() const { return state_; } From e96a0bf7996cc78715ce08b3a23767b08fb1acf8 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 30 May 2020 11:59:22 +0200 Subject: [PATCH 002/355] refactor(custom): tooltip markup --- src/modules/custom.cpp | 4 ++-- src/modules/temperature.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp index 7ab7a066..56431609 100644 --- a/src/modules/custom.cpp +++ b/src/modules/custom.cpp @@ -129,9 +129,9 @@ auto waybar::modules::Custom::update() -> void { label_.set_markup(str); if (tooltipEnabled()) { if (text_ == tooltip_) { - label_.set_tooltip_text(str); + label_.set_tooltip_markup(str); } else { - label_.set_tooltip_text(tooltip_); + label_.set_tooltip_markup(tooltip_); } } auto classes = label_.get_style_context()->list_classes(); diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp index bf0bd1c1..dc6b2d78 100644 --- a/src/modules/temperature.cpp +++ b/src/modules/temperature.cpp @@ -6,7 +6,7 @@ waybar::modules::Temperature::Temperature(const std::string& id, const Json::Val if (config_["hwmon-path"].isString()) { file_path_ = config_["hwmon-path"].asString(); } else if (config_["hwmon-path-abs"].isString() && config_["input-filename"].isString()) { - file_path_ = (*std::filesystem::directory_iterator(config_["hwmon-path-abs"].asString())).path().u8string() + "/" + config_["input-filename"].asString(); + file_path_ = (*std::filesystem::directory_iterator(config_["hwmon-path-abs"].asString())).path().string() + "/" + config_["input-filename"].asString(); } else { auto zone = config_["thermal-zone"].isInt() ? config_["thermal-zone"].asInt() : 0; file_path_ = fmt::format("/sys/class/thermal/thermal_zone{}/temp", zone); From adaf84304865e143e4e83984aaea6f6a7c9d4d96 Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Sat, 30 May 2020 12:07:38 +0200 Subject: [PATCH 003/355] foreign-toplevel-manager based taskbar module (#692) Co-authored-by: Alex --- include/factory.hpp | 3 + include/modules/wlr/taskbar.hpp | 160 +++++ man/waybar-wlr-taskbar.5.scd | 104 +++ man/waybar.5.scd | 1 + meson.build | 6 + protocol/meson.build | 1 + ...oreign-toplevel-management-unstable-v1.xml | 259 +++++++ src/factory.cpp | 5 + src/modules/wlr/taskbar.cpp | 658 ++++++++++++++++++ 9 files changed, 1197 insertions(+) create mode 100644 include/modules/wlr/taskbar.hpp create mode 100644 man/waybar-wlr-taskbar.5.scd create mode 100644 protocol/wlr-foreign-toplevel-management-unstable-v1.xml create mode 100644 src/modules/wlr/taskbar.cpp diff --git a/include/factory.hpp b/include/factory.hpp index c698aa32..28273eb0 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -7,6 +7,9 @@ #include "modules/sway/window.hpp" #include "modules/sway/workspaces.hpp" #endif +#ifdef HAVE_WLR +#include "modules/wlr/taskbar.hpp" +#endif #if defined(__linux__) && !defined(NO_FILESYSTEM) #include "modules/battery.hpp" #endif diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp new file mode 100644 index 00000000..5bcb7ec4 --- /dev/null +++ b/include/modules/wlr/taskbar.hpp @@ -0,0 +1,160 @@ +#pragma once + +#include "AModule.hpp" +#include "bar.hpp" +#include "client.hpp" +#include "util/json.hpp" + +#include +#include +#include + +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include "wlr-foreign-toplevel-management-unstable-v1-client-protocol.h" + + +namespace waybar::modules::wlr { + +class Taskbar; + +class Task +{ + public: + Task(const waybar::Bar&, const Json::Value&, Taskbar*, + struct zwlr_foreign_toplevel_handle_v1 *, struct wl_seat*); + ~Task(); + + public: + enum State { + MAXIMIZED = (1 << 0), + MINIMIZED = (1 << 1), + ACTIVE = (1 << 2), + FULLSCREEN = (1 << 3), + INVALID = (1 << 4) + }; + + private: + static uint32_t global_id; + + private: + const waybar::Bar &bar_; + const Json::Value &config_; + Taskbar *tbar_; + struct zwlr_foreign_toplevel_handle_v1 *handle_; + struct wl_seat *seat_; + + uint32_t id_; + + Gtk::Button button_; + Gtk::Box content_; + Gtk::Image icon_; + Gtk::Label text_before_; + Gtk::Label text_after_; + bool button_visible_; + + bool with_icon_; + std::string format_before_; + std::string format_after_; + + std::string format_tooltip_; + + std::string title_; + std::string app_id_; + uint32_t state_; + + private: + std::string repr() const; + std::string state_string(bool = false) const; + + public: + /* Getter functions */ + uint32_t id() const { return id_; } + std::string title() const { return title_; } + std::string app_id() const { return app_id_; } + uint32_t state() const { return state_; } + bool maximized() const { return state_ & MAXIMIZED; } + bool minimized() const { return state_ & MINIMIZED; } + bool active() const { return state_ & ACTIVE; } + bool fullscreen() const { return state_ & FULLSCREEN; } + + public: + /* Callbacks for the wlr protocol */ + void handle_title(const char *); + void handle_app_id(const char *); + void handle_output_enter(struct wl_output *); + void handle_output_leave(struct wl_output *); + void handle_state(struct wl_array *); + void handle_done(); + void handle_closed(); + + /* Callbacks for Gtk events */ + bool handle_clicked(GdkEventButton *); + + public: + bool operator==(const Task&) const; + bool operator!=(const Task&) const; + + public: + void update(); + + public: + /* Interaction with the tasks */ + void maximize(bool); + void minimize(bool); + void activate(); + void fullscreen(bool); + void close(); +}; + +using TaskPtr = std::unique_ptr; + + +class Taskbar : public waybar::AModule +{ + public: + Taskbar(const std::string&, const waybar::Bar&, const Json::Value&); + ~Taskbar(); + void update(); + + private: + const waybar::Bar &bar_; + Gtk::Box box_; + std::vector tasks_; + + Glib::RefPtr icon_theme_; + + struct zwlr_foreign_toplevel_manager_v1 *manager_; + struct wl_seat *seat_; + + public: + /* Callbacks for global registration */ + void register_manager(struct wl_registry*, uint32_t name, uint32_t version); + void register_seat(struct wl_registry*, uint32_t name, uint32_t version); + + /* Callbacks for the wlr protocol */ + void handle_toplevel_create(struct zwlr_foreign_toplevel_handle_v1 *); + void handle_finished(); + + public: + void add_button(Gtk::Button &); + void move_button(Gtk::Button &, int); + void remove_button(Gtk::Button &); + void remove_task(uint32_t); + + bool show_output(struct wl_output *) const; + bool all_outputs() const; + + Glib::RefPtr icon_theme() const; +}; + +} /* namespace waybar::modules::wlr */ diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd new file mode 100644 index 00000000..cbce6e77 --- /dev/null +++ b/man/waybar-wlr-taskbar.5.scd @@ -0,0 +1,104 @@ +waybar-wlr-taskbar(5) + +# NAME + +wlroots - Taskbar module + +# DESCRIPTION + +The *taskbar* module displays the currently open applications. This module requires +a compositor that implements the foreign-toplevel-manager interface. + +# CONFIGURATION + +Addressed by *wlr/taskbar* + +*all-outputs*: ++ + typeof: bool ++ + default: false ++ + If set to false applications on the waybar's current output will be shown. Otherwise all applications are shown. + +*format*: ++ + typeof: string ++ + default: {icon} ++ + The format, how information should be displayed. + +*icon-theme*: ++ + typeof: string ++ + The name of the icon-theme that should be used. If omitted, the system default will be used. + +*icon-size*: ++ + typeof: integer ++ + default: 16 ++ + The size of the icon. + +*tooltip*: ++ + typeof: bool ++ + default: true ++ + If set to false no tooltip will be shown. + +*tooltip-format*: ++ + typeof: string ++ + default: {title} ++ + The format, how information in the tooltip should be displayed. + +*active-first*: ++ + typeof: bool ++ + default: false ++ + If set to true, always reorder the tasks in the taskbar so that the currently active one is first. Otherwise don't reorder. + +*on-click*: ++ + typeof: string ++ + The action which should be triggered when clicking on the application button with the left mouse button. + +*on-click-middle*: ++ + typeof: string ++ + The action which should be triggered when clicking on the application button with the middle mouse button. + +*on-click-right*: ++ + typeof: string ++ + The action which should be triggered when clicking on the application button with the right mouse button. + +*on-update*: ++ + typeof: string ++ + Command to execute when the module is updated. + +# FORMAT REPLACEMENTS + +*{icon}*: The icon of the application. + +*{title}*: The title of the application. + +*{app_id}*: The app_id (== application name) of the application. + +*{state}*: The state (minimized, maximized, active, fullscreen) of the application. + +*{short_state}*: The state (minimize == m, maximized == M, active == A, fullscreen == F) represented as one character of the application. + +# CLICK ACTIONS + +*activate*: Bring the application into foreground. +*minimize*: Minimize the application. +*maximize*: Maximize the application. +*fullscreen*: Set the application to fullscreen. +*close*: Close the application. + +# EXAMPLES + +``` +"wlr/taskbar": { + "format": "{icon}", + "tooltip-format": "{title}", + "on-click": "activate", + "on-middle-click": "close" +} +``` + +# Style + +- *#taskbar* +- *#taskbar button* +- *#taskbar button.maximized* +- *#taskbar button.minimized* +- *#taskbar button.active* +- *#taskbar button.fullscreen* diff --git a/man/waybar.5.scd b/man/waybar.5.scd index 1e8004f2..9ff18910 100644 --- a/man/waybar.5.scd +++ b/man/waybar.5.scd @@ -196,5 +196,6 @@ Valid options for the "rotate" property are: 0, 90, 180 and 270. - *waybar-sway-mode(5)* - *waybar-sway-window(5)* - *waybar-sway-workspaces(5)* +- *waybar-wlr-taskbar(5)* - *waybar-temperature(5)* - *waybar-tray(5)* diff --git a/meson.build b/meson.build index c16d7854..496fc3a8 100644 --- a/meson.build +++ b/meson.build @@ -165,6 +165,11 @@ if true # find_program('sway', required : false).found() ] endif +if true + add_project_arguments('-DHAVE_WLR', language: 'cpp') + src_files += 'src/modules/wlr/taskbar.cpp' +endif + if libnl.found() and libnlgen.found() add_project_arguments('-DHAVE_LIBNL', language: 'cpp') src_files += 'src/modules/network.cpp' @@ -260,6 +265,7 @@ if scdoc.found() 'waybar-temperature.5.scd', 'waybar-tray.5.scd', 'waybar-states.5.scd', + 'waybar-wlr-taskbar.5.scd', 'waybar-bluetooth.5.scd', ] diff --git a/protocol/meson.build b/protocol/meson.build index 0699a9d9..f4146aeb 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -26,6 +26,7 @@ client_protocols = [ [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'], + ['wlr-foreign-toplevel-management-unstable-v1.xml'], ] client_protos_src = [] diff --git a/protocol/wlr-foreign-toplevel-management-unstable-v1.xml b/protocol/wlr-foreign-toplevel-management-unstable-v1.xml new file mode 100644 index 00000000..a97738f8 --- /dev/null +++ b/protocol/wlr-foreign-toplevel-management-unstable-v1.xml @@ -0,0 +1,259 @@ + + + + Copyright © 2018 Ilia Bozhinov + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + the copyright holders not be used in advertising or publicity + pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + + + + + The purpose of this protocol is to enable the creation of taskbars + and docks by providing them with a list of opened applications and + letting them request certain actions on them, like maximizing, etc. + + After a client binds the zwlr_foreign_toplevel_manager_v1, each opened + toplevel window will be sent via the toplevel event + + + + + This event is emitted whenever a new toplevel window is created. It + is emitted for all toplevels, regardless of the app that has created + them. + + All initial details of the toplevel(title, app_id, states, etc.) will + be sent immediately after this event via the corresponding events in + zwlr_foreign_toplevel_handle_v1. + + + + + + + Indicates the client no longer wishes to receive events for new toplevels. + However the compositor may emit further toplevel_created events, until + the finished event is emitted. + + The client must not send any more requests after this one. + + + + + + This event indicates that the compositor is done sending events to the + zwlr_foreign_toplevel_manager_v1. The server will destroy the object + immediately after sending this request, so it will become invalid and + the client should free any resources associated with it. + + + + + + + A zwlr_foreign_toplevel_handle_v1 object represents an opened toplevel + window. Each app may have multiple opened toplevels. + + Each toplevel has a list of outputs it is visible on, conveyed to the + client with the output_enter and output_leave events. + + + + + This event is emitted whenever the title of the toplevel changes. + + + + + + + This event is emitted whenever the app-id of the toplevel changes. + + + + + + + This event is emitted whenever the toplevel becomes visible on + the given output. A toplevel may be visible on multiple outputs. + + + + + + + This event is emitted whenever the toplevel stops being visible on + the given output. It is guaranteed that an entered-output event + with the same output has been emitted before this event. + + + + + + + Requests that the toplevel be maximized. If the maximized state actually + changes, this will be indicated by the state event. + + + + + + Requests that the toplevel be unmaximized. If the maximized state actually + changes, this will be indicated by the state event. + + + + + + Requests that the toplevel be minimized. If the minimized state actually + changes, this will be indicated by the state event. + + + + + + Requests that the toplevel be unminimized. If the minimized state actually + changes, this will be indicated by the state event. + + + + + + Request that this toplevel be activated on the given seat. + There is no guarantee the toplevel will be actually activated. + + + + + + + The different states that a toplevel can have. These have the same meaning + as the states with the same names defined in xdg-toplevel + + + + + + + + + + + This event is emitted immediately after the zlw_foreign_toplevel_handle_v1 + is created and each time the toplevel state changes, either because of a + compositor action or because of a request in this protocol. + + + + + + + + This event is sent after all changes in the toplevel state have been + sent. + + This allows changes to the zwlr_foreign_toplevel_handle_v1 properties + to be seen as atomic, even if they happen via multiple events. + + + + + + Send a request to the toplevel to close itself. The compositor would + typically use a shell-specific method to carry out this request, for + example by sending the xdg_toplevel.close event. However, this gives + no guarantees the toplevel will actually be destroyed. If and when + this happens, the zwlr_foreign_toplevel_handle_v1.closed event will + be emitted. + + + + + + The rectangle of the surface specified in this request corresponds to + the place where the app using this protocol represents the given toplevel. + It can be used by the compositor as a hint for some operations, e.g + minimizing. The client is however not required to set this, in which + case the compositor is free to decide some default value. + + If the client specifies more than one rectangle, only the last one is + considered. + + The dimensions are given in surface-local coordinates. + Setting width=height=0 removes the already-set rectangle. + + + + + + + + + + + + + + + + This event means the toplevel has been destroyed. It is guaranteed there + won't be any more events for this zwlr_foreign_toplevel_handle_v1. The + toplevel itself becomes inert so any requests will be ignored except the + destroy request. + + + + + + Destroys the zwlr_foreign_toplevel_handle_v1 object. + + This request should be called either when the client does not want to + use the toplevel anymore or after the closed event to finalize the + destruction of the object. + + + + + + + + Requests that the toplevel be fullscreened on the given output. If the + fullscreen state and/or the outputs the toplevel is visible on actually + change, this will be indicated by the state and output_enter/leave + events. + + The output parameter is only a hint to the compositor. Also, if output + is NULL, the compositor should decide which output the toplevel will be + fullscreened on, if at all. + + + + + + + Requests that the toplevel be unfullscreened. If the fullscreen state + actually changes, this will be indicated by the state event. + + + + diff --git a/src/factory.cpp b/src/factory.cpp index 6005cad5..f09ea31a 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -22,6 +22,11 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { if (ref == "sway/window") { return new waybar::modules::sway::Window(id, bar_, config_[name]); } +#endif +#ifdef HAVE_WLR + if (ref == "wlr/taskbar") { + return new waybar::modules::wlr::Taskbar(id, bar_, config_[name]); + } #endif if (ref == "idle_inhibitor") { return new waybar::modules::IdleInhibitor(id, bar_, config_[name]); diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp new file mode 100644 index 00000000..845f07c4 --- /dev/null +++ b/src/modules/wlr/taskbar.cpp @@ -0,0 +1,658 @@ +#include "modules/wlr/taskbar.hpp" + +#include "glibmm/refptr.h" +#include "util/format.hpp" + +#include +#include +#include +#include +#include + +#include + +#include + +#include + +#include + + +namespace waybar::modules::wlr { + +/* Icon loading functions */ + +/* Method 1 - get the correct icon name from the desktop file */ +static std::string get_from_desktop_app_info(const std::string &app_id) +{ + Glib::RefPtr app_info; + + std::vector prefixes = { + "", + "/usr/share/applications/", + "/usr/share/applications/kde/", + "/usr/share/applications/org.kde.", + "/usr/local/share/applications/", + "/usr/local/share/applications/org.kde.", + }; + + std::string lower_app_id = app_id; + std::transform(std::begin(lower_app_id), std::end(lower_app_id), std::begin(lower_app_id), + [](unsigned char c) { return std::tolower(c); }); + + + std::vector app_id_variations = { + app_id, + lower_app_id + }; + + std::vector suffixes = { + "", + ".desktop" + }; + + for (auto& prefix : prefixes) + for (auto& id : app_id_variations) + for (auto& suffix : suffixes) + if (!app_info) + app_info = Gio::DesktopAppInfo::create_from_filename(prefix + id + suffix); + + if (app_info) + return app_info->get_icon()->to_string(); + + return ""; +} + +/* Method 2 - use the app_id and check whether there is an icon with this name in the icon theme */ +static std::string get_from_icon_theme(Glib::RefPtr icon_theme, + const std::string &app_id) { + + if (icon_theme->lookup_icon(app_id, 24)) + return app_id; + + return ""; +} + +static bool image_load_icon(Gtk::Image& image, Glib::RefPtr icon_theme, + const std::string &app_id_list, int size) +{ + std::string app_id; + std::istringstream stream(app_id_list); + bool found = false; + + + /* Wayfire sends a list of app-id's in space separated format, other compositors + * send a single app-id, but in any case this works fine */ + while (stream >> app_id) + { + std::string icon_name = get_from_desktop_app_info(app_id); + if (icon_name.empty()) + icon_name = get_from_icon_theme(icon_theme, app_id); + + if (icon_name.empty()) + continue; + + auto pixbuf = icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + if (pixbuf) { + image.set(pixbuf); + found = true; + break; + } + } + + return found; +} + +/* Task class implementation */ +uint32_t Task::global_id = 0; + +static void tl_handle_title(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle, + const char *title) +{ + return static_cast(data)->handle_title(title); +} + +static void tl_handle_app_id(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle, + const char *app_id) +{ + return static_cast(data)->handle_app_id(app_id); +} + +static void tl_handle_output_enter(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle, + struct wl_output *output) +{ + return static_cast(data)->handle_output_enter(output); +} + +static void tl_handle_output_leave(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle, + struct wl_output *output) +{ + return static_cast(data)->handle_output_leave(output); +} + +static void tl_handle_state(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle, + struct wl_array *state) +{ + return static_cast(data)->handle_state(state); +} + +static void tl_handle_done(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle) +{ + return static_cast(data)->handle_done(); +} + +static void tl_handle_closed(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle) +{ + return static_cast(data)->handle_closed(); +} + +static const struct zwlr_foreign_toplevel_handle_v1_listener toplevel_handle_impl = { + .title = tl_handle_title, + .app_id = tl_handle_app_id, + .output_enter = tl_handle_output_enter, + .output_leave = tl_handle_output_leave, + .state = tl_handle_state, + .done = tl_handle_done, + .closed = tl_handle_closed, +}; + +Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, + struct zwlr_foreign_toplevel_handle_v1 *tl_handle, struct wl_seat *seat) : + bar_{bar}, config_{config}, tbar_{tbar}, handle_{tl_handle}, seat_{seat}, + id_{global_id++}, + content_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0}, + button_visible_{false} +{ + zwlr_foreign_toplevel_handle_v1_add_listener(handle_, &toplevel_handle_impl, this); + + button_.set_relief(Gtk::RELIEF_NONE); + + content_.add(text_before_); + content_.add(icon_); + content_.add(text_after_); + + content_.show(); + button_.add(content_); + + with_icon_ = false; + format_before_.clear(); + format_after_.clear(); + + if (config_["format"].isString()) { + /* The user defined a format string, use it */ + auto format = config_["format"].asString(); + + auto icon_pos = format.find("{icon}"); + if (icon_pos == 0) { + with_icon_ = true; + format_after_ = format.substr(6); + } else if (icon_pos == std::string::npos) { + format_after_ = format; + } else { + with_icon_ = true; + format_before_ = format.substr(0, icon_pos); + format_after_ = format.substr(icon_pos + 6); + } + } else { + /* The default is to only show the icon */ + with_icon_ = true; + } + + /* Strip spaces at the beginning and end of the format strings */ + if (!format_before_.empty() && format_before_.back() == ' ') + format_before_.pop_back(); + if (!format_after_.empty() && format_after_.front() == ' ') + format_after_.erase(std::cbegin(format_after_)); + + format_tooltip_.clear(); + if (!config_["tooltip"].isBool() || config_["tooltip"].asBool()) { + if (config_["tooltip-format"].isString()) + format_tooltip_ = config_["tooltip-format"].asString(); + else + format_tooltip_ = "{title}"; + } + + /* Handle click events if configured */ + if (config_["on-click"].isString() || config_["on-click-middle"].isString() + || config_["on-click-left"].isString()) { + button_.add_events(Gdk::BUTTON_PRESS_MASK); + button_.signal_button_press_event().connect( + sigc::mem_fun(*this, &Task::handle_clicked), false); + } +} + +Task::~Task() +{ + if (handle_) { + zwlr_foreign_toplevel_handle_v1_destroy(handle_); + handle_ = nullptr; + } + if (button_visible_) { + tbar_->remove_button(button_); + button_visible_ = false; + } +} + +std::string Task::repr() const +{ + std::stringstream ss; + ss << "Task (" << id_ << ") " << title_ << " [" << app_id_ << "] <" + << (active() ? "A" : "a") + << (maximized() ? "M" : "m") + << (minimized() ? "I" : "i") + << (fullscreen() ? "F" : "f") + << ">"; + + return ss.str(); +} + +std::string Task::state_string(bool shortened) const +{ + std::stringstream ss; + if (shortened) + ss << (minimized() ? "m" : "") << (maximized() ? "M" : "") + << (active() ? "A" : "") << (fullscreen() ? "F" : ""); + else + ss << (minimized() ? "minimized " : "") << (maximized() ? "maximized " : "") + << (active() ? "active " : "") << (fullscreen() ? "fullscreen " : ""); + + std::string res = ss.str(); + if (shortened || res.empty()) + return res; + else + return res.substr(0, res.size() - 1); +} + +void Task::handle_title(const char *title) +{ + title_ = title; +} + +void Task::handle_app_id(const char *app_id) +{ + app_id_ = app_id; + if (!image_load_icon(icon_, tbar_->icon_theme(), app_id_, + config_["icon-size"].isInt() ? config_["icon-size"].asInt() : 16)) + spdlog::warn("Failed to load icon for {}", app_id); + + if (with_icon_) + icon_.show(); +} + +void Task::handle_output_enter(struct wl_output *output) +{ + spdlog::debug("{} entered output {}", repr(), (void*)output); + + if (!button_visible_ && (tbar_->all_outputs() || tbar_->show_output(output))) { + /* The task entered the output of the current bar make the button visible */ + tbar_->add_button(button_); + button_.show(); + button_visible_ = true; + spdlog::debug("{} now visible on {}", repr(), bar_.output->name); + } +} + +void Task::handle_output_leave(struct wl_output *output) +{ + spdlog::debug("{} left output {}", repr(), (void*)output); + + if (button_visible_ && !tbar_->all_outputs() && tbar_->show_output(output)) { + /* The task left the output of the current bar, make the button invisible */ + tbar_->remove_button(button_); + button_.hide(); + button_visible_ = false; + spdlog::debug("{} now invisible on {}", repr(), bar_.output->name); + } +} + +void Task::handle_state(struct wl_array *state) +{ + state_ = 0; + for (uint32_t* entry = static_cast(state->data); + entry < static_cast(state->data) + state->size; + entry++) { + if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_MAXIMIZED) + state_ |= MAXIMIZED; + if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_MINIMIZED) + state_ |= MINIMIZED; + if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_ACTIVATED) + state_ |= ACTIVE; + if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_FULLSCREEN) + state_ |= FULLSCREEN; + } +} + +void Task::handle_done() +{ + spdlog::debug("{} changed", repr()); + + if (state_ & MAXIMIZED) { + button_.get_style_context()->add_class("maximized"); + } else if (!(state_ & MAXIMIZED)) { + button_.get_style_context()->remove_class("maximized"); + } + + if (state_ & MINIMIZED) { + button_.get_style_context()->add_class("minimized"); + } else if (!(state_ & MINIMIZED)) { + button_.get_style_context()->remove_class("minimized"); + } + + if (state_ & ACTIVE) { + button_.get_style_context()->add_class("active"); + } else if (!(state_ & ACTIVE)) { + button_.get_style_context()->remove_class("active"); + } + + if (state_ & FULLSCREEN) { + button_.get_style_context()->add_class("fullscreen"); + } else if (!(state_ & FULLSCREEN)) { + button_.get_style_context()->remove_class("fullscreen"); + } + + if (config_["active-first"].isBool() && config_["active-first"].asBool() && active()) + tbar_->move_button(button_, 0); + + tbar_->dp.emit(); +} + +void Task::handle_closed() +{ + spdlog::debug("{} closed", repr()); + zwlr_foreign_toplevel_handle_v1_destroy(handle_); + handle_ = nullptr; + if (button_visible_) { + tbar_->remove_button(button_); + button_visible_ = false; + } + tbar_->remove_task(id_); +} + +bool Task::handle_clicked(GdkEventButton *bt) +{ + std::string action; + if (config_["on-click"].isString() && bt->button == 1) + action = config_["on-click"].asString(); + else if (config_["on-click-middle"].isString() && bt->button == 2) + action = config_["on-click-middle"].asString(); + else if (config_["on-click-right"].isString() && bt->button == 3) + action = config_["on-click-right"].asString(); + + if (action.empty()) + return true; + else if (action == "activate") + activate(); + else if (action == "minimize") + minimize(!minimized()); + else if (action == "maximize") + maximize(!maximized()); + else if (action == "fullscreen") + fullscreen(!fullscreen()); + else if (action == "close") + close(); + else + spdlog::warn("Unknown action {}", action); + + return true; +} + +bool Task::operator==(const Task &o) const +{ + return o.id_ == id_; +} + +bool Task::operator!=(const Task &o) const +{ + return o.id_ != id_; +} + +void Task::update() +{ + if (!format_before_.empty()) { + text_before_.set_label( + fmt::format(format_before_, + fmt::arg("title", title_), + fmt::arg("app_id", app_id_), + fmt::arg("state", state_string()), + fmt::arg("short_state", state_string(true)) + ) + ); + text_before_.show(); + } + if (!format_after_.empty()) { + text_after_.set_label( + fmt::format(format_before_, + fmt::arg("title", title_), + fmt::arg("app_id", app_id_), + fmt::arg("state", state_string()), + fmt::arg("short_state", state_string(true)) + ) + ); + text_after_.show(); + } + + if (!format_tooltip_.empty()) { + button_.set_tooltip_markup( + fmt::format(format_tooltip_, + fmt::arg("title", title_), + fmt::arg("app_id", app_id_), + fmt::arg("state", state_string()), + fmt::arg("short_state", state_string(true)) + ) + ); + } +} + +void Task::maximize(bool set) +{ + if (set) + zwlr_foreign_toplevel_handle_v1_set_maximized(handle_); + else + zwlr_foreign_toplevel_handle_v1_unset_maximized(handle_); +} + +void Task::minimize(bool set) +{ + if (set) + zwlr_foreign_toplevel_handle_v1_set_minimized(handle_); + else + zwlr_foreign_toplevel_handle_v1_unset_minimized(handle_); +} + +void Task::activate() +{ + zwlr_foreign_toplevel_handle_v1_activate(handle_, seat_); +} + +void Task::fullscreen(bool set) +{ + if (set) + zwlr_foreign_toplevel_handle_v1_set_fullscreen(handle_, nullptr); + else + zwlr_foreign_toplevel_handle_v1_unset_fullscreen(handle_); +} + +void Task::close() +{ + zwlr_foreign_toplevel_handle_v1_close(handle_); +} + + +/* Taskbar class implementation */ +static void handle_global(void *data, struct wl_registry *registry, uint32_t name, + const char *interface, uint32_t version) +{ + if (std::strcmp(interface, zwlr_foreign_toplevel_manager_v1_interface.name) == 0) { + static_cast(data)->register_manager(registry, name, version); + } else if (std::strcmp(interface, wl_seat_interface.name) == 0) { + static_cast(data)->register_seat(registry, name, version); + } +} + +static void handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) +{ + /* Nothing to do here */ +} + +static const wl_registry_listener registry_listener_impl = { + .global = handle_global, + .global_remove = handle_global_remove +}; + +Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Value &config) + : waybar::AModule(config, "taskbar", id, false, false), + bar_(bar), + box_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0}, + manager_{nullptr}, seat_{nullptr} +{ + box_.set_name("taskbar"); + if (!id.empty()) { + box_.get_style_context()->add_class(id); + } + event_box_.add(box_); + + struct wl_display *display = Client::inst()->wl_display; + struct wl_registry *registry = wl_display_get_registry(display); + + wl_registry_add_listener(registry, ®istry_listener_impl, this); + wl_display_roundtrip(display); + + if (!manager_) { + spdlog::error("Failed to register as toplevel manager"); + return; + } + if (!seat_) { + spdlog::error("Failed to get wayland seat"); + return; + } + + /* Get the configured icon theme if specified */ + if (config_["icon-theme"].isString()) { + icon_theme_ = Gtk::IconTheme::create(); + icon_theme_->set_custom_theme(config_["icon-theme"].asString()); + spdlog::debug("Use custom icon theme: {}.", config_["icon-theme"].asString()); + } else { + spdlog::debug("Use system default icon theme"); + icon_theme_ = Gtk::IconTheme::get_default(); + } +} + +Taskbar::~Taskbar() +{ + if (manager_) { + zwlr_foreign_toplevel_manager_v1_destroy(manager_); + manager_ = nullptr; + } +} + +void Taskbar::update() +{ + for (auto& t : tasks_) { + t->update(); + } + + AModule::update(); +} + +static void tm_handle_toplevel(void *data, struct zwlr_foreign_toplevel_manager_v1 *manager, + struct zwlr_foreign_toplevel_handle_v1 *tl_handle) +{ + return static_cast(data)->handle_toplevel_create(tl_handle); +} + +static void tm_handle_finished(void *data, struct zwlr_foreign_toplevel_manager_v1 *manager) +{ + return static_cast(data)->handle_finished(); +} + +static const struct zwlr_foreign_toplevel_manager_v1_listener toplevel_manager_impl = { + .toplevel = tm_handle_toplevel, + .finished = tm_handle_finished, +}; + +void Taskbar::register_manager(struct wl_registry *registry, uint32_t name, uint32_t version) +{ + if (manager_) { + spdlog::warn("Register foreign toplevel manager again although already existing!"); + return; + } + if (version != 2) { + spdlog::warn("Using different foreign toplevel manager protocol version: {}", version); + } + + manager_ = static_cast(wl_registry_bind(registry, name, + &zwlr_foreign_toplevel_manager_v1_interface, version)); + + if (manager_) + zwlr_foreign_toplevel_manager_v1_add_listener(manager_, &toplevel_manager_impl, this); + else + spdlog::debug("Failed to register manager"); +} + +void Taskbar::register_seat(struct wl_registry *registry, uint32_t name, uint32_t version) +{ + if (seat_) { + spdlog::warn("Register seat again although already existing!"); + return; + } + + seat_ = static_cast(wl_registry_bind(registry, name, &wl_seat_interface, version)); +} + +void Taskbar::handle_toplevel_create(struct zwlr_foreign_toplevel_handle_v1 *tl_handle) +{ + tasks_.push_back(std::make_unique(bar_, config_, this, tl_handle, seat_)); +} + +void Taskbar::handle_finished() +{ + zwlr_foreign_toplevel_manager_v1_destroy(manager_); + manager_ = nullptr; +} + +void Taskbar::add_button(Gtk::Button &bt) +{ + box_.pack_start(bt, false, false); +} + +void Taskbar::move_button(Gtk::Button &bt, int pos) +{ + box_.reorder_child(bt, pos); +} + +void Taskbar::remove_button(Gtk::Button &bt) +{ + box_.remove(bt); +} + +void Taskbar::remove_task(uint32_t id) +{ + auto it = std::find_if(std::begin(tasks_), std::end(tasks_), + [id](const TaskPtr &p) { return p->id() == id; }); + + if (it == std::end(tasks_)) { + spdlog::warn("Can't find task with id {}", id); + return; + } + + tasks_.erase(it); +} + +bool Taskbar::show_output(struct wl_output *output) const +{ + return output == gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); +} + +bool Taskbar::all_outputs() const +{ + static bool result = config_["all_outputs"].isBool() ? config_["all_outputs"].asBool() : false; + + return result; +} + +Glib::RefPtr Taskbar::icon_theme() const +{ + return icon_theme_; +} + +} /* namespace waybar::modules::wlr */ From 4b2e6b54a7fcfa5aae2bbc06f8683bbcf3855849 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 1 Jun 2020 13:29:41 +0200 Subject: [PATCH 004/355] Update FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a8c110bf..3a0ca111 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,4 @@ # These are supported funding model platforms +github: Alexays custom: https://paypal.me/ARouillard From a50c12b6aefb3650afabc43575f9408d766e7425 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Mon, 8 Jun 2020 11:01:06 +0800 Subject: [PATCH 005/355] Fix typos --- man/waybar-battery.5.scd | 2 +- man/waybar-network.5.scd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd index 75d41081..917a03d7 100644 --- a/man/waybar-battery.5.scd +++ b/man/waybar-battery.5.scd @@ -20,7 +20,7 @@ The *battery* module displays the current capacity and state (eg. charging) of y *full-at*: ++ typeof: integer ++ - Define the max percentage of the battery, usefull for an old battery, e.g. 96 + Define the max percentage of the battery, useful for an old battery, e.g. 96 *interval*: ++ typeof: integer ++ diff --git a/man/waybar-network.5.scd b/man/waybar-network.5.scd index aa6eb3f5..ab459ae0 100644 --- a/man/waybar-network.5.scd +++ b/man/waybar-network.5.scd @@ -33,7 +33,7 @@ Addressed by *network* *format-ethernet*: ++ typeof: string ++ - This format is used when a ethernet interface is displayed. + This format is used when an ethernet interface is displayed. *format-wifi*: ++ typeof: string ++ @@ -103,7 +103,7 @@ Addressed by *network* *tooltip-format-ethernet*: ++ typeof: string ++ - This format is used when a ethernet interface is displayed. + This format is used when an ethernet interface is displayed. *tooltip-format-wifi*: ++ typeof: string ++ From 0080feb9afaa0fa7d8e0009f570da62560eddb8b Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Sun, 7 Jun 2020 14:51:43 -0400 Subject: [PATCH 006/355] sway/workspaces: make clicking on workspaces idempotent Previously, clicking on the same workspace you were on would throw you to another workspace if `workspace_auto_back_and_forth yes` was specified in your sway config. This also fixes workspace output moving misbehaving and doing the same. --- include/modules/sway/workspaces.hpp | 2 ++ src/modules/sway/workspaces.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/modules/sway/workspaces.hpp b/include/modules/sway/workspaces.hpp index 5454b9e3..228c71c7 100644 --- a/include/modules/sway/workspaces.hpp +++ b/include/modules/sway/workspaces.hpp @@ -20,6 +20,8 @@ class Workspaces : public AModule, public sigc::trackable { auto update() -> void; private: + static inline const std::string workspace_switch_cmd_ = "workspace --no-auto-back-and-forth \"{}\""; + void onCmd(const struct Ipc::ipc_response&); void onEvent(const struct Ipc::ipc_response&); bool filterButtons(); diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index 60d9887a..5f7c3f61 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -219,12 +219,12 @@ Gtk::Button &Workspaces::addButton(const Json::Value &node) { if (node["target_output"].isString()) { ipc_.sendCmd( IPC_COMMAND, - fmt::format("workspace \"{}\"; move workspace to output \"{}\"; workspace \"{}\"", + fmt::format(workspace_switch_cmd_ + "; move workspace to output \"{}\"; " + workspace_switch_cmd_, node["name"].asString(), node["target_output"].asString(), node["name"].asString())); } else { - ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", node["name"].asString())); + ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, node["name"].asString())); } } catch (const std::exception &e) { spdlog::error("Workspaces: {}", e.what()); @@ -276,7 +276,7 @@ bool Workspaces::handleScroll(GdkEventScroll *e) { } } try { - ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name)); + ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, name)); } catch (const std::exception &e) { spdlog::error("Workspaces: {}", e.what()); } From 343a8bef225865c3f0ef04d3536a5ddb1840c927 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 6 Jun 2020 15:41:37 +0200 Subject: [PATCH 007/355] river/tags: add module --- include/factory.hpp | 3 + include/modules/river/tags.hpp | 31 +++++++ man/waybar-river-tags.5.scd | 38 +++++++++ meson.build | 6 ++ protocol/meson.build | 1 + protocol/river-status-unstable-v1.xml | 116 +++++++++++++++++++++++++ src/factory.cpp | 7 +- src/modules/river/tags.cpp | 118 ++++++++++++++++++++++++++ 8 files changed, 319 insertions(+), 1 deletion(-) create mode 100644 include/modules/river/tags.hpp create mode 100644 man/waybar-river-tags.5.scd create mode 100644 protocol/river-status-unstable-v1.xml create mode 100644 src/modules/river/tags.cpp diff --git a/include/factory.hpp b/include/factory.hpp index 28273eb0..fcbf3a2d 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -10,6 +10,9 @@ #ifdef HAVE_WLR #include "modules/wlr/taskbar.hpp" #endif +#ifdef HAVE_RIVER +#include "modules/river/tags.hpp" +#endif #if defined(__linux__) && !defined(NO_FILESYSTEM) #include "modules/battery.hpp" #endif diff --git a/include/modules/river/tags.hpp b/include/modules/river/tags.hpp new file mode 100644 index 00000000..f80b3c59 --- /dev/null +++ b/include/modules/river/tags.hpp @@ -0,0 +1,31 @@ +#pragma once + +#include +#include + +#include "AModule.hpp" +#include "bar.hpp" +#include "river-status-unstable-v1-client-protocol.h" +#include "xdg-output-unstable-v1-client-protocol.h" + +namespace waybar::modules::river { + +class Tags : public waybar::AModule { + public: + Tags(const std::string &, const waybar::Bar &, const Json::Value &); + ~Tags(); + + // Handlers for wayland events + void handle_focused_tags(uint32_t tags); + void handle_view_tags(struct wl_array *tags); + + struct zriver_status_manager_v1 *status_manager_; + + private: + const waybar::Bar & bar_; + Gtk::Box box_; + std::vector buttons_; + struct zriver_output_status_v1 *output_status_; +}; + +} /* namespace waybar::modules::river */ diff --git a/man/waybar-river-tags.5.scd b/man/waybar-river-tags.5.scd new file mode 100644 index 00000000..a02ddeb3 --- /dev/null +++ b/man/waybar-river-tags.5.scd @@ -0,0 +1,38 @@ +waybar-river-tags(5) + +# NAME + +waybar - river tags module + +# DESCRIPTION + +The *tags* module displays the current state of tags in river. + +# CONFIGURATION + +Addressed by *river/tags* + +*num-tags*: ++ + typeof: uint ++ + default: 9 ++ + The number of tags that should be displayed. + +# EXAMPLE + +``` +"river/tags": { + "num-tags": 5 +} +``` + +# STYLE + +- *#tags button* +- *#tags button.occupied* +- *#tags button.focused* + +Note that a tag can be both occupied and focused at the same time. + +# SEE ALSO + +waybar(5), river(1) diff --git a/meson.build b/meson.build index 496fc3a8..8d6dc168 100644 --- a/meson.build +++ b/meson.build @@ -170,6 +170,11 @@ if true src_files += 'src/modules/wlr/taskbar.cpp' endif +if true + add_project_arguments('-DHAVE_RIVER', language: 'cpp') + src_files += 'src/modules/river/tags.cpp' +endif + if libnl.found() and libnlgen.found() add_project_arguments('-DHAVE_LIBNL', language: 'cpp') src_files += 'src/modules/network.cpp' @@ -259,6 +264,7 @@ if scdoc.found() 'waybar-mpd.5.scd', 'waybar-network.5.scd', 'waybar-pulseaudio.5.scd', + 'waybar-river-tags.5.scd', 'waybar-sway-mode.5.scd', 'waybar-sway-window.5.scd', 'waybar-sway-workspaces.5.scd', diff --git a/protocol/meson.build b/protocol/meson.build index f4146aeb..07d524ae 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -27,6 +27,7 @@ client_protocols = [ [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'], ['wlr-foreign-toplevel-management-unstable-v1.xml'], + ['river-status-unstable-v1.xml'], ] client_protos_src = [] diff --git a/protocol/river-status-unstable-v1.xml b/protocol/river-status-unstable-v1.xml new file mode 100644 index 00000000..a4d6f4e5 --- /dev/null +++ b/protocol/river-status-unstable-v1.xml @@ -0,0 +1,116 @@ + + + + Copyright 2020 Isaac Freund + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + + + A global factory for objects that receive status information specific + to river. It could be used to implement, for example, a status bar. + + + + + This request indicates that the client will not use the + river_status_manager object any more. Objects that have been created + through this instance are not affected. + + + + + + This creates a new river_output_status object for the given wl_output. + + + + + + + + This creates a new river_seat_status object for the given wl_seat. + + + + + + + + + This interface allows clients to receive information about the current + windowing state of an output. + + + + + This request indicates that the client will not use the + river_output_status object any more. + + + + + + Sent once binding the interface and again whenever the tag focus of + the output changes. + + + + + + + Sent once on binding the interface and again whenever the tag state + of the output changes. + + + + + + + + This interface allows clients to receive information about the current + focus of a seat. + + + + + This request indicates that the client will not use the + river_seat_status object any more. + + + + + + Sent on binding the interface and again whenever an output gains focus. + + + + + + + Sent whenever an output loses focus. + + + + + + + Sent once on binding the interface and again whenever the focused + view or a property thereof changes. The title may be an empty string + if no view is focused or the focused view did not set a title. + + + + + diff --git a/src/factory.cpp b/src/factory.cpp index f09ea31a..5a01d523 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -25,7 +25,12 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { #endif #ifdef HAVE_WLR if (ref == "wlr/taskbar") { - return new waybar::modules::wlr::Taskbar(id, bar_, config_[name]); + return new waybar::modules::wlr::Taskbar(id, bar_, config_[name]); + } +#endif +#ifdef HAVE_RIVER + if (ref == "river/tags") { + return new waybar::modules::river::Tags(id, bar_, config_[name]); } #endif if (ref == "idle_inhibitor") { diff --git a/src/modules/river/tags.cpp b/src/modules/river/tags.cpp new file mode 100644 index 00000000..804ea090 --- /dev/null +++ b/src/modules/river/tags.cpp @@ -0,0 +1,118 @@ +#include +#include +#include +#include + +#include "client.hpp" +#include "modules/river/tags.hpp" +#include "river-status-unstable-v1-client-protocol.h" +#include "xdg-output-unstable-v1-client-protocol.h" + +namespace waybar::modules::river { + +static void listen_focused_tags(void *data, struct zriver_output_status_v1 *zriver_output_status_v1, + uint32_t tags) { + static_cast(data)->handle_focused_tags(tags); +} + +static void listen_view_tags(void *data, struct zriver_output_status_v1 *zriver_output_status_v1, + struct wl_array *tags) { + static_cast(data)->handle_view_tags(tags); +} + +static const zriver_output_status_v1_listener output_status_listener_impl{ + .focused_tags = listen_focused_tags, + .view_tags = listen_view_tags, +}; + +static void handle_global(void *data, struct wl_registry *registry, uint32_t name, + const char *interface, uint32_t version) { + if (std::strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { + static_cast(data)->status_manager_ = static_cast( + wl_registry_bind(registry, name, &zriver_status_manager_v1_interface, version)); + } +} + +static void handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) { + /* Ignore event */ +} + +static const wl_registry_listener registry_listener_impl = {.global = handle_global, + .global_remove = handle_global_remove}; + +Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &config) + : waybar::AModule(config, "tags", id, false, false), + status_manager_{nullptr}, + bar_(bar), + box_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0}, + output_status_{nullptr} { + struct wl_display * display = Client::inst()->wl_display; + struct wl_registry *registry = wl_display_get_registry(display); + wl_registry_add_listener(registry, ®istry_listener_impl, this); + wl_display_roundtrip(display); + + if (!status_manager_) { + spdlog::error("river_status_manager_v1 not advertised"); + return; + } + + box_.set_name("tags"); + if (!id.empty()) { + box_.get_style_context()->add_class(id); + } + event_box_.add(box_); + + // Default to 9 tags + const uint32_t num_tags = config["num-tags"].isUInt() ? config_["num-tags"].asUInt() : 9; + for (uint32_t tag = 1; tag <= num_tags; ++tag) { + Gtk::Button &button = buttons_.emplace_back(std::to_string(tag)); + button.set_relief(Gtk::RELIEF_NONE); + box_.pack_start(button, false, false, 0); + button.show(); + } + + struct wl_output *output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); + output_status_ = zriver_status_manager_v1_get_river_output_status(status_manager_, output); + zriver_output_status_v1_add_listener(output_status_, &output_status_listener_impl, this); + + zriver_status_manager_v1_destroy(status_manager_); +} + +Tags::~Tags() { + if (output_status_) { + zriver_output_status_v1_destroy(output_status_); + } +} + +void Tags::handle_focused_tags(uint32_t tags) { + uint32_t i = 0; + for (auto &button : buttons_) { + if ((1 << i) & tags) { + button.get_style_context()->add_class("focused"); + } else { + button.get_style_context()->remove_class("focused"); + } + ++i; + } +} + +void Tags::handle_view_tags(struct wl_array *view_tags) { + // First clear all occupied state + for (auto &button : buttons_) { + button.get_style_context()->remove_class("occupied"); + } + + // Set tags with a view to occupied + uint32_t *start = static_cast(view_tags->data); + for (uint32_t *tags = start; tags < start + view_tags->size / sizeof(uint32_t); ++tags) { + uint32_t i = 0; + for (auto &button : buttons_) { + if (*tags & (1 << i)) { + button.get_style_context()->add_class("occupied"); + } + ++i; + } + } +} + +} /* namespace waybar::modules::river */ From 401ea05dd830e7cf6ef52a03aa6b2dc53587891d Mon Sep 17 00:00:00 2001 From: Jannusch Bigge Date: Tue, 16 Jun 2020 12:30:21 +0200 Subject: [PATCH 008/355] add check that all batteries from type battery --- src/modules/battery.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 406b4a33..beb0554f 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -53,8 +53,13 @@ void waybar::modules::Battery::getBatteries() { auto bat_defined = config_["bat"].isString(); if (((bat_defined && dir_name == config_["bat"].asString()) || !bat_defined) && fs::exists(node.path() / "capacity") && fs::exists(node.path() / "uevent") && - fs::exists(node.path() / "status")) { - batteries_.push_back(node.path()); + fs::exists(node.path() / "status") && fs::exists(node.path() / "type")) { + std::string type; + std::ifstream(node.path() / "type") >> type; + + if (!type.compare("Battery")){ + batteries_.push_back(node.path()); + } } auto adap_defined = config_["adapter"].isString(); if (((adap_defined && dir_name == config_["adapter"].asString()) || !adap_defined) && From 7429d1f9cc394a20c8d027841a171dd537be5711 Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Wed, 24 Jun 2020 09:36:28 +0200 Subject: [PATCH 009/355] Fix click events for the taskbar module When only the option 'on-click-right' was set and no other 'on-click' option than the taskbar module wouldn't register for click events and hence those events were handled by the generic AModule::on-click code. This code would try to start a shell with the specified command, which wouldn't make any sense in this circumstances. The taskbar code falsely checked for the 'on-click-left' option instead for the 'on-click-right' when deciding to register for click events. --- src/modules/wlr/taskbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 845f07c4..361eddcf 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -214,7 +214,7 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, /* Handle click events if configured */ if (config_["on-click"].isString() || config_["on-click-middle"].isString() - || config_["on-click-left"].isString()) { + || config_["on-click-right"].isString()) { button_.add_events(Gdk::BUTTON_PRESS_MASK); button_.signal_button_press_event().connect( sigc::mem_fun(*this, &Task::handle_clicked), false); From b7a8e8e5443ffc95811db405a2c7c57d801fafc3 Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Wed, 24 Jun 2020 09:47:34 +0200 Subject: [PATCH 010/355] Fix format option for the taskbar module When using additional format options in addition to {icon} the format is separated into text before and text after the icon. Each of the texts is displayed in a separate label one before and one after the image for the icon. The code updating the labels on changes used the wrong format strings when updating the label after the icon. --- src/modules/wlr/taskbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 361eddcf..f5889702 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -187,7 +187,7 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, with_icon_ = true; format_after_ = format.substr(6); } else if (icon_pos == std::string::npos) { - format_after_ = format; + format_before_ = format; } else { with_icon_ = true; format_before_ = format.substr(0, icon_pos); @@ -421,7 +421,7 @@ void Task::update() } if (!format_after_.empty()) { text_after_.set_label( - fmt::format(format_before_, + fmt::format(format_after_, fmt::arg("title", title_), fmt::arg("app_id", app_id_), fmt::arg("state", state_string()), From 732ce7a27cbeb47fb3566768789c14d3123bb06c Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Wed, 24 Jun 2020 13:28:27 +0200 Subject: [PATCH 011/355] chore: always include sway module --- meson.build | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 8d6dc168..3647fbbe 100644 --- a/meson.build +++ b/meson.build @@ -155,15 +155,13 @@ elif is_dragonfly or is_freebsd or is_netbsd or is_openbsd ) endif -if true # find_program('sway', required : false).found() - add_project_arguments('-DHAVE_SWAY', language: 'cpp') - src_files += [ - 'src/modules/sway/ipc/client.cpp', - 'src/modules/sway/mode.cpp', - 'src/modules/sway/window.cpp', - 'src/modules/sway/workspaces.cpp' - ] -endif +add_project_arguments('-DHAVE_SWAY', language: 'cpp') +src_files += [ + 'src/modules/sway/ipc/client.cpp', + 'src/modules/sway/mode.cpp', + 'src/modules/sway/window.cpp', + 'src/modules/sway/workspaces.cpp' +] if true add_project_arguments('-DHAVE_WLR', language: 'cpp') From 5e044e5bba141c61f6a383032e31df3c7c2a1595 Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Wed, 24 Jun 2020 15:06:30 +0200 Subject: [PATCH 012/355] Remove date macro on version for reproducible builds cf https://reproducible-builds.org/ --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8d6dc168..addd0e06 100644 --- a/meson.build +++ b/meson.build @@ -36,7 +36,7 @@ else if meson.source_root() == git_path git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip() git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip() - version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch) + version = '"@0@ (branch \'@1@\')"'.format(git_commit_hash, git_branch) add_project_arguments('-DVERSION=@0@'.format(version), language: 'cpp') else add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp') From b6067c756998825bc9b40e6dd52ed862976abbd8 Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Thu, 25 Jun 2020 08:05:06 +0200 Subject: [PATCH 013/355] Fix and extend the wlr/taskbar example in the man page The example incorrectly used 'on-middle-click' as option although it should be 'on-click-middle'. Fix this and also add some other options. --- man/waybar-wlr-taskbar.5.scd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd index cbce6e77..68cf02a7 100644 --- a/man/waybar-wlr-taskbar.5.scd +++ b/man/waybar-wlr-taskbar.5.scd @@ -87,10 +87,12 @@ Addressed by *wlr/taskbar* ``` "wlr/taskbar": { - "format": "{icon}", + "format": "{icon}", + "icon-size": 14, + "icon-theme": "Numix-Circle", "tooltip-format": "{title}", "on-click": "activate", - "on-middle-click": "close" + "on-click-middle": "close" } ``` From 8e6cbc10219f5f73d7d7162d3f7f033ee307d658 Mon Sep 17 00:00:00 2001 From: dmitry Date: Wed, 1 Jul 2020 02:10:22 +0300 Subject: [PATCH 014/355] Change find icon priority and to_lower app_id --- src/modules/wlr/taskbar.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index f5889702..16762357 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -85,9 +85,9 @@ static bool image_load_icon(Gtk::Image& image, Glib::RefPtr icon * send a single app-id, but in any case this works fine */ while (stream >> app_id) { - std::string icon_name = get_from_desktop_app_info(app_id); + std::string icon_name = get_from_icon_theme(icon_theme, app_id); if (icon_name.empty()) - icon_name = get_from_icon_theme(icon_theme, app_id); + icon_name = get_from_desktop_app_info(app_id); if (icon_name.empty()) continue; @@ -271,7 +271,9 @@ void Task::handle_title(const char *title) void Task::handle_app_id(const char *app_id) { app_id_ = app_id; - if (!image_load_icon(icon_, tbar_->icon_theme(), app_id_, + std::transform(app_id_.begin(), app_id_.end(), app_id_.begin(), + [](char c){ return std::tolower(c); }); + if (!image_load_icon(icon_, tbar_->icon_theme(), app_id_, config_["icon-size"].isInt() ? config_["icon-size"].asInt() : 16)) spdlog::warn("Failed to load icon for {}", app_id); From 43500a9983a3341bf4309767f597da3c203a2b25 Mon Sep 17 00:00:00 2001 From: dmitry Date: Wed, 1 Jul 2020 02:56:44 +0300 Subject: [PATCH 015/355] Move lower to load_icon phase --- src/modules/wlr/taskbar.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 16762357..6dd24a73 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -77,6 +77,7 @@ static bool image_load_icon(Gtk::Image& image, Glib::RefPtr icon const std::string &app_id_list, int size) { std::string app_id; + std::string lower_app_id; std::istringstream stream(app_id_list); bool found = false; @@ -85,10 +86,18 @@ static bool image_load_icon(Gtk::Image& image, Glib::RefPtr icon * send a single app-id, but in any case this works fine */ while (stream >> app_id) { + std::transform(app_id.begin(), app_id.end(), lower_app_id.begin(), + [](char c){ return std::tolower(c); }); std::string icon_name = get_from_icon_theme(icon_theme, app_id); + if (icon_name.empty()) + icon_name = get_from_icon_theme(icon_theme, lower_app_id); + if (icon_name.empty()) icon_name = get_from_desktop_app_info(app_id); + if (icon_name.empty()) + icon_name = get_from_desktop_app_info(lower_app_id); + if (icon_name.empty()) continue; @@ -271,8 +280,6 @@ void Task::handle_title(const char *title) void Task::handle_app_id(const char *app_id) { app_id_ = app_id; - std::transform(app_id_.begin(), app_id_.end(), app_id_.begin(), - [](char c){ return std::tolower(c); }); if (!image_load_icon(icon_, tbar_->icon_theme(), app_id_, config_["icon-size"].isInt() ? config_["icon-size"].asInt() : 16)) spdlog::warn("Failed to load icon for {}", app_id); From 8a13ed59bc039cb689a48c22f10a9a06d5394636 Mon Sep 17 00:00:00 2001 From: dmitry Date: Wed, 1 Jul 2020 03:05:17 +0300 Subject: [PATCH 016/355] Fix lower --- src/modules/wlr/taskbar.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 6dd24a73..95a7a512 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -86,11 +86,13 @@ static bool image_load_icon(Gtk::Image& image, Glib::RefPtr icon * send a single app-id, but in any case this works fine */ while (stream >> app_id) { - std::transform(app_id.begin(), app_id.end(), lower_app_id.begin(), - [](char c){ return std::tolower(c); }); std::string icon_name = get_from_icon_theme(icon_theme, app_id); - if (icon_name.empty()) + if (icon_name.empty()) { + lower_app_id = app_id; + std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(), + [](char c){ return std::tolower(c); }); icon_name = get_from_icon_theme(icon_theme, lower_app_id); + } if (icon_name.empty()) icon_name = get_from_desktop_app_info(app_id); From 14bc842e7721cdfa27d275e575efd40f9c37383b Mon Sep 17 00:00:00 2001 From: excellentname Date: Fri, 3 Jul 2020 20:14:01 +1000 Subject: [PATCH 017/355] Fix mpd typo in man page --- man/waybar.5.scd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar.5.scd b/man/waybar.5.scd index 9ff18910..52671106 100644 --- a/man/waybar.5.scd +++ b/man/waybar.5.scd @@ -190,7 +190,7 @@ Valid options for the "rotate" property are: 0, 90, 180 and 270. - *waybar-custom(5)* - *waybar-idle-inhibitor(5)* - *waybar-memory(5)* -- *waybar-mdp(5)* +- *waybar-mpd(5)* - *waybar-network(5)* - *waybar-pulseaudio(5)* - *waybar-sway-mode(5)* From b7e8275d90192b38d4a753d54e39ec2cdfd6dabc Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Sun, 5 Jul 2020 13:04:57 +0200 Subject: [PATCH 018/355] Properly trim when splitting up the format string Previously only single spaces would be trimmed and not multiple ones. Now use a proper trim implementation for strings. --- src/modules/wlr/taskbar.cpp | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 95a7a512..520b4b91 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -20,6 +20,27 @@ namespace waybar::modules::wlr { +/* String manipulation methods */ +const std::string WHITESPACE = " \n\r\t\f\v"; + +static std::string ltrim(const std::string& s) +{ + size_t start = s.find_first_not_of(WHITESPACE); + return (start == std::string::npos) ? "" : s.substr(start); +} + +static std::string rtrim(const std::string& s) +{ + size_t end = s.find_last_not_of(WHITESPACE); + return (end == std::string::npos) ? "" : s.substr(0, end + 1); +} + +static std::string trim(const std::string& s) +{ + return rtrim(ltrim(s)); +} + + /* Icon loading functions */ /* Method 1 - get the correct icon name from the desktop file */ @@ -196,13 +217,13 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, auto icon_pos = format.find("{icon}"); if (icon_pos == 0) { with_icon_ = true; - format_after_ = format.substr(6); + format_after_ = trim(format.substr(6)); } else if (icon_pos == std::string::npos) { format_before_ = format; } else { with_icon_ = true; - format_before_ = format.substr(0, icon_pos); - format_after_ = format.substr(icon_pos + 6); + format_before_ = trim(format.substr(0, icon_pos)); + format_after_ = trim(format.substr(icon_pos + 6)); } } else { /* The default is to only show the icon */ @@ -210,11 +231,6 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, } /* Strip spaces at the beginning and end of the format strings */ - if (!format_before_.empty() && format_before_.back() == ' ') - format_before_.pop_back(); - if (!format_after_.empty() && format_after_.front() == ' ') - format_after_.erase(std::cbegin(format_after_)); - format_tooltip_.clear(); if (!config_["tooltip"].isBool() || config_["tooltip"].asBool()) { if (config_["tooltip-format"].isString()) From 06ad35c42b924952dc349469531e03c151d32a6b Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Sun, 5 Jul 2020 13:07:12 +0200 Subject: [PATCH 019/355] Add support for multiple icon themes in the config If there are multiple icon themes defined in the config option 'icon-theme' the module will try from left to right to find an icon. The system default will always be added to this list. --- include/modules/wlr/taskbar.hpp | 4 +-- man/waybar-wlr-taskbar.5.scd | 2 +- src/modules/wlr/taskbar.cpp | 45 ++++++++++++++++++++++++--------- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index 5bcb7ec4..53a2f8c7 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -131,7 +131,7 @@ class Taskbar : public waybar::AModule Gtk::Box box_; std::vector tasks_; - Glib::RefPtr icon_theme_; + std::vector> icon_themes_; struct zwlr_foreign_toplevel_manager_v1 *manager_; struct wl_seat *seat_; @@ -154,7 +154,7 @@ class Taskbar : public waybar::AModule bool show_output(struct wl_output *) const; bool all_outputs() const; - Glib::RefPtr icon_theme() const; + std::vector> icon_themes() const; }; } /* namespace waybar::modules::wlr */ diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd index 68cf02a7..24946e1a 100644 --- a/man/waybar-wlr-taskbar.5.scd +++ b/man/waybar-wlr-taskbar.5.scd @@ -25,7 +25,7 @@ Addressed by *wlr/taskbar* *icon-theme*: ++ typeof: string ++ - The name of the icon-theme that should be used. If omitted, the system default will be used. + The names of the icon-themes that should be used to find an icon. The list will be traversed from left to right. If omitted, the system default will be used. *icon-size*: ++ typeof: integer ++ diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 520b4b91..f669fa90 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -298,12 +298,23 @@ void Task::handle_title(const char *title) void Task::handle_app_id(const char *app_id) { app_id_ = app_id; - if (!image_load_icon(icon_, tbar_->icon_theme(), app_id_, - config_["icon-size"].isInt() ? config_["icon-size"].asInt() : 16)) - spdlog::warn("Failed to load icon for {}", app_id); - if (with_icon_) + if (!with_icon_) + return; + + int icon_size = config_["icon-size"].isInt() ? config_["icon-size"].asInt() : 16; + bool found = false; + for (auto& icon_theme : tbar_->icon_themes()) { + if (image_load_icon(icon_, icon_theme, app_id_, icon_size)) { + found = true; + break; + } + } + + if (found) icon_.show(); + else + spdlog::debug("Couldn't find icon for {}", app_id_); } void Task::handle_output_enter(struct wl_output *output) @@ -555,13 +566,23 @@ Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Valu /* Get the configured icon theme if specified */ if (config_["icon-theme"].isString()) { - icon_theme_ = Gtk::IconTheme::create(); - icon_theme_->set_custom_theme(config_["icon-theme"].asString()); - spdlog::debug("Use custom icon theme: {}.", config_["icon-theme"].asString()); - } else { - spdlog::debug("Use system default icon theme"); - icon_theme_ = Gtk::IconTheme::get_default(); + auto icon_theme_config = config_["icon-theme"].asString(); + size_t start = 0, end = 0; + + do { + end = icon_theme_config.find(',', start); + auto it_name = trim(icon_theme_config.substr(start, end-start)); + + auto it = Gtk::IconTheme::create(); + it->set_custom_theme(it_name); + spdlog::debug("Use custom icon theme: {}", it_name); + + icon_themes_.push_back(it); + + start = end == std::string::npos ? end : end + 1; + } while(end != std::string::npos); } + icon_themes_.push_back(Gtk::IconTheme::get_default()); } Taskbar::~Taskbar() @@ -677,9 +698,9 @@ bool Taskbar::all_outputs() const return result; } -Glib::RefPtr Taskbar::icon_theme() const +std::vector> Taskbar::icon_themes() const { - return icon_theme_; + return icon_themes_; } } /* namespace waybar::modules::wlr */ From 7d9f6096fec773b9808b345d8c29b535bc6a8028 Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Sun, 5 Jul 2020 13:10:23 +0200 Subject: [PATCH 020/355] Respect XDG_DATA_DIRS when looking for icons. Use the base folders as defined in $XDG_DATA_DIRS and only fall back to /usr/share and /usr/local/share if the environment variable does not exist. --- src/modules/wlr/taskbar.cpp | 50 +++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index f669fa90..8d28438d 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -42,19 +43,43 @@ static std::string trim(const std::string& s) /* Icon loading functions */ +static std::vector search_prefix() +{ + std::vector prefixes = {""}; + + auto xdg_data_dirs = std::getenv("XDG_DATA_DIRS"); + if (!xdg_data_dirs) { + prefixes.push_back("/usr/share/"); + prefixes.push_back("/usr/local/share/"); + } else { + std::string xdg_data_dirs_str(xdg_data_dirs); + size_t start = 0, end = 0; + + do { + end = xdg_data_dirs_str.find(':', start); + auto p = xdg_data_dirs_str.substr(start, end-start); + prefixes.push_back(trim(p) + "/"); + + start = end == std::string::npos ? end : end + 1; + } while(end != std::string::npos); + } + + for (auto& p : prefixes) + spdlog::debug("Using 'desktop' search path prefix: {}", p); + + return prefixes; +} /* Method 1 - get the correct icon name from the desktop file */ static std::string get_from_desktop_app_info(const std::string &app_id) { - Glib::RefPtr app_info; + static std::vector prefixes = search_prefix(); - std::vector prefixes = { + std::vector app_folders = { "", - "/usr/share/applications/", - "/usr/share/applications/kde/", - "/usr/share/applications/org.kde.", - "/usr/local/share/applications/", - "/usr/local/share/applications/org.kde.", + "applications/", + "applications/kde/", + "applications/org.kde." }; std::string lower_app_id = app_id; @@ -72,11 +97,14 @@ static std::string get_from_desktop_app_info(const std::string &app_id) ".desktop" }; + Glib::RefPtr app_info; + for (auto& prefix : prefixes) - for (auto& id : app_id_variations) - for (auto& suffix : suffixes) - if (!app_info) - app_info = Gio::DesktopAppInfo::create_from_filename(prefix + id + suffix); + for (auto& folder : app_folders) + for (auto& id : app_id_variations) + for (auto& suffix : suffixes) + if (!app_info) + app_info = Gio::DesktopAppInfo::create_from_filename(prefix + folder + id + suffix); if (app_info) return app_info->get_icon()->to_string(); From 70e368a1c665ec90b745e20e67a42e8c81eeefe6 Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Tue, 7 Jul 2020 10:39:28 +0200 Subject: [PATCH 021/355] Refactor the lower_app_id logic Move the lower_app_id lookup logic completely in the image_load_icon method and use it also when looking up the icon from the desktop files as well as icon themes. --- src/modules/wlr/taskbar.cpp | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 8d28438d..b440dfc4 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -82,16 +82,6 @@ static std::string get_from_desktop_app_info(const std::string &app_id) "applications/org.kde." }; - std::string lower_app_id = app_id; - std::transform(std::begin(lower_app_id), std::end(lower_app_id), std::begin(lower_app_id), - [](unsigned char c) { return std::tolower(c); }); - - - std::vector app_id_variations = { - app_id, - lower_app_id - }; - std::vector suffixes = { "", ".desktop" @@ -101,10 +91,9 @@ static std::string get_from_desktop_app_info(const std::string &app_id) for (auto& prefix : prefixes) for (auto& folder : app_folders) - for (auto& id : app_id_variations) - for (auto& suffix : suffixes) - if (!app_info) - app_info = Gio::DesktopAppInfo::create_from_filename(prefix + folder + id + suffix); + for (auto& suffix : suffixes) + if (!app_info) + app_info = Gio::DesktopAppInfo::create_from_filename(prefix + folder + app_id + suffix); if (app_info) return app_info->get_icon()->to_string(); @@ -126,26 +115,23 @@ static bool image_load_icon(Gtk::Image& image, Glib::RefPtr icon const std::string &app_id_list, int size) { std::string app_id; - std::string lower_app_id; std::istringstream stream(app_id_list); bool found = false; - /* Wayfire sends a list of app-id's in space separated format, other compositors * send a single app-id, but in any case this works fine */ while (stream >> app_id) { + auto lower_app_id = app_id; + std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(), + [](char c){ return std::tolower(c); }); + std::string icon_name = get_from_icon_theme(icon_theme, app_id); - if (icon_name.empty()) { - lower_app_id = app_id; - std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(), - [](char c){ return std::tolower(c); }); - icon_name = get_from_icon_theme(icon_theme, lower_app_id); - } + if (icon_name.empty()) + icon_name = get_from_icon_theme(icon_theme, lower_app_id); if (icon_name.empty()) icon_name = get_from_desktop_app_info(app_id); - if (icon_name.empty()) icon_name = get_from_desktop_app_info(lower_app_id); From bc112eaae114403e19145bf64e898c499772385c Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Tue, 7 Jul 2020 11:22:08 +0200 Subject: [PATCH 022/355] Convert icon-theme option to array|string Use the config support of using arrays in its options instead of the complicated and error-prone parsing of the string. --- man/waybar-wlr-taskbar.5.scd | 2 +- src/modules/wlr/taskbar.cpp | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd index 24946e1a..f0444122 100644 --- a/man/waybar-wlr-taskbar.5.scd +++ b/man/waybar-wlr-taskbar.5.scd @@ -24,7 +24,7 @@ Addressed by *wlr/taskbar* The format, how information should be displayed. *icon-theme*: ++ - typeof: string ++ + typeof: array|string ++ The names of the icon-themes that should be used to find an icon. The list will be traversed from left to right. If omitted, the system default will be used. *icon-size*: ++ diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index b440dfc4..23a91661 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -579,22 +579,24 @@ Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Valu } /* Get the configured icon theme if specified */ - if (config_["icon-theme"].isString()) { - auto icon_theme_config = config_["icon-theme"].asString(); - size_t start = 0, end = 0; - - do { - end = icon_theme_config.find(',', start); - auto it_name = trim(icon_theme_config.substr(start, end-start)); + if (config_["icon-theme"].isArray()) { + for (auto& c : config_["icon-theme"]) { + auto it_name = c.asString(); auto it = Gtk::IconTheme::create(); it->set_custom_theme(it_name); spdlog::debug("Use custom icon theme: {}", it_name); icon_themes_.push_back(it); + } + } else if (config_["icon-theme"].isString()) { + auto it_name = config_["icon-theme"].asString(); - start = end == std::string::npos ? end : end + 1; - } while(end != std::string::npos); + auto it = Gtk::IconTheme::create(); + it->set_custom_theme(it_name); + spdlog::debug("Use custom icon theme: {}", it_name); + + icon_themes_.push_back(it); } icon_themes_.push_back(Gtk::IconTheme::get_default()); } From 27f89bdcc32fe42effde28767e3cb33d5c6aaefb Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 Jul 2020 22:02:47 +0200 Subject: [PATCH 023/355] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 54c148f0..1fa086da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ jobs: env: before_install: - sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf - - sudo pkg install -y date gtk-layer-shell gtkmm30 jsoncpp libdbusmenu + - sudo pkg install -y gtk-layer-shell gtkmm30 jsoncpp libdbusmenu libfmt libmpdclient libudev-devd meson pulseaudio scdoc spdlog script: - meson build -Dman-pages=enabled From e3fdd6d94a3e3465bd05a032b69fdeeb89744f09 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 12 Jul 2020 11:57:47 +0200 Subject: [PATCH 024/355] fix: don't a warning for a width/height of 0 --- src/bar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bar.cpp b/src/bar.cpp index b2e84da4..3bbc2a35 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -121,7 +121,7 @@ void waybar::Bar::onConfigure(GdkEventConfigure* ev) { auto tmp_width = width_; if (ev->height > static_cast(height_)) { // Default minimal value - if (height_ != 1) { + if (height_ > 1) { spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); } if (config["height"].isUInt()) { @@ -132,7 +132,7 @@ void waybar::Bar::onConfigure(GdkEventConfigure* ev) { } if (ev->width > static_cast(width_)) { // Default minimal value - if (width_ != 1) { + if (width_ > 1) { spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); } if (config["width"].isUInt()) { From a1f6e386240ee751dc8ae52e6d7a1f1e84d25016 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 16 Jul 2020 17:03:39 +0000 Subject: [PATCH 025/355] CI: switch FreeBSD to /quarterly packages devel/libffi on /latest was recently updated to 3.3, breaking ABI. However, TravisCI has lang/python37 preinstalled likely from /quarterly. Instead of calling `pkg upgrade -y` or `pkg upgrade -y python37` switch to /quarterly until a newer dependency is required to justify /latest. $ meson build -Dman-pages=enabled [...] ImportError: Shared object "libffi.so.6" not found, required by "_ctypes.so" --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1fa086da..62f78633 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ jobs: compiler: clang env: before_install: - - sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf - sudo pkg install -y gtk-layer-shell gtkmm30 jsoncpp libdbusmenu libfmt libmpdclient libudev-devd meson pulseaudio scdoc spdlog script: From 759602af64e10948af9665813af05237e36ad845 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 Jul 2020 10:23:04 +0200 Subject: [PATCH 026/355] Update mpd.cpp --- src/modules/mpd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp index 19009cd3..957b3c76 100644 --- a/src/modules/mpd.cpp +++ b/src/modules/mpd.cpp @@ -352,7 +352,7 @@ bool waybar::modules::MPD::handlePlayPause(GdkEventButton* const& e) { } bool waybar::modules::MPD::stopped() { - return connection_ == nullptr || state_ == MPD_STATE_UNKNOWN || state_ == MPD_STATE_STOP; + return connection_ == nullptr || state_ == MPD_STATE_UNKNOWN || state_ == MPD_STATE_STOP || status_ == nullptr; } bool waybar::modules::MPD::playing() { return connection_ != nullptr && state_ == MPD_STATE_PLAY; } From 246f7bf555e17dcdb0f765aca3b852382b4075df Mon Sep 17 00:00:00 2001 From: excellentname Date: Tue, 21 Jul 2020 12:36:48 +1000 Subject: [PATCH 027/355] Handle SIGCHLD for exec/forkExec When forkExec is called it begins to ignore all SIGCHLD signals for the rest of the progam's execution so that they are automatically reaped. However, this means that subsequent waitpid calls in the exec function will always fail. So instead handle SIGCHLD by reaping any processes created by forkExec and ignoring all others so that they can be handled directly by the exec function. --- include/util/command.hpp | 12 ++++++++++-- src/main.cpp | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/include/util/command.hpp b/include/util/command.hpp index a72a8294..9db8d833 100644 --- a/include/util/command.hpp +++ b/include/util/command.hpp @@ -7,6 +7,9 @@ #include +extern sig_atomic_t is_inserting_pid; +extern std::list reap; + namespace waybar::util::command { struct res { @@ -32,10 +35,11 @@ inline std::string read(FILE* fp) { inline int close(FILE* fp, pid_t pid) { int stat = -1; + pid_t ret; fclose(fp); do { - waitpid(pid, &stat, WCONTINUED | WUNTRACED); + ret = waitpid(pid, &stat, WCONTINUED | WUNTRACED); if (WIFEXITED(stat)) { spdlog::debug("Cmd exited with code {}", WEXITSTATUS(stat)); @@ -45,6 +49,8 @@ inline int close(FILE* fp, pid_t pid) { spdlog::debug("Cmd stopped by {}", WSTOPSIG(stat)); } else if (WIFCONTINUED(stat)) { spdlog::debug("Cmd continued"); + } else if (ret == -1) { + spdlog::debug("waitpid failed: {}", strerror(errno)); } else { break; } @@ -111,7 +117,9 @@ inline int32_t forkExec(const std::string& cmd) { execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0); exit(0); } else { - signal(SIGCHLD, SIG_IGN); + is_inserting_pid = true; + reap.push_back(pid); + is_inserting_pid = false; } return pid; diff --git a/src/main.cpp b/src/main.cpp index f066cf85..5350ec09 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,32 @@ #include +#include +#include +#include #include #include "client.hpp" +sig_atomic_t is_inserting_pid = false; +std::list reap; + +static void handler(int sig) { + int saved_errno = errno; + if (!is_inserting_pid) { + for (auto it = reap.begin(); it != reap.end(); ++it) { + if (waitpid(*it, nullptr, WNOHANG) == *it) { + it = reap.erase(it); + } + } + } + errno = saved_errno; +} + +inline void installSigChldHandler(void) { + struct sigaction sa; + sigemptyset(&sa.sa_mask); + sa.sa_handler = handler; + sigaction(SIGCHLD, &sa, nullptr); +} + int main(int argc, char* argv[]) { try { auto client = waybar::Client::inst(); @@ -18,6 +43,7 @@ int main(int argc, char* argv[]) { } }); } + installSigChldHandler(); auto ret = client->main(argc, argv); delete client; From 15fe73a2520e1ca84fbf5fd783cfe0c4bfebe79c Mon Sep 17 00:00:00 2001 From: Michael Rodler Date: Wed, 22 Jul 2020 16:13:24 +0200 Subject: [PATCH 028/355] duplicate the logic to assign numbers to workspaces from sway into waybar to handle perisstent workspaces --- src/modules/sway/workspaces.cpp | 39 ++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index 5f7c3f61..fd2ad43d 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -1,9 +1,28 @@ #include "modules/sway/workspaces.hpp" +#include +#include #include + namespace waybar::modules::sway { +// this is the code that sway uses to assign a number to a workspace. This is +// taken quite verbatim from `sway/ipc-json.c`. +int sway_wsname_to_num(std::string name) { + if (isdigit(name[0])) { + errno = 0; + char * endptr = NULL; + long long parsed_num = strtoll(name.c_str(), &endptr, 10); + if (errno != 0 || parsed_num > INT32_MAX || parsed_num < 0 || endptr == name.c_str()) { + return -1; + } else { + return (int)parsed_num; + } + } + return -1; +} + Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value &config) : AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()), bar_(bar), @@ -102,13 +121,27 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) { // the "num" property (integer type): // The workspace number or -1 for workspaces that do // not start with a number. - auto l = lhs["num"].asInt(); - auto r = rhs["num"].asInt(); + //auto l = lhs["num"].asInt(); + //auto r = rhs["num"].asInt(); + + // We cannot rely on the "num" property as provided by sway + // via IPC, because persistent workspace might not exist in + // sway's view. However, we need this property also for + // not-yet created persistent workspace. As such, we simply + // duplicate sway's logic of assigning the "num" property + // into waybar (see sway_wsname_to_num). This way the + // sorting should work out even when we include workspaces + // that do not currently exist. + auto lname = lhs["name"].asString(); + auto rname = rhs["name"].asString(); + auto l = sway_wsname_to_num(lname); + auto r = sway_wsname_to_num(rname); + if (l == r) { // in case both integers are the same, lexicographical // sort. This also covers the case when both don't have a // number (i.e., l == r == -1). - return lhs["name"].asString() < rhs["name"].asString(); + return lname < rname; } // one of the workspaces doesn't begin with a number, so From c3359dec1b3a711f2912aab6c11009a8c46d2fe2 Mon Sep 17 00:00:00 2001 From: excellentname Date: Sat, 25 Jul 2020 21:02:59 +1000 Subject: [PATCH 029/355] Replace signal handler with signal handling thread --- include/util/command.hpp | 22 ++++++++++--- src/main.cpp | 70 +++++++++++++++++++++++++++++++--------- 2 files changed, 72 insertions(+), 20 deletions(-) diff --git a/include/util/command.hpp b/include/util/command.hpp index 9db8d833..52655581 100644 --- a/include/util/command.hpp +++ b/include/util/command.hpp @@ -7,7 +7,7 @@ #include -extern sig_atomic_t is_inserting_pid; +extern std::mutex reap_mtx; extern std::list reap; namespace waybar::util::command { @@ -71,6 +71,12 @@ inline FILE* open(const std::string& cmd, int& pid) { } if (!child_pid) { + int err; + sigset_t mask; + sigfillset(&mask); + // Reset sigmask + err = pthread_sigmask(SIG_UNBLOCK, &mask, nullptr); + if (err != 0) spdlog::error("pthread_sigmask in open failed: {}", strerror(err)); ::close(fd[0]); dup2(fd[1], 1); setpgid(child_pid, child_pid); @@ -103,7 +109,7 @@ inline struct res execNoRead(const std::string& cmd) { inline int32_t forkExec(const std::string& cmd) { if (cmd == "") return -1; - int32_t pid = fork(); + pid_t pid = fork(); if (pid < 0) { spdlog::error("Unable to exec cmd {}, error {}", cmd.c_str(), strerror(errno)); @@ -112,14 +118,20 @@ inline int32_t forkExec(const std::string& cmd) { // Child executes the command if (!pid) { + int err; + sigset_t mask; + sigfillset(&mask); + // Reset sigmask + err = pthread_sigmask(SIG_UNBLOCK, &mask, nullptr); + if (err != 0) spdlog::error("pthread_sigmask in forkExec failed: {}", strerror(err)); setpgid(pid, pid); - signal(SIGCHLD, SIG_DFL); execl("/bin/sh", "sh", "-c", cmd.c_str(), (char*)0); exit(0); } else { - is_inserting_pid = true; + reap_mtx.lock(); reap.push_back(pid); - is_inserting_pid = false; + reap_mtx.unlock(); + spdlog::debug("Added child to reap list: {}", pid); } return pid; diff --git a/src/main.cpp b/src/main.cpp index 5350ec09..19a8de1e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,30 +1,70 @@ #include #include +#include #include #include #include #include "client.hpp" -sig_atomic_t is_inserting_pid = false; +std::mutex reap_mtx; std::list reap; -static void handler(int sig) { - int saved_errno = errno; - if (!is_inserting_pid) { - for (auto it = reap.begin(); it != reap.end(); ++it) { - if (waitpid(*it, nullptr, WNOHANG) == *it) { - it = reap.erase(it); - } +void* signalThread(void* args) { + int err, signum; + sigset_t mask; + sigemptyset(&mask); + sigaddset(&mask, SIGCHLD); + + while (true) { + err = sigwait(&mask, &signum); + if (err != 0) { + spdlog::error("sigwait failed: {}", strerror(errno)); + continue; + } + + switch (signum) { + case SIGCHLD: + spdlog::debug("Received SIGCHLD in signalThread"); + if (!reap.empty()) { + reap_mtx.lock(); + for (auto it = reap.begin(); it != reap.end(); ++it) { + if (waitpid(*it, nullptr, WNOHANG) == *it) { + spdlog::debug("Reaped child with PID: {}", *it); + it = reap.erase(it); + } + } + reap_mtx.unlock(); + } + break; + default: + spdlog::debug("Received signal with number {}, but not handling", + signum); + break; } } - errno = saved_errno; } -inline void installSigChldHandler(void) { - struct sigaction sa; - sigemptyset(&sa.sa_mask); - sa.sa_handler = handler; - sigaction(SIGCHLD, &sa, nullptr); +void startSignalThread(void) { + int err; + sigset_t mask; + sigemptyset(&mask); + sigaddset(&mask, SIGCHLD); + + // Block SIGCHLD so it can be handled by the signal thread + // Any threads created by this one (the main thread) should not + // modify their signal mask to unblock SIGCHLD + err = pthread_sigmask(SIG_BLOCK, &mask, nullptr); + if (err != 0) { + spdlog::error("pthread_sigmask failed in startSignalThread: {}", strerror(err)); + exit(1); + } + + pthread_t thread_id; + err = pthread_create(&thread_id, nullptr, signalThread, nullptr); + if (err != 0) { + spdlog::error("pthread_create failed in startSignalThread: {}", strerror(err)); + exit(1); + } } int main(int argc, char* argv[]) { @@ -43,7 +83,7 @@ int main(int argc, char* argv[]) { } }); } - installSigChldHandler(); + startSignalThread(); auto ret = client->main(argc, argv); delete client; From 006850ea5e77419fb857a791d23040bc29d8b182 Mon Sep 17 00:00:00 2001 From: Michael Rodler Date: Mon, 27 Jul 2020 10:56:49 +0200 Subject: [PATCH 030/355] Changed helper function for workspace->num assignment to a static method of Workspaces class and adapted comments/method name to be consistent with the rest --- include/modules/sway/workspaces.hpp | 2 ++ src/modules/sway/workspaces.cpp | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/modules/sway/workspaces.hpp b/include/modules/sway/workspaces.hpp index 228c71c7..92ec0516 100644 --- a/include/modules/sway/workspaces.hpp +++ b/include/modules/sway/workspaces.hpp @@ -22,6 +22,8 @@ class Workspaces : public AModule, public sigc::trackable { private: static inline const std::string workspace_switch_cmd_ = "workspace --no-auto-back-and-forth \"{}\""; + static int convertWorkspaceNameToNum(std::string name); + void onCmd(const struct Ipc::ipc_response&); void onEvent(const struct Ipc::ipc_response&); bool filterButtons(); diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index fd2ad43d..fc6d5eb8 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -1,15 +1,15 @@ #include "modules/sway/workspaces.hpp" -#include -#include #include +#include +#include namespace waybar::modules::sway { -// this is the code that sway uses to assign a number to a workspace. This is -// taken quite verbatim from `sway/ipc-json.c`. -int sway_wsname_to_num(std::string name) { +// Helper function to to assign a number to a workspace, just like sway. In fact +// this is taken quite verbatim from `sway/ipc-json.c`. +int Workspaces::convertWorkspaceNameToNum(std::string name) { if (isdigit(name[0])) { errno = 0; char * endptr = NULL; @@ -121,21 +121,23 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) { // the "num" property (integer type): // The workspace number or -1 for workspaces that do // not start with a number. - //auto l = lhs["num"].asInt(); - //auto r = rhs["num"].asInt(); - + // We could rely on sway providing this property: + // + // auto l = lhs["num"].asInt(); + // auto r = rhs["num"].asInt(); + // // We cannot rely on the "num" property as provided by sway // via IPC, because persistent workspace might not exist in // sway's view. However, we need this property also for // not-yet created persistent workspace. As such, we simply // duplicate sway's logic of assigning the "num" property - // into waybar (see sway_wsname_to_num). This way the + // into waybar (see convertWorkspaceNameToNum). This way the // sorting should work out even when we include workspaces // that do not currently exist. auto lname = lhs["name"].asString(); auto rname = rhs["name"].asString(); - auto l = sway_wsname_to_num(lname); - auto r = sway_wsname_to_num(rname); + int l = convertWorkspaceNameToNum(lname); + int r = convertWorkspaceNameToNum(rname); if (l == r) { // in case both integers are the same, lexicographical From 17967da67623a31b388a4ef2fc76f3007e2c96ad Mon Sep 17 00:00:00 2001 From: Jonas Toth Date: Tue, 28 Jul 2020 20:04:28 +0200 Subject: [PATCH 031/355] Fix 'date' dependency in meson The 'date' library dependency was incompletly imported with meson. Only the target 'date::date' seemed to be caught by meson, but 'date::date-tz' not, which lead to build errors in gentoos sandbox environment. See this question, too: https://stackoverflow.com/questions/62951569/meson-doesnt-link-library Adding the modules in meson imports them all and the library builds nice. Note, that this did not happen with a standard checkout and local build on my system, but only when creating an ebuild for the package. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5d45a290..dd56c290 100644 --- a/meson.build +++ b/meson.build @@ -98,7 +98,7 @@ gtk_layer_shell = dependency('gtk-layer-shell-0', required: get_option('gtk-layer-shell'), fallback : ['gtk-layer-shell', 'gtk_layer_shell_dep']) systemd = dependency('systemd', required: get_option('systemd')) -tz_dep = dependency('date', default_options : [ 'use_system_tzdb=true' ], fallback: [ 'date', 'tz_dep' ]) +tz_dep = dependency('date', default_options : [ 'use_system_tzdb=true' ], modules : [ 'date::date', 'date::date-tz' ], fallback: [ 'date', 'tz_dep' ]) prefix = get_option('prefix') sysconfdir = get_option('sysconfdir') From fb8cda9d903d5a10153f8ece720a0fb7ad3efbd9 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Fri, 31 Jul 2020 08:15:16 +0200 Subject: [PATCH 032/355] network: make missing nl80211 non-fatal This will enable the networking module to be used for ethernet interfaces on kernels without nl80211 support. It should be reasonable to allow desktop systems without wireless interfaces to run custom kenrel configs without nl80211 compiled in. --- src/modules/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index a288c6a0..2c0562f4 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -158,7 +158,7 @@ void waybar::modules::Network::createInfoSocket() { } nl80211_id_ = genl_ctrl_resolve(sock_, "nl80211"); if (nl80211_id_ < 0) { - throw std::runtime_error("Can't resolve nl80211 interface"); + spdlog::warn("Can't resolve nl80211 interface"); } } From 74018167ffb135b9d7190e37a4c0dda8a0cbbb6a Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 4 Aug 2020 20:54:14 +0200 Subject: [PATCH 033/355] fix: add missing modules to list in waybar.5 --- man/waybar.5.scd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/man/waybar.5.scd b/man/waybar.5.scd index 52671106..cd64f7d5 100644 --- a/man/waybar.5.scd +++ b/man/waybar.5.scd @@ -185,14 +185,18 @@ Valid options for the "rotate" property are: 0, 90, 180 and 270. - *waybar-backlight(5)* - *waybar-battery(5)* +- *waybar-bluetooth(5)* - *waybar-clock(5)* - *waybar-cpu(5)* - *waybar-custom(5)* +- *waybar-disk(5)* - *waybar-idle-inhibitor(5)* - *waybar-memory(5)* - *waybar-mpd(5)* - *waybar-network(5)* - *waybar-pulseaudio(5)* +- *waybar-river-tags(5)* +- *waybar-states(5)* - *waybar-sway-mode(5)* - *waybar-sway-window(5)* - *waybar-sway-workspaces(5)* From 2b11b7ef8c9b66e9f00ec573fa3de3f14e724e0d Mon Sep 17 00:00:00 2001 From: dmitry Date: Wed, 5 Aug 2020 02:17:38 +0300 Subject: [PATCH 034/355] Base wlr impl (Manager, Group) --- include/factory.hpp | 1 + include/modules/wlr/workspaces.hpp | 82 ++++++++ meson.build | 1 + protocol/meson.build | 1 + protocol/wlr-workspace-unstable-v1.xml | 270 +++++++++++++++++++++++++ src/factory.cpp | 3 + src/modules/wlr/workspaces.cpp | 152 ++++++++++++++ 7 files changed, 510 insertions(+) create mode 100644 include/modules/wlr/workspaces.hpp create mode 100644 protocol/wlr-workspace-unstable-v1.xml create mode 100644 src/modules/wlr/workspaces.cpp diff --git a/include/factory.hpp b/include/factory.hpp index fcbf3a2d..db6fd875 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -9,6 +9,7 @@ #endif #ifdef HAVE_WLR #include "modules/wlr/taskbar.hpp" +#include "modules/wlr/workspaces.hpp" #endif #ifdef HAVE_RIVER #include "modules/river/tags.hpp" diff --git a/include/modules/wlr/workspaces.hpp b/include/modules/wlr/workspaces.hpp new file mode 100644 index 00000000..351ddc45 --- /dev/null +++ b/include/modules/wlr/workspaces.hpp @@ -0,0 +1,82 @@ +#pragma once + +#include +#include + +#include +#include + +#include "AModule.hpp" +#include "bar.hpp" +#include "wlr-workspace-unstable-v1-client-protocol.h" + +namespace waybar::modules::wlr { + +class WorkspaceManager; +class WorkspaceGroup; + +class Workspace { + public: + Workspace(const waybar::Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, + zwlr_workspace_handle_v1 &workspace); + ~Workspace() = default; + auto update() -> void; + + enum class State { ACTIVE = 1 << 1 }; + + private: + const Bar & bar_; + const Gtk::Box box_; + const Gtk::Image icon_; + const Json::Value & config_; + const WorkspaceGroup &workspace_group_; + + // wlr stuff + zwlr_workspace_handle_v1 &workspace_handle_; + uint32_t state_; +}; + +class WorkspaceGroup { + public: + WorkspaceGroup(const waybar::Bar &bar, const Json::Value &config, WorkspaceManager &manager, + zwlr_workspace_group_handle_v1 &workspace_group_handle); + auto update() -> void; + + // wlr stuff + auto handle_workspace_create(zwlr_workspace_handle_v1 &workspace_handle) -> void; + auto handle_remove() -> void; + auto handle_output_enter(wl_output &output) -> void; + auto handle_output_leave(wl_output &output) -> void; + + private: + const waybar::Bar & bar_; + const Json::Value & config_; + const WorkspaceManager & workspace_manager_; + std::vector> workspaces_; + + // wlr stuff + zwlr_workspace_group_handle_v1 &workspace_group_handle_; +}; + +class WorkspaceManager : public AModule { + public: + WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config); + auto update() -> void override; + + // wlr stuff + auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void; + auto handle_workspace_group_create(zwlr_workspace_group_handle_v1 *workspace_group_handle) + -> void; + auto handle_done() -> void; + auto handle_finished() -> void; + + private: + const waybar::Bar & bar_; + Gtk::Box box_; + std::vector> groups_; + + // wlr stuff + zwlr_workspace_manager_v1 *workspace_manager_ = nullptr; +}; + +} // namespace waybar::modules::wlr diff --git a/meson.build b/meson.build index dd56c290..d0ba1e81 100644 --- a/meson.build +++ b/meson.build @@ -166,6 +166,7 @@ src_files += [ if true add_project_arguments('-DHAVE_WLR', language: 'cpp') src_files += 'src/modules/wlr/taskbar.cpp' + src_files += 'src/modules/wlr/workspaces.cpp' endif if true diff --git a/protocol/meson.build b/protocol/meson.build index 07d524ae..467260bc 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -27,6 +27,7 @@ client_protocols = [ [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'], ['wlr-foreign-toplevel-management-unstable-v1.xml'], + ['wlr-workspace-unstable-v1.xml'], ['river-status-unstable-v1.xml'], ] diff --git a/protocol/wlr-workspace-unstable-v1.xml b/protocol/wlr-workspace-unstable-v1.xml new file mode 100644 index 00000000..ae0e44db --- /dev/null +++ b/protocol/wlr-workspace-unstable-v1.xml @@ -0,0 +1,270 @@ + + + + Copyright © 2019 Christopher Billington + Copyright © 2020 Ilia Bozhinov + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + the copyright holders not be used in advertising or publicity + pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + + + + + Workspaces, also called virtual desktops, are groups of surfaces. A + compositor with a concept of workspaces may only show some such groups of + surfaces (those of 'active' workspaces) at a time. 'Activating' a + workspace is a request for the compositor to display that workspace's + surfaces as normal, whereas the compositor may hide or otherwise + de-emphasise surfaces that are associated only with 'inactive' workspaces. + Workspaces are grouped by which sets of outputs they correspond to, and + may contain surfaces only from those outputs. In this way, it is possible + for each output to have its own set of workspaces, or for all outputs (or + any other arbitrary grouping) to share workspaces. Compositors may + optionally conceptually arrange each group of workspaces in an + N-dimensional grid. + + The purpose of this protocol is to enable the creation of taskbars and + docks by providing them with a list of workspaces and their properties, + and allowing them to activate and deactivate workspaces. + + After a client binds the zwlr_workspace_manager_v1, each workspace will be + sent via the workspace event. + + + + + This event is emitted whenever a new workspace group has been created. + + All initial details of the workspace group (workspaces, outputs) will be + sent immediately after this event via the corresponding events in + zwlr_workspace_group_handle_v1. + + + + + + + The client must send this request after it has finished sending other + requests. The compositor must process a series of requests preceding a + commit request atomically. + + This allows changes to the workspace properties to be seen as atomic, + even if they happen via multiple events, and even if they involve + multiple zwlr_workspace_handle_v1 objects, for example, deactivating one + workspace and activating another. + + + + + + This event is sent after all changes in all workspace groups have been + sent. + + This allows changes to one or more zwlr_workspace_group_handle_v1 + properties to be seen as atomic, even if they happen via multiple + events. In particular, an output moving from one workspace group to + another sends an output_enter event and an output_leave event to the two + zwlr_workspace_group_handle_v1 objects in question. The compositor sends + the done event only after updating the output information in both + workspace groups. + + + + + + This event indicates that the compositor is done sending events to the + zwlr_workspace_manager_v1. The server will destroy the object + immediately after sending this request, so it will become invalid and + the client should free any resources associated with it. + + + + + + Indicates the client no longer wishes to receive events for new + workspace groups. However the compositor may emit further workspace + events, until the finished event is emitted. + + The client must not send any more requests after this one. + + + + + + + A zwlr_workspace_group_handle_v1 object represents a a workspace group + that is assigned a set of outputs and contains a number of workspaces. + + The set of outputs assigned to the workspace group is conveyed to the client via + output_enter and output_leave events, and its workspaces are conveyed with + workspace events. + + + + + This event is emitted whenever an output is assigned to the workspace + group. + + + + + + + This event is emitted whenever an output is removed from the workspace + group. + + + + + + + This event is emitted whenever a new workspace has been created. + + All initial details of the workspace (name, coordinates, state) will + be sent immediately after this event via the corresponding events in + zwlr_workspace_handle_v1. + + + + + + + This event means the zwlr_workspace_group_handle_v1 has been destroyed. + It is guaranteed there won't be any more events for this + zwlr_workspace_group_handle_v1. The zwlr_workspace_group_handle_v1 becomes + inert so any requests will be ignored except the destroy request. + + The compositor must remove all workspaces belonging to a workspace group + before removing the workspace group. + + + + + + Destroys the zwlr_workspace_handle_v1 object. + + This request should be called either when the client does not want to + use the workspace object any more or after the remove event to finalize + the destruction of the object. + + + + + + + A zwlr_workspace_handle_v1 object represents a a workspace that handles a + group of surfaces. + + Each workspace has a name, conveyed to the client with the name event; a + list of states, conveyed to the client with the state event; and + optionally a set of coordinates, conveyed to the client with the + coordinates event. The client may request that the compositor activate or + deactivate the workspace. + + + + + This event is emitted immediately after the zwlr_workspace_handle_v1 is + created and whenever the name of the workspace changes. + + + + + + + This event is used to organize workspaces into an N-dimensional grid + within a workspace group, and if supported, is emitted immediately after + the zwlr_workspace_handle_v1 is created and whenever the coordinates of + the workspace change. Compositors may not send this event if they do not + conceptually arrange workspaces in this way. If compositors simply + number workspaces, without any geometric interpretation, they may send + 1D coordinates, which clients should not interpret as implying any + geometry. Sending an empty array means that the compositor no longer + orders the workspace geometrically. + + Coordinates have an arbitrary number of dimensions N with an uint32 + position along each dimension. By convention if N > 1, the first + dimension is X, the second Y, the third Z, and so on. The compositor may + chose to utilize these events for a more novel workspace layout + convention, however. No guarantee is made about the grid being filled or + bounded; there may be a workspace at coordinate 1 and another at + coordinate 1000 and none in between. Within a workspace group, however, + workspaces must have unique coordinates of equal dimensionality. + + + + + + + This event is emitted immediately after the zwlr_workspace_handle_v1 is + created and each time the workspace state changes, either because of a + compositor action or because of a request in this protocol. + + + + + + + The different states that a workspace can have. + + + + + + + + This event means the zwlr_workspace_handle_v1 has been destroyed. It is + guaranteed there won't be any more events for this + zwlr_workspace_handle_v1. The zwlr_workspace_handle_v1 becomes inert so + any requests will be ignored except the destroy request. + + + + + + Destroys the zwlr_workspace_handle_v1 object. + + This request should be called either when the client does not want to + use the workspace object any more or after the remove event to finalize + the destruction of the object. + + + + + + Request that this workspace be activated. + + There is no guarantee the workspace will be actually activated, and + behaviour may be compositor-dependent. For example, activating a + workspace may or may not deactivate all other workspaces in the same + group. + + + + + + Request that this workspace be deactivated. + + There is no guarantee the workspace will be actually deactivated. + + + + diff --git a/src/factory.cpp b/src/factory.cpp index 5a01d523..804378e2 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -27,6 +27,9 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { if (ref == "wlr/taskbar") { return new waybar::modules::wlr::Taskbar(id, bar_, config_[name]); } + if (ref == "wlr/workspaces") { + return new waybar::modules::wlr::WorkspaceManager(id, bar_, config_[name]); + } #endif #ifdef HAVE_RIVER if (ref == "river/tags") { diff --git a/src/modules/wlr/workspaces.cpp b/src/modules/wlr/workspaces.cpp new file mode 100644 index 00000000..0d9ae0b3 --- /dev/null +++ b/src/modules/wlr/workspaces.cpp @@ -0,0 +1,152 @@ +#include "modules/wlr/workspaces.hpp" + +#include +#include + +#include + +namespace waybar::modules::wlr { + +static void handle_global(void *data, wl_registry *registry, uint32_t name, + const char *interface, uint32_t version) { + if (std::strcmp(interface, zwlr_workspace_manager_v1_interface.name) == 0) { + static_cast(data)->register_manager(registry, name, version); + } +} + +static void handle_global_remove(void *data, wl_registry *registry, uint32_t name) { + /* Nothing to do here */ +} + +static const wl_registry_listener registry_listener_impl = {.global = handle_global, + .global_remove = handle_global_remove}; + +WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar, + const Json::Value &config) + : waybar::AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()), + bar_(bar), + box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) { + box_.set_name("workspaces"); + if (!id.empty()) { + box_.get_style_context()->add_class(id); + } + event_box_.add(box_); + + // wlr stuff + wl_display * display = Client::inst()->wl_display; + wl_registry *registry = wl_display_get_registry(display); + + wl_registry_add_listener(registry, ®istry_listener_impl, this); + wl_display_roundtrip(display); + + if (!workspace_manager_) { + return; + } +} + +static void workspace_manager_handle_workspace_group( + void *data, zwlr_workspace_manager_v1 *_, + zwlr_workspace_group_handle_v1 *workspace_group) { + static_cast(data)->handle_workspace_group_create(workspace_group); +} + +static void workspace_manager_handle_done(void *data, zwlr_workspace_manager_v1 *_) { + static_cast(data)->handle_done(); +} + +static void workspace_manager_handle_finished(void *data, zwlr_workspace_manager_v1 *_) { + static_cast(data)->handle_finished(); +} + +static const zwlr_workspace_manager_v1_listener workspace_manager_impl = { + .workspace_group = workspace_manager_handle_workspace_group, + .done = workspace_manager_handle_done, + .finished = workspace_manager_handle_finished, +}; + +auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, uint32_t version) + -> void { + if (workspace_manager_) { + spdlog::warn("Register workspace manager again although already registered!"); + return; + } + if (version != 1) { + spdlog::warn("Using different workspace manager protocol version: {}", version); + } + + workspace_manager_ = static_cast( + wl_registry_bind(registry, name, &zwlr_workspace_manager_v1_interface, version)); + + if (workspace_manager_) + zwlr_workspace_manager_v1_add_listener(workspace_manager_, &workspace_manager_impl, this); + else + spdlog::debug("Failed to register manager"); +} +auto WorkspaceManager::handle_workspace_group_create( + zwlr_workspace_group_handle_v1 *workspace_group_handle) -> void { + groups_.push_back(std::make_unique(bar_, config_, *this, *workspace_group_handle)); +} + +auto WorkspaceManager::handle_finished() -> void { + zwlr_workspace_manager_v1_destroy(workspace_manager_); + workspace_manager_ = nullptr; +} +auto WorkspaceManager::handle_done() -> void {} +auto WorkspaceManager::update() -> void { + for (auto &group : groups_) { + group->update(); + } + AModule::update(); +} + +static void workspace_group_handle_output_enter(void *data, + zwlr_workspace_group_handle_v1 *_, + wl_output *output) { + static_cast(data)->handle_output_enter(*output); +} + +static void workspace_group_handle_output_leave(void *data, + zwlr_workspace_group_handle_v1 *_, + wl_output *output) { + static_cast(data)->handle_output_leave(*output); +} + +static void workspace_group_handle_workspace(void *data, + zwlr_workspace_group_handle_v1 *_, + zwlr_workspace_handle_v1 *workspace) { + static_cast(data)->handle_workspace_create(*workspace); +} + +static void workspace_group_handle_remove(void *data, + zwlr_workspace_group_handle_v1 *_) { + static_cast(data)->handle_remove(); +} + +static const zwlr_workspace_group_handle_v1_listener workspace_group_impl = { + .output_enter = workspace_group_handle_output_enter, + .output_leave = workspace_group_handle_output_leave, + .workspace = workspace_group_handle_workspace, + .remove = workspace_group_handle_remove +}; + +WorkspaceGroup::WorkspaceGroup(const Bar & bar, const Json::Value &config, WorkspaceManager &manager, + zwlr_workspace_group_handle_v1 &workspace_group_handle) + : bar_(bar), config_(config), workspace_manager_(manager), workspace_group_handle_(workspace_group_handle) +{ + zwlr_workspace_group_handle_v1_add_listener(&workspace_group_handle, &workspace_group_impl, this); +} +auto WorkspaceGroup::handle_workspace_create(zwlr_workspace_handle_v1 &workspace) -> void { + workspaces_.push_back(std::make_unique(bar_, config_, *this, workspace)); +} +auto WorkspaceGroup::handle_remove() -> void {} +auto WorkspaceGroup::handle_output_enter(wl_output &output) -> void {} +auto WorkspaceGroup::handle_output_leave(wl_output &output) -> void {} +auto WorkspaceGroup::update() -> void { + +} +Workspace::Workspace(const Bar &bar, const Json::Value &config, + WorkspaceGroup &workspace_group, zwlr_workspace_handle_v1 &workspace) + : bar_(bar), config_(config), workspace_group_(workspace_group), workspace_handle_(workspace) +{ +} +} // namespace waybar::modules::wlr \ No newline at end of file From 40d3f1c1feee28d34390f99b36edb9da504ea4b1 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 5 Aug 2020 09:42:04 -0700 Subject: [PATCH 035/355] chore(subprojects): update date to 3.0.0 Fixes #776, fixes #780 --- subprojects/date.wrap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/subprojects/date.wrap b/subprojects/date.wrap index ea73f0fa..4d4067c9 100644 --- a/subprojects/date.wrap +++ b/subprojects/date.wrap @@ -1,9 +1,9 @@ [wrap-file] -source_url=https://github.com/HowardHinnant/date/archive/v2.4.1.tar.gz -source_filename=date-2.4.1.tar.gz -source_hash=98907d243397483bd7ad889bf6c66746db0d7d2a39cc9aacc041834c40b65b98 -directory=date-2.4.1 +source_url=https://github.com/HowardHinnant/date/archive/v3.0.0.tar.gz +source_filename=date-3.0.0.tar.gz +source_hash=87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3 +directory=date-3.0.0 -patch_url = https://github.com/mesonbuild/hinnant-date/releases/download/2.4.1-1/hinnant-date.zip -patch_filename = hinnant-date-2.4.1-1-wrap.zip -patch_hash = 2061673a6f8e6d63c3a40df4da58fa2b3de2835fd9b3e74649e8279599f3a8f6 +patch_url = https://github.com/mesonbuild/hinnant-date/releases/download/3.0.0-1/hinnant-date.zip +patch_filename = hinnant-date-3.0.0-1-wrap.zip +patch_hash = 6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe From 66aa3574d9c3a5696889f5b2f9718b7606472404 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 5 Aug 2020 09:44:58 -0700 Subject: [PATCH 036/355] chore(subprojects): update gtk-layer-shell to 0.2.0 Fixes: #530, fixes #750 --- subprojects/gtk-layer-shell.wrap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subprojects/gtk-layer-shell.wrap b/subprojects/gtk-layer-shell.wrap index b826ab9c..9db9df5d 100644 --- a/subprojects/gtk-layer-shell.wrap +++ b/subprojects/gtk-layer-shell.wrap @@ -1,5 +1,5 @@ [wrap-file] -directory = gtk-layer-shell-0.1.0 -source_filename = gtk-layer-shell-0.1.0.tar.gz -source_hash = f7569e27ae30b1a94c3ad6c955cf56240d6bc272b760d9d266ce2ccdb94a5cf0 -source_url = https://github.com/wmww/gtk-layer-shell/archive/v0.1.0/gtk-layer-shell-0.1.0.tar.gz +directory = gtk-layer-shell-0.2.0 +source_filename = gtk-layer-shell-0.2.0.tar.gz +source_hash = 6934376b5296d079fca2c1ba6b222ec91db6bf3667142340ee2bdebfb4b69116 +source_url = https://github.com/wmww/gtk-layer-shell/archive/v0.2.0/gtk-layer-shell-0.2.0.tar.gz From dcc0201b45efa2e6327ac65cfd63f7006a0d0f78 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 5 Aug 2020 09:39:16 -0700 Subject: [PATCH 037/355] chore(protocol): update wlr-layer-shell-unstable-v1 protocol. Statically linked gtk-layer-shell would use layer-shell protocol object file from waybar and print runtime warning if the version does not match --- protocol/wlr-layer-shell-unstable-v1.xml | 52 ++++++++++++++++++------ 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/protocol/wlr-layer-shell-unstable-v1.xml b/protocol/wlr-layer-shell-unstable-v1.xml index fb4f6b23..f9a4fe05 100644 --- a/protocol/wlr-layer-shell-unstable-v1.xml +++ b/protocol/wlr-layer-shell-unstable-v1.xml @@ -25,7 +25,7 @@ THIS SOFTWARE. - + Clients can use this interface to assign the surface_layer role to wl_surfaces. Such surfaces are assigned to a "layer" of the output and @@ -82,17 +82,27 @@ + + + + + + This request indicates that the client will not use the layer_shell + object any more. Objects that have been created through this instance + are not affected. + + - + An interface that may be implemented by a wl_surface, for surfaces that are designed to be rendered as a layer of a stacked desktop-like environment. - Layer surface state (size, anchor, exclusive zone, margin, interactivity) - is double-buffered, and will be applied at the time wl_surface.commit of - the corresponding wl_surface is called. + Layer surface state (layer, size, anchor, exclusive zone, + margin, interactivity) is double-buffered, and will be applied at the + time wl_surface.commit of the corresponding wl_surface is called. @@ -115,7 +125,7 @@ Requests that the compositor anchor the surface to the specified edges - and corners. If two orthoginal edges are specified (e.g. 'top' and + and corners. If two orthogonal edges are specified (e.g. 'top' and 'left'), then the anchor point will be the intersection of the edges (e.g. the top left corner of the output); otherwise the anchor point will be centered on that edge, or in the center if none is specified. @@ -127,20 +137,25 @@ - Requests that the compositor avoids occluding an area of the surface - with other surfaces. The compositor's use of this information is + Requests that the compositor avoids occluding an area with other + surfaces. The compositor's use of this information is implementation-dependent - do not assume that this region will not actually be occluded. - A positive value is only meaningful if the surface is anchored to an - edge, rather than a corner. The zone is the number of surface-local - coordinates from the edge that are considered exclusive. + A positive value is only meaningful if the surface is anchored to one + edge or an edge and both perpendicular edges. If the surface is not + anchored, anchored to only two perpendicular edges (a corner), anchored + to only two parallel edges or anchored to all edges, a positive value + will be treated the same as zero. + + A positive zone is the distance from the edge in surface-local + coordinates to consider exclusive. Surfaces that do not wish to have an exclusive zone may instead specify how they should interact with surfaces that do. If set to zero, the surface indicates that it would like to be moved to avoid occluding - surfaces with a positive excluzive zone. If set to -1, the surface - indicates that it would not like to be moved to accomodate for other + surfaces with a positive exclusive zone. If set to -1, the surface + indicates that it would not like to be moved to accommodate for other surfaces, and the compositor should extend it all the way to the edges it is anchored to. @@ -281,5 +296,16 @@ + + + + + + Change the layer that the surface is rendered on. + + Layer is double-buffered, see wl_surface.commit. + + + From edd4d8ee119f1ebeb51ecbac814784e8980e08ca Mon Sep 17 00:00:00 2001 From: dmitry Date: Wed, 5 Aug 2020 23:10:08 +0300 Subject: [PATCH 038/355] Finish implement wlr --- include/factory.hpp | 2 +- include/modules/wlr/workspace_manager.hpp | 109 +++++++++++ .../modules/wlr/workspace_manager_binding.hpp | 8 + include/modules/wlr/workspaces.hpp | 82 -------- meson.build | 3 +- src/modules/wlr/workspace_manager.cpp | 182 ++++++++++++++++++ src/modules/wlr/workspace_manager_binding.cpp | 134 +++++++++++++ src/modules/wlr/workspaces.cpp | 152 --------------- 8 files changed, 436 insertions(+), 236 deletions(-) create mode 100644 include/modules/wlr/workspace_manager.hpp create mode 100644 include/modules/wlr/workspace_manager_binding.hpp delete mode 100644 include/modules/wlr/workspaces.hpp create mode 100644 src/modules/wlr/workspace_manager.cpp create mode 100644 src/modules/wlr/workspace_manager_binding.cpp delete mode 100644 src/modules/wlr/workspaces.cpp diff --git a/include/factory.hpp b/include/factory.hpp index db6fd875..a34e3612 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -9,7 +9,7 @@ #endif #ifdef HAVE_WLR #include "modules/wlr/taskbar.hpp" -#include "modules/wlr/workspaces.hpp" +#include "modules/wlr/workspace_manager.hpp" #endif #ifdef HAVE_RIVER #include "modules/river/tags.hpp" diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp new file mode 100644 index 00000000..3c8fe99d --- /dev/null +++ b/include/modules/wlr/workspace_manager.hpp @@ -0,0 +1,109 @@ +#pragma once + +#include +#include + +#include +#include + +#include "AModule.hpp" +#include "bar.hpp" +#include "wlr-workspace-unstable-v1-client-protocol.h" + +namespace waybar::modules::wlr { + +class WorkspaceManager; +class WorkspaceGroup; + +class Workspace { + public: + Workspace(const waybar::Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, + zwlr_workspace_handle_v1 *workspace); + ~Workspace(); + auto update() -> void; + + auto id() const -> uint32_t { return id_; } + auto handle_name(const std::string &name) -> void { name_ = name; } + auto handle_coordinates(const std::vector &coordinates) -> void { + coordinates_ = coordinates; + } + auto handle_state(const std::vector &state) -> void; + auto handle_remove() -> void; + + enum class State { ACTIVE = 1 << 0 }; + + private: + static uint32_t workspace_global_id; + const Bar & bar_; + const Json::Value &config_; + WorkspaceGroup & workspace_group_; + + // wlr stuff + zwlr_workspace_handle_v1 *workspace_handle_; + uint32_t state_ = 0; + + uint32_t id_; + std::string name_; + std::vector coordinates_; + + const Gtk::Box box_; + const Gtk::Image icon_; +}; + +class WorkspaceGroup { + public: + WorkspaceGroup(const waybar::Bar &bar, const Json::Value &config, WorkspaceManager &manager, + zwlr_workspace_group_handle_v1 *workspace_group_handle); + ~WorkspaceGroup(); + auto update() -> void; + + auto id() const -> uint32_t { return id_; } + auto remove_workspace(uint32_t id_) -> void; + + // wlr stuff + auto handle_workspace_create(zwlr_workspace_handle_v1 *workspace_handle) -> void; + + auto handle_remove() -> void; + auto handle_output_enter(wl_output *output) -> void; + auto handle_output_leave() -> void; + + private: + static uint32_t group_global_id; + const waybar::Bar &bar_; + const Json::Value &config_; + WorkspaceManager & workspace_manager_; + + // wlr stuff + zwlr_workspace_group_handle_v1 *workspace_group_handle_; + wl_output * output_ = nullptr; + + uint32_t id_; + std::vector> workspaces_; +}; + +class WorkspaceManager : public AModule { + public: + WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config); + ~WorkspaceManager() override; + auto update() -> void override; + + auto remove_workspace_group(uint32_t id_) -> void; + + // wlr stuff + auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void; + auto handle_workspace_group_create(zwlr_workspace_group_handle_v1 *workspace_group_handle) + -> void; + + auto handle_done() -> void; + auto handle_finished() -> void; + + private: + const waybar::Bar & bar_; + Gtk::Box box_; + std::vector> groups_; + + // wlr stuff + zwlr_workspace_manager_v1 *workspace_manager_ = nullptr; +}; + +} // namespace waybar::modules::wlr diff --git a/include/modules/wlr/workspace_manager_binding.hpp b/include/modules/wlr/workspace_manager_binding.hpp new file mode 100644 index 00000000..1cef652f --- /dev/null +++ b/include/modules/wlr/workspace_manager_binding.hpp @@ -0,0 +1,8 @@ +#include "wlr-workspace-unstable-v1-client-protocol.h" + +namespace waybar::modules::wlr { + void add_registry_listener(void *data); + void add_workspace_listener(zwlr_workspace_handle_v1 *workspace_handle, void *data); + void add_workspace_group_listener(zwlr_workspace_group_handle_v1 *workspace_group_handle, void *data); + zwlr_workspace_manager_v1* workspace_manager_bind(wl_registry *registry, uint32_t name, uint32_t version, void *data); +} \ No newline at end of file diff --git a/include/modules/wlr/workspaces.hpp b/include/modules/wlr/workspaces.hpp deleted file mode 100644 index 351ddc45..00000000 --- a/include/modules/wlr/workspaces.hpp +++ /dev/null @@ -1,82 +0,0 @@ -#pragma once - -#include -#include - -#include -#include - -#include "AModule.hpp" -#include "bar.hpp" -#include "wlr-workspace-unstable-v1-client-protocol.h" - -namespace waybar::modules::wlr { - -class WorkspaceManager; -class WorkspaceGroup; - -class Workspace { - public: - Workspace(const waybar::Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, - zwlr_workspace_handle_v1 &workspace); - ~Workspace() = default; - auto update() -> void; - - enum class State { ACTIVE = 1 << 1 }; - - private: - const Bar & bar_; - const Gtk::Box box_; - const Gtk::Image icon_; - const Json::Value & config_; - const WorkspaceGroup &workspace_group_; - - // wlr stuff - zwlr_workspace_handle_v1 &workspace_handle_; - uint32_t state_; -}; - -class WorkspaceGroup { - public: - WorkspaceGroup(const waybar::Bar &bar, const Json::Value &config, WorkspaceManager &manager, - zwlr_workspace_group_handle_v1 &workspace_group_handle); - auto update() -> void; - - // wlr stuff - auto handle_workspace_create(zwlr_workspace_handle_v1 &workspace_handle) -> void; - auto handle_remove() -> void; - auto handle_output_enter(wl_output &output) -> void; - auto handle_output_leave(wl_output &output) -> void; - - private: - const waybar::Bar & bar_; - const Json::Value & config_; - const WorkspaceManager & workspace_manager_; - std::vector> workspaces_; - - // wlr stuff - zwlr_workspace_group_handle_v1 &workspace_group_handle_; -}; - -class WorkspaceManager : public AModule { - public: - WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config); - auto update() -> void override; - - // wlr stuff - auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void; - auto handle_workspace_group_create(zwlr_workspace_group_handle_v1 *workspace_group_handle) - -> void; - auto handle_done() -> void; - auto handle_finished() -> void; - - private: - const waybar::Bar & bar_; - Gtk::Box box_; - std::vector> groups_; - - // wlr stuff - zwlr_workspace_manager_v1 *workspace_manager_ = nullptr; -}; - -} // namespace waybar::modules::wlr diff --git a/meson.build b/meson.build index d0ba1e81..638a766d 100644 --- a/meson.build +++ b/meson.build @@ -166,7 +166,8 @@ src_files += [ if true add_project_arguments('-DHAVE_WLR', language: 'cpp') src_files += 'src/modules/wlr/taskbar.cpp' - src_files += 'src/modules/wlr/workspaces.cpp' + src_files += 'src/modules/wlr/workspace_manager.cpp' + src_files += 'src/modules/wlr/workspace_manager_binding.cpp' endif if true diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp new file mode 100644 index 00000000..04a31888 --- /dev/null +++ b/src/modules/wlr/workspace_manager.cpp @@ -0,0 +1,182 @@ +#include "modules/wlr/workspace_manager.hpp" + +#include +#include + +#include + +#include "modules/wlr/workspace_manager_binding.hpp" + +namespace waybar::modules::wlr { + +uint32_t Workspace::workspace_global_id = 0; +uint32_t WorkspaceGroup::group_global_id = 0; + +WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar, + const Json::Value &config) + : waybar::AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()), + bar_(bar), + box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) { + box_.set_name("workspaces"); + if (!id.empty()) { + box_.get_style_context()->add_class(id); + } + event_box_.add(box_); + + add_registry_listener(this); + if (!workspace_manager_) { + return; + } +} + +auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, uint32_t version) + -> void { + if (workspace_manager_) { + spdlog::warn("Register workspace manager again although already registered!"); + return; + } + if (version != 1) { + spdlog::warn("Using different workspace manager protocol version: {}", version); + } + workspace_manager_ = workspace_manager_bind(registry, name, version, this); +} + +auto WorkspaceManager::handle_workspace_group_create( + zwlr_workspace_group_handle_v1 *workspace_group_handle) -> void { + groups_.push_back(std::make_unique(bar_, config_, *this, workspace_group_handle)); + spdlog::debug("Workspace group {} created", groups_.back()->id()); +} + +auto WorkspaceManager::handle_finished() -> void { + zwlr_workspace_manager_v1_destroy(workspace_manager_); + workspace_manager_ = nullptr; +} + +auto WorkspaceManager::handle_done() -> void { +} + +auto WorkspaceManager::update() -> void { + for (auto &group : groups_) { + group->update(); + } + AModule::update(); +} + +WorkspaceManager::~WorkspaceManager() { + if (!workspace_manager_) { + return; + } + + zwlr_workspace_manager_v1_destroy(workspace_manager_); + workspace_manager_ = nullptr; +} +auto WorkspaceManager::remove_workspace_group(uint32_t id) -> void { + auto it = std::find_if(groups_.begin(), + groups_.end(), + [id](const std::unique_ptr &g) { return g->id() == id; }); + + if (it == groups_.end()) { + spdlog::warn("Can't find group with id {}", id); + return; + } + + groups_.erase(it); +} + +WorkspaceGroup::WorkspaceGroup(const Bar &bar, const Json::Value &config, WorkspaceManager &manager, + zwlr_workspace_group_handle_v1 *workspace_group_handle) + : bar_(bar), + config_(config), + workspace_manager_(manager), + workspace_group_handle_(workspace_group_handle), + id_(++group_global_id) { + add_workspace_group_listener(workspace_group_handle, this); +} + +WorkspaceGroup::~WorkspaceGroup()->void { + if (!workspace_group_handle_) { + return; + } + + zwlr_workspace_group_handle_v1_destroy(workspace_group_handle_); + workspace_group_handle_ = nullptr; +} + +auto WorkspaceGroup::handle_workspace_create(zwlr_workspace_handle_v1 *workspace) -> void { + workspaces_.push_back(std::make_unique(bar_, config_, *this, workspace)); + spdlog::debug("Workspace {} created", workspaces_.back()->id()); +} + +auto WorkspaceGroup::handle_remove() -> void { + zwlr_workspace_group_handle_v1_destroy(workspace_group_handle_); + workspace_group_handle_ = nullptr; + workspace_manager_.remove_workspace_group(id_); +} + +auto WorkspaceGroup::handle_output_enter(wl_output *output) -> void { + spdlog::debug("Output {} assigned to {} group", (void *)output, id_); + output_ = output; +} + +auto WorkspaceGroup::handle_output_leave() -> void { + spdlog::debug("Output {} remove from {} group", (void *)output_, id_); + output_ = nullptr; +} + +auto WorkspaceGroup::update() -> void { + for (auto &workspace : workspaces_) { + workspace->update(); + } +} + +auto WorkspaceGroup::remove_workspace(uint32_t id) -> void { + auto it = std::find_if(workspaces_.begin(), + workspaces_.end(), + [id](const std::unique_ptr &w) { return w->id() == id; }); + + if (it == workspaces_.end()) { + spdlog::warn("Can't find group with id {}", id); + return; + } + + workspaces_.erase(it); +} + +Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, + zwlr_workspace_handle_v1 *workspace) + : bar_(bar), + config_(config), + workspace_group_(workspace_group), + workspace_handle_(workspace), + id_(++workspace_global_id) { + add_workspace_listener(workspace, this); +} + +Workspace::~Workspace() { + if (!workspace_handle_) { + return; + } + + zwlr_workspace_handle_v1_destroy(workspace_handle_); + workspace_handle_ = nullptr; +} + +auto Workspace::update() -> void {} + +auto Workspace::handle_state(const std::vector &state) -> void { + state_ = 0; + for (auto state_entry : state) { + switch (state_entry) { + case ZWLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE: + state_ |= (uint32_t)State::ACTIVE; + break; + } + } +} + +auto Workspace::handle_remove() -> void { + zwlr_workspace_handle_v1_destroy(workspace_handle_); + workspace_handle_ = nullptr; + workspace_group_.remove_workspace(id_); +} +} // namespace waybar::modules::wlr \ No newline at end of file diff --git a/src/modules/wlr/workspace_manager_binding.cpp b/src/modules/wlr/workspace_manager_binding.cpp new file mode 100644 index 00000000..f6db711b --- /dev/null +++ b/src/modules/wlr/workspace_manager_binding.cpp @@ -0,0 +1,134 @@ +#include "modules/wlr/workspace_manager_binding.hpp" + +#include + +#include "client.hpp" +#include "modules/wlr/workspace_manager.hpp" + +namespace waybar::modules::wlr { + +static void handle_global(void *data, wl_registry *registry, uint32_t name, const char *interface, + uint32_t version) { + if (std::strcmp(interface, zwlr_workspace_manager_v1_interface.name) == 0) { + static_cast(data)->register_manager(registry, name, version); + } +} + +static void handle_global_remove(void *data, wl_registry *registry, uint32_t name) { + /* Nothing to do here */ +} + +static const wl_registry_listener registry_listener_impl = {.global = handle_global, + .global_remove = handle_global_remove}; + +void add_registry_listener(void *data) { + wl_display * display = Client::inst()->wl_display; + wl_registry *registry = wl_display_get_registry(display); + + wl_registry_add_listener(registry, ®istry_listener_impl, data); + wl_display_roundtrip(display); + wl_display_roundtrip(display); +} + +static void workspace_manager_handle_workspace_group( + void *data, zwlr_workspace_manager_v1 *_, zwlr_workspace_group_handle_v1 *workspace_group) { + static_cast(data)->handle_workspace_group_create(workspace_group); +} + +static void workspace_manager_handle_done(void *data, zwlr_workspace_manager_v1 *_) { + static_cast(data)->handle_done(); +} + +static void workspace_manager_handle_finished(void *data, zwlr_workspace_manager_v1 *_) { + static_cast(data)->handle_finished(); +} + +static const zwlr_workspace_manager_v1_listener workspace_manager_impl = { + .workspace_group = workspace_manager_handle_workspace_group, + .done = workspace_manager_handle_done, + .finished = workspace_manager_handle_finished, +}; + +zwlr_workspace_manager_v1 *workspace_manager_bind(wl_registry *registry, uint32_t name, + uint32_t version, void *data) { + auto *workspace_manager = static_cast( + wl_registry_bind(registry, name, &zwlr_workspace_manager_v1_interface, version)); + + if (workspace_manager) + zwlr_workspace_manager_v1_add_listener(workspace_manager, &workspace_manager_impl, data); + else + spdlog::error("Failed to register manager"); + + return workspace_manager; +} + +static void workspace_group_handle_output_enter(void *data, zwlr_workspace_group_handle_v1 *_, + wl_output *output) { + static_cast(data)->handle_output_enter(output); +} + +static void workspace_group_handle_output_leave(void *data, zwlr_workspace_group_handle_v1 *_, + wl_output *output) { + static_cast(data)->handle_output_leave(); +} + +static void workspace_group_handle_workspace(void *data, zwlr_workspace_group_handle_v1 *_, + zwlr_workspace_handle_v1 *workspace) { + static_cast(data)->handle_workspace_create(workspace); +} + +static void workspace_group_handle_remove(void *data, zwlr_workspace_group_handle_v1 *_) { + static_cast(data)->handle_remove(); +} + +static const zwlr_workspace_group_handle_v1_listener workspace_group_impl = { + .output_enter = workspace_group_handle_output_enter, + .output_leave = workspace_group_handle_output_leave, + .workspace = workspace_group_handle_workspace, + .remove = workspace_group_handle_remove}; + +void add_workspace_group_listener(zwlr_workspace_group_handle_v1 *workspace_group_handle, + void * data) { + zwlr_workspace_group_handle_v1_add_listener(workspace_group_handle, &workspace_group_impl, data); +} + +void workspace_handle_name(void *data, struct zwlr_workspace_handle_v1 *_, const char *name) { + static_cast(data)->handle_name(name); +} + +void workspace_handle_coordinates(void *data, struct zwlr_workspace_handle_v1 *_, + struct wl_array *coordinates) { + std::vector coords_vec; + auto coords = static_cast(coordinates->data); + for (size_t i = 0; i < coordinates->size; ++i) { + coords_vec.push_back(coords[i]); + } + + static_cast(data)->handle_coordinates(coords_vec); +} + +void workspace_handle_state(void *data, struct zwlr_workspace_handle_v1 *_, + struct wl_array *state) { + std::vector state_vec; + auto coords = static_cast(state->data); + for (size_t i = 0; i < state->size; ++i) { + state_vec.push_back(coords[i]); + } + + static_cast(data)->handle_state(state_vec); +} + +void workspace_handle_remove(void *data, struct zwlr_workspace_handle_v1 *_) { + static_cast(data)->handle_remove(); +} + +static const zwlr_workspace_handle_v1_listener workspace_impl = { + .name = workspace_handle_name, + .coordinates = workspace_handle_coordinates, + .state = workspace_handle_state, + .remove = workspace_handle_remove}; + +void add_workspace_listener(zwlr_workspace_handle_v1 *workspace_handle, void *data) { + zwlr_workspace_handle_v1_add_listener(workspace_handle, &workspace_impl, data); +} +} // namespace waybar::modules::wlr diff --git a/src/modules/wlr/workspaces.cpp b/src/modules/wlr/workspaces.cpp deleted file mode 100644 index 0d9ae0b3..00000000 --- a/src/modules/wlr/workspaces.cpp +++ /dev/null @@ -1,152 +0,0 @@ -#include "modules/wlr/workspaces.hpp" - -#include -#include - -#include - -namespace waybar::modules::wlr { - -static void handle_global(void *data, wl_registry *registry, uint32_t name, - const char *interface, uint32_t version) { - if (std::strcmp(interface, zwlr_workspace_manager_v1_interface.name) == 0) { - static_cast(data)->register_manager(registry, name, version); - } -} - -static void handle_global_remove(void *data, wl_registry *registry, uint32_t name) { - /* Nothing to do here */ -} - -static const wl_registry_listener registry_listener_impl = {.global = handle_global, - .global_remove = handle_global_remove}; - -WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar, - const Json::Value &config) - : waybar::AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()), - bar_(bar), - box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) { - box_.set_name("workspaces"); - if (!id.empty()) { - box_.get_style_context()->add_class(id); - } - event_box_.add(box_); - - // wlr stuff - wl_display * display = Client::inst()->wl_display; - wl_registry *registry = wl_display_get_registry(display); - - wl_registry_add_listener(registry, ®istry_listener_impl, this); - wl_display_roundtrip(display); - - if (!workspace_manager_) { - return; - } -} - -static void workspace_manager_handle_workspace_group( - void *data, zwlr_workspace_manager_v1 *_, - zwlr_workspace_group_handle_v1 *workspace_group) { - static_cast(data)->handle_workspace_group_create(workspace_group); -} - -static void workspace_manager_handle_done(void *data, zwlr_workspace_manager_v1 *_) { - static_cast(data)->handle_done(); -} - -static void workspace_manager_handle_finished(void *data, zwlr_workspace_manager_v1 *_) { - static_cast(data)->handle_finished(); -} - -static const zwlr_workspace_manager_v1_listener workspace_manager_impl = { - .workspace_group = workspace_manager_handle_workspace_group, - .done = workspace_manager_handle_done, - .finished = workspace_manager_handle_finished, -}; - -auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, uint32_t version) - -> void { - if (workspace_manager_) { - spdlog::warn("Register workspace manager again although already registered!"); - return; - } - if (version != 1) { - spdlog::warn("Using different workspace manager protocol version: {}", version); - } - - workspace_manager_ = static_cast( - wl_registry_bind(registry, name, &zwlr_workspace_manager_v1_interface, version)); - - if (workspace_manager_) - zwlr_workspace_manager_v1_add_listener(workspace_manager_, &workspace_manager_impl, this); - else - spdlog::debug("Failed to register manager"); -} -auto WorkspaceManager::handle_workspace_group_create( - zwlr_workspace_group_handle_v1 *workspace_group_handle) -> void { - groups_.push_back(std::make_unique(bar_, config_, *this, *workspace_group_handle)); -} - -auto WorkspaceManager::handle_finished() -> void { - zwlr_workspace_manager_v1_destroy(workspace_manager_); - workspace_manager_ = nullptr; -} -auto WorkspaceManager::handle_done() -> void {} -auto WorkspaceManager::update() -> void { - for (auto &group : groups_) { - group->update(); - } - AModule::update(); -} - -static void workspace_group_handle_output_enter(void *data, - zwlr_workspace_group_handle_v1 *_, - wl_output *output) { - static_cast(data)->handle_output_enter(*output); -} - -static void workspace_group_handle_output_leave(void *data, - zwlr_workspace_group_handle_v1 *_, - wl_output *output) { - static_cast(data)->handle_output_leave(*output); -} - -static void workspace_group_handle_workspace(void *data, - zwlr_workspace_group_handle_v1 *_, - zwlr_workspace_handle_v1 *workspace) { - static_cast(data)->handle_workspace_create(*workspace); -} - -static void workspace_group_handle_remove(void *data, - zwlr_workspace_group_handle_v1 *_) { - static_cast(data)->handle_remove(); -} - -static const zwlr_workspace_group_handle_v1_listener workspace_group_impl = { - .output_enter = workspace_group_handle_output_enter, - .output_leave = workspace_group_handle_output_leave, - .workspace = workspace_group_handle_workspace, - .remove = workspace_group_handle_remove -}; - -WorkspaceGroup::WorkspaceGroup(const Bar & bar, const Json::Value &config, WorkspaceManager &manager, - zwlr_workspace_group_handle_v1 &workspace_group_handle) - : bar_(bar), config_(config), workspace_manager_(manager), workspace_group_handle_(workspace_group_handle) -{ - zwlr_workspace_group_handle_v1_add_listener(&workspace_group_handle, &workspace_group_impl, this); -} -auto WorkspaceGroup::handle_workspace_create(zwlr_workspace_handle_v1 &workspace) -> void { - workspaces_.push_back(std::make_unique(bar_, config_, *this, workspace)); -} -auto WorkspaceGroup::handle_remove() -> void {} -auto WorkspaceGroup::handle_output_enter(wl_output &output) -> void {} -auto WorkspaceGroup::handle_output_leave(wl_output &output) -> void {} -auto WorkspaceGroup::update() -> void { - -} -Workspace::Workspace(const Bar &bar, const Json::Value &config, - WorkspaceGroup &workspace_group, zwlr_workspace_handle_v1 &workspace) - : bar_(bar), config_(config), workspace_group_(workspace_group), workspace_handle_(workspace) -{ -} -} // namespace waybar::modules::wlr \ No newline at end of file From 99f3e37ccf6f5e37813b34732c3a1fbcc98ae249 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 5 Aug 2020 23:00:36 +0200 Subject: [PATCH 039/355] chore: update archlinux, debian dockerfiles --- Dockerfiles/archlinux | 2 +- Dockerfiles/debian | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux index d8ae16fd..0b618ffe 100644 --- a/Dockerfiles/archlinux +++ b/Dockerfiles/archlinux @@ -3,4 +3,4 @@ FROM archlinux/base:latest RUN pacman -Syu --noconfirm && \ - pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient --noconfirm + pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection --noconfirm diff --git a/Dockerfiles/debian b/Dockerfiles/debian index 077aca86..9f65dbf2 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -3,5 +3,5 @@ FROM debian:sid RUN apt-get update && \ - apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection && \ + apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection apt-get install libgirepository1.0-dev && \ apt-get clean From 2ca20f90505a5fb46ff882b89737eaed7dd2122a Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 5 Aug 2020 23:01:37 +0200 Subject: [PATCH 040/355] chore: remove unwanted typo --- Dockerfiles/debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/debian b/Dockerfiles/debian index 9f65dbf2..cee17441 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -3,5 +3,5 @@ FROM debian:sid RUN apt-get update && \ - apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection apt-get install libgirepository1.0-dev && \ + apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev && \ apt-get clean From 01c682c41ecb6a415b477745166ef430a344c370 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 5 Aug 2020 23:26:59 +0200 Subject: [PATCH 041/355] chore: v0.9.3 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index dd56c290..56b45be8 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'waybar', 'cpp', 'c', - version: '0.9.2', + version: '0.9.3', license: 'MIT', default_options : [ 'cpp_std=c++17', From 7638f5c5958d0f9243c8b71569b9cb048f439a7a Mon Sep 17 00:00:00 2001 From: dmitry Date: Thu, 6 Aug 2020 01:42:57 +0300 Subject: [PATCH 042/355] Add base name representation --- include/modules/wlr/workspace_manager.hpp | 14 ++++++++---- src/modules/wlr/workspace_manager.cpp | 26 ++++++++++++++++++----- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp index 3c8fe99d..f606331d 100644 --- a/include/modules/wlr/workspace_manager.hpp +++ b/include/modules/wlr/workspace_manager.hpp @@ -1,7 +1,9 @@ #pragma once #include +#include #include +#include #include #include @@ -23,6 +25,7 @@ class Workspace { auto update() -> void; auto id() const -> uint32_t { return id_; } + // wlr stuff auto handle_name(const std::string &name) -> void { name_ = name; } auto handle_coordinates(const std::vector &coordinates) -> void { coordinates_ = coordinates; @@ -46,8 +49,9 @@ class Workspace { std::string name_; std::vector coordinates_; - const Gtk::Box box_; - const Gtk::Image icon_; + Gtk::Button button_; + Gtk::Box content_; + Gtk::Label label_; }; class WorkspaceGroup { @@ -62,11 +66,12 @@ class WorkspaceGroup { // wlr stuff auto handle_workspace_create(zwlr_workspace_handle_v1 *workspace_handle) -> void; - auto handle_remove() -> void; auto handle_output_enter(wl_output *output) -> void; auto handle_output_leave() -> void; + auto add_button(Gtk::Button &button) -> void; + private: static uint32_t group_global_id; const waybar::Bar &bar_; @@ -93,10 +98,11 @@ class WorkspaceManager : public AModule { auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void; auto handle_workspace_group_create(zwlr_workspace_group_handle_v1 *workspace_group_handle) -> void; - auto handle_done() -> void; auto handle_finished() -> void; + auto add_button(Gtk::Button &button) -> void { box_.pack_start(button, false, false); } + private: const waybar::Bar & bar_; Gtk::Box box_; diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index 04a31888..25ce5253 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -14,7 +14,7 @@ uint32_t WorkspaceGroup::group_global_id = 0; WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config) - : waybar::AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()), + : waybar::AModule(config, "workspaces", id, false, false), bar_(bar), box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) { box_.set_name("workspaces"); @@ -53,6 +53,7 @@ auto WorkspaceManager::handle_finished() -> void { } auto WorkspaceManager::handle_done() -> void { + dp.emit(); } auto WorkspaceManager::update() -> void { @@ -92,8 +93,11 @@ WorkspaceGroup::WorkspaceGroup(const Bar &bar, const Json::Value &config, Worksp id_(++group_global_id) { add_workspace_group_listener(workspace_group_handle, this); } +auto WorkspaceGroup::add_button(Gtk::Button &button) -> void { + workspace_manager_.add_button(button); +} -WorkspaceGroup::~WorkspaceGroup()->void { +WorkspaceGroup::~WorkspaceGroup() { if (!workspace_group_handle_) { return; } @@ -135,7 +139,7 @@ auto WorkspaceGroup::remove_workspace(uint32_t id) -> void { [id](const std::unique_ptr &w) { return w->id() == id; }); if (it == workspaces_.end()) { - spdlog::warn("Can't find group with id {}", id); + spdlog::warn("Can't find workspace with id {}", id); return; } @@ -148,8 +152,17 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup & config_(config), workspace_group_(workspace_group), workspace_handle_(workspace), - id_(++workspace_global_id) { + id_(++workspace_global_id), + content_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0} { add_workspace_listener(workspace, this); + workspace_group.add_button(button_); + button_.set_relief(Gtk::RELIEF_NONE); + label_.set_label(fmt::format("{name}", fmt::arg("name", "1"))); + label_.show(); + content_.add(label_); + content_.show(); + button_.add(content_); + button_.show(); } Workspace::~Workspace() { @@ -161,7 +174,10 @@ Workspace::~Workspace() { workspace_handle_ = nullptr; } -auto Workspace::update() -> void {} +auto Workspace::update() -> void { + label_.set_label(fmt::format("{name}", fmt::arg("name", name_))); + label_.show(); +} auto Workspace::handle_state(const std::vector &state) -> void { state_ = 0; From 6a2d214b55cb1e8517afccb18c3799b22e16a57e Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Wed, 5 Aug 2020 20:31:57 -0400 Subject: [PATCH 043/355] Fix titles containing & and other HTML entities --- src/modules/wlr/taskbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 23a91661..025e5c19 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -306,7 +306,7 @@ std::string Task::state_string(bool shortened) const void Task::handle_title(const char *title) { - title_ = title; + title_ = Glib::Markup::escape_text(title); } void Task::handle_app_id(const char *app_id) From 4cd31cf3c36db71c04eabf3dad1f12b877991015 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Wed, 5 Aug 2020 20:35:41 -0400 Subject: [PATCH 044/355] Fix wlr/taskbar all-outputs config string --- src/modules/wlr/taskbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 025e5c19..f7e11df9 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -709,7 +709,7 @@ bool Taskbar::show_output(struct wl_output *output) const bool Taskbar::all_outputs() const { - static bool result = config_["all_outputs"].isBool() ? config_["all_outputs"].asBool() : false; + static bool result = config_["all-outputs"].isBool() ? config_["all-outputs"].asBool() : false; return result; } From 9ebfc54eb5cb52acc6b54aeaec86be196388061f Mon Sep 17 00:00:00 2001 From: NotAFile Date: Thu, 6 Aug 2020 16:04:30 +0200 Subject: [PATCH 045/355] switch workspace on mouse-down to match swaybar fixes #686 --- src/modules/sway/workspaces.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index fc6d5eb8..77743511 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -249,7 +249,7 @@ Gtk::Button &Workspaces::addButton(const Json::Value &node) { auto &&button = pair.first->second; box_.pack_start(button, false, false, 0); button.set_relief(Gtk::RELIEF_NONE); - button.signal_clicked().connect([this, node] { + button.signal_pressed().connect([this, node] { try { if (node["target_output"].isString()) { ipc_.sendCmd( From a446cd692d19acc215aa1fe42a2e24f7507ea2d5 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 6 Aug 2020 21:57:02 +0200 Subject: [PATCH 046/355] Fix MPD, add missing while loop --- src/modules/mpd.cpp | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp index 957b3c76..d2877f35 100644 --- a/src/modules/mpd.cpp +++ b/src/modules/mpd.cpp @@ -63,20 +63,22 @@ auto waybar::modules::MPD::update() -> void { std::thread waybar::modules::MPD::event_listener() { return std::thread([this] { - try { - if (connection_ == nullptr) { - // Retry periodically if no connection - dp.emit(); - std::this_thread::sleep_for(interval_); - } else { - waitForEvent(); - dp.emit(); - } - } catch (const std::exception& e) { - if (strcmp(e.what(), "Connection to MPD closed") == 0) { - spdlog::debug("{}: {}", module_name_, e.what()); - } else { - spdlog::warn("{}: {}", module_name_, e.what()); + while (true) { + try { + if (connection_ == nullptr) { + // Retry periodically if no connection + dp.emit(); + std::this_thread::sleep_for(interval_); + } else { + waitForEvent(); + dp.emit(); + } + } catch (const std::exception& e) { + if (strcmp(e.what(), "Connection to MPD closed") == 0) { + spdlog::debug("{}: {}", module_name_, e.what()); + } else { + spdlog::warn("{}: {}", module_name_, e.what()); + } } } }); From d51adfe7bc2e6e653c1075b64f7b1a27c8ca6482 Mon Sep 17 00:00:00 2001 From: Maxim Baz Date: Thu, 6 Aug 2020 23:21:53 +0200 Subject: [PATCH 047/355] systemd: use standard targets, update service type --- resources/waybar.service.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/resources/waybar.service.in b/resources/waybar.service.in index 03262a33..2c907e90 100644 --- a/resources/waybar.service.in +++ b/resources/waybar.service.in @@ -1,13 +1,11 @@ [Unit] Description=Highly customizable Wayland bar for Sway and Wlroots based compositors. Documentation=https://github.com/Alexays/Waybar/wiki/ -PartOf=wayland-session.target -After=wayland-session.target +PartOf=graphical-session.target +After=graphical-session.target [Service] -Type=dbus -BusName=fr.arouillard.waybar ExecStart=@prefix@/bin/waybar [Install] -WantedBy=wayland-session.target +WantedBy=graphical-session.target From 4c251578e923760372bf51f2d9540d7abd9b204b Mon Sep 17 00:00:00 2001 From: dmitry Date: Fri, 7 Aug 2020 02:45:08 +0300 Subject: [PATCH 048/355] Add formatting and states handling --- include/modules/wlr/workspace_manager.hpp | 20 +++++- src/modules/wlr/workspace_manager.cpp | 80 ++++++++++++++++++++--- 2 files changed, 87 insertions(+), 13 deletions(-) diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp index f606331d..8cd065f1 100644 --- a/include/modules/wlr/workspace_manager.hpp +++ b/include/modules/wlr/workspace_manager.hpp @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -25,6 +26,7 @@ class Workspace { auto update() -> void; auto id() const -> uint32_t { return id_; } + auto is_active() const -> bool { return state_ & static_cast(State::ACTIVE); } // wlr stuff auto handle_name(const std::string &name) -> void { name_ = name; } auto handle_coordinates(const std::vector &coordinates) -> void { @@ -33,9 +35,14 @@ class Workspace { auto handle_state(const std::vector &state) -> void; auto handle_remove() -> void; + auto handle_done() -> void; + auto handle_clicked() -> void; + enum class State { ACTIVE = 1 << 0 }; private: + auto get_icon() -> std::string; + static uint32_t workspace_global_id; const Bar & bar_; const Json::Value &config_; @@ -45,9 +52,12 @@ class Workspace { zwlr_workspace_handle_v1 *workspace_handle_; uint32_t state_ = 0; - uint32_t id_; - std::string name_; - std::vector coordinates_; + uint32_t id_; + std::string name_; + std::vector coordinates_; + static std::map icons_map_; + std::string format_; + bool with_icon_ = false; Gtk::Button button_; Gtk::Box content_; @@ -62,6 +72,7 @@ class WorkspaceGroup { auto update() -> void; auto id() const -> uint32_t { return id_; } + auto is_visible() const -> bool { return output_ != nullptr; } auto remove_workspace(uint32_t id_) -> void; // wlr stuff @@ -71,6 +82,8 @@ class WorkspaceGroup { auto handle_output_leave() -> void; auto add_button(Gtk::Button &button) -> void; + auto handle_done() -> void; + auto commit() -> void; private: static uint32_t group_global_id; @@ -102,6 +115,7 @@ class WorkspaceManager : public AModule { auto handle_finished() -> void; auto add_button(Gtk::Button &button) -> void { box_.pack_start(button, false, false); } + auto commit() -> void; private: const waybar::Bar & bar_; diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index 25ce5253..cf0510da 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -9,8 +9,9 @@ namespace waybar::modules::wlr { -uint32_t Workspace::workspace_global_id = 0; -uint32_t WorkspaceGroup::group_global_id = 0; +uint32_t Workspace::workspace_global_id = 0; +uint32_t WorkspaceGroup::group_global_id = 0; +std::map Workspace::icons_map_; WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar, const Json::Value &config) @@ -53,6 +54,9 @@ auto WorkspaceManager::handle_finished() -> void { } auto WorkspaceManager::handle_done() -> void { + for (auto &group : groups_) { + group->handle_done(); + } dp.emit(); } @@ -83,6 +87,7 @@ auto WorkspaceManager::remove_workspace_group(uint32_t id) -> void { groups_.erase(it); } +auto WorkspaceManager::commit() -> void { zwlr_workspace_manager_v1_commit(workspace_manager_); } WorkspaceGroup::WorkspaceGroup(const Bar &bar, const Json::Value &config, WorkspaceManager &manager, zwlr_workspace_group_handle_v1 *workspace_group_handle) @@ -145,6 +150,14 @@ auto WorkspaceGroup::remove_workspace(uint32_t id) -> void { workspaces_.erase(it); } +auto WorkspaceGroup::handle_done() -> void { + if (is_visible()) { + for (auto &workspace : workspaces_) { + workspace->handle_done(); + } + } +} +auto WorkspaceGroup::commit() -> void { workspace_manager_.commit(); } Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, zwlr_workspace_handle_v1 *workspace) @@ -152,17 +165,30 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup & config_(config), workspace_group_(workspace_group), workspace_handle_(workspace), - id_(++workspace_global_id), - content_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0} { + id_(++workspace_global_id) { add_workspace_listener(workspace, this); + + auto config_format = config["format"]; + + format_ = config_format.isString() ? config_format.asString() : "{name}"; + with_icon_ = format_.find("{icon}") != std::string::npos; + + if (with_icon_ && icons_map_.empty()) { + auto format_icons = config["format-icons"]; + for (auto &name : format_icons.getMemberNames()) { + icons_map_.emplace(name, format_icons[name].asString()); + } + } + + button_.signal_clicked().connect(sigc::mem_fun(this, &Workspace::handle_clicked)); + workspace_group.add_button(button_); button_.set_relief(Gtk::RELIEF_NONE); - label_.set_label(fmt::format("{name}", fmt::arg("name", "1"))); - label_.show(); - content_.add(label_); - content_.show(); + content_.set_center_widget(label_); button_.add(content_); button_.show(); + label_.show(); + content_.show(); } Workspace::~Workspace() { @@ -175,8 +201,8 @@ Workspace::~Workspace() { } auto Workspace::update() -> void { - label_.set_label(fmt::format("{name}", fmt::arg("name", name_))); - label_.show(); + label_.set_markup(fmt::format( + format_, fmt::arg("name", name_), fmt::arg("icon", with_icon_ ? get_icon() : ""))); } auto Workspace::handle_state(const std::vector &state) -> void { @@ -195,4 +221,38 @@ auto Workspace::handle_remove() -> void { workspace_handle_ = nullptr; workspace_group_.remove_workspace(id_); } +auto Workspace::handle_done() -> void { + spdlog::debug("Workspace {} changed to state {}", id_, state_); + auto style_context = button_.get_style_context(); + if (is_active()) { + style_context->add_class("focused"); + } else { + style_context->remove_class("focused"); + } +} +auto Workspace::get_icon() -> std::string { + if (is_active()) { + auto focused_icon_it = icons_map_.find("focused"); + if (focused_icon_it != icons_map_.end()) { + return focused_icon_it->second; + } + } + + auto named_icon_it = icons_map_.find(name_); + if (named_icon_it != icons_map_.end()) { + return named_icon_it->second; + } + + auto default_icon_it = icons_map_.find("default"); + if (default_icon_it != icons_map_.end()) { + return default_icon_it->second; + } + + return name_; +} +auto Workspace::handle_clicked() -> void { + spdlog::debug("Workspace {} clicked", (void*)workspace_handle_); + zwlr_workspace_handle_v1_activate(workspace_handle_); + workspace_group_.commit(); +} } // namespace waybar::modules::wlr \ No newline at end of file From 0ad29a5960c945fed328d300fce3d897d2a68994 Mon Sep 17 00:00:00 2001 From: dmitry Date: Fri, 7 Aug 2020 23:46:47 +0300 Subject: [PATCH 049/355] Finish base implementation --- include/modules/wlr/workspace_manager.hpp | 28 +++--- src/modules/wlr/workspace_manager.cpp | 86 +++++++++++++++---- src/modules/wlr/workspace_manager_binding.cpp | 12 ++- 3 files changed, 96 insertions(+), 30 deletions(-) diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp index 8cd065f1..abec5d66 100644 --- a/include/modules/wlr/workspace_manager.hpp +++ b/include/modules/wlr/workspace_manager.hpp @@ -21,29 +21,31 @@ class WorkspaceGroup; class Workspace { public: Workspace(const waybar::Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, - zwlr_workspace_handle_v1 *workspace); + zwlr_workspace_handle_v1 *workspace, uint32_t id); ~Workspace(); auto update() -> void; auto id() const -> uint32_t { return id_; } auto is_active() const -> bool { return state_ & static_cast(State::ACTIVE); } // wlr stuff - auto handle_name(const std::string &name) -> void { name_ = name; } - auto handle_coordinates(const std::vector &coordinates) -> void { - coordinates_ = coordinates; - } + auto handle_name(const std::string &name) -> void; + auto handle_coordinates(const std::vector &coordinates) -> void; auto handle_state(const std::vector &state) -> void; auto handle_remove() -> void; auto handle_done() -> void; auto handle_clicked() -> void; + auto show() -> void { button_.show(); } + auto hide() -> void { button_.hide(); } + auto get_button_ref() -> Gtk::Button & { return button_; } + auto get_name() -> std::string & { return name_; } + auto get_coords() -> std::vector & { return coordinates_; } enum class State { ACTIVE = 1 << 0 }; private: auto get_icon() -> std::string; - static uint32_t workspace_global_id; const Bar & bar_; const Json::Value &config_; WorkspaceGroup & workspace_group_; @@ -66,8 +68,9 @@ class Workspace { class WorkspaceGroup { public: - WorkspaceGroup(const waybar::Bar &bar, const Json::Value &config, WorkspaceManager &manager, - zwlr_workspace_group_handle_v1 *workspace_group_handle); + WorkspaceGroup(const waybar::Bar &bar, Gtk::Box &box, const Json::Value &config, + WorkspaceManager &manager, zwlr_workspace_group_handle_v1 *workspace_group_handle, + uint32_t id); ~WorkspaceGroup(); auto update() -> void; @@ -84,10 +87,12 @@ class WorkspaceGroup { auto add_button(Gtk::Button &button) -> void; auto handle_done() -> void; auto commit() -> void; + auto sort_workspaces() -> void; private: - static uint32_t group_global_id; + static uint32_t workspace_global_id; const waybar::Bar &bar_; + Gtk::Box & box_; const Json::Value &config_; WorkspaceManager & workspace_manager_; @@ -97,6 +102,8 @@ class WorkspaceGroup { uint32_t id_; std::vector> workspaces_; + bool sort_by_name = true; + bool sort_by_coordinates = true; }; class WorkspaceManager : public AModule { @@ -114,7 +121,6 @@ class WorkspaceManager : public AModule { auto handle_done() -> void; auto handle_finished() -> void; - auto add_button(Gtk::Button &button) -> void { box_.pack_start(button, false, false); } auto commit() -> void; private: @@ -124,6 +130,8 @@ class WorkspaceManager : public AModule { // wlr stuff zwlr_workspace_manager_v1 *workspace_manager_ = nullptr; + + static uint32_t group_global_id; }; } // namespace waybar::modules::wlr diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index cf0510da..2892d550 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -9,8 +9,8 @@ namespace waybar::modules::wlr { -uint32_t Workspace::workspace_global_id = 0; -uint32_t WorkspaceGroup::group_global_id = 0; +uint32_t WorkspaceGroup::workspace_global_id = 0; +uint32_t WorkspaceManager::group_global_id = 0; std::map Workspace::icons_map_; WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar, @@ -44,8 +44,10 @@ auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, ui auto WorkspaceManager::handle_workspace_group_create( zwlr_workspace_group_handle_v1 *workspace_group_handle) -> void { - groups_.push_back(std::make_unique(bar_, config_, *this, workspace_group_handle)); - spdlog::debug("Workspace group {} created", groups_.back()->id()); + auto new_id = ++group_global_id; + groups_.push_back( + std::make_unique(bar_, box_, config_, *this, workspace_group_handle, new_id)); + spdlog::debug("Workspace group {} created", new_id); } auto WorkspaceManager::handle_finished() -> void { @@ -89,17 +91,28 @@ auto WorkspaceManager::remove_workspace_group(uint32_t id) -> void { } auto WorkspaceManager::commit() -> void { zwlr_workspace_manager_v1_commit(workspace_manager_); } -WorkspaceGroup::WorkspaceGroup(const Bar &bar, const Json::Value &config, WorkspaceManager &manager, - zwlr_workspace_group_handle_v1 *workspace_group_handle) +WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value &config, + WorkspaceManager & manager, + zwlr_workspace_group_handle_v1 *workspace_group_handle, uint32_t id) : bar_(bar), + box_(box), config_(config), workspace_manager_(manager), workspace_group_handle_(workspace_group_handle), - id_(++group_global_id) { + id_(id) { add_workspace_group_listener(workspace_group_handle, this); + auto config_sort_by_name = config_["sort_by_name"]; + if (config_sort_by_name.isBool()) { + sort_by_name = config_sort_by_name.asBool(); + } + + auto config_sort_by_coordinates = config_["sort_by_coordinates"]; + if (config_sort_by_coordinates.isBool()) { + sort_by_coordinates = config_sort_by_coordinates.asBool(); + } } auto WorkspaceGroup::add_button(Gtk::Button &button) -> void { - workspace_manager_.add_button(button); + box_.pack_start(button, false, false); } WorkspaceGroup::~WorkspaceGroup() { @@ -112,8 +125,9 @@ WorkspaceGroup::~WorkspaceGroup() { } auto WorkspaceGroup::handle_workspace_create(zwlr_workspace_handle_v1 *workspace) -> void { - workspaces_.push_back(std::make_unique(bar_, config_, *this, workspace)); - spdlog::debug("Workspace {} created", workspaces_.back()->id()); + auto new_id = ++workspace_global_id; + workspaces_.push_back(std::make_unique(bar_, config_, *this, workspace, new_id)); + spdlog::debug("Workspace {} created", new_id); } auto WorkspaceGroup::handle_remove() -> void { @@ -124,12 +138,18 @@ auto WorkspaceGroup::handle_remove() -> void { auto WorkspaceGroup::handle_output_enter(wl_output *output) -> void { spdlog::debug("Output {} assigned to {} group", (void *)output, id_); + for (auto &workspace : workspaces_) { + workspace->show(); + } output_ = output; } auto WorkspaceGroup::handle_output_leave() -> void { spdlog::debug("Output {} remove from {} group", (void *)output_, id_); output_ = nullptr; + for (auto &workspace : workspaces_) { + workspace->hide(); + } } auto WorkspaceGroup::update() -> void { @@ -150,22 +170,37 @@ auto WorkspaceGroup::remove_workspace(uint32_t id) -> void { workspaces_.erase(it); } + auto WorkspaceGroup::handle_done() -> void { - if (is_visible()) { - for (auto &workspace : workspaces_) { - workspace->handle_done(); - } + for (auto &workspace : workspaces_) { + workspace->handle_done(); } } auto WorkspaceGroup::commit() -> void { workspace_manager_.commit(); } +auto WorkspaceGroup::sort_workspaces() -> void { + auto cmp = [=](std::unique_ptr &lhs, std::unique_ptr &rhs) { + if (sort_by_name && lhs->get_name() != rhs->get_name()) { + return lhs->get_name() < rhs->get_name(); + } + + return lhs->get_coords() < rhs->get_coords(); + }; + std::sort(workspaces_.begin(), workspaces_.end(), cmp); + for (size_t i = 0; i < workspaces_.size(); ++i) { + for (auto &workspace : workspaces_) { + box_.reorder_child(workspace->get_button_ref(), i); + } + } +} + Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, - zwlr_workspace_handle_v1 *workspace) + zwlr_workspace_handle_v1 *workspace, uint32_t id) : bar_(bar), config_(config), workspace_group_(workspace_group), workspace_handle_(workspace), - id_(++workspace_global_id) { + id_(id) { add_workspace_listener(workspace, this); auto config_format = config["format"]; @@ -186,6 +221,10 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup & button_.set_relief(Gtk::RELIEF_NONE); content_.set_center_widget(label_); button_.add(content_); + if (!workspace_group.is_visible()) { + return; + } + button_.show(); label_.show(); content_.show(); @@ -221,6 +260,7 @@ auto Workspace::handle_remove() -> void { workspace_handle_ = nullptr; workspace_group_.remove_workspace(id_); } + auto Workspace::handle_done() -> void { spdlog::debug("Workspace {} changed to state {}", id_, state_); auto style_context = button_.get_style_context(); @@ -230,6 +270,7 @@ auto Workspace::handle_done() -> void { style_context->remove_class("focused"); } } + auto Workspace::get_icon() -> std::string { if (is_active()) { auto focused_icon_it = icons_map_.find("focused"); @@ -250,9 +291,20 @@ auto Workspace::get_icon() -> std::string { return name_; } + auto Workspace::handle_clicked() -> void { - spdlog::debug("Workspace {} clicked", (void*)workspace_handle_); + spdlog::debug("Workspace {} clicked", (void *)workspace_handle_); zwlr_workspace_handle_v1_activate(workspace_handle_); workspace_group_.commit(); } + +auto Workspace::handle_name(const std::string &name) -> void { + name_ = name; + workspace_group_.sort_workspaces(); +} + +auto Workspace::handle_coordinates(const std::vector &coordinates) -> void { + coordinates_ = coordinates; + workspace_group_.sort_workspaces(); +} } // namespace waybar::modules::wlr \ No newline at end of file diff --git a/src/modules/wlr/workspace_manager_binding.cpp b/src/modules/wlr/workspace_manager_binding.cpp index f6db711b..c7d84bbb 100644 --- a/src/modules/wlr/workspace_manager_binding.cpp +++ b/src/modules/wlr/workspace_manager_binding.cpp @@ -107,12 +107,18 @@ void workspace_handle_coordinates(void *data, struct zwlr_workspace_handle_v1 *_ static_cast(data)->handle_coordinates(coords_vec); } -void workspace_handle_state(void *data, struct zwlr_workspace_handle_v1 *_, +void workspace_handle_state(void *data, struct zwlr_workspace_handle_v1 *workspace_handle, struct wl_array *state) { std::vector state_vec; - auto coords = static_cast(state->data); + auto states = static_cast(state->data); for (size_t i = 0; i < state->size; ++i) { - state_vec.push_back(coords[i]); + // To sync server and pending states + if (states[i] == ZWLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE) { + zwlr_workspace_handle_v1_activate(workspace_handle); + } else { + zwlr_workspace_handle_v1_deactivate(workspace_handle); + } + state_vec.push_back(states[i]); } static_cast(data)->handle_state(state_vec); From 42b6c089f34b24cb46a7add4892112a4b15799ca Mon Sep 17 00:00:00 2001 From: dmitry Date: Sat, 8 Aug 2020 00:09:35 +0300 Subject: [PATCH 050/355] Add docs and adjust sorting --- man/waybar-wlr-workspaces.5.scd | 69 +++++++++++++++++++++++++++ man/waybar.5.scd | 1 + meson.build | 1 + src/modules/wlr/workspace_manager.cpp | 23 +++++++-- 4 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 man/waybar-wlr-workspaces.5.scd diff --git a/man/waybar-wlr-workspaces.5.scd b/man/waybar-wlr-workspaces.5.scd new file mode 100644 index 00000000..732c01be --- /dev/null +++ b/man/waybar-wlr-workspaces.5.scd @@ -0,0 +1,69 @@ +waybar-wlr-workspaces(5) + +# NAME + +waybar - wlr workspaces module + +# DESCRIPTION + +The *workspaces* module displays the currently used workspaces in waynland compositor. + +# CONFIGURATION + +Addressed by *wlr/workspaces* + +*format*: ++ + typeof: string ++ + default: {name} ++ + The format, how information should be displayed. + +*format-icons*: ++ + typeof: array ++ + Based on the workspace name and state, the corresponding icon gets selected. See *icons*. + +*sort-by-name*: ++ + typeof: bool ++ + default: true ++ + Should workspaces be sorted by name. + +*sort-by-coordinates*: ++ + typeof: bool ++ + default: false ++ + Should workspaces be sorted by coordinates. + Note that if both *sort-by-name* and *sort-by-coordinates* are true sort by name will be first. + If both are false - sort by id will be performed. + +# FORMAT REPLACEMENTS + +*{name}*: Number stripped from workspace value. + +*{icon}*: Icon, as defined in *format-icons*. + +# ICONS + +Additional to workspace name matching, the following *format-icons* can be set. + +- *default*: Will be shown, when no string matches is found. +- *focused*: Will be shown, when workspace is focused + +# EXAMPLES + +``` +"wlr/workspaces": { + "format": "{name}: {icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "focused": "", + "default": "" + } +} +``` + +# Style + +- *#workspaces button* +- *#workspaces button.focused* diff --git a/man/waybar.5.scd b/man/waybar.5.scd index 52671106..a7588219 100644 --- a/man/waybar.5.scd +++ b/man/waybar.5.scd @@ -197,5 +197,6 @@ Valid options for the "rotate" property are: 0, 90, 180 and 270. - *waybar-sway-window(5)* - *waybar-sway-workspaces(5)* - *waybar-wlr-taskbar(5)* +- *waybar-wlr-workspaces(5)* - *waybar-temperature(5)* - *waybar-tray(5)* diff --git a/meson.build b/meson.build index 638a766d..19c6b4ac 100644 --- a/meson.build +++ b/meson.build @@ -272,6 +272,7 @@ if scdoc.found() 'waybar-tray.5.scd', 'waybar-states.5.scd', 'waybar-wlr-taskbar.5.scd', + 'waybar-wlr-workspaces.5.scd', 'waybar-bluetooth.5.scd', ] diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index 2892d550..d86dc62f 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -101,12 +101,12 @@ WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value workspace_group_handle_(workspace_group_handle), id_(id) { add_workspace_group_listener(workspace_group_handle, this); - auto config_sort_by_name = config_["sort_by_name"]; + auto config_sort_by_name = config_["sort-by-name"]; if (config_sort_by_name.isBool()) { sort_by_name = config_sort_by_name.asBool(); } - auto config_sort_by_coordinates = config_["sort_by_coordinates"]; + auto config_sort_by_coordinates = config_["sort-by-coordinates"]; if (config_sort_by_coordinates.isBool()) { sort_by_coordinates = config_sort_by_coordinates.asBool(); } @@ -180,12 +180,25 @@ auto WorkspaceGroup::commit() -> void { workspace_manager_.commit(); } auto WorkspaceGroup::sort_workspaces() -> void { auto cmp = [=](std::unique_ptr &lhs, std::unique_ptr &rhs) { - if (sort_by_name && lhs->get_name() != rhs->get_name()) { - return lhs->get_name() < rhs->get_name(); + auto is_name_less = lhs->get_name() < rhs->get_name(); + auto is_name_eq = lhs->get_name() == rhs->get_name(); + auto is_coords_less = lhs->get_coords() < rhs->get_coords(); + if (sort_by_name) { + if (sort_by_coordinates) { + return is_name_eq ? is_coords_less : is_name_less; + } + else { + return is_name_less; + } } - return lhs->get_coords() < rhs->get_coords(); + if (sort_by_coordinates) { + return is_coords_less; + } + + return lhs->id() < rhs->id(); }; + std::sort(workspaces_.begin(), workspaces_.end(), cmp); for (size_t i = 0; i < workspaces_.size(); ++i) { for (auto &workspace : workspaces_) { From 50e8f7ca86f871cb4a18828a811bcbde36864473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= Date: Sat, 8 Aug 2020 13:17:56 +0200 Subject: [PATCH 051/355] add repo info to README --- README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f7bc4c89..74f46600 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [AUR](https://aur.archlinux.org/packages/waybar-git/), [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/waybar), and [Alpine Linux](https://pkgs.alpinelinux.org/packages?name=waybar)
> *Waybar [examples](https://github.com/Alexays/Waybar/wiki/Examples)* -**Current features** +#### Current features - Sway (Workspaces, Binding mode, Focused window name) - Tray [#21](https://github.com/Alexays/Waybar/issues/21) - Local time @@ -22,11 +22,21 @@ - Multiple output configuration - And much more customizations -**Configuration and Styling** +#### Configuration and Styling [See the wiki for more details](https://github.com/Alexays/Waybar/wiki). -**How to build** +### Installation + +Waybar is available from a number of Linux distributions: + +[![Packaging status](https://repology.org/badge/vertical-allrepos/waybar.svg)](https://repology.org/project/waybar/versions) + +An Ubuntu PPA with more recent versions is available +[here](https://launchpad.net/~nschloe/+archive/ubuntu/waybar). + + +#### Building from source ```bash $ git clone https://github.com/Alexays/Waybar From 9b41b9593418772ce578a87de5984d4e37ef7f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Mon, 10 Aug 2020 20:53:29 +0200 Subject: [PATCH 052/355] Fix crash with fmt --- include/util/format.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/util/format.hpp b/include/util/format.hpp index 0147701b..288d8f0c 100644 --- a/include/util/format.hpp +++ b/include/util/format.hpp @@ -23,7 +23,7 @@ namespace fmt { constexpr auto parse(ParseContext& ctx) -> decltype (ctx.begin()) { auto it = ctx.begin(), end = ctx.end(); if (it != end && *it == ':') ++it; - if (*it == '>' || *it == '<' || *it == '=') { + if (it && (*it == '>' || *it == '<' || *it == '=')) { spec = *it; ++it; } From 22409d27c5a6307880828841a8b7c4a113b3dc1b Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 11 Aug 2020 00:28:56 +0300 Subject: [PATCH 053/355] Fix docs typos Add removing buttons Adjust handling multiple outputs. --- include/modules/wlr/workspace_manager.hpp | 1 + man/waybar-wlr-workspaces.5.scd | 7 ++++--- src/modules/wlr/workspace_manager.cpp | 21 ++++++++++++++++++++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp index abec5d66..73c5893f 100644 --- a/include/modules/wlr/workspace_manager.hpp +++ b/include/modules/wlr/workspace_manager.hpp @@ -85,6 +85,7 @@ class WorkspaceGroup { auto handle_output_leave() -> void; auto add_button(Gtk::Button &button) -> void; + auto remove_button(Gtk::Button &button) -> void; auto handle_done() -> void; auto commit() -> void; auto sort_workspaces() -> void; diff --git a/man/waybar-wlr-workspaces.5.scd b/man/waybar-wlr-workspaces.5.scd index 732c01be..c1e827f3 100644 --- a/man/waybar-wlr-workspaces.5.scd +++ b/man/waybar-wlr-workspaces.5.scd @@ -6,7 +6,7 @@ waybar - wlr workspaces module # DESCRIPTION -The *workspaces* module displays the currently used workspaces in waynland compositor. +The *workspaces* module displays the currently used workspaces in wayland compositor. # CONFIGURATION @@ -35,7 +35,7 @@ Addressed by *wlr/workspaces* # FORMAT REPLACEMENTS -*{name}*: Number stripped from workspace value. +*{name}*: Name of workspace assigned by compositor *{icon}*: Icon, as defined in *format-icons*. @@ -43,7 +43,7 @@ Addressed by *wlr/workspaces* Additional to workspace name matching, the following *format-icons* can be set. -- *default*: Will be shown, when no string matches is found. +- *default*: Will be shown, when no string match is found. - *focused*: Will be shown, when workspace is focused # EXAMPLES @@ -65,5 +65,6 @@ Additional to workspace name matching, the following *format-icons* can be set. # Style +- *#workspaces* - *#workspaces button* - *#workspaces button.focused* diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index d86dc62f..20294f4a 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -1,5 +1,6 @@ #include "modules/wlr/workspace_manager.hpp" +#include #include #include @@ -77,6 +78,7 @@ WorkspaceManager::~WorkspaceManager() { zwlr_workspace_manager_v1_destroy(workspace_manager_); workspace_manager_ = nullptr; } + auto WorkspaceManager::remove_workspace_group(uint32_t id) -> void { auto it = std::find_if(groups_.begin(), groups_.end(), @@ -111,6 +113,7 @@ WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value sort_by_coordinates = config_sort_by_coordinates.asBool(); } } + auto WorkspaceGroup::add_button(Gtk::Button &button) -> void { box_.pack_start(button, false, false); } @@ -138,15 +141,25 @@ auto WorkspaceGroup::handle_remove() -> void { auto WorkspaceGroup::handle_output_enter(wl_output *output) -> void { spdlog::debug("Output {} assigned to {} group", (void *)output, id_); + output_ = output; + + if (output != gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj())) { + return; + } + for (auto &workspace : workspaces_) { workspace->show(); } - output_ = output; } auto WorkspaceGroup::handle_output_leave() -> void { spdlog::debug("Output {} remove from {} group", (void *)output_, id_); output_ = nullptr; + + if (output_ != gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj())) { + return; + } + for (auto &workspace : workspaces_) { workspace->hide(); } @@ -176,6 +189,7 @@ auto WorkspaceGroup::handle_done() -> void { workspace->handle_done(); } } + auto WorkspaceGroup::commit() -> void { workspace_manager_.commit(); } auto WorkspaceGroup::sort_workspaces() -> void { @@ -207,6 +221,10 @@ auto WorkspaceGroup::sort_workspaces() -> void { } } +auto WorkspaceGroup::remove_button(Gtk::Button &button) -> void { + box_.remove(button); +} + Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, zwlr_workspace_handle_v1 *workspace, uint32_t id) : bar_(bar), @@ -244,6 +262,7 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup & } Workspace::~Workspace() { + workspace_group_.remove_button(button_); if (!workspace_handle_) { return; } From 8f10c9056c901f9a89b03ce4fbe2f8d108cb49d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Wed, 12 Aug 2020 11:38:48 +0100 Subject: [PATCH 054/355] Add option for no workspace switch on click In sway/workspaces, just like disable-scroll turns on/off the ability to change workspaces by scrolling the mouse add disable-click that turns on/off the ability to change workspaces by clicking. --- man/waybar-sway-workspaces.5.scd | 5 +++++ src/modules/sway/workspaces.cpp | 32 +++++++++++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd index 56b703a2..56411829 100644 --- a/man/waybar-sway-workspaces.5.scd +++ b/man/waybar-sway-workspaces.5.scd @@ -31,6 +31,11 @@ Addressed by *sway/workspaces* default: false ++ If set to false, you can scroll to cycle through workspaces. If set to true this behaviour is disabled. +*disable-click*: ++ + typeof: bool ++ + default: false ++ + If set to false, you can click to change workspace. If set to true this behaviour is disabled. + *smooth-scrolling-threshold*: ++ typeof: double ++ Threshold to be used when scrolling. diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index 77743511..6775a214 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -249,22 +249,24 @@ Gtk::Button &Workspaces::addButton(const Json::Value &node) { auto &&button = pair.first->second; box_.pack_start(button, false, false, 0); button.set_relief(Gtk::RELIEF_NONE); - button.signal_pressed().connect([this, node] { - try { - if (node["target_output"].isString()) { - ipc_.sendCmd( - IPC_COMMAND, - fmt::format(workspace_switch_cmd_ + "; move workspace to output \"{}\"; " + workspace_switch_cmd_, - node["name"].asString(), - node["target_output"].asString(), - node["name"].asString())); - } else { - ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, node["name"].asString())); + if (!config_["disable-click"].asBool()) { + button.signal_pressed().connect([this, node] { + try { + if (node["target_output"].isString()) { + ipc_.sendCmd( + IPC_COMMAND, + fmt::format(workspace_switch_cmd_ + "; move workspace to output \"{}\"; " + workspace_switch_cmd_, + node["name"].asString(), + node["target_output"].asString(), + node["name"].asString())); + } else { + ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, node["name"].asString())); + } + } catch (const std::exception &e) { + spdlog::error("Workspaces: {}", e.what()); } - } catch (const std::exception &e) { - spdlog::error("Workspaces: {}", e.what()); - } - }); + }); + } return button; } From 29fa74f621683720ac8a180c2fdbdd180046477b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Wed, 12 Aug 2020 11:41:00 +0100 Subject: [PATCH 055/355] Add IDs to sway workspace buttons for CSS styling In case you want to style a specific workspace add IDs to the workspace buttons. Styling is done by matching button#sway-workspace-${name}. --- man/waybar-sway-workspaces.5.scd | 1 + src/modules/sway/workspaces.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd index 56411829..7147d713 100644 --- a/man/waybar-sway-workspaces.5.scd +++ b/man/waybar-sway-workspaces.5.scd @@ -139,3 +139,4 @@ n.b.: the list of outputs can be obtained from command line using *swaymsg -t ge - *#workspaces button.urgent* - *#workspaces button.persistent* - *#workspaces button.current_output* +- *#workspaces button#sway-workspace-${name} diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index 6775a214..17a0be29 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -248,6 +248,7 @@ Gtk::Button &Workspaces::addButton(const Json::Value &node) { auto pair = buttons_.emplace(node["name"].asString(), node["name"].asString()); auto &&button = pair.first->second; box_.pack_start(button, false, false, 0); + button.set_name("sway-workspace-" + node["name"].asString()); button.set_relief(Gtk::RELIEF_NONE); if (!config_["disable-click"].asBool()) { button.signal_pressed().connect([this, node] { From 0aa8c03beaaed42fccb11b55ae09adcf5641229b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Thu, 13 Aug 2020 20:11:55 +0100 Subject: [PATCH 056/355] Add missing * in man page --- man/waybar-sway-workspaces.5.scd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd index 7147d713..5e516892 100644 --- a/man/waybar-sway-workspaces.5.scd +++ b/man/waybar-sway-workspaces.5.scd @@ -139,4 +139,4 @@ n.b.: the list of outputs can be obtained from command line using *swaymsg -t ge - *#workspaces button.urgent* - *#workspaces button.persistent* - *#workspaces button.current_output* -- *#workspaces button#sway-workspace-${name} +- *#workspaces button#sway-workspace-${name}* From 8cd6e1330894c6371e49a61ca0f76f72d016dd88 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Wed, 5 Aug 2020 20:31:36 -0400 Subject: [PATCH 057/355] clock: allow custom formatting for today in calendar --- man/waybar-clock.5.scd | 5 +++++ src/modules/clock.cpp | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/man/waybar-clock.5.scd b/man/waybar-clock.5.scd index 3610f19d..79555bcb 100644 --- a/man/waybar-clock.5.scd +++ b/man/waybar-clock.5.scd @@ -31,6 +31,11 @@ The *clock* module displays the current date and time. default: inferred from current locale ++ A locale to be used to display the time. Intended to render times in custom timezones with the proper language and format. +*today-format*: ++ + typeof: string ++ + default: {} ++ + The format of today's date in the calendar. + *max-length*: ++ typeof: integer ++ The maximum length in character the module should display. diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index f41126b0..cfdeda2d 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -99,7 +99,12 @@ auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::str os << '\n'; } if (d == curr_day) { - os << "" << date::format("%e", d) << ""; + if (config_["today-format"].isString()) { + auto today_format = config_["today-format"].asString(); + os << fmt::format(today_format, date::format("%e", d)); + } else { + os << "" << date::format("%e", d) << ""; + } } else { os << date::format("%e", d); } From 62082bdb0121ea738f9b8723221572899c19a872 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Wed, 12 Aug 2020 22:46:51 -0400 Subject: [PATCH 058/355] clock: scroll through multiple timezones --- include/ALabel.hpp | 2 +- include/modules/clock.hpp | 3 +++ man/waybar-clock.5.scd | 5 +++++ src/ALabel.cpp | 5 +++-- src/modules/clock.cpp | 36 +++++++++++++++++++++++++++++++++++- 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/include/ALabel.hpp b/include/ALabel.hpp index d4ad94d3..6848d677 100644 --- a/include/ALabel.hpp +++ b/include/ALabel.hpp @@ -10,7 +10,7 @@ namespace waybar { class ALabel : public AModule { public: ALabel(const Json::Value &, const std::string &, const std::string &, const std::string &format, - uint16_t interval = 0, bool ellipsize = false); + uint16_t interval = 0, bool ellipsize = false, bool enable_click = false, bool enable_scroll = false); virtual ~ALabel() = default; virtual auto update() -> void; virtual std::string getIcon(uint16_t, const std::string &alt = "", uint16_t max = 0); diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp index e3873a6d..643b7369 100644 --- a/include/modules/clock.hpp +++ b/include/modules/clock.hpp @@ -28,9 +28,12 @@ class Clock : public ALabel { std::locale locale_; const date::time_zone* time_zone_; bool fixed_time_zone_; + int time_zone_idx_; date::year_month_day cached_calendar_ymd_; std::string cached_calendar_text_; + bool handleScroll(GdkEventScroll* e); + auto calendar_text(const waybar_time& wtime) -> std::string; auto weekdays_header(const date::weekday& first_dow, std::ostream& os) -> void; auto first_day_of_week() -> date::weekday; diff --git a/man/waybar-clock.5.scd b/man/waybar-clock.5.scd index 79555bcb..9f36c435 100644 --- a/man/waybar-clock.5.scd +++ b/man/waybar-clock.5.scd @@ -26,6 +26,11 @@ The *clock* module displays the current date and time. default: inferred local timezone ++ The timezone to display the time in, e.g. America/New_York. +*timezones*: ++ + typeof: list of strings ++ + A list of timezones to use for time display, changed using the scroll wheel. ++ + Use "" to represent the system's local timezone. Using %Z in the format or tooltip format is useful to track which time zone is currently displayed. + *locale*: ++ typeof: string ++ default: inferred from current locale ++ diff --git a/src/ALabel.cpp b/src/ALabel.cpp index 68313e09..00fa2f72 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -5,8 +5,9 @@ namespace waybar { ALabel::ALabel(const Json::Value& config, const std::string& name, const std::string& id, - const std::string& format, uint16_t interval, bool ellipsize) - : AModule(config, name, id, config["format-alt"].isString()), + const std::string& format, uint16_t interval, bool ellipsize, bool enable_click, + bool enable_scroll) + : AModule(config, name, id, config["format-alt"].isString() || enable_click, enable_scroll), format_(config_["format"].isString() ? config_["format"].asString() : format), interval_(config_["interval"] == "once" ? std::chrono::seconds(100000000) diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index cfdeda2d..f3136067 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -13,7 +13,7 @@ using waybar::modules::waybar_time; waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config) - : ALabel(config, "clock", id, "{:%H:%M}", 60), fixed_time_zone_(false) { + : ALabel(config, "clock", id, "{:%H:%M}", 60, false, false, true), fixed_time_zone_(false) { if (config_["timezone"].isString()) { spdlog::warn("As using a timezone, some format args may be missing as the date library havn't got a release since 2018."); time_zone_ = date::locate_zone(config_["timezone"].asString()); @@ -71,6 +71,40 @@ auto waybar::modules::Clock::update() -> void { ALabel::update(); } +bool waybar::modules::Clock::handleScroll(GdkEventScroll *e) { + // defer to user commands if set + if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) { + return AModule::handleScroll(e); + } + + auto dir = AModule::getScrollDir(e); + if (dir != SCROLL_DIR::UP && dir != SCROLL_DIR::DOWN) { + return true; + } + if (!config_["timezones"].isArray() || config_["timezones"].empty()) { + return true; + } + auto nr_zones = config_["timezones"].size(); + int new_idx = time_zone_idx_ + ((dir == SCROLL_DIR::UP) ? 1 : -1); + if (new_idx < 0) { + time_zone_idx_ = nr_zones - 1; + } else if (new_idx >= nr_zones) { + time_zone_idx_ = 0; + } else { + time_zone_idx_ = new_idx; + } + auto zone_name = config_["timezones"][time_zone_idx_]; + if (!zone_name.isString() || zone_name.empty()) { + fixed_time_zone_ = false; + } else { + time_zone_ = date::locate_zone(zone_name.asString()); + fixed_time_zone_ = true; + } + + update(); + return true; +} + auto waybar::modules::Clock::calendar_text(const waybar_time& wtime) -> std::string { const auto daypoint = date::floor(wtime.ztime.get_local_time()); const auto ymd = date::year_month_day(daypoint); From fdfb60c633681908e81337ce793350588add2478 Mon Sep 17 00:00:00 2001 From: wjoe Date: Fri, 14 Aug 2020 20:56:45 +0200 Subject: [PATCH 059/355] meson feature: make rfkill optional --- meson.build | 12 ++++++++++-- meson_options.txt | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 56b45be8..16da9575 100644 --- a/meson.build +++ b/meson.build @@ -137,12 +137,10 @@ if is_linux add_project_arguments('-DHAVE_MEMORY_LINUX', language: 'cpp') src_files += files( 'src/modules/battery.cpp', - 'src/modules/bluetooth.cpp', 'src/modules/cpu/common.cpp', 'src/modules/cpu/linux.cpp', 'src/modules/memory/common.cpp', 'src/modules/memory/linux.cpp', - 'src/util/rfkill.cpp' ) elif is_dragonfly or is_freebsd or is_netbsd or is_openbsd add_project_arguments('-DHAVE_CPU_BSD', language: 'cpp') @@ -207,6 +205,16 @@ if gtk_layer_shell.found() add_project_arguments('-DHAVE_GTK_LAYER_SHELL', language: 'cpp') endif +if get_option('rfkill').enabled() + if is_linux + add_project_arguments('-DWANT_RFKILL', language: 'cpp') + src_files += files( + 'src/modules/bluetooth.cpp', + 'src/util/rfkill.cpp' + ) + endif +endif + subdir('protocol') executable( diff --git a/meson_options.txt b/meson_options.txt index a44ff648..de47da74 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,3 +7,4 @@ option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable supp option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') option('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon') option('gtk-layer-shell', type: 'feature', value: 'auto', description: 'Use gtk-layer-shell library for popups support') +option('rfkill', type: 'feature', value: 'auto', description: 'Enable support for RFKILL') From 4565f7f8b9ade0e43057cbd47b3f14b218fd589e Mon Sep 17 00:00:00 2001 From: wjoe Date: Fri, 14 Aug 2020 20:58:48 +0200 Subject: [PATCH 060/355] only compile rfkill into the network module if the feature is enabled. --- include/modules/network.hpp | 4 ++++ src/modules/network.cpp | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index a0156fbc..4441dc07 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -11,7 +11,9 @@ #include #include "ALabel.hpp" #include "util/sleeper_thread.hpp" +#ifdef WANT_RFKILL #include "util/rfkill.hpp" +#endif namespace waybar::modules { @@ -70,9 +72,11 @@ class Network : public ALabel { util::SleeperThread thread_; util::SleeperThread thread_timer_; +#ifdef WANT_RFKILL util::SleeperThread thread_rfkill_; util::Rfkill rfkill_; +#endif }; } // namespace waybar::modules diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 2c0562f4..4e96cef0 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -4,7 +4,9 @@ #include #include #include "util/format.hpp" +#ifdef WANT_RFKILL #include "util/rfkill.hpp" +#endif namespace { @@ -84,8 +86,10 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf cidr_(-1), signal_strength_dbm_(0), signal_strength_(0), - frequency_(0), - rfkill_{RFKILL_TYPE_WLAN} { +#ifdef WANT_RFKILL + rfkill_{RFKILL_TYPE_WLAN}, +#endif + frequency_(0) { auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY); auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY); if (down_octets) { @@ -174,6 +178,7 @@ void waybar::modules::Network::worker() { } thread_timer_.sleep_for(interval_); }; +#ifdef WANT_RFKILL thread_rfkill_ = [this] { rfkill_.waitForEvent(); { @@ -184,14 +189,19 @@ void waybar::modules::Network::worker() { } } }; +#else + spdlog::warn("Waybar has been built without rfkill support."); +#endif } const std::string waybar::modules::Network::getNetworkState() const { +#ifdef WANT_RFKILL if (ifid_ == -1) { if (rfkill_.getState()) return "disabled"; return "disconnected"; } +#endif if (ipaddr_.empty()) return "linked"; if (essid_.empty()) return "ethernet"; return "wifi"; From 4d775008df1cabaa6a9cfd56dfb75fa5d83d54b1 Mon Sep 17 00:00:00 2001 From: wjoe Date: Fri, 14 Aug 2020 20:59:30 +0200 Subject: [PATCH 061/355] only return a bluetooth module from factory if the rfkill feature is enabled. --- include/factory.hpp | 4 +++- src/factory.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/factory.hpp b/include/factory.hpp index fcbf3a2d..ebc2359f 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -43,7 +43,9 @@ #include "modules/custom.hpp" #include "modules/temperature.hpp" #if defined(__linux__) -#include "modules/bluetooth.hpp" +# ifdef WANT_RFKILL +# include "modules/bluetooth.hpp" +# endif #endif namespace waybar { diff --git a/src/factory.cpp b/src/factory.cpp index 5a01d523..af93b20f 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -81,9 +81,11 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { return new waybar::modules::Temperature(id, config_[name]); } #if defined(__linux__) +# ifdef WANT_RFKILL if (ref == "bluetooth") { return new waybar::modules::Bluetooth(id, config_[name]); } +# endif #endif if (ref.compare(0, 7, "custom/") == 0 && ref.size() > 7) { return new waybar::modules::Custom(ref.substr(7), id, config_[name]); From 3663b9193dc6e3100fa02c472e5b068e988a8f81 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sun, 9 Aug 2020 18:58:01 -0700 Subject: [PATCH 062/355] refactor(bar): separate GTK event handlers for gtk-layer-shell Cleanly separate resizing logic for gtk-layer-shell and manually managed layer surface code. --- include/bar.hpp | 7 ++- src/bar.cpp | 127 +++++++++++++++++++++++++++++++----------------- 2 files changed, 89 insertions(+), 45 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index 63f0e221..fdc5a739 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -53,13 +53,18 @@ class Bar { static void layerSurfaceHandleClosed(void *, struct zwlr_layer_surface_v1 *); #ifdef HAVE_GTK_LAYER_SHELL + /* gtk-layer-shell code */ void initGtkLayerShell(); + void onConfigureGLS(GdkEventConfigure *ev); + void onMapGLS(GdkEventAny *ev); #endif + /* fallback layer-surface code */ void onConfigure(GdkEventConfigure *ev); void onRealize(); void onMap(GdkEventAny *ev); - void setExclusiveZone(uint32_t width, uint32_t height); void setSurfaceSize(uint32_t width, uint32_t height); + /* common code */ + void setExclusiveZone(uint32_t width, uint32_t height); auto setupWidgets() -> void; void getModules(const Factory &, const std::string &); void setupAltFormatKeyForModule(const std::string &module_name); diff --git a/src/bar.cpp b/src/bar.cpp index 3bbc2a35..45e34201 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -101,56 +101,25 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) use_gls_ = config["gtk-layer-shell"].isBool() ? config["gtk-layer-shell"].asBool() : true; if (use_gls_) { initGtkLayerShell(); + window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMapGLS)); + window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Bar::onConfigureGLS)); } #endif - window.signal_realize().connect_notify(sigc::mem_fun(*this, &Bar::onRealize)); - window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap)); - window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Bar::onConfigure)); + if (!use_gls_) { + window.signal_realize().connect_notify(sigc::mem_fun(*this, &Bar::onRealize)); + window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap)); + window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Bar::onConfigure)); + } window.set_size_request(width_, height_); setupWidgets(); - if (window.get_realized()) { + if (!use_gls_ && window.get_realized()) { onRealize(); } window.show_all(); } -void waybar::Bar::onConfigure(GdkEventConfigure* ev) { - auto tmp_height = height_; - auto tmp_width = width_; - if (ev->height > static_cast(height_)) { - // Default minimal value - if (height_ > 1) { - spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); - } - if (config["height"].isUInt()) { - spdlog::info(SIZE_DEFINED, "Height"); - } else { - tmp_height = ev->height; - } - } - if (ev->width > static_cast(width_)) { - // Default minimal value - if (width_ > 1) { - spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); - } - if (config["width"].isUInt()) { - spdlog::info(SIZE_DEFINED, "Width"); - } else { - tmp_width = ev->width; - } - } - if (use_gls_) { - width_ = tmp_width; - height_ = tmp_height; - spdlog::debug("Set surface size {}x{} for output {}", width_, height_, output->name); - setExclusiveZone(tmp_width, tmp_height); - } else if (tmp_width != width_ || tmp_height != height_) { - setSurfaceSize(tmp_width, tmp_height); - } -} - #ifdef HAVE_GTK_LAYER_SHELL void waybar::Bar::initGtkLayerShell() { auto gtk_window = window.gobj(); @@ -181,8 +150,80 @@ void waybar::Bar::initGtkLayerShell() { setExclusiveZone(width_, height_); } } + +void waybar::Bar::onConfigureGLS(GdkEventConfigure* ev) { + /* + * GTK wants new size for the window. + * Actual resizing is done within the gtk-layer-shell code; the only remaining action is to apply + * exclusive zone. + * gtk_layer_auto_exclusive_zone_enable() could handle even that, but at the cost of ignoring + * margins on unanchored edge. + * + * Note: forced resizing to a window smaller than required by GTK would not work with + * gtk-layer-shell. + */ + if (vertical) { + if (width_ > 1 && ev->width > static_cast(width_)) { + spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); + } + } else { + if (!vertical && height_ > 1 && ev->height > static_cast(height_)) { + spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); + } + } + width_ = ev->width; + height_ = ev->height; + spdlog::info(BAR_SIZE_MSG, width_, height_, output->name); + setExclusiveZone(width_, height_); +} + +void waybar::Bar::onMapGLS(GdkEventAny* ev) { + /* + * Obtain a pointer to the custom layer surface for modules that require it (idle_inhibitor). + */ + auto gdk_window = window.get_window(); + surface = gdk_wayland_window_get_wl_surface(gdk_window->gobj()); +} + #endif +void waybar::Bar::onConfigure(GdkEventConfigure* ev) { + /* + * GTK wants new size for the window. + * + * Prefer configured size if it's non-default. + * If the size is not set and the window is smaller than requested by GTK, request resize from + * layer surface. + */ + auto tmp_height = height_; + auto tmp_width = width_; + if (ev->height > static_cast(height_)) { + // Default minimal value + if (height_ > 1) { + spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); + } + if (config["height"].isUInt()) { + spdlog::info(SIZE_DEFINED, "Height"); + } else { + tmp_height = ev->height; + } + } + if (ev->width > static_cast(width_)) { + // Default minimal value + if (width_ > 1) { + spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); + } + if (config["width"].isUInt()) { + spdlog::info(SIZE_DEFINED, "Width"); + } else { + tmp_width = ev->width; + } + } + if (tmp_width != width_ || tmp_height != height_) { + setSurfaceSize(tmp_width, tmp_height); + } +} + void waybar::Bar::onRealize() { auto gdk_window = window.get_window()->gobj(); gdk_wayland_window_set_use_custom_surface(gdk_window); @@ -192,10 +233,6 @@ void waybar::Bar::onMap(GdkEventAny* ev) { auto gdk_window = window.get_window()->gobj(); surface = gdk_wayland_window_get_wl_surface(gdk_window); - if (use_gls_) { - return; - } - auto client = waybar::Client::inst(); // owned by output->monitor; no need to destroy auto wl_output = gdk_wayland_monitor_get_wl_output(output->monitor->gobj()); @@ -362,7 +399,9 @@ auto waybar::Bar::toggle() -> void { window.set_opacity(1); } setExclusiveZone(width_, height_); - wl_surface_commit(surface); + if (!use_gls_) { + wl_surface_commit(surface); + } } void waybar::Bar::getModules(const Factory& factory, const std::string& pos) { From f4e15dd93d589ed4efb10bad5035476ca623f5cb Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 14 Aug 2020 23:53:44 -0700 Subject: [PATCH 063/355] chore(subprojects): update gtk-layer-shell to 0.3.0 Fixes warning about xdg_wm_base.version mismatch. Fixes potential crash when GTK does not expect wl_surface to be committed. --- subprojects/gtk-layer-shell.wrap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subprojects/gtk-layer-shell.wrap b/subprojects/gtk-layer-shell.wrap index 9db9df5d..6fe68c3f 100644 --- a/subprojects/gtk-layer-shell.wrap +++ b/subprojects/gtk-layer-shell.wrap @@ -1,5 +1,5 @@ [wrap-file] -directory = gtk-layer-shell-0.2.0 -source_filename = gtk-layer-shell-0.2.0.tar.gz -source_hash = 6934376b5296d079fca2c1ba6b222ec91db6bf3667142340ee2bdebfb4b69116 -source_url = https://github.com/wmww/gtk-layer-shell/archive/v0.2.0/gtk-layer-shell-0.2.0.tar.gz +directory = gtk-layer-shell-0.3.0 +source_filename = gtk-layer-shell-0.3.0.tar.gz +source_hash = edd5e31279d494df66da9e9190c219fa295da547f5538207685e98468dbc134d +source_url = https://github.com/wmww/gtk-layer-shell/archive/v0.3.0/gtk-layer-shell-0.3.0.tar.gz From 033f0b01b7d7aefd8867320e569344de5713f57f Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 15 Aug 2020 10:36:15 +0200 Subject: [PATCH 064/355] Fix rfkill condition --- src/modules/network.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 4e96cef0..ab9b2e5e 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -195,13 +195,13 @@ void waybar::modules::Network::worker() { } const std::string waybar::modules::Network::getNetworkState() const { -#ifdef WANT_RFKILL if (ifid_ == -1) { +#ifdef WANT_RFKILL if (rfkill_.getState()) return "disabled"; +#endif return "disconnected"; } -#endif if (ipaddr_.empty()) return "linked"; if (essid_.empty()) return "ethernet"; return "wifi"; From b54fb247456e3e4980891a8c9e6e545d5f808597 Mon Sep 17 00:00:00 2001 From: dmitry Date: Sun, 16 Aug 2020 15:54:21 +0300 Subject: [PATCH 065/355] Remove trim usage in format Some clang-tidy fixes --- include/modules/wlr/taskbar.hpp | 2 +- src/modules/wlr/taskbar.cpp | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index 53a2f8c7..7085d79d 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -70,7 +70,7 @@ class Task std::string title_; std::string app_id_; - uint32_t state_; + uint32_t state_ = 0; private: std::string repr() const; diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 23a91661..5c0dcb3b 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -49,8 +49,8 @@ static std::vector search_prefix() auto xdg_data_dirs = std::getenv("XDG_DATA_DIRS"); if (!xdg_data_dirs) { - prefixes.push_back("/usr/share/"); - prefixes.push_back("/usr/local/share/"); + prefixes.emplace_back("/usr/share/"); + prefixes.emplace_back("/usr/local/share/"); } else { std::string xdg_data_dirs_str(xdg_data_dirs); size_t start = 0, end = 0; @@ -102,7 +102,7 @@ static std::string get_from_desktop_app_info(const std::string &app_id) } /* Method 2 - use the app_id and check whether there is an icon with this name in the icon theme */ -static std::string get_from_icon_theme(Glib::RefPtr icon_theme, +static std::string get_from_icon_theme(const Glib::RefPtr& icon_theme, const std::string &app_id) { if (icon_theme->lookup_icon(app_id, 24)) @@ -111,7 +111,7 @@ static std::string get_from_icon_theme(Glib::RefPtr icon_theme, return ""; } -static bool image_load_icon(Gtk::Image& image, Glib::RefPtr icon_theme, +static bool image_load_icon(Gtk::Image& image, const Glib::RefPtr& icon_theme, const std::string &app_id_list, int size) { std::string app_id; @@ -231,13 +231,13 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, auto icon_pos = format.find("{icon}"); if (icon_pos == 0) { with_icon_ = true; - format_after_ = trim(format.substr(6)); + format_after_ = format.substr(6); } else if (icon_pos == std::string::npos) { format_before_ = format; } else { with_icon_ = true; - format_before_ = trim(format.substr(0, icon_pos)); - format_after_ = trim(format.substr(icon_pos + 6)); + format_before_ = format.substr(0, icon_pos); + format_after_ = format.substr(icon_pos + 6); } } else { /* The default is to only show the icon */ @@ -360,7 +360,7 @@ void Task::handle_output_leave(struct wl_output *output) void Task::handle_state(struct wl_array *state) { state_ = 0; - for (uint32_t* entry = static_cast(state->data); + for (auto* entry = static_cast(state->data); entry < static_cast(state->data) + state->size; entry++) { if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_MAXIMIZED) @@ -709,9 +709,7 @@ bool Taskbar::show_output(struct wl_output *output) const bool Taskbar::all_outputs() const { - static bool result = config_["all_outputs"].isBool() ? config_["all_outputs"].asBool() : false; - - return result; + return config_["all_outputs"].isBool() && config_["all_outputs"].asBool(); } std::vector> Taskbar::icon_themes() const From d263607b27af6b5ca2c0cb59a0de319c7e2009af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernoch?= Date: Tue, 18 Aug 2020 23:09:35 +0200 Subject: [PATCH 066/355] network: fix typo - update tooltip only when it changes --- src/modules/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index ab9b2e5e..39141208 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -287,7 +287,7 @@ auto waybar::modules::Network::update() -> void { fmt::arg("bandwidthUpBits", pow_format(bandwidth_up * 8ull / interval_.count(), "b/s")), fmt::arg("bandwidthDownOctets", pow_format(bandwidth_down / interval_.count(), "o/s")), fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s"))); - if (label_.get_tooltip_text() != text) { + if (label_.get_tooltip_text() != tooltip_text) { label_.set_tooltip_text(tooltip_text); } } else if (label_.get_tooltip_text() != text) { From 8fb54f47ea5052448757abb35e4cf7c001b97343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernoch?= Date: Wed, 19 Aug 2020 23:11:16 +0200 Subject: [PATCH 067/355] battery: allow custom tooltip format --- src/modules/battery.cpp | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index beb0554f..999e24ed 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -169,22 +169,37 @@ auto waybar::modules::Battery::update() -> void { if (status == "Unknown") { status = getAdapterStatus(capacity); } - if (tooltipEnabled()) { - std::string tooltip_text; - if (time_remaining != 0) { - std::string time_to = std::string("Time to ") + ((time_remaining > 0) ? "empty" : "full"); - tooltip_text = time_to + ": " + formatTimeRemaining(time_remaining); - } else { - tooltip_text = status; - } - label_.set_tooltip_text(tooltip_text); - } + auto status_pretty = status; // Transform to lowercase and replace space with dash std::transform(status.begin(), status.end(), status.begin(), [](char ch) { return ch == ' ' ? '-' : std::tolower(ch); }); auto format = format_; auto state = getState(capacity, true); + auto time_remaining_formatted = formatTimeRemaining(time_remaining); + if (tooltipEnabled()) { + std::string tooltip_text_default; + std::string tooltip_format = "{autoTooltip}"; + if (time_remaining != 0) { + std::string time_to = std::string("Time to ") + ((time_remaining > 0) ? "empty" : "full"); + tooltip_text_default = time_to + ": " + time_remaining_formatted; + } else { + tooltip_text_default = status_pretty; + } + if (!state.empty() && config_["tooltip-format-" + status + "-" + state].isString()) { + tooltip_format = config_["tooltip-format-" + status + "-" + state].asString(); + } else if (config_["tooltip-format-" + status].isString()) { + tooltip_format = config_["tooltip-format-" + status].asString(); + } else if (!state.empty() && config_["tooltip-format-" + state].isString()) { + tooltip_format = config_["tooltip-format-" + state].asString(); + } else if (config_["tooltip-format"].isString()) { + tooltip_format = config_["tooltip-format"].asString(); + } + label_.set_tooltip_text(fmt::format(tooltip_format, + fmt::arg("autoTooltip", tooltip_text_default), + fmt::arg("capacity", capacity), + fmt::arg("time", time_remaining_formatted))); + } if (!old_status_.empty()) { label_.get_style_context()->remove_class(old_status_); } @@ -205,7 +220,7 @@ auto waybar::modules::Battery::update() -> void { label_.set_markup(fmt::format(format, fmt::arg("capacity", capacity), fmt::arg("icon", getIcon(capacity, icons)), - fmt::arg("time", formatTimeRemaining(time_remaining)))); + fmt::arg("time", time_remaining_formatted))); } // Call parent update ALabel::update(); From 6f7d7e645aeeadb2c081dc00bf9ecaaebdf2991c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Wed, 19 Aug 2020 22:11:11 +0100 Subject: [PATCH 068/355] Prevent line breaks in ellipsized labels If a label is being ellipsized it doesn't make sense to allow it to use line breaks to have multiple lines. Fixes #827 --- src/ALabel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ALabel.cpp b/src/ALabel.cpp index 00fa2f72..3a4063d9 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -22,8 +22,10 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st if (config_["max-length"].isUInt()) { label_.set_max_width_chars(config_["max-length"].asUInt()); label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END); + label_.set_single_line_mode(true); } else if (ellipsize && label_.get_max_width_chars() == -1) { label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END); + label_.set_single_line_mode(true); } if (config_["rotate"].isUInt()) { From ea722615c46d07f5859d2c6a78caebf1f069bc2e Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Mon, 10 Aug 2020 19:23:16 -0400 Subject: [PATCH 069/355] Allow enabing pango markup in the taskbar string The fix for taskbar tooltips in 6a2d214b55 was incomplete: it causes the label to contain escaped titles. Use set_markup so that GTK decodes markup again, but only if requested by the user (disabling markup is needed if using format strings like "{title:.15}" to avoid terminating the string in the middle of an XML entity). --- man/waybar-wlr-taskbar.5.scd | 5 ++++ src/modules/wlr/taskbar.cpp | 51 ++++++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd index f0444122..55d2afdc 100644 --- a/man/waybar-wlr-taskbar.5.scd +++ b/man/waybar-wlr-taskbar.5.scd @@ -32,6 +32,11 @@ Addressed by *wlr/taskbar* default: 16 ++ The size of the icon. +*markup*: ++ + typeof: bool ++ + default: false ++ + If set to true, pango markup will be accepted in format and tooltip-format. + *tooltip*: ++ typeof: bool ++ default: true ++ diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index f7e11df9..57c88fe1 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -306,7 +306,7 @@ std::string Task::state_string(bool shortened) const void Task::handle_title(const char *title) { - title_ = Glib::Markup::escape_text(title); + title_ = title; } void Task::handle_app_id(const char *app_id) @@ -460,38 +460,51 @@ bool Task::operator!=(const Task &o) const void Task::update() { + bool markup = config_["markup"].isBool() ? config_["markup"].asBool() : false; + std::string title = title_; + std::string app_id = app_id_; + if (markup) { + title = Glib::Markup::escape_text(title); + app_id = Glib::Markup::escape_text(app_id); + } if (!format_before_.empty()) { - text_before_.set_label( - fmt::format(format_before_, - fmt::arg("title", title_), - fmt::arg("app_id", app_id_), + auto txt = fmt::format(format_before_, + fmt::arg("title", title), + fmt::arg("app_id", app_id), fmt::arg("state", state_string()), fmt::arg("short_state", state_string(true)) - ) - ); + ); + if (markup) + text_before_.set_markup(txt); + else + text_before_.set_label(txt); text_before_.show(); } if (!format_after_.empty()) { - text_after_.set_label( - fmt::format(format_after_, - fmt::arg("title", title_), - fmt::arg("app_id", app_id_), + auto txt = fmt::format(format_after_, + fmt::arg("title", title), + fmt::arg("app_id", app_id), fmt::arg("state", state_string()), fmt::arg("short_state", state_string(true)) - ) - ); + ); + if (markup) + text_after_.set_markup(txt); + else + text_after_.set_label(txt); text_after_.show(); } if (!format_tooltip_.empty()) { - button_.set_tooltip_markup( - fmt::format(format_tooltip_, - fmt::arg("title", title_), - fmt::arg("app_id", app_id_), + auto txt = fmt::format(format_tooltip_, + fmt::arg("title", title), + fmt::arg("app_id", app_id), fmt::arg("state", state_string()), fmt::arg("short_state", state_string(true)) - ) - ); + ); + if (markup) + button_.set_tooltip_markup(txt); + else + button_.set_tooltip_text(txt); } } From ba78199dd1a8bc7e240ea560e70d6626500eadf1 Mon Sep 17 00:00:00 2001 From: Tamir Zahavi-Brunner Date: Fri, 28 Aug 2020 01:16:41 +0300 Subject: [PATCH 070/355] custom: Fix "restart-interval" This commit fixes the issue where the process would restart immediately and the thread would sleep after the process has restarted, and not before. Fixes #621 --- src/modules/custom.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp index 56431609..5ee9bb52 100644 --- a/src/modules/custom.cpp +++ b/src/modules/custom.cpp @@ -50,7 +50,6 @@ void waybar::modules::Custom::continuousWorker() { thread_ = [this, cmd] { char* buff = nullptr; size_t len = 0; - bool restart = false; if (getline(&buff, &len, fp_) == -1) { int exit_code = 1; if (fp_) { @@ -63,8 +62,8 @@ void waybar::modules::Custom::continuousWorker() { spdlog::error("{} stopped unexpectedly, is it endless?", name_); } if (config_["restart-interval"].isUInt()) { - restart = true; pid_ = -1; + thread_.sleep_for(std::chrono::seconds(config_["restart-interval"].asUInt())); fp_ = util::command::open(cmd, pid_); if (!fp_) { throw std::runtime_error("Unable to open " + cmd); @@ -83,9 +82,6 @@ void waybar::modules::Custom::continuousWorker() { output_ = {0, output}; dp.emit(); } - if (restart) { - thread_.sleep_for(std::chrono::seconds(config_["restart-interval"].asUInt())); - } }; } From 943b6bc51bbe16c8db72a7b16cabd1aa95c1b853 Mon Sep 17 00:00:00 2001 From: Renee D'Netto Date: Thu, 27 Aug 2020 22:07:19 +1000 Subject: [PATCH 071/355] Implement support for reloading of config files. Fixes #759. --- include/client.hpp | 1 + src/client.cpp | 9 ++++----- src/main.cpp | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index 39b6ae3b..37281a29 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -14,6 +14,7 @@ class Client { public: static Client *inst(); int main(int argc, char *argv[]); + void reset(); Glib::RefPtr gtk_app; Glib::RefPtr gdk_display; diff --git a/src/client.cpp b/src/client.cpp index 316e7ec6..042f61d8 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -269,10 +269,9 @@ int waybar::Client::main(int argc, char *argv[]) { gtk_app->hold(); gtk_app->run(); bars.clear(); - zxdg_output_manager_v1_destroy(xdg_output_manager); - zwlr_layer_shell_v1_destroy(layer_shell); - zwp_idle_inhibit_manager_v1_destroy(idle_inhibit_manager); - wl_registry_destroy(registry); - wl_display_disconnect(wl_display); return 0; } + +void waybar::Client::reset() { + gtk_app->quit(); +} diff --git a/src/main.cpp b/src/main.cpp index 19a8de1e..13a25670 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,6 +8,7 @@ std::mutex reap_mtx; std::list reap; +volatile bool reload; void* signalThread(void* args) { int err, signum; @@ -70,12 +71,19 @@ void startSignalThread(void) { int main(int argc, char* argv[]) { try { auto client = waybar::Client::inst(); + std::signal(SIGUSR1, [](int /*signal*/) { for (auto& bar : waybar::Client::inst()->bars) { bar->toggle(); } }); + std::signal(SIGUSR2, [](int /*signal*/) { + spdlog::info("Reloading..."); + reload = true; + waybar::Client::inst()->reset(); + }); + for (int sig = SIGRTMIN + 1; sig <= SIGRTMAX; ++sig) { std::signal(sig, [](int sig) { for (auto& bar : waybar::Client::inst()->bars) { @@ -85,7 +93,12 @@ int main(int argc, char* argv[]) { } startSignalThread(); - auto ret = client->main(argc, argv); + auto ret = 0; + do { + reload = false; + ret = client->main(argc, argv); + } while (reload); + delete client; return ret; } catch (const std::exception& e) { From 1b22e2b3200de7fdb94e52e33f3e8846587c98db Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Sat, 29 Aug 2020 22:56:26 -0700 Subject: [PATCH 072/355] style(workspaces): align text with other modules Currently, the bottom border on workspace buttons eats into the box size and causes the text to sit higher than in other modules. This is ugly when there are other modules (like the window title) right next to the workspace module. To fix the issue, create the bottom border using an inset box-shadow, which doesn't affect the box's content sizing. --- resources/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/style.css b/resources/style.css index e21ae00e..c454bffa 100644 --- a/resources/style.css +++ b/resources/style.css @@ -41,19 +41,19 @@ window#waybar.chromium { padding: 0 5px; background-color: transparent; color: #ffffff; - border-bottom: 3px solid transparent; + /* Use box-shadow instead of border so the text isn't offset */ + box-shadow: inset 0 -3px transparent; } /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ #workspaces button:hover { background: rgba(0, 0, 0, 0.2); - box-shadow: inherit; - border-bottom: 3px solid #ffffff; + box-shadow: inset 0 -3px #ffffff; } #workspaces button.focused { background-color: #64727D; - border-bottom: 3px solid #ffffff; + box-shadow: inset 0 -3px #ffffff; } #workspaces button.urgent { From 225a0eccddd777c474d5efb720611dd5589df914 Mon Sep 17 00:00:00 2001 From: MusiKid Date: Wed, 2 Sep 2020 14:25:57 +0200 Subject: [PATCH 073/355] Add support for memory tooltip --- src/modules/memory/common.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/modules/memory/common.cpp b/src/modules/memory/common.cpp index 4875ec8f..a332d58c 100644 --- a/src/modules/memory/common.cpp +++ b/src/modules/memory/common.cpp @@ -36,7 +36,17 @@ auto waybar::modules::Memory::update() -> void { fmt::arg("used", used_ram_gigabytes), fmt::arg("avail", available_ram_gigabytes))); if (tooltipEnabled()) { - label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1)); + if (config_["tooltip-format"].isString()) { + auto tooltip_format = config_["tooltip-format"].asString(); + label_.set_tooltip_text(fmt::format(tooltip_format, + used_ram_percentage, + fmt::arg("total", total_ram_gigabytes), + fmt::arg("percentage", used_ram_percentage), + fmt::arg("used", used_ram_gigabytes), + fmt::arg("avail", available_ram_gigabytes))); + } else { + label_.set_tooltip_text(fmt::format("{:.{}f}GiB used", used_ram_gigabytes, 1)); + } } event_box_.show(); } else { From 98b6d7f283f6cefa2fb8e43f0d175041dcb1c943 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 6 Sep 2020 21:48:42 +0200 Subject: [PATCH 074/355] Fix non-standard usage of Fixes the following build warning with musl libc: In file included from ../src/util/rfkill.cpp:24: /usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include to [-Wcpp] 1 | #warning redirecting incorrect #include to | ^~~~~~~ --- src/util/rfkill.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/rfkill.cpp b/src/util/rfkill.cpp index f987f4cc..82d29e91 100644 --- a/src/util/rfkill.cpp +++ b/src/util/rfkill.cpp @@ -20,8 +20,8 @@ #include #include +#include #include -#include #include #include From 9e3e4368c733b9d13d78253aacb37173b7ec83cf Mon Sep 17 00:00:00 2001 From: Tamir Zahavi-Brunner Date: Sun, 6 Sep 2020 22:47:34 +0300 Subject: [PATCH 075/355] custom: Add "exec-on-event" config This config allows disabling the default behavior of re-executing the script whenever an event that has a command set is triggered. Fixes #841 --- include/modules/custom.hpp | 1 + man/waybar-custom.5.scd | 6 ++++++ src/modules/custom.cpp | 10 ++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/modules/custom.hpp b/include/modules/custom.hpp index b8dad9dd..7c771450 100644 --- a/include/modules/custom.hpp +++ b/include/modules/custom.hpp @@ -22,6 +22,7 @@ class Custom : public ALabel { void continuousWorker(); void parseOutputRaw(); void parseOutputJson(); + void handleEvent(); bool handleScroll(GdkEventScroll* e); bool handleToggle(GdkEventButton* const& e); diff --git a/man/waybar-custom.5.scd b/man/waybar-custom.5.scd index 121585a9..3e820c63 100644 --- a/man/waybar-custom.5.scd +++ b/man/waybar-custom.5.scd @@ -22,6 +22,12 @@ Addressed by *custom/* The path to a script, which determines if the script in *exec* should be executed. *exec* will be executed if the exit code of *exec-if* equals 0. +*exec-on-event*: ++ + typeof: bool ++ + default: true ++ + If an event command is set (e.g. *on-click* or *on-scroll-up*) then re-execute the script after + executing the event command. + *return-type*: ++ typeof: string ++ See *return-type* diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp index 5ee9bb52..92eedaaa 100644 --- a/src/modules/custom.cpp +++ b/src/modules/custom.cpp @@ -91,15 +91,21 @@ void waybar::modules::Custom::refresh(int sig) { } } +void waybar::modules::Custom::handleEvent() { + if (!config_["exec-on-event"].isBool() || config_["exec-on-event"].asBool()) { + thread_.wake_up(); + } +} + bool waybar::modules::Custom::handleScroll(GdkEventScroll* e) { auto ret = ALabel::handleScroll(e); - thread_.wake_up(); + handleEvent(); return ret; } bool waybar::modules::Custom::handleToggle(GdkEventButton* const& e) { auto ret = ALabel::handleToggle(e); - thread_.wake_up(); + handleEvent(); return ret; } From c65167022223abc8e86650924c7da7e1b1a4b19d Mon Sep 17 00:00:00 2001 From: koffeinfriedhof Date: Sun, 13 Sep 2020 17:32:00 +0200 Subject: [PATCH 076/355] Added song position and queue length. --- man/waybar-mpd.5.scd | 4 ++++ resources/config | 2 +- src/modules/mpd.cpp | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd index 1ee7a988..e8105deb 100644 --- a/man/waybar-mpd.5.scd +++ b/man/waybar-mpd.5.scd @@ -148,6 +148,10 @@ Addressed by *mpd* *{totalTime}*: The length of the current song. To format as a date/time (see example configuration) +*{songPosition}*: The position of the current song. + +*{queueLength}*: The length of the current queue. + *{stateIcon}*: The icon corresponding the playing or paused status of the player (see *state-icons* option) *{consumeIcon}*: The icon corresponding the "consume" option (see *consume-icons* option) diff --git a/resources/config b/resources/config index 832f76c8..36c4f967 100644 --- a/resources/config +++ b/resources/config @@ -27,7 +27,7 @@ "format": "{}" }, "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ", + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ ", "format-disconnected": "Disconnected ", "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", "unknown-tag": "N/A", diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp index d2877f35..26878b11 100644 --- a/src/modules/mpd.cpp +++ b/src/modules/mpd.cpp @@ -133,6 +133,7 @@ void waybar::modules::MPD::setLabel() { auto format = format_; std::string artist, album_artist, album, title, date; + int song_pos, queue_length; std::chrono::seconds elapsedTime, totalTime; std::string stateIcon = ""; @@ -161,6 +162,8 @@ void waybar::modules::MPD::setLabel() { album = getTag(MPD_TAG_ALBUM); title = getTag(MPD_TAG_TITLE); date = getTag(MPD_TAG_DATE); + song_pos = mpd_status_get_song_pos(status_.get()); + queue_length = mpd_status_get_queue_length(status_.get()); elapsedTime = std::chrono::seconds(mpd_status_get_elapsed_time(status_.get())); totalTime = std::chrono::seconds(mpd_status_get_total_time(status_.get())); } @@ -184,6 +187,8 @@ void waybar::modules::MPD::setLabel() { fmt::arg("date", Glib::Markup::escape_text(date).raw()), fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), + fmt::arg("songPosition", song_pos), + fmt::arg("queueLength", queue_length), fmt::arg("stateIcon", stateIcon), fmt::arg("consumeIcon", consumeIcon), fmt::arg("randomIcon", randomIcon), @@ -200,6 +205,8 @@ void waybar::modules::MPD::setLabel() { fmt::arg("album", album), fmt::arg("title", title), fmt::arg("date", date), + fmt::arg("songPosition", song_pos), + fmt::arg("queueLength", queue_length), fmt::arg("stateIcon", stateIcon), fmt::arg("consumeIcon", consumeIcon), fmt::arg("randomIcon", randomIcon), From 95f505a457def2f148d6aa9795dd3f4e6264c061 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 21 Sep 2020 10:56:40 +0200 Subject: [PATCH 077/355] revert: restore eventfd --- include/modules/network.hpp | 2 ++ src/modules/network.cpp | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 4441dc07..c02d3c5e 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -54,6 +54,8 @@ class Network : public ALabel { struct sockaddr_nl nladdr_ = {0}; struct nl_sock* sock_ = nullptr; struct nl_sock* ev_sock_ = nullptr; + int efd_; + int ev_fd_; int nl80211_id_; std::mutex mutex_; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 39141208..74ae9130 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -83,6 +83,8 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf : ALabel(config, "network", id, "{ifname}", 60), ifid_(-1), family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET), + efd_(-1), + ev_fd_(-1), cidr_(-1), signal_strength_dbm_(0), signal_strength_(0), @@ -119,6 +121,12 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf } waybar::modules::Network::~Network() { + if (ev_fd_ > -1) { + close(ev_fd_); + } + if (efd_ > -1) { + close(efd_); + } if (ev_sock_ != nullptr) { nl_socket_drop_membership(ev_sock_, RTNLGRP_LINK); if (family_ == AF_INET) { @@ -150,6 +158,30 @@ void waybar::modules::Network::createEventSocket() { } else { nl_socket_add_membership(ev_sock_, RTNLGRP_IPV6_IFADDR); } + efd_ = epoll_create1(EPOLL_CLOEXEC); + if (efd_ < 0) { + throw std::runtime_error("Can't create epoll"); + } + { + ev_fd_ = eventfd(0, EFD_NONBLOCK); + struct epoll_event event; + memset(&event, 0, sizeof(event)); + event.events = EPOLLIN | EPOLLET; + event.data.fd = ev_fd_; + if (epoll_ctl(efd_, EPOLL_CTL_ADD, ev_fd_, &event) == -1) { + throw std::runtime_error("Can't add epoll event"); + } + } + { + auto fd = nl_socket_get_fd(ev_sock_); + struct epoll_event event; + memset(&event, 0, sizeof(event)); + event.events = EPOLLIN | EPOLLET | EPOLLRDHUP; + event.data.fd = fd; + if (epoll_ctl(efd_, EPOLL_CTL_ADD, fd, &event) == -1) { + throw std::runtime_error("Can't add epoll event"); + } + } } void waybar::modules::Network::createInfoSocket() { @@ -192,6 +224,19 @@ void waybar::modules::Network::worker() { #else spdlog::warn("Waybar has been built without rfkill support."); #endif + thread_ = [this] { + std::array events{}; + + int ec = epoll_wait(efd_, events.data(), EPOLL_MAX, -1); + if (ec > 0) { + for (auto i = 0; i < ec; i++) { + if (events[i].data.fd != nl_socket_get_fd(ev_sock_) || nl_recvmsgs_default(ev_sock_) < 0) { + thread_.stop(); + break; + } + } + } + }; } const std::string waybar::modules::Network::getNetworkState() const { From 6db795401a6c060a1e9c6d2a72be3caa69ad8ed0 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 21 Sep 2020 12:18:42 +0200 Subject: [PATCH 078/355] chore: v0.9.4 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 16da9575..acc8a470 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'waybar', 'cpp', 'c', - version: '0.9.3', + version: '0.9.4', license: 'MIT', default_options : [ 'cpp_std=c++17', From 12016d35bb09b9628a0a37272557fad4e4b4a7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Mon, 21 Sep 2020 13:17:11 +0200 Subject: [PATCH 079/355] disk module: add state for percentage_used --- man/waybar-disk.5.scd | 4 ++++ src/modules/disk.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/man/waybar-disk.5.scd b/man/waybar-disk.5.scd index 1a9320ce..431d7c8f 100644 --- a/man/waybar-disk.5.scd +++ b/man/waybar-disk.5.scd @@ -31,6 +31,10 @@ Addressed by *disk* typeof: integer ++ Positive value to rotate the text label. +*states*: ++ + typeof: array ++ + A number of disk utilization states which get activated on certain percentage thresholds (percentage_used). See *waybar-states(5)*. + *max-length*: ++ typeof: integer ++ The maximum length in character the module should display. diff --git a/src/modules/disk.cpp b/src/modules/disk.cpp index 59ffea67..83d612b1 100644 --- a/src/modules/disk.cpp +++ b/src/modules/disk.cpp @@ -47,13 +47,14 @@ auto waybar::modules::Disk::update() -> void { auto free = pow_format(stats.f_bavail * stats.f_frsize, "B", true); auto used = pow_format((stats.f_blocks - stats.f_bavail) * stats.f_frsize, "B", true); auto total = pow_format(stats.f_blocks * stats.f_frsize, "B", true); + auto percentage_used = (stats.f_blocks - stats.f_bavail) * 100 / stats.f_blocks; label_.set_markup(fmt::format(format_ , stats.f_bavail * 100 / stats.f_blocks , fmt::arg("free", free) , fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks) , fmt::arg("used", used) - , fmt::arg("percentage_used", (stats.f_blocks - stats.f_bavail) * 100 / stats.f_blocks) + , fmt::arg("percentage_used", percentage_used) , fmt::arg("total", total) , fmt::arg("path", path_) )); @@ -67,12 +68,13 @@ auto waybar::modules::Disk::update() -> void { , fmt::arg("free", free) , fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks) , fmt::arg("used", used) - , fmt::arg("percentage_used", (stats.f_blocks - stats.f_bavail) * 100 / stats.f_blocks) + , fmt::arg("percentage_used", percentage_used) , fmt::arg("total", total) , fmt::arg("path", path_) )); } event_box_.show(); + getState(percentage_used); // Call parent update ALabel::update(); } From 7ba14c2097c43866fca5e20ccb736f7ca854fcfd Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Sat, 26 Sep 2020 15:55:06 -0400 Subject: [PATCH 080/355] Fix "on-click-backward" when "on-click-forward" is not present --- src/AModule.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AModule.cpp b/src/AModule.cpp index 10bd0775..7da942e0 100644 --- a/src/AModule.cpp +++ b/src/AModule.cpp @@ -44,9 +44,9 @@ bool AModule::handleToggle(GdkEventButton* const& e) { format = config_["on-click-middle"].asString(); } else if (config_["on-click-right"].isString() && e->button == 3) { format = config_["on-click-right"].asString(); - } else if (config_["on-click-forward"].isString() && e->button == 8) { + } else if (config_["on-click-backward"].isString() && e->button == 8) { format = config_["on-click-backward"].asString(); - } else if (config_["on-click-backward"].isString() && e->button == 9) { + } else if (config_["on-click-forward"].isString() && e->button == 9) { format = config_["on-click-forward"].asString(); } if (!format.empty()) { From 83d679bf72da86c9121b285e5ee6323fb3cbd1a1 Mon Sep 17 00:00:00 2001 From: lrhel Date: Sat, 26 Sep 2020 23:06:12 +0000 Subject: [PATCH 081/355] Add format-icons for workspace's name entry --- src/modules/sway/workspaces.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index 17a0be29..8d78bf50 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -283,6 +283,8 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node return config_["format-icons"]["persistent"].asString(); } else if (config_["format-icons"][key].isString()) { return config_["format-icons"][key].asString(); + } else if (config_["format-icons"][trimWorkspaceName(key)].isString()) { + return config_["format-icons"][trimWorkspaceName(key)].asString(); } } return name; From e9b5be9adbfcc8982c8fc1117d92a250a682c8a1 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 29 Sep 2020 22:28:39 +0200 Subject: [PATCH 082/355] fix: add global /etc/xdg/waybar back. fixes #714 --- src/client.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client.cpp b/src/client.cpp index 316e7ec6..70cc22cf 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -162,6 +162,7 @@ std::tuple waybar::Client::getConfigs( "$XDG_CONFIG_HOME/waybar/config", "$HOME/.config/waybar/config", "$HOME/waybar/config", + "/etc/xdg/waybar/config", SYSCONFDIR "/xdg/waybar/config", "./resources/config", }) @@ -170,6 +171,7 @@ std::tuple waybar::Client::getConfigs( "$XDG_CONFIG_HOME/waybar/style.css", "$HOME/.config/waybar/style.css", "$HOME/waybar/style.css", + "/etc/xdg/waybar/style.css", SYSCONFDIR "/xdg/waybar/style.css", "./resources/style.css", }) From 73681a30e5ad70a3308b883deedd2b5ad694d8c6 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 29 Sep 2020 22:31:28 +0200 Subject: [PATCH 083/355] man: add the prefixed path were config is loaded --- man/{waybar.5.scd => waybar.5.scd.in} | 1 + meson.build | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) rename man/{waybar.5.scd => waybar.5.scd.in} (99%) diff --git a/man/waybar.5.scd b/man/waybar.5.scd.in similarity index 99% rename from man/waybar.5.scd rename to man/waybar.5.scd.in index cd64f7d5..430b9fcd 100644 --- a/man/waybar.5.scd +++ b/man/waybar.5.scd.in @@ -14,6 +14,7 @@ Valid locations for this file are: - *~/.config/waybar/config* - *~/waybar/config* - */etc/xdg/waybar/config* +- *@sysconfdir@/xdg/waybar/config* A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config Also a minimal example configuration can be found on the at the bottom of this man page. diff --git a/meson.build b/meson.build index acc8a470..5ac09869 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,8 @@ project( ], ) +fs = import('fs') + compiler = meson.get_compiler('cpp') cpp_args = [] @@ -256,9 +258,20 @@ scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_opti if scdoc.found() scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) sh = find_program('sh', native: true) + + main_manpage = configure_file( + input: 'man/waybar.5.scd.in', + output: 'waybar.5.scd', + configuration: { + 'sysconfdir': join_paths(prefix, sysconfdir) + } + ) + + main_manpage_path = join_paths(meson.build_root(), '@0@'.format(main_manpage)) + mandir = get_option('mandir') man_files = [ - 'waybar.5.scd', + main_manpage_path, 'waybar-backlight.5.scd', 'waybar-battery.5.scd', 'waybar-clock.5.scd', @@ -281,14 +294,18 @@ if scdoc.found() 'waybar-bluetooth.5.scd', ] - foreach filename : man_files - topic = filename.split('.')[-3].split('/')[-1] - section = filename.split('.')[-2] + foreach file : man_files + path = '@0@'.format(file) + basename = fs.name(path) + + topic = basename.split('.')[-3].split('/')[-1] + section = basename.split('.')[-2] output = '@0@.@1@'.format(topic, section) custom_target( output, - input: 'man/@0@'.format(filename), + # drops the 'man' if `path` is an absolute path + input: join_paths('man', path), output: output, command: [ sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.path(), output) From e4427cb017f235cda521c4a024bc4da55bf7c976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 6 Sep 2020 14:44:13 -0300 Subject: [PATCH 084/355] sndio: Add module. - can control sndio: change volume, toggle mute - appearance is somewhat dynamic: takes muted status into account - uses polling inside sleeper thread to update values - uses sioctl_* functions, requires sndio>=1.7.0. --- README.md | 1 + include/factory.hpp | 3 + include/modules/sndio.hpp | 29 +++++++ man/waybar-sndio.5.scd | 83 +++++++++++++++++++ meson.build | 20 +++++ meson_options.txt | 1 + src/factory.cpp | 5 ++ src/modules/sndio.cpp | 167 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 309 insertions(+) create mode 100644 include/modules/sndio.hpp create mode 100644 man/waybar-sndio.5.scd create mode 100644 src/modules/sndio.cpp diff --git a/README.md b/README.md index 74f46600..b104adec 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ libnl [Network module] libappindicator-gtk3 [Tray module] libdbusmenu-gtk3 [Tray module] libmpdclient [MPD module] +libsndio [sndio module] ``` **Build dependencies** diff --git a/include/factory.hpp b/include/factory.hpp index ebc2359f..3efe6cbd 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -39,6 +39,9 @@ #ifdef HAVE_LIBMPDCLIENT #include "modules/mpd.hpp" #endif +#ifdef HAVE_LIBSNDIO +#include "modules/sndio.hpp" +#endif #include "bar.hpp" #include "modules/custom.hpp" #include "modules/temperature.hpp" diff --git a/include/modules/sndio.hpp b/include/modules/sndio.hpp new file mode 100644 index 00000000..f14d0622 --- /dev/null +++ b/include/modules/sndio.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include +#include +#include "ALabel.hpp" +#include "util/sleeper_thread.hpp" + +namespace waybar::modules { + +class Sndio : public ALabel { + public: + Sndio(const std::string&, const Json::Value&); + ~Sndio(); + auto update() -> void; + auto set_desc(struct sioctl_desc *, unsigned int) -> void; + auto put_val(unsigned int, unsigned int) -> void; + bool handleScroll(GdkEventScroll *); + bool handleToggle(GdkEventButton* const&); + + private: + util::SleeperThread thread_; + struct sioctl_hdl *hdl_; + std::vector pfds_; + unsigned int addr_; + unsigned int volume_, old_volume_, maxval_; + bool muted_; +}; + +} // namespace waybar::modules diff --git a/man/waybar-sndio.5.scd b/man/waybar-sndio.5.scd new file mode 100644 index 00000000..a61c3325 --- /dev/null +++ b/man/waybar-sndio.5.scd @@ -0,0 +1,83 @@ +waybar-sndio(5) + +# NAME + +waybar - sndio module + +# DESCRIPTION + +The *sndio* module displays the current volume reported by sndio(7). + +Additionally, you can control the volume by scrolling *up* or *down* while the +cursor is over the module, and clicking on the module toggles mute. + +# CONFIGURATION + +*format*: ++ + typeof: string ++ + default: {volume}% ++ + The format for how information should be displayed. + +*rotate*: ++ + typeof: integer ++ + Positive value to rotate the text label. + +*max-length*: ++ + typeof: integer ++ + The maximum length in character the module should display. + +*scroll-step*: ++ + typeof: int ++ + default: 5 ++ + The speed in which to change the volume when scrolling. + +*on-click*: ++ + typeof: string ++ + Command to execute when clicked on the module. + This replaces the default behaviour of toggling mute. + +*on-click-middle*: ++ + typeof: string ++ + Command to execute when middle-clicked on the module using mousewheel. + +*on-click-right*: ++ + typeof: string ++ + Command to execute when you right clicked on the module. + +*on-update*: ++ + typeof: string ++ + Command to execute when the module is updated. + +*on-scroll-up*: ++ + typeof: string ++ + Command to execute when scrolling up on the module. + This replaces the default behaviour of volume control. + +*on-scroll-down*: ++ + typeof: string ++ + Command to execute when scrolling down on the module. + This replaces the default behaviour of volume control. + +*smooth-scrolling-threshold*: ++ + typeof: double ++ + Threshold to be used when scrolling. + +# FORMAT REPLACEMENTS + +*{volume}*: Volume in percentage. + +*{raw_value}*: Volume as value reported by sndio. + +# EXAMPLES + +``` +"sndio": { + "format": "{raw_value} 🎜", + "scroll-step": 3 +} +``` + +# STYLE + +- *#sndio* +- *#sndio.muted* diff --git a/meson.build b/meson.build index 5ac09869..023894cd 100644 --- a/meson.build +++ b/meson.build @@ -96,6 +96,19 @@ libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl')) libpulse = dependency('libpulse', required: get_option('pulseaudio')) libudev = dependency('libudev', required: get_option('libudev')) libmpdclient = dependency('libmpdclient', required: get_option('mpd')) + +libsndio = compiler.find_library('sndio', required: get_option('sndio')) +if libsndio.found() + if not compiler.has_function('sioctl_open', prefix: '#include ', dependencies: libsndio) + if get_option('sndio').enabled() + error('libsndio is too old, required >=1.7.0') + else + warning('libsndio is too old, required >=1.7.0') + libsndio = dependency('', required: false) + endif + endif +endif + gtk_layer_shell = dependency('gtk-layer-shell-0', required: get_option('gtk-layer-shell'), fallback : ['gtk-layer-shell', 'gtk_layer_shell_dep']) @@ -207,6 +220,11 @@ if gtk_layer_shell.found() add_project_arguments('-DHAVE_GTK_LAYER_SHELL', language: 'cpp') endif +if libsndio.found() + add_project_arguments('-DHAVE_LIBSNDIO', language: 'cpp') + src_files += 'src/modules/sndio.cpp' +endif + if get_option('rfkill').enabled() if is_linux add_project_arguments('-DWANT_RFKILL', language: 'cpp') @@ -241,6 +259,7 @@ executable( libepoll, libmpdclient, gtk_layer_shell, + libsndio, tz_dep ], include_directories: [include_directories('include')], @@ -292,6 +311,7 @@ if scdoc.found() 'waybar-states.5.scd', 'waybar-wlr-taskbar.5.scd', 'waybar-bluetooth.5.scd', + 'waybar-sndio.5.scd', ] foreach file : man_files diff --git a/meson_options.txt b/meson_options.txt index de47da74..cb5581b3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -8,3 +8,4 @@ option('man-pages', type: 'feature', value: 'auto', description: 'Generate and i option('mpd', type: 'feature', value: 'auto', description: 'Enable support for the Music Player Daemon') option('gtk-layer-shell', type: 'feature', value: 'auto', description: 'Use gtk-layer-shell library for popups support') option('rfkill', type: 'feature', value: 'auto', description: 'Enable support for RFKILL') +option('sndio', type: 'feature', value: 'auto', description: 'Enable support for sndio') diff --git a/src/factory.cpp b/src/factory.cpp index af93b20f..8a5e8250 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -76,6 +76,11 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { if (ref == "mpd") { return new waybar::modules::MPD(id, config_[name]); } +#endif +#ifdef HAVE_LIBSNDIO + if (ref == "sndio") { + return new waybar::modules::Sndio(id, config_[name]); + } #endif if (ref == "temperature") { return new waybar::modules::Temperature(id, config_[name]); diff --git a/src/modules/sndio.cpp b/src/modules/sndio.cpp new file mode 100644 index 00000000..e72c56f9 --- /dev/null +++ b/src/modules/sndio.cpp @@ -0,0 +1,167 @@ +#include "modules/sndio.hpp" +#include +#include +#include +#include + +namespace waybar::modules { + +void ondesc(void *arg, struct sioctl_desc *d, int curval) { + auto self = static_cast(arg); + if (d == NULL) { + // d is NULL when the list is done + return; + } + self->set_desc(d, curval); +} + +void onval(void *arg, unsigned int addr, unsigned int val) { + auto self = static_cast(arg); + self->put_val(addr, val); +} + +Sndio::Sndio(const std::string &id, const Json::Value &config) + : ALabel(config, "sndio", id, "{volume}%"), + hdl_(nullptr), + pfds_(0), + addr_(0), + volume_(0), + old_volume_(0), + maxval_(0), + muted_(false) { + hdl_ = sioctl_open(SIO_DEVANY, SIOCTL_READ | SIOCTL_WRITE, 0); + if (hdl_ == nullptr) { + throw std::runtime_error("sioctl_open() failed."); + } + + if(sioctl_ondesc(hdl_, ondesc, this) == 0) { + throw std::runtime_error("sioctl_ondesc() failed."); + } + + sioctl_onval(hdl_, onval, this); + + pfds_.reserve(sioctl_nfds(hdl_)); + + event_box_.show(); + + event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK | Gdk::BUTTON_PRESS_MASK); + event_box_.signal_scroll_event().connect( + sigc::mem_fun(*this, &Sndio::handleScroll)); + event_box_.signal_button_press_event().connect( + sigc::mem_fun(*this, &Sndio::handleToggle)); + + thread_ = [this] { + dp.emit(); + + int nfds = sioctl_pollfd(hdl_, pfds_.data(), POLLIN); + if (nfds == 0) { + throw std::runtime_error("sioctl_pollfd() failed."); + } + while (poll(pfds_.data(), nfds, -1) < 0) { + if (errno != EINTR) { + throw std::runtime_error("poll() failed."); + } + } + + int revents = sioctl_revents(hdl_, pfds_.data()); + if (revents & POLLHUP) { + throw std::runtime_error("disconnected!"); + } + }; +} + +Sndio::~Sndio() { + sioctl_close(hdl_); +} + +auto Sndio::update() -> void { + auto format = format_; + unsigned int vol = 100. * static_cast(volume_) / static_cast(maxval_); + + if (volume_ == 0) { + label_.get_style_context()->add_class("muted"); + } else { + label_.get_style_context()->remove_class("muted"); + } + + label_.set_markup(fmt::format(format, + fmt::arg("volume", vol), + fmt::arg("raw_value", volume_))); + + ALabel::update(); +} + +auto Sndio::set_desc(struct sioctl_desc *d, unsigned int val) -> void { + std::string name{d->func}; + std::string node_name{d->node0.name}; + + if (name == "level" && node_name == "output" && d->type == SIOCTL_NUM) { + // store addr for output.level value, used in put_val + addr_ = d->addr; + maxval_ = d->maxval; + volume_ = val; + } +} + +auto Sndio::put_val(unsigned int addr, unsigned int val) -> void { + if (addr == addr_) { + volume_ = val; + } +} + +bool Sndio::handleScroll(GdkEventScroll *e) { + // change the volume only when no user provided + // events are configured + if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) { + return AModule::handleScroll(e); + } + + auto dir = AModule::getScrollDir(e); + if (dir == SCROLL_DIR::NONE) { + return true; + } + + int step = 5; + if (config_["scroll-step"].isInt()) { + step = config_["scroll-step"].asInt(); + } + + int new_volume = volume_; + if (muted_) { + new_volume = old_volume_; + } + + if (dir == SCROLL_DIR::UP) { + new_volume += step; + } else if (dir == SCROLL_DIR::DOWN) { + new_volume -= step; + } + new_volume = std::clamp(new_volume, 0, static_cast(maxval_)); + + // quits muted mode if volume changes + muted_ = false; + + sioctl_setval(hdl_, addr_, new_volume); + + return true; +} + +bool Sndio::handleToggle(GdkEventButton* const& e) { + // toggle mute only when no user provided events are configured + if (config_["on-click"].isString()) { + return AModule::handleToggle(e); + } + + muted_ = !muted_; + if (muted_) { + // store old volume to be able to restore it later + old_volume_ = volume_; + sioctl_setval(hdl_, addr_, 0); + } else { + sioctl_setval(hdl_, addr_, old_volume_); + } + + return true; +} + +} /* namespace waybar::modules */ From 1f66b06f93ca740767acc6925ae66c50e5e9a453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 9 Sep 2020 14:48:27 -0300 Subject: [PATCH 085/355] Dockerfiles/alpine: add sndio-dev. --- Dockerfiles/alpine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/alpine b/Dockerfiles/alpine index 7b718375..21d1cbba 100644 --- a/Dockerfiles/alpine +++ b/Dockerfiles/alpine @@ -2,4 +2,4 @@ FROM alpine:latest -RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev pugixml-dev libnl3-dev pulseaudio-dev libmpdclient-dev scdoc +RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev pugixml-dev libnl3-dev pulseaudio-dev libmpdclient-dev sndio-dev scdoc From aa625f51967ad7bb6a71ed018e814892332441e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 6 Sep 2020 15:15:58 -0300 Subject: [PATCH 086/355] .travis.yml: add sndio to FreeBSD run. Also add necessary environment variables and move to /latest, which has sndio-1.7.0. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62f78633..abc739cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,9 @@ jobs: compiler: clang env: before_install: - - sudo pkg install -y gtk-layer-shell gtkmm30 jsoncpp libdbusmenu + - export CPPFLAGS+=-isystem/usr/local/include LDFLAGS+=-L/usr/local/lib # sndio + - sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf + - sudo pkg install -y gtk-layer-shell gtkmm30 jsoncpp libdbusmenu sndio libfmt libmpdclient libudev-devd meson pulseaudio scdoc spdlog script: - meson build -Dman-pages=enabled From 22e46ea6cc64e35f7ab1536d3b43a6a523658242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 4 Oct 2020 02:53:21 -0300 Subject: [PATCH 087/355] sndio: Add reconnection support. --- include/modules/sndio.hpp | 1 + src/modules/sndio.cpp | 62 ++++++++++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/include/modules/sndio.hpp b/include/modules/sndio.hpp index f14d0622..32ed7066 100644 --- a/include/modules/sndio.hpp +++ b/include/modules/sndio.hpp @@ -18,6 +18,7 @@ class Sndio : public ALabel { bool handleToggle(GdkEventButton* const&); private: + auto connect_to_sndio() -> void; util::SleeperThread thread_; struct sioctl_hdl *hdl_; std::vector pfds_; diff --git a/src/modules/sndio.cpp b/src/modules/sndio.cpp index e72c56f9..34c46bdd 100644 --- a/src/modules/sndio.cpp +++ b/src/modules/sndio.cpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace waybar::modules { @@ -20,8 +21,25 @@ void onval(void *arg, unsigned int addr, unsigned int val) { self->put_val(addr, val); } +auto Sndio::connect_to_sndio() -> void { + hdl_ = sioctl_open(SIO_DEVANY, SIOCTL_READ | SIOCTL_WRITE, 0); + if (hdl_ == nullptr) { + throw std::runtime_error("sioctl_open() failed."); + } + + if (sioctl_ondesc(hdl_, ondesc, this) == 0) { + throw std::runtime_error("sioctl_ondesc() failed."); + } + + if (sioctl_onval(hdl_, onval, this) == 0) { + throw std::runtime_error("sioctl_onval() failed."); + } + + pfds_.reserve(sioctl_nfds(hdl_)); +} + Sndio::Sndio(const std::string &id, const Json::Value &config) - : ALabel(config, "sndio", id, "{volume}%"), + : ALabel(config, "sndio", id, "{volume}%", 1), hdl_(nullptr), pfds_(0), addr_(0), @@ -29,18 +47,7 @@ Sndio::Sndio(const std::string &id, const Json::Value &config) old_volume_(0), maxval_(0), muted_(false) { - hdl_ = sioctl_open(SIO_DEVANY, SIOCTL_READ | SIOCTL_WRITE, 0); - if (hdl_ == nullptr) { - throw std::runtime_error("sioctl_open() failed."); - } - - if(sioctl_ondesc(hdl_, ondesc, this) == 0) { - throw std::runtime_error("sioctl_ondesc() failed."); - } - - sioctl_onval(hdl_, onval, this); - - pfds_.reserve(sioctl_nfds(hdl_)); + connect_to_sndio(); event_box_.show(); @@ -65,7 +72,28 @@ Sndio::Sndio(const std::string &id, const Json::Value &config) int revents = sioctl_revents(hdl_, pfds_.data()); if (revents & POLLHUP) { - throw std::runtime_error("disconnected!"); + spdlog::warn("sndio disconnected!"); + sioctl_close(hdl_); + hdl_ = nullptr; + + // reconnection loop + while (thread_.isRunning()) { + try { + connect_to_sndio(); + } catch(std::runtime_error const& e) { + // avoid leaking hdl_ + if (hdl_) { + sioctl_close(hdl_); + hdl_ = nullptr; + } + // rate limiting for the retries + thread_.sleep_for(interval_); + continue; + } + + spdlog::warn("sndio reconnected!"); + break; + } } }; } @@ -116,6 +144,9 @@ bool Sndio::handleScroll(GdkEventScroll *e) { return AModule::handleScroll(e); } + // only try to talk to sndio if connected + if (hdl_ == nullptr) return true; + auto dir = AModule::getScrollDir(e); if (dir == SCROLL_DIR::NONE) { return true; @@ -152,6 +183,9 @@ bool Sndio::handleToggle(GdkEventButton* const& e) { return AModule::handleToggle(e); } + // only try to talk to sndio if connected + if (hdl_ == nullptr) return true; + muted_ = !muted_; if (muted_) { // store old volume to be able to restore it later From 21fdcf41c3aacf381bf4756b6a4ec765e5f8c1db Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Sat, 3 Oct 2020 22:01:51 -0700 Subject: [PATCH 088/355] mpd: revamped to event-driven, single-threaded Fix MPD connection issues by converting/rewriting module into a state-machine driven system. It is fully single-threaded and uses events for transitioning between states. It supports all features and functionality of the previous MPD module. Signed-off-by: Joseph Benden --- include/factory.hpp | 2 +- include/modules/mpd.hpp | 74 ------ include/modules/mpd/mpd.hpp | 66 ++++++ include/modules/mpd/state.hpp | 217 +++++++++++++++++ include/modules/mpd/state.inl.hpp | 24 ++ meson.build | 3 +- src/modules/{ => mpd}/mpd.cpp | 156 ++++-------- src/modules/mpd/state.cpp | 382 ++++++++++++++++++++++++++++++ 8 files changed, 736 insertions(+), 188 deletions(-) delete mode 100644 include/modules/mpd.hpp create mode 100644 include/modules/mpd/mpd.hpp create mode 100644 include/modules/mpd/state.hpp create mode 100644 include/modules/mpd/state.inl.hpp rename src/modules/{ => mpd}/mpd.cpp (72%) create mode 100644 src/modules/mpd/state.cpp diff --git a/include/factory.hpp b/include/factory.hpp index 3efe6cbd..f73c6e19 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -37,7 +37,7 @@ #include "modules/pulseaudio.hpp" #endif #ifdef HAVE_LIBMPDCLIENT -#include "modules/mpd.hpp" +#include "modules/mpd/mpd.hpp" #endif #ifdef HAVE_LIBSNDIO #include "modules/sndio.hpp" diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp deleted file mode 100644 index d08b28b2..00000000 --- a/include/modules/mpd.hpp +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include "ALabel.hpp" - -namespace waybar::modules { - -class MPD : public ALabel { - public: - MPD(const std::string&, const Json::Value&); - auto update() -> void; - - private: - std::thread periodic_updater(); - std::string getTag(mpd_tag_type type, unsigned idx = 0); - void setLabel(); - std::string getStateIcon(); - std::string getOptionIcon(std::string optionName, bool activated); - - std::thread event_listener(); - - // Assumes `connection_lock_` is locked - void tryConnect(); - // If checking errors on the main connection, make sure to lock it using - // `connection_lock_` before calling checkErrors - void checkErrors(mpd_connection* conn); - - // Assumes `connection_lock_` is locked - void fetchState(); - void waitForEvent(); - - bool handlePlayPause(GdkEventButton* const&); - - bool stopped(); - bool playing(); - bool paused(); - - const std::string module_name_; - - using unique_connection = std::unique_ptr; - using unique_status = std::unique_ptr; - using unique_song = std::unique_ptr; - - // Not using unique_ptr since we don't manage the pointer - // (It's either nullptr, or from the config) - const char* server_; - const unsigned port_; - - unsigned timeout_; - - // We need a mutex here because we can trigger updates from multiple thread: - // the event based updates, the periodic updates needed for the elapsed time, - // and the click play/pause feature - std::mutex connection_lock_; - unique_connection connection_; - // The alternate connection will be used to wait for events: since it will - // be blocking (idle) we can't send commands via this connection - // - // No lock since only used in the event listener thread - unique_connection alternate_connection_; - - // Protect them using the `connection_lock_` - unique_status status_; - mpd_state state_; - unique_song song_; - - // To make sure the previous periodic_updater stops before creating a new one - std::mutex periodic_lock_; -}; - -} // namespace waybar::modules diff --git a/include/modules/mpd/mpd.hpp b/include/modules/mpd/mpd.hpp new file mode 100644 index 00000000..effe6334 --- /dev/null +++ b/include/modules/mpd/mpd.hpp @@ -0,0 +1,66 @@ +#pragma once + +#include +#include +#include + +#include +#include + +#include "ALabel.hpp" +#include "modules/mpd/state.hpp" + +namespace waybar::modules { + +class MPD : public ALabel { + friend class detail::Context; + + // State machine + detail::Context context_{this}; + + const std::string module_name_; + + // Not using unique_ptr since we don't manage the pointer + // (It's either nullptr, or from the config) + const char* server_; + const unsigned port_; + + unsigned timeout_; + + detail::unique_connection connection_; + + detail::unique_status status_; + mpd_state state_; + detail::unique_song song_; + + public: + MPD(const std::string&, const Json::Value&); + virtual ~MPD() noexcept = default; + auto update() -> void; + + private: + std::string getTag(mpd_tag_type type, unsigned idx = 0) const; + void setLabel(); + std::string getStateIcon() const; + std::string getOptionIcon(std::string optionName, bool activated) const; + + // GUI-side methods + bool handlePlayPause(GdkEventButton* const&); + void emit() { dp.emit(); } + + // MPD-side, Non-GUI methods. + void tryConnect(); + void checkErrors(mpd_connection* conn); + void fetchState(); + void queryMPD(); + + inline bool stopped() const { return connection_ && state_ == MPD_STATE_STOP; } + inline bool playing() const { return connection_ && state_ == MPD_STATE_PLAY; } + inline bool paused() const { return connection_ && state_ == MPD_STATE_PAUSE; } +}; + +#if !defined(MPD_NOINLINE) +#include "modules/mpd/state.inl.hpp" +#endif + +} // namespace waybar::modules diff --git a/include/modules/mpd/state.hpp b/include/modules/mpd/state.hpp new file mode 100644 index 00000000..79e4f638 --- /dev/null +++ b/include/modules/mpd/state.hpp @@ -0,0 +1,217 @@ +#pragma once + +#include +#include +#include + +#include +#include + +#include "ALabel.hpp" + +namespace waybar::modules { +class MPD; +} // namespace waybar::modules + +namespace waybar::modules::detail { + +using unique_connection = std::unique_ptr; +using unique_status = std::unique_ptr; +using unique_song = std::unique_ptr; + +class Context; + +/// This state machine loosely follows a non-hierarchical, statechart +/// pattern, and includes ENTRY and EXIT actions. +/// +/// The State class is the base class for all other states. The +/// entry and exit methods are automatically called when entering +/// into a new state and exiting from the current state. This +/// includes initially entering (Disconnected class) and exiting +/// Waybar. +/// +/// The following nested "top-level" states are represented: +/// 1. Idle - await notification of MPD activity. +/// 2. All Non-Idle states: +/// 1. Playing - An active song is producing audio output. +/// 2. Paused - The current song is paused. +/// 3. Stopped - No song is actively playing. +/// 3. Disconnected - periodically attempt MPD (re-)connection. +/// +/// NOTE: Since this statechart is non-hierarchical, the above +/// states are flattened into a set. + +class State { + public: + virtual ~State() noexcept = default; + + virtual void entry() noexcept { spdlog::debug("mpd: ignore entry action"); } + virtual void exit() noexcept { spdlog::debug("mpd: ignore exit action"); } + + virtual void play() { spdlog::debug("mpd: ignore play state transition"); } + virtual void stop() { spdlog::debug("mpd: ignore stop state transition"); } + virtual void pause() { spdlog::debug("mpd: ignore pause state transition"); } + + /// Request state update the GUI. + virtual void update() noexcept { spdlog::debug("mpd: ignoring update method request"); } +}; + +class Idle : public State { + Context* const ctx_; + sigc::connection idle_connection_; + + public: + Idle(Context* const ctx) : ctx_{ctx} {} + virtual ~Idle() noexcept { this->exit(); }; + + void entry() noexcept override; + void exit() noexcept override; + + void play() override; + void stop() override; + void pause() override; + void update() noexcept override; + + private: + Idle(const Idle&) = delete; + Idle& operator=(const Idle&) = delete; + + bool on_io(Glib::IOCondition const&); +}; + +class Playing : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Playing(Context* const ctx) : ctx_{ctx} {} + virtual ~Playing() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void pause() override; + void stop() override; + void update() noexcept override; + + private: + Playing(Playing const&) = delete; + Playing& operator=(Playing const&) = delete; + + bool on_timer(); +}; + +class Paused : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Paused(Context* const ctx) : ctx_{ctx} {} + virtual ~Paused() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void play() override; + void stop() override; + void update() noexcept override; + + private: + Paused(Paused const&) = delete; + Paused& operator=(Paused const&) = delete; + + bool on_timer(); +}; + +class Stopped : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Stopped(Context* const ctx) : ctx_{ctx} {} + virtual ~Stopped() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void play() override; + void pause() override; + void update() noexcept override; + + private: + Stopped(Stopped const&) = delete; + Stopped& operator=(Stopped const&) = delete; + + bool on_timer(); +}; + +class Disconnected : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Disconnected(Context* const ctx) : ctx_{ctx} {} + virtual ~Disconnected() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void update() noexcept override; + + private: + Disconnected(Disconnected const&) = delete; + Disconnected& operator=(Disconnected const&) = delete; + + void arm_timer(int interval) noexcept; + void disarm_timer() noexcept; + + bool on_timer(); +}; + +class Context { + std::unique_ptr state_; + waybar::modules::MPD* mpd_module_; + + friend class State; + friend class Playing; + friend class Paused; + friend class Stopped; + friend class Disconnected; + friend class Idle; + + protected: + void setState(std::unique_ptr&& new_state) noexcept { + if (state_.get() != nullptr) { + state_->exit(); + } + state_ = std::move(new_state); + state_->entry(); + } + + bool is_connected() const; + bool is_playing() const; + bool is_paused() const; + bool is_stopped() const; + constexpr std::size_t interval() const; + void tryConnect() const; + void checkErrors(mpd_connection*) const; + void do_update(); + void queryMPD() const; + void fetchState() const; + constexpr mpd_state state() const; + void emit() const; + [[nodiscard]] unique_connection& connection(); + + public: + explicit Context(waybar::modules::MPD* const mpd_module) + : state_{std::make_unique(this)}, mpd_module_{mpd_module} { + state_->entry(); + } + + void play() { state_->play(); } + void stop() { state_->stop(); } + void pause() { state_->pause(); } + void update() noexcept { state_->update(); } +}; + +} // namespace waybar::modules::detail diff --git a/include/modules/mpd/state.inl.hpp b/include/modules/mpd/state.inl.hpp new file mode 100644 index 00000000..0d83b0b3 --- /dev/null +++ b/include/modules/mpd/state.inl.hpp @@ -0,0 +1,24 @@ +#pragma once + +namespace detail { + +inline bool Context::is_connected() const { return mpd_module_->connection_ != nullptr; } +inline bool Context::is_playing() const { return mpd_module_->playing(); } +inline bool Context::is_paused() const { return mpd_module_->paused(); } +inline bool Context::is_stopped() const { return mpd_module_->stopped(); } + +constexpr inline std::size_t Context::interval() const { return mpd_module_->interval_.count(); } +inline void Context::tryConnect() const { mpd_module_->tryConnect(); } +inline unique_connection& Context::connection() { return mpd_module_->connection_; } +constexpr inline mpd_state Context::state() const { return mpd_module_->state_; } + +inline void Context::do_update() { + mpd_module_->setLabel(); +} + +inline void Context::checkErrors(mpd_connection* conn) const { mpd_module_->checkErrors(conn); } +inline void Context::queryMPD() const { mpd_module_->queryMPD(); } +inline void Context::fetchState() const { mpd_module_->fetchState(); } +inline void Context::emit() const { mpd_module_->emit(); } + +} // namespace detail diff --git a/meson.build b/meson.build index 023894cd..de203826 100644 --- a/meson.build +++ b/meson.build @@ -213,7 +213,8 @@ endif if libmpdclient.found() add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp') - src_files += 'src/modules/mpd.cpp' + src_files += 'src/modules/mpd/mpd.cpp' + src_files += 'src/modules/mpd/state.cpp' endif if gtk_layer_shell.found() diff --git a/src/modules/mpd.cpp b/src/modules/mpd/mpd.cpp similarity index 72% rename from src/modules/mpd.cpp rename to src/modules/mpd/mpd.cpp index 26878b11..50f28179 100644 --- a/src/modules/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -1,8 +1,15 @@ -#include "modules/mpd.hpp" +#include "modules/mpd/mpd.hpp" -#include +#include #include +#include "modules/mpd/state.hpp" +#if defined(MPD_NOINLINE) +namespace waybar::modules { +#include "modules/mpd/state.inl.hpp" +} // namespace waybar::modules +#endif + waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) : ALabel(config, "mpd", id, "{album} - {artist} - {title}", 5), module_name_(id.empty() ? "mpd" : "mpd#" + id), @@ -10,7 +17,6 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) port_(config_["port"].isUInt() ? config["port"].asUInt() : 0), timeout_(config_["timeout"].isUInt() ? config_["timeout"].asUInt() * 1'000 : 30'000), connection_(nullptr, &mpd_connection_free), - alternate_connection_(nullptr, &mpd_connection_free), status_(nullptr, &mpd_status_free), song_(nullptr, &mpd_song_free) { if (!config_["port"].isNull() && !config_["port"].isUInt()) { @@ -28,73 +34,33 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) server_ = config["server"].asCString(); } - event_listener().detach(); - event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &MPD::handlePlayPause)); } auto waybar::modules::MPD::update() -> void { - std::lock_guard guard(connection_lock_); - tryConnect(); - - if (connection_ != nullptr) { - try { - bool wasPlaying = playing(); - if(!wasPlaying) { - // Wait until the periodic_updater has stopped - std::lock_guard periodic_guard(periodic_lock_); - } - fetchState(); - if (!wasPlaying && playing()) { - periodic_updater().detach(); - } - } catch (const std::exception& e) { - spdlog::error("{}: {}", module_name_, e.what()); - state_ = MPD_STATE_UNKNOWN; - } - } - - setLabel(); + context_.update(); // Call parent update ALabel::update(); } -std::thread waybar::modules::MPD::event_listener() { - return std::thread([this] { - while (true) { - try { - if (connection_ == nullptr) { - // Retry periodically if no connection - dp.emit(); - std::this_thread::sleep_for(interval_); - } else { - waitForEvent(); - dp.emit(); - } - } catch (const std::exception& e) { - if (strcmp(e.what(), "Connection to MPD closed") == 0) { - spdlog::debug("{}: {}", module_name_, e.what()); - } else { - spdlog::warn("{}: {}", module_name_, e.what()); - } - } +void waybar::modules::MPD::queryMPD() { + if (connection_ != nullptr) { + spdlog::debug("{}: fetching state information", module_name_); + try { + fetchState(); + spdlog::debug("{}: fetch complete", module_name_); + } catch (std::exception const& e) { + spdlog::error("{}: {}", module_name_, e.what()); + state_ = MPD_STATE_UNKNOWN; } - }); + + dp.emit(); + } } -std::thread waybar::modules::MPD::periodic_updater() { - return std::thread([this] { - std::lock_guard guard(periodic_lock_); - while (connection_ != nullptr && playing()) { - dp.emit(); - std::this_thread::sleep_for(std::chrono::seconds(1)); - } - }); -} - -std::string waybar::modules::MPD::getTag(mpd_tag_type type, unsigned idx) { +std::string waybar::modules::MPD::getTag(mpd_tag_type type, unsigned idx) const { std::string result = config_["unknown-tag"].isString() ? config_["unknown-tag"].asString() : "N/A"; const char* tag = mpd_song_get_tag(song_.get(), type, idx); @@ -133,7 +99,7 @@ void waybar::modules::MPD::setLabel() { auto format = format_; std::string artist, album_artist, album, title, date; - int song_pos, queue_length; + int song_pos, queue_length; std::chrono::seconds elapsedTime, totalTime; std::string stateIcon = ""; @@ -149,8 +115,8 @@ void waybar::modules::MPD::setLabel() { label_.get_style_context()->add_class("playing"); label_.get_style_context()->remove_class("paused"); } else if (paused()) { - format = - config_["format-paused"].isString() ? config_["format-paused"].asString() : config_["format"].asString(); + format = config_["format-paused"].isString() ? config_["format-paused"].asString() + : config_["format"].asString(); label_.get_style_context()->add_class("paused"); label_.get_style_context()->remove_class("playing"); } @@ -216,7 +182,7 @@ void waybar::modules::MPD::setLabel() { } } -std::string waybar::modules::MPD::getStateIcon() { +std::string waybar::modules::MPD::getStateIcon() const { if (!config_["state-icons"].isObject()) { return ""; } @@ -238,7 +204,7 @@ std::string waybar::modules::MPD::getStateIcon() { } } -std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool activated) { +std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool activated) const { if (!config_[optionName + "-icons"].isObject()) { return ""; } @@ -261,15 +227,11 @@ void waybar::modules::MPD::tryConnect() { } connection_ = - unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); + detail::unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); - alternate_connection_ = - unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); - - if (connection_ == nullptr || alternate_connection_ == nullptr) { + if (connection_ == nullptr) { spdlog::error("{}: Failed to connect to MPD", module_name_); connection_.reset(); - alternate_connection_.reset(); return; } @@ -279,7 +241,6 @@ void waybar::modules::MPD::tryConnect() { } catch (std::runtime_error& e) { spdlog::error("{}: Failed to connect to MPD: {}", module_name_, e.what()); connection_.reset(); - alternate_connection_.reset(); } } @@ -292,7 +253,6 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) { case MPD_ERROR_CLOSED: mpd_connection_clear_error(conn); connection_.reset(); - alternate_connection_.reset(); state_ = MPD_STATE_UNKNOWN; throw std::runtime_error("Connection to MPD closed"); default: @@ -306,37 +266,20 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) { } void waybar::modules::MPD::fetchState() { + if (connection_ == nullptr) { + spdlog::error("{}: Not connected to MPD", module_name_); + return; + } + auto conn = connection_.get(); - status_ = unique_status(mpd_run_status(conn), &mpd_status_free); + + status_ = detail::unique_status(mpd_run_status(conn), &mpd_status_free); checkErrors(conn); + state_ = mpd_status_get_state(status_.get()); checkErrors(conn); - song_ = unique_song(mpd_run_current_song(conn), &mpd_song_free); - checkErrors(conn); -} - -void waybar::modules::MPD::waitForEvent() { - auto conn = alternate_connection_.get(); - // Wait for a player (play/pause), option (random, shuffle, etc.), or playlist - // change - if (!mpd_send_idle_mask( - conn, static_cast(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_QUEUE))) { - checkErrors(conn); - return; - } - // alternate_idle_ = true; - - // See issue #277: - // https://github.com/Alexays/Waybar/issues/277 - mpd_recv_idle(conn, /* disable_timeout = */ false); - // See issue #281: - // https://github.com/Alexays/Waybar/issues/281 - std::lock_guard guard(connection_lock_); - - checkErrors(conn); - mpd_response_finish(conn); - + song_ = detail::unique_song(mpd_run_current_song(conn), &mpd_song_free); checkErrors(conn); } @@ -346,24 +289,13 @@ bool waybar::modules::MPD::handlePlayPause(GdkEventButton* const& e) { } if (e->button == 1) { - std::lock_guard guard(connection_lock_); - if (stopped()) { - mpd_run_play(connection_.get()); - } else { - mpd_run_toggle_pause(connection_.get()); - } + if (state_ == MPD_STATE_PLAY) + context_.pause(); + else + context_.play(); } else if (e->button == 3) { - std::lock_guard guard(connection_lock_); - mpd_run_stop(connection_.get()); + context_.stop(); } return true; } - -bool waybar::modules::MPD::stopped() { - return connection_ == nullptr || state_ == MPD_STATE_UNKNOWN || state_ == MPD_STATE_STOP || status_ == nullptr; -} - -bool waybar::modules::MPD::playing() { return connection_ != nullptr && state_ == MPD_STATE_PLAY; } - -bool waybar::modules::MPD::paused() { return connection_ != nullptr && state_ == MPD_STATE_PAUSE; } diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp new file mode 100644 index 00000000..21b67aec --- /dev/null +++ b/src/modules/mpd/state.cpp @@ -0,0 +1,382 @@ +#include "modules/mpd/state.hpp" + +#include +#include + +#include "modules/mpd/mpd.hpp" +#if defined(MPD_NOINLINE) +namespace waybar::modules { +#include "modules/mpd/state.inl.hpp" +} // namespace waybar::modules +#endif + +namespace waybar::modules::detail { + +#define IDLE_RUN_NOIDLE_AND_CMD(...) \ + if (idle_connection_.connected()) { \ + idle_connection_.disconnect(); \ + auto conn = ctx_->connection().get(); \ + if (!mpd_run_noidle(conn)) { \ + if (mpd_connection_get_error(conn) != MPD_ERROR_SUCCESS) { \ + spdlog::error("mpd: Idle: failed to unregister for IDLE events"); \ + ctx_->checkErrors(conn); \ + } \ + } \ + __VA_ARGS__; \ + } + +void Idle::play() { + IDLE_RUN_NOIDLE_AND_CMD(mpd_run_play(conn)); + + ctx_->setState(std::make_unique(ctx_)); +} + +void Idle::pause() { + IDLE_RUN_NOIDLE_AND_CMD(mpd_run_pause(conn, true)); + + ctx_->setState(std::make_unique(ctx_)); +} + +void Idle::stop() { + IDLE_RUN_NOIDLE_AND_CMD(mpd_run_stop(conn)); + + ctx_->setState(std::make_unique(ctx_)); +} + +#undef IDLE_RUN_NOIDLE_AND_CMD + +void Idle::update() noexcept { + // This is intentionally blank. +} + +void Idle::entry() noexcept { + auto conn = ctx_->connection().get(); + assert(conn != nullptr); + + if (!mpd_send_idle_mask( + conn, static_cast(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_QUEUE))) { + ctx_->checkErrors(conn); + spdlog::error("mpd: Idle: failed to register for IDLE events"); + } else { + spdlog::debug("mpd: Idle: watching FD"); + sigc::slot idle_slot = sigc::mem_fun(*this, &Idle::on_io); + idle_connection_ = + Glib::signal_io().connect(idle_slot, + mpd_connection_get_fd(conn), + Glib::IO_IN | Glib::IO_PRI | Glib::IO_ERR | Glib::IO_HUP); + } +} + +void Idle::exit() noexcept { + if (idle_connection_.connected()) { + idle_connection_.disconnect(); + spdlog::debug("mpd: Idle: unwatching FD"); + } +} + +bool Idle::on_io(Glib::IOCondition const&) { + auto conn = ctx_->connection().get(); + + // callback should do this: + enum mpd_idle events = mpd_recv_idle(conn, /* ignore_timeout?= */ false); + spdlog::debug("mpd: Idle: recv_idle events -> {}", events); + + mpd_response_finish(conn); + try { + ctx_->checkErrors(conn); + } catch (std::exception const& e) { + spdlog::warn("mpd: Idle: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + mpd_state state = ctx_->state(); + + if (state == MPD_STATE_STOP) { + ctx_->emit(); + ctx_->setState(std::make_unique(ctx_)); + } else if (state == MPD_STATE_PLAY) { + ctx_->emit(); + ctx_->setState(std::make_unique(ctx_)); + } else if (state == MPD_STATE_PAUSE) { + ctx_->emit(); + ctx_->setState(std::make_unique(ctx_)); + } else { + ctx_->emit(); + // self transition + ctx_->setState(std::make_unique(ctx_)); + } + + return false; +} + +void Playing::entry() noexcept { + sigc::slot timer_slot = sigc::mem_fun(*this, &Playing::on_timer); + timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 1'000); + spdlog::debug("mpd: Playing: enabled 1 second periodic timer."); +} + +void Playing::exit() noexcept { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Playing: disabled 1 second periodic timer."); + } +} + +bool Playing::on_timer() { + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (!ctx_->is_connected()) { + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + + if (!ctx_->is_playing()) { + if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + } else { + ctx_->setState(std::make_unique(ctx_)); + } + return false; + } + + ctx_->queryMPD(); + ctx_->emit(); + } catch (std::exception const& e) { + spdlog::warn("mpd: Playing: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + return true; +} + +void Playing::stop() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_stop(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Playing::pause() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_pause(ctx_->connection().get(), true); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Playing::update() noexcept { ctx_->do_update(); } + +void Paused::entry() noexcept { + sigc::slot timer_slot = sigc::mem_fun(*this, &Paused::on_timer); + timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200); + spdlog::debug("mpd: Paused: enabled 200 ms periodic timer."); +} + +void Paused::exit() noexcept { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Paused: disabled 200 ms periodic timer."); + } +} + +bool Paused::on_timer() { + bool rc = true; + + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (!ctx_->is_connected()) { + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + + ctx_->emit(); + + if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_playing()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_stopped()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + } catch (std::exception const& e) { + spdlog::warn("mpd: Paused: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + + return rc; +} + +void Paused::play() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_play(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Paused::stop() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_stop(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Paused::update() noexcept { ctx_->do_update(); } + +void Stopped::entry() noexcept { + sigc::slot timer_slot = sigc::mem_fun(*this, &Stopped::on_timer); + timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200); + spdlog::debug("mpd: Stopped: enabled 200 ms periodic timer."); +} + +void Stopped::exit() noexcept { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Stopped: disabled 200 ms periodic timer."); + } +} + +bool Stopped::on_timer() { + bool rc = true; + + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (!ctx_->is_connected()) { + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + + ctx_->emit(); + + if (ctx_->is_stopped()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_playing()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + } catch (std::exception const& e) { + spdlog::warn("mpd: Stopped: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + + return rc; +} + +void Stopped::play() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_play(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Stopped::pause() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_pause(ctx_->connection().get(), true); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Stopped::update() noexcept { ctx_->do_update(); } + +void Disconnected::arm_timer(int interval) noexcept { + // unregister timer, if present + disarm_timer(); + + // register timer + sigc::slot timer_slot = sigc::mem_fun(*this, &Disconnected::on_timer); + timer_connection_ = + Glib::signal_timeout().connect(timer_slot, interval); + spdlog::debug("mpd: Disconnected: enabled interval timer."); +} + +void Disconnected::disarm_timer() noexcept { + // unregister timer, if present + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Disconnected: disabled interval timer."); + } +} + +void Disconnected::entry() noexcept { + arm_timer(1'000); +} + +void Disconnected::exit() noexcept { + disarm_timer(); +} + +bool Disconnected::on_timer() { + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (ctx_->is_connected()) { + ctx_->fetchState(); + ctx_->emit(); + + if (ctx_->is_playing()) { + ctx_->setState(std::make_unique(ctx_)); + } else if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + } else { + ctx_->setState(std::make_unique(ctx_)); + } + + return false; // do not rearm timer + } + } catch (std::exception const& e) { + spdlog::warn("mpd: Disconnected: error: {}", e.what()); + } + + arm_timer(ctx_->interval() * 1'000); + + return false; +} + +void Disconnected::update() noexcept { ctx_->do_update(); } + +} // namespace waybar::modules::detail From cc3acf8102c71d470b00fd55126aef4fb335f728 Mon Sep 17 00:00:00 2001 From: nikto_b Date: Sat, 10 Oct 2020 19:09:18 +0300 Subject: [PATCH 089/355] feature: created sway language submodule; added styles & config part for a sway language submodule --- include/factory.hpp | 1 + include/modules/sway/language.hpp | 28 +++++++++++++ meson.build | 1 + resources/config | 2 +- resources/style.css | 8 ++++ src/factory.cpp | 3 ++ src/modules/sway/language.cpp | 70 +++++++++++++++++++++++++++++++ 7 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 include/modules/sway/language.hpp create mode 100644 src/modules/sway/language.cpp diff --git a/include/factory.hpp b/include/factory.hpp index 3efe6cbd..7eed15a5 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -6,6 +6,7 @@ #include "modules/sway/mode.hpp" #include "modules/sway/window.hpp" #include "modules/sway/workspaces.hpp" +#include "modules/sway/language.hpp" #endif #ifdef HAVE_WLR #include "modules/wlr/taskbar.hpp" diff --git a/include/modules/sway/language.hpp b/include/modules/sway/language.hpp new file mode 100644 index 00000000..7cd6bf62 --- /dev/null +++ b/include/modules/sway/language.hpp @@ -0,0 +1,28 @@ +#pragma once + +#include +#include "ALabel.hpp" +#include "bar.hpp" +#include "client.hpp" +#include "modules/sway/ipc/client.hpp" +#include "util/json.hpp" + +namespace waybar::modules::sway { + +class Language : public ALabel, public sigc::trackable { + public: + Language(const std::string& id, const Json::Value& config); + ~Language() = default; + auto update() -> void; + + private: + void onEvent(const struct Ipc::ipc_response&); + void onCmd(const struct Ipc::ipc_response&); + + std::string lang_; + util::JsonParser parser_; + std::mutex mutex_; + Ipc ipc_; +}; + +} // namespace waybar::modules::sway diff --git a/meson.build b/meson.build index 023894cd..e563de07 100644 --- a/meson.build +++ b/meson.build @@ -172,6 +172,7 @@ add_project_arguments('-DHAVE_SWAY', language: 'cpp') src_files += [ 'src/modules/sway/ipc/client.cpp', 'src/modules/sway/mode.cpp', + 'src/modules/sway/language.cpp', 'src/modules/sway/window.cpp', 'src/modules/sway/workspaces.cpp' ] diff --git a/resources/config b/resources/config index 36c4f967..f3c0a778 100644 --- a/resources/config +++ b/resources/config @@ -6,7 +6,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], "modules-center": ["sway/window"], - "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"], + "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration // "sway/workspaces": { // "disable-scroll": true, diff --git a/resources/style.css b/resources/style.css index e21ae00e..a16afd09 100644 --- a/resources/style.css +++ b/resources/style.css @@ -200,3 +200,11 @@ label:focus { #mpd.paused { background-color: #51a37a; } + +#language { + background: #00b093; + color: #740864; + padding: 0 5px; + margin: 0 5px; + min-width: 16px; +} diff --git a/src/factory.cpp b/src/factory.cpp index 8a5e8250..1f907894 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -22,6 +22,9 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { if (ref == "sway/window") { return new waybar::modules::sway::Window(id, bar_, config_[name]); } + if (ref == "sway/language") { + return new waybar::modules::sway::Language(id, config_[name]); + } #endif #ifdef HAVE_WLR if (ref == "wlr/taskbar") { diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp new file mode 100644 index 00000000..a3186477 --- /dev/null +++ b/src/modules/sway/language.cpp @@ -0,0 +1,70 @@ +#include "modules/sway/language.hpp" +#include + +namespace waybar::modules::sway { + +Language::Language(const std::string& id, const Json::Value& config) + : ALabel(config, "language", id, "{}", 0, true) { + ipc_.subscribe(R"(["input"])"); + ipc_.signal_event.connect(sigc::mem_fun(*this, &Language::onEvent)); + ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Language::onCmd)); + ipc_.sendCmd(IPC_GET_INPUTS); + // Launch worker + ipc_.setWorker([this] { + try { + ipc_.handleEvent(); + } catch (const std::exception& e) { + spdlog::error("Language: {}", e.what()); + } + }); + dp.emit(); +} + +void Language::onCmd(const struct Ipc::ipc_response& res) { + try { + auto payload = parser_.parse(res.payload); + //Display current layout of a device with a maximum count of layouts, expecting that all will be OK + Json::Value::ArrayIndex maxId = 0, max = 0; + for(Json::Value::ArrayIndex i = 0; i < payload.size(); i++) { + if(payload[i]["xkb_layout_names"].size() > max) { + max = payload[i]["xkb_layout_names"].size(); + maxId = i; + } + } + auto layout_name = payload[maxId]["xkb_active_layout_name"].asString().substr(0,2); + lang_ = Glib::Markup::escape_text(layout_name); + dp.emit(); + } catch (const std::exception& e) { + spdlog::error("Language: {}", e.what()); + } +} + +void Language::onEvent(const struct Ipc::ipc_response& res) { + try { + std::lock_guard lock(mutex_); + auto payload = parser_.parse(res.payload)["input"]; + if (payload["type"].asString() == "keyboard") { + auto layout_name = payload["xkb_active_layout_name"].asString().substr(0,2); + lang_ = Glib::Markup::escape_text(layout_name); + } + dp.emit(); + } catch (const std::exception& e) { + spdlog::error("Language: {}", e.what()); + } +} + +auto Language::update() -> void { + if (lang_.empty()) { + event_box_.hide(); + } else { + label_.set_markup(fmt::format(format_, lang_)); + if (tooltipEnabled()) { + label_.set_tooltip_text(lang_); + } + event_box_.show(); + } + // Call parent update + ALabel::update(); +} + +} // namespace waybar::modules::sway From e9b2d275c836a08d8d5eae4cf2766f362c3cb572 Mon Sep 17 00:00:00 2001 From: Christoffer Noerbjerg Date: Sun, 11 Oct 2020 22:36:30 +0200 Subject: [PATCH 090/355] added module group selectors for styling --- src/bar.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bar.cpp b/src/bar.cpp index 45e34201..8af6b971 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -24,6 +24,9 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) window.get_style_context()->add_class(output->name); window.get_style_context()->add_class(config["name"].asString()); window.get_style_context()->add_class(config["position"].asString()); + left_.get_style_context()->add_class("modules-left"); + center_.get_style_context()->add_class("modules-center"); + right_.get_style_context()->add_class("modules-right"); if (config["position"] == "right" || config["position"] == "left") { height_ = 0; From 4229e9b2ca8aaa31bbf624e019b4cf82aed06e68 Mon Sep 17 00:00:00 2001 From: Ole Martin Handeland Date: Mon, 12 Oct 2020 02:05:26 +0200 Subject: [PATCH 091/355] Implemented format-{state} for cpu/disk/memory --- src/modules/cpu/common.cpp | 15 +++++++++++++-- src/modules/disk.cpp | 32 +++++++++++++++++++++----------- src/modules/memory/common.cpp | 26 ++++++++++++++++++-------- 3 files changed, 52 insertions(+), 21 deletions(-) diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index f2204cde..e86d10a0 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -15,8 +15,19 @@ auto waybar::modules::Cpu::update() -> void { if (tooltipEnabled()) { label_.set_tooltip_text(tooltip); } - label_.set_markup(fmt::format(format_, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage))); - getState(cpu_usage); + auto format = format_; + auto state = getState(cpu_usage); + if (!state.empty() && config_["format-" + state].isString()) { + format = config_["format-" + state].asString(); + } + + if (format.empty()) { + event_box_.hide(); + } else { + event_box_.show(); + label_.set_markup(fmt::format(format, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage))); + } + // Call parent update ALabel::update(); } diff --git a/src/modules/disk.cpp b/src/modules/disk.cpp index 83d612b1..e63db475 100644 --- a/src/modules/disk.cpp +++ b/src/modules/disk.cpp @@ -49,15 +49,27 @@ auto waybar::modules::Disk::update() -> void { auto total = pow_format(stats.f_blocks * stats.f_frsize, "B", true); auto percentage_used = (stats.f_blocks - stats.f_bavail) * 100 / stats.f_blocks; - label_.set_markup(fmt::format(format_ - , stats.f_bavail * 100 / stats.f_blocks - , fmt::arg("free", free) - , fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks) - , fmt::arg("used", used) - , fmt::arg("percentage_used", percentage_used) - , fmt::arg("total", total) - , fmt::arg("path", path_) - )); + auto format = format_; + auto state = getState(percentage_used); + if (!state.empty() && config_["format-" + state].isString()) { + format = config_["format-" + state].asString(); + } + + if (format.empty()) { + event_box_.hide(); + } else { + event_box_.show(); + label_.set_markup(fmt::format(format + , stats.f_bavail * 100 / stats.f_blocks + , fmt::arg("free", free) + , fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks) + , fmt::arg("used", used) + , fmt::arg("percentage_used", percentage_used) + , fmt::arg("total", total) + , fmt::arg("path", path_) + )); + } + if (tooltipEnabled()) { std::string tooltip_format = "{used} used out of {total} on {path} ({percentage_used}%)"; if (config_["tooltip-format"].isString()) { @@ -73,8 +85,6 @@ auto waybar::modules::Disk::update() -> void { , fmt::arg("path", path_) )); } - event_box_.show(); - getState(percentage_used); // Call parent update ALabel::update(); } diff --git a/src/modules/memory/common.cpp b/src/modules/memory/common.cpp index a332d58c..09ce8e83 100644 --- a/src/modules/memory/common.cpp +++ b/src/modules/memory/common.cpp @@ -28,13 +28,24 @@ auto waybar::modules::Memory::update() -> void { auto used_ram_gigabytes = (memtotal - memfree) / std::pow(1024, 2); auto available_ram_gigabytes = memfree / std::pow(1024, 2); - getState(used_ram_percentage); - label_.set_markup(fmt::format(format_, - used_ram_percentage, - fmt::arg("total", total_ram_gigabytes), - fmt::arg("percentage", used_ram_percentage), - fmt::arg("used", used_ram_gigabytes), - fmt::arg("avail", available_ram_gigabytes))); + auto format = format_; + auto state = getState(used_ram_percentage); + if (!state.empty() && config_["format-" + state].isString()) { + format = config_["format-" + state].asString(); + } + + if (format.empty()) { + event_box_.hide(); + } else { + event_box_.show(); + label_.set_markup(fmt::format(format, + used_ram_percentage, + fmt::arg("total", total_ram_gigabytes), + fmt::arg("percentage", used_ram_percentage), + fmt::arg("used", used_ram_gigabytes), + fmt::arg("avail", available_ram_gigabytes))); + } + if (tooltipEnabled()) { if (config_["tooltip-format"].isString()) { auto tooltip_format = config_["tooltip-format"].asString(); @@ -48,7 +59,6 @@ auto waybar::modules::Memory::update() -> void { label_.set_tooltip_text(fmt::format("{:.{}f}GiB used", used_ram_gigabytes, 1)); } } - event_box_.show(); } else { event_box_.hide(); } From 54beabb9dc7ce3bc3a80488c948ca6bfd437336d Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 18 Oct 2020 10:45:31 +0200 Subject: [PATCH 092/355] Revert "mpd: revamped to event-driven, single-threaded" --- include/factory.hpp | 2 +- include/modules/mpd.hpp | 74 ++++++ include/modules/mpd/mpd.hpp | 66 ------ include/modules/mpd/state.hpp | 217 ----------------- include/modules/mpd/state.inl.hpp | 24 -- meson.build | 3 +- src/modules/{mpd => }/mpd.cpp | 156 ++++++++---- src/modules/mpd/state.cpp | 382 ------------------------------ 8 files changed, 188 insertions(+), 736 deletions(-) create mode 100644 include/modules/mpd.hpp delete mode 100644 include/modules/mpd/mpd.hpp delete mode 100644 include/modules/mpd/state.hpp delete mode 100644 include/modules/mpd/state.inl.hpp rename src/modules/{mpd => }/mpd.cpp (72%) delete mode 100644 src/modules/mpd/state.cpp diff --git a/include/factory.hpp b/include/factory.hpp index f73c6e19..3efe6cbd 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -37,7 +37,7 @@ #include "modules/pulseaudio.hpp" #endif #ifdef HAVE_LIBMPDCLIENT -#include "modules/mpd/mpd.hpp" +#include "modules/mpd.hpp" #endif #ifdef HAVE_LIBSNDIO #include "modules/sndio.hpp" diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp new file mode 100644 index 00000000..d08b28b2 --- /dev/null +++ b/include/modules/mpd.hpp @@ -0,0 +1,74 @@ +#pragma once + +#include +#include +#include +#include +#include "ALabel.hpp" + +namespace waybar::modules { + +class MPD : public ALabel { + public: + MPD(const std::string&, const Json::Value&); + auto update() -> void; + + private: + std::thread periodic_updater(); + std::string getTag(mpd_tag_type type, unsigned idx = 0); + void setLabel(); + std::string getStateIcon(); + std::string getOptionIcon(std::string optionName, bool activated); + + std::thread event_listener(); + + // Assumes `connection_lock_` is locked + void tryConnect(); + // If checking errors on the main connection, make sure to lock it using + // `connection_lock_` before calling checkErrors + void checkErrors(mpd_connection* conn); + + // Assumes `connection_lock_` is locked + void fetchState(); + void waitForEvent(); + + bool handlePlayPause(GdkEventButton* const&); + + bool stopped(); + bool playing(); + bool paused(); + + const std::string module_name_; + + using unique_connection = std::unique_ptr; + using unique_status = std::unique_ptr; + using unique_song = std::unique_ptr; + + // Not using unique_ptr since we don't manage the pointer + // (It's either nullptr, or from the config) + const char* server_; + const unsigned port_; + + unsigned timeout_; + + // We need a mutex here because we can trigger updates from multiple thread: + // the event based updates, the periodic updates needed for the elapsed time, + // and the click play/pause feature + std::mutex connection_lock_; + unique_connection connection_; + // The alternate connection will be used to wait for events: since it will + // be blocking (idle) we can't send commands via this connection + // + // No lock since only used in the event listener thread + unique_connection alternate_connection_; + + // Protect them using the `connection_lock_` + unique_status status_; + mpd_state state_; + unique_song song_; + + // To make sure the previous periodic_updater stops before creating a new one + std::mutex periodic_lock_; +}; + +} // namespace waybar::modules diff --git a/include/modules/mpd/mpd.hpp b/include/modules/mpd/mpd.hpp deleted file mode 100644 index effe6334..00000000 --- a/include/modules/mpd/mpd.hpp +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include -#include -#include - -#include -#include - -#include "ALabel.hpp" -#include "modules/mpd/state.hpp" - -namespace waybar::modules { - -class MPD : public ALabel { - friend class detail::Context; - - // State machine - detail::Context context_{this}; - - const std::string module_name_; - - // Not using unique_ptr since we don't manage the pointer - // (It's either nullptr, or from the config) - const char* server_; - const unsigned port_; - - unsigned timeout_; - - detail::unique_connection connection_; - - detail::unique_status status_; - mpd_state state_; - detail::unique_song song_; - - public: - MPD(const std::string&, const Json::Value&); - virtual ~MPD() noexcept = default; - auto update() -> void; - - private: - std::string getTag(mpd_tag_type type, unsigned idx = 0) const; - void setLabel(); - std::string getStateIcon() const; - std::string getOptionIcon(std::string optionName, bool activated) const; - - // GUI-side methods - bool handlePlayPause(GdkEventButton* const&); - void emit() { dp.emit(); } - - // MPD-side, Non-GUI methods. - void tryConnect(); - void checkErrors(mpd_connection* conn); - void fetchState(); - void queryMPD(); - - inline bool stopped() const { return connection_ && state_ == MPD_STATE_STOP; } - inline bool playing() const { return connection_ && state_ == MPD_STATE_PLAY; } - inline bool paused() const { return connection_ && state_ == MPD_STATE_PAUSE; } -}; - -#if !defined(MPD_NOINLINE) -#include "modules/mpd/state.inl.hpp" -#endif - -} // namespace waybar::modules diff --git a/include/modules/mpd/state.hpp b/include/modules/mpd/state.hpp deleted file mode 100644 index 79e4f638..00000000 --- a/include/modules/mpd/state.hpp +++ /dev/null @@ -1,217 +0,0 @@ -#pragma once - -#include -#include -#include - -#include -#include - -#include "ALabel.hpp" - -namespace waybar::modules { -class MPD; -} // namespace waybar::modules - -namespace waybar::modules::detail { - -using unique_connection = std::unique_ptr; -using unique_status = std::unique_ptr; -using unique_song = std::unique_ptr; - -class Context; - -/// This state machine loosely follows a non-hierarchical, statechart -/// pattern, and includes ENTRY and EXIT actions. -/// -/// The State class is the base class for all other states. The -/// entry and exit methods are automatically called when entering -/// into a new state and exiting from the current state. This -/// includes initially entering (Disconnected class) and exiting -/// Waybar. -/// -/// The following nested "top-level" states are represented: -/// 1. Idle - await notification of MPD activity. -/// 2. All Non-Idle states: -/// 1. Playing - An active song is producing audio output. -/// 2. Paused - The current song is paused. -/// 3. Stopped - No song is actively playing. -/// 3. Disconnected - periodically attempt MPD (re-)connection. -/// -/// NOTE: Since this statechart is non-hierarchical, the above -/// states are flattened into a set. - -class State { - public: - virtual ~State() noexcept = default; - - virtual void entry() noexcept { spdlog::debug("mpd: ignore entry action"); } - virtual void exit() noexcept { spdlog::debug("mpd: ignore exit action"); } - - virtual void play() { spdlog::debug("mpd: ignore play state transition"); } - virtual void stop() { spdlog::debug("mpd: ignore stop state transition"); } - virtual void pause() { spdlog::debug("mpd: ignore pause state transition"); } - - /// Request state update the GUI. - virtual void update() noexcept { spdlog::debug("mpd: ignoring update method request"); } -}; - -class Idle : public State { - Context* const ctx_; - sigc::connection idle_connection_; - - public: - Idle(Context* const ctx) : ctx_{ctx} {} - virtual ~Idle() noexcept { this->exit(); }; - - void entry() noexcept override; - void exit() noexcept override; - - void play() override; - void stop() override; - void pause() override; - void update() noexcept override; - - private: - Idle(const Idle&) = delete; - Idle& operator=(const Idle&) = delete; - - bool on_io(Glib::IOCondition const&); -}; - -class Playing : public State { - Context* const ctx_; - sigc::connection timer_connection_; - - public: - Playing(Context* const ctx) : ctx_{ctx} {} - virtual ~Playing() noexcept { this->exit(); } - - void entry() noexcept override; - void exit() noexcept override; - - void pause() override; - void stop() override; - void update() noexcept override; - - private: - Playing(Playing const&) = delete; - Playing& operator=(Playing const&) = delete; - - bool on_timer(); -}; - -class Paused : public State { - Context* const ctx_; - sigc::connection timer_connection_; - - public: - Paused(Context* const ctx) : ctx_{ctx} {} - virtual ~Paused() noexcept { this->exit(); } - - void entry() noexcept override; - void exit() noexcept override; - - void play() override; - void stop() override; - void update() noexcept override; - - private: - Paused(Paused const&) = delete; - Paused& operator=(Paused const&) = delete; - - bool on_timer(); -}; - -class Stopped : public State { - Context* const ctx_; - sigc::connection timer_connection_; - - public: - Stopped(Context* const ctx) : ctx_{ctx} {} - virtual ~Stopped() noexcept { this->exit(); } - - void entry() noexcept override; - void exit() noexcept override; - - void play() override; - void pause() override; - void update() noexcept override; - - private: - Stopped(Stopped const&) = delete; - Stopped& operator=(Stopped const&) = delete; - - bool on_timer(); -}; - -class Disconnected : public State { - Context* const ctx_; - sigc::connection timer_connection_; - - public: - Disconnected(Context* const ctx) : ctx_{ctx} {} - virtual ~Disconnected() noexcept { this->exit(); } - - void entry() noexcept override; - void exit() noexcept override; - - void update() noexcept override; - - private: - Disconnected(Disconnected const&) = delete; - Disconnected& operator=(Disconnected const&) = delete; - - void arm_timer(int interval) noexcept; - void disarm_timer() noexcept; - - bool on_timer(); -}; - -class Context { - std::unique_ptr state_; - waybar::modules::MPD* mpd_module_; - - friend class State; - friend class Playing; - friend class Paused; - friend class Stopped; - friend class Disconnected; - friend class Idle; - - protected: - void setState(std::unique_ptr&& new_state) noexcept { - if (state_.get() != nullptr) { - state_->exit(); - } - state_ = std::move(new_state); - state_->entry(); - } - - bool is_connected() const; - bool is_playing() const; - bool is_paused() const; - bool is_stopped() const; - constexpr std::size_t interval() const; - void tryConnect() const; - void checkErrors(mpd_connection*) const; - void do_update(); - void queryMPD() const; - void fetchState() const; - constexpr mpd_state state() const; - void emit() const; - [[nodiscard]] unique_connection& connection(); - - public: - explicit Context(waybar::modules::MPD* const mpd_module) - : state_{std::make_unique(this)}, mpd_module_{mpd_module} { - state_->entry(); - } - - void play() { state_->play(); } - void stop() { state_->stop(); } - void pause() { state_->pause(); } - void update() noexcept { state_->update(); } -}; - -} // namespace waybar::modules::detail diff --git a/include/modules/mpd/state.inl.hpp b/include/modules/mpd/state.inl.hpp deleted file mode 100644 index 0d83b0b3..00000000 --- a/include/modules/mpd/state.inl.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -namespace detail { - -inline bool Context::is_connected() const { return mpd_module_->connection_ != nullptr; } -inline bool Context::is_playing() const { return mpd_module_->playing(); } -inline bool Context::is_paused() const { return mpd_module_->paused(); } -inline bool Context::is_stopped() const { return mpd_module_->stopped(); } - -constexpr inline std::size_t Context::interval() const { return mpd_module_->interval_.count(); } -inline void Context::tryConnect() const { mpd_module_->tryConnect(); } -inline unique_connection& Context::connection() { return mpd_module_->connection_; } -constexpr inline mpd_state Context::state() const { return mpd_module_->state_; } - -inline void Context::do_update() { - mpd_module_->setLabel(); -} - -inline void Context::checkErrors(mpd_connection* conn) const { mpd_module_->checkErrors(conn); } -inline void Context::queryMPD() const { mpd_module_->queryMPD(); } -inline void Context::fetchState() const { mpd_module_->fetchState(); } -inline void Context::emit() const { mpd_module_->emit(); } - -} // namespace detail diff --git a/meson.build b/meson.build index de203826..023894cd 100644 --- a/meson.build +++ b/meson.build @@ -213,8 +213,7 @@ endif if libmpdclient.found() add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp') - src_files += 'src/modules/mpd/mpd.cpp' - src_files += 'src/modules/mpd/state.cpp' + src_files += 'src/modules/mpd.cpp' endif if gtk_layer_shell.found() diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd.cpp similarity index 72% rename from src/modules/mpd/mpd.cpp rename to src/modules/mpd.cpp index 50f28179..26878b11 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd.cpp @@ -1,15 +1,8 @@ -#include "modules/mpd/mpd.hpp" +#include "modules/mpd.hpp" -#include +#include #include -#include "modules/mpd/state.hpp" -#if defined(MPD_NOINLINE) -namespace waybar::modules { -#include "modules/mpd/state.inl.hpp" -} // namespace waybar::modules -#endif - waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) : ALabel(config, "mpd", id, "{album} - {artist} - {title}", 5), module_name_(id.empty() ? "mpd" : "mpd#" + id), @@ -17,6 +10,7 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) port_(config_["port"].isUInt() ? config["port"].asUInt() : 0), timeout_(config_["timeout"].isUInt() ? config_["timeout"].asUInt() * 1'000 : 30'000), connection_(nullptr, &mpd_connection_free), + alternate_connection_(nullptr, &mpd_connection_free), status_(nullptr, &mpd_status_free), song_(nullptr, &mpd_song_free) { if (!config_["port"].isNull() && !config_["port"].isUInt()) { @@ -34,33 +28,73 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) server_ = config["server"].asCString(); } + event_listener().detach(); + event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &MPD::handlePlayPause)); } auto waybar::modules::MPD::update() -> void { - context_.update(); + std::lock_guard guard(connection_lock_); + tryConnect(); + + if (connection_ != nullptr) { + try { + bool wasPlaying = playing(); + if(!wasPlaying) { + // Wait until the periodic_updater has stopped + std::lock_guard periodic_guard(periodic_lock_); + } + fetchState(); + if (!wasPlaying && playing()) { + periodic_updater().detach(); + } + } catch (const std::exception& e) { + spdlog::error("{}: {}", module_name_, e.what()); + state_ = MPD_STATE_UNKNOWN; + } + } + + setLabel(); // Call parent update ALabel::update(); } -void waybar::modules::MPD::queryMPD() { - if (connection_ != nullptr) { - spdlog::debug("{}: fetching state information", module_name_); - try { - fetchState(); - spdlog::debug("{}: fetch complete", module_name_); - } catch (std::exception const& e) { - spdlog::error("{}: {}", module_name_, e.what()); - state_ = MPD_STATE_UNKNOWN; +std::thread waybar::modules::MPD::event_listener() { + return std::thread([this] { + while (true) { + try { + if (connection_ == nullptr) { + // Retry periodically if no connection + dp.emit(); + std::this_thread::sleep_for(interval_); + } else { + waitForEvent(); + dp.emit(); + } + } catch (const std::exception& e) { + if (strcmp(e.what(), "Connection to MPD closed") == 0) { + spdlog::debug("{}: {}", module_name_, e.what()); + } else { + spdlog::warn("{}: {}", module_name_, e.what()); + } + } } - - dp.emit(); - } + }); } -std::string waybar::modules::MPD::getTag(mpd_tag_type type, unsigned idx) const { +std::thread waybar::modules::MPD::periodic_updater() { + return std::thread([this] { + std::lock_guard guard(periodic_lock_); + while (connection_ != nullptr && playing()) { + dp.emit(); + std::this_thread::sleep_for(std::chrono::seconds(1)); + } + }); +} + +std::string waybar::modules::MPD::getTag(mpd_tag_type type, unsigned idx) { std::string result = config_["unknown-tag"].isString() ? config_["unknown-tag"].asString() : "N/A"; const char* tag = mpd_song_get_tag(song_.get(), type, idx); @@ -99,7 +133,7 @@ void waybar::modules::MPD::setLabel() { auto format = format_; std::string artist, album_artist, album, title, date; - int song_pos, queue_length; + int song_pos, queue_length; std::chrono::seconds elapsedTime, totalTime; std::string stateIcon = ""; @@ -115,8 +149,8 @@ void waybar::modules::MPD::setLabel() { label_.get_style_context()->add_class("playing"); label_.get_style_context()->remove_class("paused"); } else if (paused()) { - format = config_["format-paused"].isString() ? config_["format-paused"].asString() - : config_["format"].asString(); + format = + config_["format-paused"].isString() ? config_["format-paused"].asString() : config_["format"].asString(); label_.get_style_context()->add_class("paused"); label_.get_style_context()->remove_class("playing"); } @@ -182,7 +216,7 @@ void waybar::modules::MPD::setLabel() { } } -std::string waybar::modules::MPD::getStateIcon() const { +std::string waybar::modules::MPD::getStateIcon() { if (!config_["state-icons"].isObject()) { return ""; } @@ -204,7 +238,7 @@ std::string waybar::modules::MPD::getStateIcon() const { } } -std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool activated) const { +std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool activated) { if (!config_[optionName + "-icons"].isObject()) { return ""; } @@ -227,11 +261,15 @@ void waybar::modules::MPD::tryConnect() { } connection_ = - detail::unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); + unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); - if (connection_ == nullptr) { + alternate_connection_ = + unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); + + if (connection_ == nullptr || alternate_connection_ == nullptr) { spdlog::error("{}: Failed to connect to MPD", module_name_); connection_.reset(); + alternate_connection_.reset(); return; } @@ -241,6 +279,7 @@ void waybar::modules::MPD::tryConnect() { } catch (std::runtime_error& e) { spdlog::error("{}: Failed to connect to MPD: {}", module_name_, e.what()); connection_.reset(); + alternate_connection_.reset(); } } @@ -253,6 +292,7 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) { case MPD_ERROR_CLOSED: mpd_connection_clear_error(conn); connection_.reset(); + alternate_connection_.reset(); state_ = MPD_STATE_UNKNOWN; throw std::runtime_error("Connection to MPD closed"); default: @@ -266,20 +306,37 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) { } void waybar::modules::MPD::fetchState() { - if (connection_ == nullptr) { - spdlog::error("{}: Not connected to MPD", module_name_); - return; - } - auto conn = connection_.get(); - - status_ = detail::unique_status(mpd_run_status(conn), &mpd_status_free); + status_ = unique_status(mpd_run_status(conn), &mpd_status_free); checkErrors(conn); - state_ = mpd_status_get_state(status_.get()); checkErrors(conn); - song_ = detail::unique_song(mpd_run_current_song(conn), &mpd_song_free); + song_ = unique_song(mpd_run_current_song(conn), &mpd_song_free); + checkErrors(conn); +} + +void waybar::modules::MPD::waitForEvent() { + auto conn = alternate_connection_.get(); + // Wait for a player (play/pause), option (random, shuffle, etc.), or playlist + // change + if (!mpd_send_idle_mask( + conn, static_cast(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_QUEUE))) { + checkErrors(conn); + return; + } + // alternate_idle_ = true; + + // See issue #277: + // https://github.com/Alexays/Waybar/issues/277 + mpd_recv_idle(conn, /* disable_timeout = */ false); + // See issue #281: + // https://github.com/Alexays/Waybar/issues/281 + std::lock_guard guard(connection_lock_); + + checkErrors(conn); + mpd_response_finish(conn); + checkErrors(conn); } @@ -289,13 +346,24 @@ bool waybar::modules::MPD::handlePlayPause(GdkEventButton* const& e) { } if (e->button == 1) { - if (state_ == MPD_STATE_PLAY) - context_.pause(); - else - context_.play(); + std::lock_guard guard(connection_lock_); + if (stopped()) { + mpd_run_play(connection_.get()); + } else { + mpd_run_toggle_pause(connection_.get()); + } } else if (e->button == 3) { - context_.stop(); + std::lock_guard guard(connection_lock_); + mpd_run_stop(connection_.get()); } return true; } + +bool waybar::modules::MPD::stopped() { + return connection_ == nullptr || state_ == MPD_STATE_UNKNOWN || state_ == MPD_STATE_STOP || status_ == nullptr; +} + +bool waybar::modules::MPD::playing() { return connection_ != nullptr && state_ == MPD_STATE_PLAY; } + +bool waybar::modules::MPD::paused() { return connection_ != nullptr && state_ == MPD_STATE_PAUSE; } diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp deleted file mode 100644 index 21b67aec..00000000 --- a/src/modules/mpd/state.cpp +++ /dev/null @@ -1,382 +0,0 @@ -#include "modules/mpd/state.hpp" - -#include -#include - -#include "modules/mpd/mpd.hpp" -#if defined(MPD_NOINLINE) -namespace waybar::modules { -#include "modules/mpd/state.inl.hpp" -} // namespace waybar::modules -#endif - -namespace waybar::modules::detail { - -#define IDLE_RUN_NOIDLE_AND_CMD(...) \ - if (idle_connection_.connected()) { \ - idle_connection_.disconnect(); \ - auto conn = ctx_->connection().get(); \ - if (!mpd_run_noidle(conn)) { \ - if (mpd_connection_get_error(conn) != MPD_ERROR_SUCCESS) { \ - spdlog::error("mpd: Idle: failed to unregister for IDLE events"); \ - ctx_->checkErrors(conn); \ - } \ - } \ - __VA_ARGS__; \ - } - -void Idle::play() { - IDLE_RUN_NOIDLE_AND_CMD(mpd_run_play(conn)); - - ctx_->setState(std::make_unique(ctx_)); -} - -void Idle::pause() { - IDLE_RUN_NOIDLE_AND_CMD(mpd_run_pause(conn, true)); - - ctx_->setState(std::make_unique(ctx_)); -} - -void Idle::stop() { - IDLE_RUN_NOIDLE_AND_CMD(mpd_run_stop(conn)); - - ctx_->setState(std::make_unique(ctx_)); -} - -#undef IDLE_RUN_NOIDLE_AND_CMD - -void Idle::update() noexcept { - // This is intentionally blank. -} - -void Idle::entry() noexcept { - auto conn = ctx_->connection().get(); - assert(conn != nullptr); - - if (!mpd_send_idle_mask( - conn, static_cast(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_QUEUE))) { - ctx_->checkErrors(conn); - spdlog::error("mpd: Idle: failed to register for IDLE events"); - } else { - spdlog::debug("mpd: Idle: watching FD"); - sigc::slot idle_slot = sigc::mem_fun(*this, &Idle::on_io); - idle_connection_ = - Glib::signal_io().connect(idle_slot, - mpd_connection_get_fd(conn), - Glib::IO_IN | Glib::IO_PRI | Glib::IO_ERR | Glib::IO_HUP); - } -} - -void Idle::exit() noexcept { - if (idle_connection_.connected()) { - idle_connection_.disconnect(); - spdlog::debug("mpd: Idle: unwatching FD"); - } -} - -bool Idle::on_io(Glib::IOCondition const&) { - auto conn = ctx_->connection().get(); - - // callback should do this: - enum mpd_idle events = mpd_recv_idle(conn, /* ignore_timeout?= */ false); - spdlog::debug("mpd: Idle: recv_idle events -> {}", events); - - mpd_response_finish(conn); - try { - ctx_->checkErrors(conn); - } catch (std::exception const& e) { - spdlog::warn("mpd: Idle: error: {}", e.what()); - ctx_->setState(std::make_unique(ctx_)); - return false; - } - - ctx_->fetchState(); - mpd_state state = ctx_->state(); - - if (state == MPD_STATE_STOP) { - ctx_->emit(); - ctx_->setState(std::make_unique(ctx_)); - } else if (state == MPD_STATE_PLAY) { - ctx_->emit(); - ctx_->setState(std::make_unique(ctx_)); - } else if (state == MPD_STATE_PAUSE) { - ctx_->emit(); - ctx_->setState(std::make_unique(ctx_)); - } else { - ctx_->emit(); - // self transition - ctx_->setState(std::make_unique(ctx_)); - } - - return false; -} - -void Playing::entry() noexcept { - sigc::slot timer_slot = sigc::mem_fun(*this, &Playing::on_timer); - timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 1'000); - spdlog::debug("mpd: Playing: enabled 1 second periodic timer."); -} - -void Playing::exit() noexcept { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - spdlog::debug("mpd: Playing: disabled 1 second periodic timer."); - } -} - -bool Playing::on_timer() { - // Attempt to connect with MPD. - try { - ctx_->tryConnect(); - - // Success? - if (!ctx_->is_connected()) { - ctx_->setState(std::make_unique(ctx_)); - return false; - } - - ctx_->fetchState(); - - if (!ctx_->is_playing()) { - if (ctx_->is_paused()) { - ctx_->setState(std::make_unique(ctx_)); - } else { - ctx_->setState(std::make_unique(ctx_)); - } - return false; - } - - ctx_->queryMPD(); - ctx_->emit(); - } catch (std::exception const& e) { - spdlog::warn("mpd: Playing: error: {}", e.what()); - ctx_->setState(std::make_unique(ctx_)); - return false; - } - - return true; -} - -void Playing::stop() { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - - mpd_run_stop(ctx_->connection().get()); - } - - ctx_->setState(std::make_unique(ctx_)); -} - -void Playing::pause() { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - - mpd_run_pause(ctx_->connection().get(), true); - } - - ctx_->setState(std::make_unique(ctx_)); -} - -void Playing::update() noexcept { ctx_->do_update(); } - -void Paused::entry() noexcept { - sigc::slot timer_slot = sigc::mem_fun(*this, &Paused::on_timer); - timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200); - spdlog::debug("mpd: Paused: enabled 200 ms periodic timer."); -} - -void Paused::exit() noexcept { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - spdlog::debug("mpd: Paused: disabled 200 ms periodic timer."); - } -} - -bool Paused::on_timer() { - bool rc = true; - - // Attempt to connect with MPD. - try { - ctx_->tryConnect(); - - // Success? - if (!ctx_->is_connected()) { - ctx_->setState(std::make_unique(ctx_)); - return false; - } - - ctx_->fetchState(); - - ctx_->emit(); - - if (ctx_->is_paused()) { - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } else if (ctx_->is_playing()) { - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } else if (ctx_->is_stopped()) { - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } - } catch (std::exception const& e) { - spdlog::warn("mpd: Paused: error: {}", e.what()); - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } - - return rc; -} - -void Paused::play() { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - - mpd_run_play(ctx_->connection().get()); - } - - ctx_->setState(std::make_unique(ctx_)); -} - -void Paused::stop() { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - - mpd_run_stop(ctx_->connection().get()); - } - - ctx_->setState(std::make_unique(ctx_)); -} - -void Paused::update() noexcept { ctx_->do_update(); } - -void Stopped::entry() noexcept { - sigc::slot timer_slot = sigc::mem_fun(*this, &Stopped::on_timer); - timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200); - spdlog::debug("mpd: Stopped: enabled 200 ms periodic timer."); -} - -void Stopped::exit() noexcept { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - spdlog::debug("mpd: Stopped: disabled 200 ms periodic timer."); - } -} - -bool Stopped::on_timer() { - bool rc = true; - - // Attempt to connect with MPD. - try { - ctx_->tryConnect(); - - // Success? - if (!ctx_->is_connected()) { - ctx_->setState(std::make_unique(ctx_)); - return false; - } - - ctx_->fetchState(); - - ctx_->emit(); - - if (ctx_->is_stopped()) { - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } else if (ctx_->is_playing()) { - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } else if (ctx_->is_paused()) { - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } - } catch (std::exception const& e) { - spdlog::warn("mpd: Stopped: error: {}", e.what()); - ctx_->setState(std::make_unique(ctx_)); - rc = false; - } - - return rc; -} - -void Stopped::play() { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - - mpd_run_play(ctx_->connection().get()); - } - - ctx_->setState(std::make_unique(ctx_)); -} - -void Stopped::pause() { - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - - mpd_run_pause(ctx_->connection().get(), true); - } - - ctx_->setState(std::make_unique(ctx_)); -} - -void Stopped::update() noexcept { ctx_->do_update(); } - -void Disconnected::arm_timer(int interval) noexcept { - // unregister timer, if present - disarm_timer(); - - // register timer - sigc::slot timer_slot = sigc::mem_fun(*this, &Disconnected::on_timer); - timer_connection_ = - Glib::signal_timeout().connect(timer_slot, interval); - spdlog::debug("mpd: Disconnected: enabled interval timer."); -} - -void Disconnected::disarm_timer() noexcept { - // unregister timer, if present - if (timer_connection_.connected()) { - timer_connection_.disconnect(); - spdlog::debug("mpd: Disconnected: disabled interval timer."); - } -} - -void Disconnected::entry() noexcept { - arm_timer(1'000); -} - -void Disconnected::exit() noexcept { - disarm_timer(); -} - -bool Disconnected::on_timer() { - // Attempt to connect with MPD. - try { - ctx_->tryConnect(); - - // Success? - if (ctx_->is_connected()) { - ctx_->fetchState(); - ctx_->emit(); - - if (ctx_->is_playing()) { - ctx_->setState(std::make_unique(ctx_)); - } else if (ctx_->is_paused()) { - ctx_->setState(std::make_unique(ctx_)); - } else { - ctx_->setState(std::make_unique(ctx_)); - } - - return false; // do not rearm timer - } - } catch (std::exception const& e) { - spdlog::warn("mpd: Disconnected: error: {}", e.what()); - } - - arm_timer(ctx_->interval() * 1'000); - - return false; -} - -void Disconnected::update() noexcept { ctx_->do_update(); } - -} // namespace waybar::modules::detail From 8f961ac3976048d7a389d77737d9694f26fe863d Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Sat, 3 Oct 2020 22:01:51 -0700 Subject: [PATCH 093/355] mpd: revamped to event-driven, single-threaded Fix MPD connection issues by converting/rewriting module into a state-machine driven system. It is fully single-threaded and uses events for transitioning between states. It supports all features and functionality of the previous MPD module. Signed-off-by: Joseph Benden --- include/factory.hpp | 2 +- include/modules/mpd.hpp | 74 ------ include/modules/mpd/mpd.hpp | 66 ++++++ include/modules/mpd/state.hpp | 217 +++++++++++++++++ include/modules/mpd/state.inl.hpp | 24 ++ meson.build | 3 +- src/modules/{ => mpd}/mpd.cpp | 154 ++++-------- src/modules/mpd/state.cpp | 382 ++++++++++++++++++++++++++++++ 8 files changed, 735 insertions(+), 187 deletions(-) delete mode 100644 include/modules/mpd.hpp create mode 100644 include/modules/mpd/mpd.hpp create mode 100644 include/modules/mpd/state.hpp create mode 100644 include/modules/mpd/state.inl.hpp rename src/modules/{ => mpd}/mpd.cpp (73%) create mode 100644 src/modules/mpd/state.cpp diff --git a/include/factory.hpp b/include/factory.hpp index 3efe6cbd..f73c6e19 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -37,7 +37,7 @@ #include "modules/pulseaudio.hpp" #endif #ifdef HAVE_LIBMPDCLIENT -#include "modules/mpd.hpp" +#include "modules/mpd/mpd.hpp" #endif #ifdef HAVE_LIBSNDIO #include "modules/sndio.hpp" diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp deleted file mode 100644 index d08b28b2..00000000 --- a/include/modules/mpd.hpp +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include "ALabel.hpp" - -namespace waybar::modules { - -class MPD : public ALabel { - public: - MPD(const std::string&, const Json::Value&); - auto update() -> void; - - private: - std::thread periodic_updater(); - std::string getTag(mpd_tag_type type, unsigned idx = 0); - void setLabel(); - std::string getStateIcon(); - std::string getOptionIcon(std::string optionName, bool activated); - - std::thread event_listener(); - - // Assumes `connection_lock_` is locked - void tryConnect(); - // If checking errors on the main connection, make sure to lock it using - // `connection_lock_` before calling checkErrors - void checkErrors(mpd_connection* conn); - - // Assumes `connection_lock_` is locked - void fetchState(); - void waitForEvent(); - - bool handlePlayPause(GdkEventButton* const&); - - bool stopped(); - bool playing(); - bool paused(); - - const std::string module_name_; - - using unique_connection = std::unique_ptr; - using unique_status = std::unique_ptr; - using unique_song = std::unique_ptr; - - // Not using unique_ptr since we don't manage the pointer - // (It's either nullptr, or from the config) - const char* server_; - const unsigned port_; - - unsigned timeout_; - - // We need a mutex here because we can trigger updates from multiple thread: - // the event based updates, the periodic updates needed for the elapsed time, - // and the click play/pause feature - std::mutex connection_lock_; - unique_connection connection_; - // The alternate connection will be used to wait for events: since it will - // be blocking (idle) we can't send commands via this connection - // - // No lock since only used in the event listener thread - unique_connection alternate_connection_; - - // Protect them using the `connection_lock_` - unique_status status_; - mpd_state state_; - unique_song song_; - - // To make sure the previous periodic_updater stops before creating a new one - std::mutex periodic_lock_; -}; - -} // namespace waybar::modules diff --git a/include/modules/mpd/mpd.hpp b/include/modules/mpd/mpd.hpp new file mode 100644 index 00000000..f92df933 --- /dev/null +++ b/include/modules/mpd/mpd.hpp @@ -0,0 +1,66 @@ +#pragma once + +#include +#include +#include + +#include +#include + +#include "ALabel.hpp" +#include "modules/mpd/state.hpp" + +namespace waybar::modules { + +class MPD : public ALabel { + friend class detail::Context; + + // State machine + detail::Context context_{this}; + + const std::string module_name_; + + // Not using unique_ptr since we don't manage the pointer + // (It's either nullptr, or from the config) + const char* server_; + const unsigned port_; + + unsigned timeout_; + + detail::unique_connection connection_; + + detail::unique_status status_; + mpd_state state_; + detail::unique_song song_; + + public: + MPD(const std::string&, const Json::Value&); + virtual ~MPD() noexcept = default; + auto update() -> void; + + private: + std::string getTag(mpd_tag_type type, unsigned idx = 0) const; + void setLabel(); + std::string getStateIcon() const; + std::string getOptionIcon(std::string optionName, bool activated) const; + + // GUI-side methods + bool handlePlayPause(GdkEventButton* const&); + void emit() { dp.emit(); } + + // MPD-side, Non-GUI methods. + void tryConnect(); + void checkErrors(mpd_connection* conn); + void fetchState(); + void queryMPD(); + + inline bool stopped() const { return connection_ && state_ == MPD_STATE_STOP; } + inline bool playing() const { return connection_ && state_ == MPD_STATE_PLAY; } + inline bool paused() const { return connection_ && state_ == MPD_STATE_PAUSE; } +}; + +#if !defined(MPD_NOINLINE) +#include "modules/mpd/state.inl.hpp" +#endif + +} // namespace waybar::modules diff --git a/include/modules/mpd/state.hpp b/include/modules/mpd/state.hpp new file mode 100644 index 00000000..3b181598 --- /dev/null +++ b/include/modules/mpd/state.hpp @@ -0,0 +1,217 @@ +#pragma once + +#include +#include +#include + +#include +#include + +#include "ALabel.hpp" + +namespace waybar::modules { +class MPD; +} // namespace waybar::modules + +namespace waybar::modules::detail { + +using unique_connection = std::unique_ptr; +using unique_status = std::unique_ptr; +using unique_song = std::unique_ptr; + +class Context; + +/// This state machine loosely follows a non-hierarchical, statechart +/// pattern, and includes ENTRY and EXIT actions. +/// +/// The State class is the base class for all other states. The +/// entry and exit methods are automatically called when entering +/// into a new state and exiting from the current state. This +/// includes initially entering (Disconnected class) and exiting +/// Waybar. +/// +/// The following nested "top-level" states are represented: +/// 1. Idle - await notification of MPD activity. +/// 2. All Non-Idle states: +/// 1. Playing - An active song is producing audio output. +/// 2. Paused - The current song is paused. +/// 3. Stopped - No song is actively playing. +/// 3. Disconnected - periodically attempt MPD (re-)connection. +/// +/// NOTE: Since this statechart is non-hierarchical, the above +/// states are flattened into a set. + +class State { + public: + virtual ~State() noexcept = default; + + virtual void entry() noexcept { spdlog::debug("mpd: ignore entry action"); } + virtual void exit() noexcept { spdlog::debug("mpd: ignore exit action"); } + + virtual void play() { spdlog::debug("mpd: ignore play state transition"); } + virtual void stop() { spdlog::debug("mpd: ignore stop state transition"); } + virtual void pause() { spdlog::debug("mpd: ignore pause state transition"); } + + /// Request state update the GUI. + virtual void update() noexcept { spdlog::debug("mpd: ignoring update method request"); } +}; + +class Idle : public State { + Context* const ctx_; + sigc::connection idle_connection_; + + public: + Idle(Context* const ctx) : ctx_{ctx} {} + virtual ~Idle() noexcept { this->exit(); }; + + void entry() noexcept override; + void exit() noexcept override; + + void play() override; + void stop() override; + void pause() override; + void update() noexcept override; + + private: + Idle(const Idle&) = delete; + Idle& operator=(const Idle&) = delete; + + bool on_io(Glib::IOCondition const&); +}; + +class Playing : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Playing(Context* const ctx) : ctx_{ctx} {} + virtual ~Playing() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void pause() override; + void stop() override; + void update() noexcept override; + + private: + Playing(Playing const&) = delete; + Playing& operator=(Playing const&) = delete; + + bool on_timer(); +}; + +class Paused : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Paused(Context* const ctx) : ctx_{ctx} {} + virtual ~Paused() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void play() override; + void stop() override; + void update() noexcept override; + + private: + Paused(Paused const&) = delete; + Paused& operator=(Paused const&) = delete; + + bool on_timer(); +}; + +class Stopped : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Stopped(Context* const ctx) : ctx_{ctx} {} + virtual ~Stopped() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void play() override; + void pause() override; + void update() noexcept override; + + private: + Stopped(Stopped const&) = delete; + Stopped& operator=(Stopped const&) = delete; + + bool on_timer(); +}; + +class Disconnected : public State { + Context* const ctx_; + sigc::connection timer_connection_; + + public: + Disconnected(Context* const ctx) : ctx_{ctx} {} + virtual ~Disconnected() noexcept { this->exit(); } + + void entry() noexcept override; + void exit() noexcept override; + + void update() noexcept override; + + private: + Disconnected(Disconnected const&) = delete; + Disconnected& operator=(Disconnected const&) = delete; + + void arm_timer(int interval) noexcept; + void disarm_timer() noexcept; + + bool on_timer(); +}; + +class Context { + std::unique_ptr state_; + waybar::modules::MPD* mpd_module_; + + friend class State; + friend class Playing; + friend class Paused; + friend class Stopped; + friend class Disconnected; + friend class Idle; + + protected: + void setState(std::unique_ptr&& new_state) noexcept { + if (state_.get() != nullptr) { + state_->exit(); + } + state_ = std::move(new_state); + state_->entry(); + } + + bool is_connected() const; + bool is_playing() const; + bool is_paused() const; + bool is_stopped() const; + constexpr std::size_t interval() const; + void tryConnect() const; + void checkErrors(mpd_connection*) const; + void do_update(); + void queryMPD() const; + void fetchState() const; + constexpr mpd_state state() const; + void emit() const; + [[nodiscard]] unique_connection& connection(); + + public: + explicit Context(waybar::modules::MPD* const mpd_module) + : state_{std::make_unique(this)}, mpd_module_{mpd_module} { + state_->entry(); + } + + void play() { state_->play(); } + void stop() { state_->stop(); } + void pause() { state_->pause(); } + void update() noexcept { state_->update(); } +}; + +} // namespace waybar::modules::detail diff --git a/include/modules/mpd/state.inl.hpp b/include/modules/mpd/state.inl.hpp new file mode 100644 index 00000000..0d83b0b3 --- /dev/null +++ b/include/modules/mpd/state.inl.hpp @@ -0,0 +1,24 @@ +#pragma once + +namespace detail { + +inline bool Context::is_connected() const { return mpd_module_->connection_ != nullptr; } +inline bool Context::is_playing() const { return mpd_module_->playing(); } +inline bool Context::is_paused() const { return mpd_module_->paused(); } +inline bool Context::is_stopped() const { return mpd_module_->stopped(); } + +constexpr inline std::size_t Context::interval() const { return mpd_module_->interval_.count(); } +inline void Context::tryConnect() const { mpd_module_->tryConnect(); } +inline unique_connection& Context::connection() { return mpd_module_->connection_; } +constexpr inline mpd_state Context::state() const { return mpd_module_->state_; } + +inline void Context::do_update() { + mpd_module_->setLabel(); +} + +inline void Context::checkErrors(mpd_connection* conn) const { mpd_module_->checkErrors(conn); } +inline void Context::queryMPD() const { mpd_module_->queryMPD(); } +inline void Context::fetchState() const { mpd_module_->fetchState(); } +inline void Context::emit() const { mpd_module_->emit(); } + +} // namespace detail diff --git a/meson.build b/meson.build index 023894cd..de203826 100644 --- a/meson.build +++ b/meson.build @@ -213,7 +213,8 @@ endif if libmpdclient.found() add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp') - src_files += 'src/modules/mpd.cpp' + src_files += 'src/modules/mpd/mpd.cpp' + src_files += 'src/modules/mpd/state.cpp' endif if gtk_layer_shell.found() diff --git a/src/modules/mpd.cpp b/src/modules/mpd/mpd.cpp similarity index 73% rename from src/modules/mpd.cpp rename to src/modules/mpd/mpd.cpp index 26878b11..edce9417 100644 --- a/src/modules/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -1,8 +1,15 @@ -#include "modules/mpd.hpp" +#include "modules/mpd/mpd.hpp" #include #include +#include "modules/mpd/state.hpp" +#if defined(MPD_NOINLINE) +namespace waybar::modules { +#include "modules/mpd/state.inl.hpp" +} // namespace waybar::modules +#endif + waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) : ALabel(config, "mpd", id, "{album} - {artist} - {title}", 5), module_name_(id.empty() ? "mpd" : "mpd#" + id), @@ -10,7 +17,6 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) port_(config_["port"].isUInt() ? config["port"].asUInt() : 0), timeout_(config_["timeout"].isUInt() ? config_["timeout"].asUInt() * 1'000 : 30'000), connection_(nullptr, &mpd_connection_free), - alternate_connection_(nullptr, &mpd_connection_free), status_(nullptr, &mpd_status_free), song_(nullptr, &mpd_song_free) { if (!config_["port"].isNull() && !config_["port"].isUInt()) { @@ -28,73 +34,33 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) server_ = config["server"].asCString(); } - event_listener().detach(); - event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &MPD::handlePlayPause)); } auto waybar::modules::MPD::update() -> void { - std::lock_guard guard(connection_lock_); - tryConnect(); - - if (connection_ != nullptr) { - try { - bool wasPlaying = playing(); - if(!wasPlaying) { - // Wait until the periodic_updater has stopped - std::lock_guard periodic_guard(periodic_lock_); - } - fetchState(); - if (!wasPlaying && playing()) { - periodic_updater().detach(); - } - } catch (const std::exception& e) { - spdlog::error("{}: {}", module_name_, e.what()); - state_ = MPD_STATE_UNKNOWN; - } - } - - setLabel(); + context_.update(); // Call parent update ALabel::update(); } -std::thread waybar::modules::MPD::event_listener() { - return std::thread([this] { - while (true) { - try { - if (connection_ == nullptr) { - // Retry periodically if no connection - dp.emit(); - std::this_thread::sleep_for(interval_); - } else { - waitForEvent(); - dp.emit(); - } - } catch (const std::exception& e) { - if (strcmp(e.what(), "Connection to MPD closed") == 0) { - spdlog::debug("{}: {}", module_name_, e.what()); - } else { - spdlog::warn("{}: {}", module_name_, e.what()); - } - } +void waybar::modules::MPD::queryMPD() { + if (connection_ != nullptr) { + spdlog::debug("{}: fetching state information", module_name_); + try { + fetchState(); + spdlog::debug("{}: fetch complete", module_name_); + } catch (std::exception const& e) { + spdlog::error("{}: {}", module_name_, e.what()); + state_ = MPD_STATE_UNKNOWN; } - }); + + dp.emit(); + } } -std::thread waybar::modules::MPD::periodic_updater() { - return std::thread([this] { - std::lock_guard guard(periodic_lock_); - while (connection_ != nullptr && playing()) { - dp.emit(); - std::this_thread::sleep_for(std::chrono::seconds(1)); - } - }); -} - -std::string waybar::modules::MPD::getTag(mpd_tag_type type, unsigned idx) { +std::string waybar::modules::MPD::getTag(mpd_tag_type type, unsigned idx) const { std::string result = config_["unknown-tag"].isString() ? config_["unknown-tag"].asString() : "N/A"; const char* tag = mpd_song_get_tag(song_.get(), type, idx); @@ -133,7 +99,7 @@ void waybar::modules::MPD::setLabel() { auto format = format_; std::string artist, album_artist, album, title, date; - int song_pos, queue_length; + int song_pos, queue_length; std::chrono::seconds elapsedTime, totalTime; std::string stateIcon = ""; @@ -149,8 +115,8 @@ void waybar::modules::MPD::setLabel() { label_.get_style_context()->add_class("playing"); label_.get_style_context()->remove_class("paused"); } else if (paused()) { - format = - config_["format-paused"].isString() ? config_["format-paused"].asString() : config_["format"].asString(); + format = config_["format-paused"].isString() ? config_["format-paused"].asString() + : config_["format"].asString(); label_.get_style_context()->add_class("paused"); label_.get_style_context()->remove_class("playing"); } @@ -216,7 +182,7 @@ void waybar::modules::MPD::setLabel() { } } -std::string waybar::modules::MPD::getStateIcon() { +std::string waybar::modules::MPD::getStateIcon() const { if (!config_["state-icons"].isObject()) { return ""; } @@ -238,7 +204,7 @@ std::string waybar::modules::MPD::getStateIcon() { } } -std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool activated) { +std::string waybar::modules::MPD::getOptionIcon(std::string optionName, bool activated) const { if (!config_[optionName + "-icons"].isObject()) { return ""; } @@ -261,15 +227,11 @@ void waybar::modules::MPD::tryConnect() { } connection_ = - unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); + detail::unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); - alternate_connection_ = - unique_connection(mpd_connection_new(server_, port_, timeout_), &mpd_connection_free); - - if (connection_ == nullptr || alternate_connection_ == nullptr) { + if (connection_ == nullptr) { spdlog::error("{}: Failed to connect to MPD", module_name_); connection_.reset(); - alternate_connection_.reset(); return; } @@ -279,7 +241,6 @@ void waybar::modules::MPD::tryConnect() { } catch (std::runtime_error& e) { spdlog::error("{}: Failed to connect to MPD: {}", module_name_, e.what()); connection_.reset(); - alternate_connection_.reset(); } } @@ -292,7 +253,6 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) { case MPD_ERROR_CLOSED: mpd_connection_clear_error(conn); connection_.reset(); - alternate_connection_.reset(); state_ = MPD_STATE_UNKNOWN; throw std::runtime_error("Connection to MPD closed"); default: @@ -306,37 +266,20 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) { } void waybar::modules::MPD::fetchState() { + if (connection_ == nullptr) { + spdlog::error("{}: Not connected to MPD", module_name_); + return; + } + auto conn = connection_.get(); - status_ = unique_status(mpd_run_status(conn), &mpd_status_free); + + status_ = detail::unique_status(mpd_run_status(conn), &mpd_status_free); checkErrors(conn); + state_ = mpd_status_get_state(status_.get()); checkErrors(conn); - song_ = unique_song(mpd_run_current_song(conn), &mpd_song_free); - checkErrors(conn); -} - -void waybar::modules::MPD::waitForEvent() { - auto conn = alternate_connection_.get(); - // Wait for a player (play/pause), option (random, shuffle, etc.), or playlist - // change - if (!mpd_send_idle_mask( - conn, static_cast(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_QUEUE))) { - checkErrors(conn); - return; - } - // alternate_idle_ = true; - - // See issue #277: - // https://github.com/Alexays/Waybar/issues/277 - mpd_recv_idle(conn, /* disable_timeout = */ false); - // See issue #281: - // https://github.com/Alexays/Waybar/issues/281 - std::lock_guard guard(connection_lock_); - - checkErrors(conn); - mpd_response_finish(conn); - + song_ = detail::unique_song(mpd_run_current_song(conn), &mpd_song_free); checkErrors(conn); } @@ -346,24 +289,13 @@ bool waybar::modules::MPD::handlePlayPause(GdkEventButton* const& e) { } if (e->button == 1) { - std::lock_guard guard(connection_lock_); - if (stopped()) { - mpd_run_play(connection_.get()); - } else { - mpd_run_toggle_pause(connection_.get()); - } + if (state_ == MPD_STATE_PLAY) + context_.pause(); + else + context_.play(); } else if (e->button == 3) { - std::lock_guard guard(connection_lock_); - mpd_run_stop(connection_.get()); + context_.stop(); } return true; } - -bool waybar::modules::MPD::stopped() { - return connection_ == nullptr || state_ == MPD_STATE_UNKNOWN || state_ == MPD_STATE_STOP || status_ == nullptr; -} - -bool waybar::modules::MPD::playing() { return connection_ != nullptr && state_ == MPD_STATE_PLAY; } - -bool waybar::modules::MPD::paused() { return connection_ != nullptr && state_ == MPD_STATE_PAUSE; } diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp new file mode 100644 index 00000000..570c167f --- /dev/null +++ b/src/modules/mpd/state.cpp @@ -0,0 +1,382 @@ +#include "modules/mpd/state.hpp" + +#include +#include + +#include "modules/mpd/mpd.hpp" +#if defined(MPD_NOINLINE) +namespace waybar::modules { +#include "modules/mpd/state.inl.hpp" +} // namespace waybar::modules +#endif + +namespace waybar::modules::detail { + +#define IDLE_RUN_NOIDLE_AND_CMD(...) \ + if (idle_connection_.connected()) { \ + idle_connection_.disconnect(); \ + auto conn = ctx_->connection().get(); \ + if (!mpd_run_noidle(conn)) { \ + if (mpd_connection_get_error(conn) != MPD_ERROR_SUCCESS) { \ + spdlog::error("mpd: Idle: failed to unregister for IDLE events"); \ + ctx_->checkErrors(conn); \ + } \ + } \ + __VA_ARGS__; \ + } + +void Idle::play() { + IDLE_RUN_NOIDLE_AND_CMD(mpd_run_play(conn)); + + ctx_->setState(std::make_unique(ctx_)); +} + +void Idle::pause() { + IDLE_RUN_NOIDLE_AND_CMD(mpd_run_pause(conn, true)); + + ctx_->setState(std::make_unique(ctx_)); +} + +void Idle::stop() { + IDLE_RUN_NOIDLE_AND_CMD(mpd_run_stop(conn)); + + ctx_->setState(std::make_unique(ctx_)); +} + +#undef IDLE_RUN_NOIDLE_AND_CMD + +void Idle::update() noexcept { + // This is intentionally blank. +} + +void Idle::entry() noexcept { + auto conn = ctx_->connection().get(); + assert(conn != nullptr); + + if (!mpd_send_idle_mask( + conn, static_cast(MPD_IDLE_PLAYER | MPD_IDLE_OPTIONS | MPD_IDLE_QUEUE))) { + ctx_->checkErrors(conn); + spdlog::error("mpd: Idle: failed to register for IDLE events"); + } else { + spdlog::debug("mpd: Idle: watching FD"); + sigc::slot idle_slot = sigc::mem_fun(*this, &Idle::on_io); + idle_connection_ = + Glib::signal_io().connect(idle_slot, + mpd_connection_get_fd(conn), + Glib::IO_IN | Glib::IO_PRI | Glib::IO_ERR | Glib::IO_HUP); + } +} + +void Idle::exit() noexcept { + if (idle_connection_.connected()) { + idle_connection_.disconnect(); + spdlog::debug("mpd: Idle: unwatching FD"); + } +} + +bool Idle::on_io(Glib::IOCondition const&) { + auto conn = ctx_->connection().get(); + + // callback should do this: + enum mpd_idle events = mpd_recv_idle(conn, /* ignore_timeout?= */ false); + spdlog::debug("mpd: Idle: recv_idle events -> {}", events); + + mpd_response_finish(conn); + try { + ctx_->checkErrors(conn); + } catch (std::exception const& e) { + spdlog::warn("mpd: Idle: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + mpd_state state = ctx_->state(); + + if (state == MPD_STATE_STOP) { + ctx_->emit(); + ctx_->setState(std::make_unique(ctx_)); + } else if (state == MPD_STATE_PLAY) { + ctx_->emit(); + ctx_->setState(std::make_unique(ctx_)); + } else if (state == MPD_STATE_PAUSE) { + ctx_->emit(); + ctx_->setState(std::make_unique(ctx_)); + } else { + ctx_->emit(); + // self transition + ctx_->setState(std::make_unique(ctx_)); + } + + return false; +} + +void Playing::entry() noexcept { + sigc::slot timer_slot = sigc::mem_fun(*this, &Playing::on_timer); + timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 1'000); + spdlog::debug("mpd: Playing: enabled 1 second periodic timer."); +} + +void Playing::exit() noexcept { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Playing: disabled 1 second periodic timer."); + } +} + +bool Playing::on_timer() { + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (!ctx_->is_connected()) { + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + + if (!ctx_->is_playing()) { + if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + } else { + ctx_->setState(std::make_unique(ctx_)); + } + return false; + } + + ctx_->queryMPD(); + ctx_->emit(); + } catch (std::exception const& e) { + spdlog::warn("mpd: Playing: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + return true; +} + +void Playing::stop() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_stop(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Playing::pause() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_pause(ctx_->connection().get(), true); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Playing::update() noexcept { ctx_->do_update(); } + +void Paused::entry() noexcept { + sigc::slot timer_slot = sigc::mem_fun(*this, &Paused::on_timer); + timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200); + spdlog::debug("mpd: Paused: enabled 200 ms periodic timer."); +} + +void Paused::exit() noexcept { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Paused: disabled 200 ms periodic timer."); + } +} + +bool Paused::on_timer() { + bool rc = true; + + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (!ctx_->is_connected()) { + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + + ctx_->emit(); + + if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_playing()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_stopped()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + } catch (std::exception const& e) { + spdlog::warn("mpd: Paused: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + + return rc; +} + +void Paused::play() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_play(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Paused::stop() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_stop(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Paused::update() noexcept { ctx_->do_update(); } + +void Stopped::entry() noexcept { + sigc::slot timer_slot = sigc::mem_fun(*this, &Stopped::on_timer); + timer_connection_ = Glib::signal_timeout().connect(timer_slot, /* milliseconds */ 200); + spdlog::debug("mpd: Stopped: enabled 200 ms periodic timer."); +} + +void Stopped::exit() noexcept { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Stopped: disabled 200 ms periodic timer."); + } +} + +bool Stopped::on_timer() { + bool rc = true; + + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (!ctx_->is_connected()) { + ctx_->setState(std::make_unique(ctx_)); + return false; + } + + ctx_->fetchState(); + + ctx_->emit(); + + if (ctx_->is_stopped()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_playing()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } else if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + } catch (std::exception const& e) { + spdlog::warn("mpd: Stopped: error: {}", e.what()); + ctx_->setState(std::make_unique(ctx_)); + rc = false; + } + + return rc; +} + +void Stopped::play() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_play(ctx_->connection().get()); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Stopped::pause() { + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + + mpd_run_pause(ctx_->connection().get(), true); + } + + ctx_->setState(std::make_unique(ctx_)); +} + +void Stopped::update() noexcept { ctx_->do_update(); } + +void Disconnected::arm_timer(int interval) noexcept { + // unregister timer, if present + disarm_timer(); + + // register timer + sigc::slot timer_slot = sigc::mem_fun(*this, &Disconnected::on_timer); + timer_connection_ = + Glib::signal_timeout().connect(timer_slot, interval); + spdlog::debug("mpd: Disconnected: enabled interval timer."); +} + +void Disconnected::disarm_timer() noexcept { + // unregister timer, if present + if (timer_connection_.connected()) { + timer_connection_.disconnect(); + spdlog::debug("mpd: Disconnected: disabled interval timer."); + } +} + +void Disconnected::entry() noexcept { + arm_timer(1'000); +} + +void Disconnected::exit() noexcept { + disarm_timer(); +} + +bool Disconnected::on_timer() { + // Attempt to connect with MPD. + try { + ctx_->tryConnect(); + + // Success? + if (ctx_->is_connected()) { + ctx_->fetchState(); + ctx_->emit(); + + if (ctx_->is_playing()) { + ctx_->setState(std::make_unique(ctx_)); + } else if (ctx_->is_paused()) { + ctx_->setState(std::make_unique(ctx_)); + } else { + ctx_->setState(std::make_unique(ctx_)); + } + + return false; // do not rearm timer + } + } catch (std::exception const& e) { + spdlog::warn("mpd: Disconnected: error: {}", e.what()); + } + + arm_timer(ctx_->interval() * 1'000); + + return false; +} + +void Disconnected::update() noexcept { ctx_->do_update(); } + +} // namespace waybar::modules::detail From 587eb5fdb4d7de2891fa0a874f7c4ea0c9d4d882 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Mon, 19 Oct 2020 11:54:36 -0700 Subject: [PATCH 094/355] mpd: support password protected MPD - Add MPD module option `password`, and document it. - Add logic to send the password, directly after connecting to MPD. Fixes: #576 Signed-off-by: Joseph Benden --- include/modules/mpd/mpd.hpp | 7 ++++--- man/waybar-mpd.5.scd | 4 ++++ src/modules/mpd/mpd.cpp | 11 +++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/include/modules/mpd/mpd.hpp b/include/modules/mpd/mpd.hpp index f92df933..0fc1ce99 100644 --- a/include/modules/mpd/mpd.hpp +++ b/include/modules/mpd/mpd.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include #include @@ -22,8 +22,9 @@ class MPD : public ALabel { // Not using unique_ptr since we don't manage the pointer // (It's either nullptr, or from the config) - const char* server_; - const unsigned port_; + const char* server_; + const unsigned port_; + const std::string password_; unsigned timeout_; diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd index e8105deb..8c33c624 100644 --- a/man/waybar-mpd.5.scd +++ b/man/waybar-mpd.5.scd @@ -20,6 +20,10 @@ Addressed by *mpd* typeof: integer ++ The port MPD listens to. If empty, use the default port. +*password*: ++ + typeof: string ++ + The password required to connect to the MPD server. If empty, no password is sent to MPD. + *interval*: ++ typeof: integer++ default: 5 ++ diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index edce9417..6dc24e73 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -15,6 +15,7 @@ waybar::modules::MPD::MPD(const std::string& id, const Json::Value& config) module_name_(id.empty() ? "mpd" : "mpd#" + id), server_(nullptr), port_(config_["port"].isUInt() ? config["port"].asUInt() : 0), + password_(config_["password"].empty() ? "" : config_["password"].asString()), timeout_(config_["timeout"].isUInt() ? config_["timeout"].asUInt() * 1'000 : 30'000), connection_(nullptr, &mpd_connection_free), status_(nullptr, &mpd_status_free), @@ -238,6 +239,16 @@ void waybar::modules::MPD::tryConnect() { try { checkErrors(connection_.get()); spdlog::debug("{}: Connected to MPD", module_name_); + + if (!password_.empty()) { + bool res = mpd_run_password(connection_.get(), password_.c_str()); + if (!res) { + spdlog::error("{}: Wrong MPD password", module_name_); + connection_.reset(); + return; + } + checkErrors(connection_.get()); + } } catch (std::runtime_error& e) { spdlog::error("{}: Failed to connect to MPD: {}", module_name_, e.what()); connection_.reset(); From ed402d7583291eda34cac4a32b4caac58e7dc900 Mon Sep 17 00:00:00 2001 From: nikto_b Date: Tue, 20 Oct 2020 12:20:58 +0300 Subject: [PATCH 095/355] feature: language submodule - created man page --- man/waybar-sway-language.5.scd | 72 ++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 man/waybar-sway-language.5.scd diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd new file mode 100644 index 00000000..a288cca9 --- /dev/null +++ b/man/waybar-sway-language.5.scd @@ -0,0 +1,72 @@ +waybar-sway-language(5) + +# NAME + +waybar - sway language module + +# DESCRIPTION + +The *language* module displays the current keyboard layout in Sway + +# CONFIGURATION + +Addressed by *sway/language* + +*format*: ++ + typeof: string ++ + default: {} ++ + The format, how information should be displayed. On {} data gets inserted. + +*rotate*: ++ + typeof: integer ++ + Positive value to rotate the text label. + +*max-length*: ++ + typeof: integer ++ + The maximum length in character the module should display. + +*on-click*: ++ + typeof: string ++ + Command to execute when clicked on the module. + +*on-click-middle*: ++ + typeof: string ++ + Command to execute when middle-clicked on the module using mousewheel. + +*on-click-right*: ++ + typeof: string ++ + Command to execute when you right clicked on the module. + +*on-update*: ++ + typeof: string ++ + Command to execute when the module is updated. + +*on-scroll-up*: ++ + typeof: string ++ + Command to execute when scrolling up on the module. + +*on-scroll-down*: ++ + typeof: string ++ + Command to execute when scrolling down on the module. + +*smooth-scrolling-threshold*: ++ + typeof: double ++ + Threshold to be used when scrolling. + +*tooltip*: ++ + typeof: bool ++ + default: true ++ + Option to disable tooltip on hover. + +# EXAMPLES + +``` +"sway/language": { + "format": "{}", + "max-length": 50 +} +``` + +# STYLE + +- *#language* From be3f47b37437e11a84031b076ef46802c654c7fe Mon Sep 17 00:00:00 2001 From: Flakebi Date: Fri, 23 Oct 2020 21:13:20 +0200 Subject: [PATCH 096/355] Fix various mpd bugs - Add elapsedTime and totalTime to tooltip format arguments - Catch format exceptions and print error - Copy mpd connection error message before it gets freed - Update display after connection to mpd was lost --- src/modules/mpd/mpd.cpp | 74 ++++++++++++++++++++++----------------- src/modules/mpd/state.cpp | 1 + 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index 6dc24e73..710f23ff 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -144,42 +144,51 @@ void waybar::modules::MPD::setLabel() { bool singleActivated = mpd_status_get_single(status_.get()); std::string singleIcon = getOptionIcon("single", singleActivated); - // TODO: format can fail - label_.set_markup( - fmt::format(format, - fmt::arg("artist", Glib::Markup::escape_text(artist).raw()), - fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist).raw()), - fmt::arg("album", Glib::Markup::escape_text(album).raw()), - fmt::arg("title", Glib::Markup::escape_text(title).raw()), - fmt::arg("date", Glib::Markup::escape_text(date).raw()), - fmt::arg("elapsedTime", elapsedTime), - fmt::arg("totalTime", totalTime), - fmt::arg("songPosition", song_pos), - fmt::arg("queueLength", queue_length), - fmt::arg("stateIcon", stateIcon), - fmt::arg("consumeIcon", consumeIcon), - fmt::arg("randomIcon", randomIcon), - fmt::arg("repeatIcon", repeatIcon), - fmt::arg("singleIcon", singleIcon))); + try { + label_.set_markup( + fmt::format(format, + fmt::arg("artist", Glib::Markup::escape_text(artist).raw()), + fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist).raw()), + fmt::arg("album", Glib::Markup::escape_text(album).raw()), + fmt::arg("title", Glib::Markup::escape_text(title).raw()), + fmt::arg("date", Glib::Markup::escape_text(date).raw()), + fmt::arg("elapsedTime", elapsedTime), + fmt::arg("totalTime", totalTime), + fmt::arg("songPosition", song_pos), + fmt::arg("queueLength", queue_length), + fmt::arg("stateIcon", stateIcon), + fmt::arg("consumeIcon", consumeIcon), + fmt::arg("randomIcon", randomIcon), + fmt::arg("repeatIcon", repeatIcon), + fmt::arg("singleIcon", singleIcon))); + } catch (fmt::format_error const& e) { + spdlog::warn("mpd: format error: {}", e.what()); + } if (tooltipEnabled()) { std::string tooltip_format; tooltip_format = config_["tooltip-format"].isString() ? config_["tooltip-format"].asString() : "MPD (connected)"; - auto tooltip_text = fmt::format(tooltip_format, - fmt::arg("artist", artist), - fmt::arg("albumArtist", album_artist), - fmt::arg("album", album), - fmt::arg("title", title), - fmt::arg("date", date), - fmt::arg("songPosition", song_pos), - fmt::arg("queueLength", queue_length), - fmt::arg("stateIcon", stateIcon), - fmt::arg("consumeIcon", consumeIcon), - fmt::arg("randomIcon", randomIcon), - fmt::arg("repeatIcon", repeatIcon), - fmt::arg("singleIcon", singleIcon)); - label_.set_tooltip_text(tooltip_text); + try { + auto tooltip_text = fmt::format(tooltip_format, + fmt::arg("artist", artist), + fmt::arg("albumArtist", album_artist), + fmt::arg("album", album), + fmt::arg("title", title), + fmt::arg("date", date), + fmt::arg("elapsedTime", elapsedTime), + fmt::arg("totalTime", totalTime), + fmt::arg("songPosition", song_pos), + fmt::arg("queueLength", queue_length), + fmt::arg("stateIcon", stateIcon), + fmt::arg("consumeIcon", consumeIcon), + fmt::arg("randomIcon", randomIcon), + fmt::arg("repeatIcon", repeatIcon), + fmt::arg("singleIcon", singleIcon)); + label_.set_tooltip_text(tooltip_text); + } catch (fmt::format_error const& e) { + spdlog::warn("mpd: format error (tooltip): {}", e.what()); + } } } @@ -269,8 +278,9 @@ void waybar::modules::MPD::checkErrors(mpd_connection* conn) { default: if (conn) { auto error_message = mpd_connection_get_error_message(conn); + std::string error(error_message); mpd_connection_clear_error(conn); - throw std::runtime_error(std::string(error_message)); + throw std::runtime_error(error); } throw std::runtime_error("Invalid connection"); } diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp index 570c167f..ffe18e7c 100644 --- a/src/modules/mpd/state.cpp +++ b/src/modules/mpd/state.cpp @@ -341,6 +341,7 @@ void Disconnected::disarm_timer() noexcept { } void Disconnected::entry() noexcept { + ctx_->emit(); arm_timer(1'000); } From 67d54ef3d53e5257e465ec556177ea569100263e Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sat, 24 Oct 2020 22:56:24 -0700 Subject: [PATCH 097/355] fix(wlr/taskbar): do not bind to unsupported protocol versions It's not allowed to bind to a higher version of a wayland protocol than supported by the client. Binding wlr-foreign-toplevel-manager-v1 v3 to a generated code for v2 causes errors in libwayland due to a missing handler for `zwlr_foreign_toplevel_handle_v1.parent` event. --- src/client.cpp | 2 ++ src/modules/wlr/taskbar.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index 70cc22cf..9dd93d81 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -32,6 +32,8 @@ void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint const char *interface, uint32_t version) { auto client = static_cast(data); if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { + // limit version to a highest supported by the client protocol file + version = std::min(version, zwlr_layer_shell_v1_interface.version); client->layer_shell = static_cast( wl_registry_bind(registry, name, &zwlr_layer_shell_v1_interface, version)); } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0 && diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 45915dc6..8d6fa9b4 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -653,9 +653,11 @@ void Taskbar::register_manager(struct wl_registry *registry, uint32_t name, uint spdlog::warn("Register foreign toplevel manager again although already existing!"); return; } - if (version != 2) { + if (version < ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_FULLSCREEN_SINCE_VERSION) { spdlog::warn("Using different foreign toplevel manager protocol version: {}", version); } + // limit version to a highest supported by the client protocol file + version = std::min(version, zwlr_foreign_toplevel_manager_v1_interface.version); manager_ = static_cast(wl_registry_bind(registry, name, &zwlr_foreign_toplevel_manager_v1_interface, version)); @@ -672,6 +674,7 @@ void Taskbar::register_seat(struct wl_registry *registry, uint32_t name, uint32_ spdlog::warn("Register seat again although already existing!"); return; } + version = std::min(version, wl_seat_interface.version); seat_ = static_cast(wl_registry_bind(registry, name, &wl_seat_interface, version)); } From 7a0c0ca6134dc777e179980d77fc76ca9adb4410 Mon Sep 17 00:00:00 2001 From: 1sixth <67363572+1sixth@users.noreply.github.com> Date: Wed, 28 Oct 2020 19:39:50 +0800 Subject: [PATCH 098/355] replace lowercase "k" with uppercase "K" Other units are all uppercased, so using an uppercased "K" makes it look more consistent (especially when {bandwidthUpBits} or something like that is used). --- include/util/format.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/util/format.hpp b/include/util/format.hpp index 288d8f0c..d7d16090 100644 --- a/include/util/format.hpp +++ b/include/util/format.hpp @@ -42,7 +42,7 @@ namespace fmt { template auto format(const pow_format& s, FormatContext &ctx) -> decltype (ctx.out()) { - const char* units[] = { "", "k", "M", "G", "T", "P", nullptr}; + const char* units[] = { "", "K", "M", "G", "T", "P", nullptr}; auto base = s.binary_ ? 1024ull : 1000ll; auto fraction = (double) s.val_; From 2b3d7be9cb7253d852db0214f7c492d6aec8f74a Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 20 Oct 2020 23:18:58 -0700 Subject: [PATCH 099/355] feat(bar): let gtk-layer-shell manage exclusive zone Previous attempts to use auto exclusive zone from gtk-layer-shell failed because gls was expecting real booleans (`TRUE`/`FALSE`) as set_anchor arguments. With that being fixed, gtk_layer_auto_exclusive_zone_enable makes gls handle everything related to the bar resizing. The only remaining purpose of onConfigureGLS is to log warnings and bar size changes; gtk-layer-shell code path no longer needs saved width_ or height_ values. --- src/bar.cpp | 72 ++++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/src/bar.cpp b/src/bar.cpp index 8af6b971..7f60b2fc 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -2,10 +2,11 @@ #include #endif +#include + #include "bar.hpp" #include "client.hpp" #include "factory.hpp" -#include waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) : output(w_output), @@ -134,33 +135,32 @@ void waybar::Bar::initGtkLayerShell() { gtk_layer_set_monitor(gtk_window, output->monitor->gobj()); gtk_layer_set_namespace(gtk_window, "waybar"); - gtk_layer_set_anchor( - gtk_window, GTK_LAYER_SHELL_EDGE_LEFT, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT); - gtk_layer_set_anchor( - gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT); - gtk_layer_set_anchor( - gtk_window, GTK_LAYER_SHELL_EDGE_TOP, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP); - gtk_layer_set_anchor( - gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM); + gtk_layer_set_anchor(gtk_window, + GTK_LAYER_SHELL_EDGE_LEFT, + (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? TRUE : FALSE); + gtk_layer_set_anchor(gtk_window, + GTK_LAYER_SHELL_EDGE_RIGHT, + (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) ? TRUE : FALSE); + gtk_layer_set_anchor(gtk_window, + GTK_LAYER_SHELL_EDGE_TOP, + (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? TRUE : FALSE); + gtk_layer_set_anchor(gtk_window, + GTK_LAYER_SHELL_EDGE_BOTTOM, + (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM) ? TRUE : FALSE); gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_LEFT, margins_.left); gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, margins_.right); gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_TOP, margins_.top); gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, margins_.bottom); - if (width_ > 1 && height_ > 1) { - /* configure events are not emitted if the bar is using initial size */ - setExclusiveZone(width_, height_); - } + setExclusiveZone(width_, height_); } void waybar::Bar::onConfigureGLS(GdkEventConfigure* ev) { /* * GTK wants new size for the window. - * Actual resizing is done within the gtk-layer-shell code; the only remaining action is to apply - * exclusive zone. - * gtk_layer_auto_exclusive_zone_enable() could handle even that, but at the cost of ignoring - * margins on unanchored edge. + * Actual resizing and management of the exclusve zone is handled within the gtk-layer-shell code. + * This event handler only updates stored size of the window and prints some warnings. * * Note: forced resizing to a window smaller than required by GTK would not work with * gtk-layer-shell. @@ -170,14 +170,13 @@ void waybar::Bar::onConfigureGLS(GdkEventConfigure* ev) { spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); } } else { - if (!vertical && height_ > 1 && ev->height > static_cast(height_)) { + if (height_ > 1 && ev->height > static_cast(height_)) { spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); } } width_ = ev->width; height_ = ev->height; spdlog::info(BAR_SIZE_MSG, width_, height_, output->name); - setExclusiveZone(width_, height_); } void waybar::Bar::onMapGLS(GdkEventAny* ev) { @@ -262,26 +261,31 @@ void waybar::Bar::onMap(GdkEventAny* ev) { } void waybar::Bar::setExclusiveZone(uint32_t width, uint32_t height) { - auto zone = 0; - if (visible) { - // exclusive zone already includes margin for anchored edge, - // only opposite margin should be added - if (vertical) { - zone += width; - zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? margins_.right : margins_.left; - } else { - zone += height; - zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? margins_.bottom : margins_.top; - } - } - spdlog::debug("Set exclusive zone {} for output {}", zone, output->name); - #ifdef HAVE_GTK_LAYER_SHELL if (use_gls_) { - gtk_layer_set_exclusive_zone(window.gobj(), zone); + if (visible) { + spdlog::debug("Enable auto exclusive zone for output {}", output->name); + gtk_layer_auto_exclusive_zone_enable(window.gobj()); + } else { + spdlog::debug("Disable exclusive zone for output {}", output->name); + gtk_layer_set_exclusive_zone(window.gobj(), 0); + } } else #endif { + auto zone = 0; + if (visible) { + // exclusive zone already includes margin for anchored edge, + // only opposite margin should be added + if (vertical) { + zone += width; + zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? margins_.right : margins_.left; + } else { + zone += height; + zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? margins_.bottom : margins_.top; + } + } + spdlog::debug("Set exclusive zone {} for output {}", zone, output->name); zwlr_layer_surface_v1_set_exclusive_zone(layer_surface_, zone); } } From 7735c80d0e421ab0787f99db6c269895ef856729 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 21 Oct 2020 22:16:12 -0700 Subject: [PATCH 100/355] refactor(bar): Split GLS and raw layer-shell implementations Extract two surface implementations from the bar class: GLSSurfaceImpl and RawSurfaceImpl. This change allowed to remove _all_ surface type conditionals and significantly simplify the Bar code. The change also applies PImpl pattern to the Bar, allowing to remove some headers and fields from `bar.hpp`. --- include/bar.hpp | 62 ++--- src/bar.cpp | 644 ++++++++++++++++++++++++++++-------------------- 2 files changed, 408 insertions(+), 298 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index fdc5a739..df503275 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -7,6 +7,7 @@ #include #include #include + #include "AModule.hpp" #include "idle-inhibit-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h" @@ -23,13 +24,35 @@ struct waybar_output { nullptr, &zxdg_output_v1_destroy}; }; +struct bar_margins { + int top = 0; + int right = 0; + int bottom = 0; + int left = 0; +}; + +class BarSurface { + protected: + BarSurface() = default; + + public: + virtual void set_exclusive_zone(bool enable) = 0; + virtual void set_layer(const std::string_view &layer) = 0; + virtual void set_margins(const struct bar_margins &margins) = 0; + virtual void set_position(const std::string_view &position) = 0; + virtual void set_size(uint32_t width, uint32_t height) = 0; + + virtual ~BarSurface() = default; +}; + class Bar { public: Bar(struct waybar_output *w_output, const Json::Value &); Bar(const Bar &) = delete; ~Bar() = default; - auto toggle() -> void; + void setVisible(bool visible); + void toggle(); void handleSignal(int); struct waybar_output *output; @@ -40,48 +63,15 @@ class Bar { Gtk::Window window; private: - static constexpr const char *MIN_HEIGHT_MSG = - "Requested height: {} exceeds the minimum height: {} required by the modules"; - static constexpr const char *MIN_WIDTH_MSG = - "Requested width: {} exceeds the minimum width: {} required by the modules"; - static constexpr const char *BAR_SIZE_MSG = - "Bar configured (width: {}, height: {}) for output: {}"; - static constexpr const char *SIZE_DEFINED = - "{} size is defined in the config file so it will stay like that"; - static void layerSurfaceHandleConfigure(void *, struct zwlr_layer_surface_v1 *, uint32_t, - uint32_t, uint32_t); - static void layerSurfaceHandleClosed(void *, struct zwlr_layer_surface_v1 *); - -#ifdef HAVE_GTK_LAYER_SHELL - /* gtk-layer-shell code */ - void initGtkLayerShell(); - void onConfigureGLS(GdkEventConfigure *ev); - void onMapGLS(GdkEventAny *ev); -#endif - /* fallback layer-surface code */ - void onConfigure(GdkEventConfigure *ev); - void onRealize(); - void onMap(GdkEventAny *ev); - void setSurfaceSize(uint32_t width, uint32_t height); - /* common code */ - void setExclusiveZone(uint32_t width, uint32_t height); + void onMap(GdkEventAny *); auto setupWidgets() -> void; void getModules(const Factory &, const std::string &); void setupAltFormatKeyForModule(const std::string &module_name); void setupAltFormatKeyForModuleList(const char *module_list_name); - struct margins { - int top = 0; - int right = 0; - int bottom = 0; - int left = 0; - } margins_; - struct zwlr_layer_surface_v1 *layer_surface_; - // use gtk-layer-shell instead of handling layer surfaces directly - bool use_gls_ = false; + std::unique_ptr surface_impl_; uint32_t width_ = 0; uint32_t height_ = 1; - uint8_t anchor_; Gtk::Box left_; Gtk::Box center_; Gtk::Box right_; diff --git a/src/bar.cpp b/src/bar.cpp index 7f60b2fc..a684f12b 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -8,13 +8,346 @@ #include "client.hpp" #include "factory.hpp" +namespace waybar { +static constexpr const char* MIN_HEIGHT_MSG = + "Requested height: {} exceeds the minimum height: {} required by the modules"; + +static constexpr const char* MIN_WIDTH_MSG = + "Requested width: {} exceeds the minimum width: {} required by the modules"; + +static constexpr const char* BAR_SIZE_MSG = "Bar configured (width: {}, height: {}) for output: {}"; + +static constexpr const char* SIZE_DEFINED = + "{} size is defined in the config file so it will stay like that"; + +#ifdef HAVE_GTK_LAYER_SHELL +struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { + GLSSurfaceImpl(Gtk::Window& window, struct waybar_output& output) : window_{window} { + output_name_ = output.name; + // this has to be executed before GtkWindow.realize + gtk_layer_init_for_window(window_.gobj()); + gtk_layer_set_keyboard_interactivity(window.gobj(), FALSE); + gtk_layer_set_monitor(window_.gobj(), output.monitor->gobj()); + gtk_layer_set_namespace(window_.gobj(), "waybar"); + + window.signal_configure_event().connect_notify( + sigc::mem_fun(*this, &GLSSurfaceImpl::on_configure)); + } + + void set_exclusive_zone(bool enable) override { + if (enable) { + gtk_layer_auto_exclusive_zone_enable(window_.gobj()); + } else { + gtk_layer_set_exclusive_zone(window_.gobj(), 0); + } + } + + void set_margins(const struct bar_margins& margins) override { + gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_LEFT, margins.left); + gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_RIGHT, margins.right); + gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_TOP, margins.top); + gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, margins.bottom); + } + + void set_layer(const std::string_view& value) override { + auto layer = GTK_LAYER_SHELL_LAYER_BOTTOM; + if (value == "top") { + layer = GTK_LAYER_SHELL_LAYER_TOP; + } else if (value == "overlay") { + layer = GTK_LAYER_SHELL_LAYER_OVERLAY; + } + gtk_layer_set_layer(window_.gobj(), layer); + } + + void set_position(const std::string_view& position) override { + auto unanchored = GTK_LAYER_SHELL_EDGE_BOTTOM; + vertical_ = false; + if (position == "bottom") { + unanchored = GTK_LAYER_SHELL_EDGE_TOP; + } else if (position == "left") { + unanchored = GTK_LAYER_SHELL_EDGE_RIGHT; + vertical_ = true; + } else if (position == "right") { + vertical_ = true; + unanchored = GTK_LAYER_SHELL_EDGE_LEFT; + } + for (auto edge : {GTK_LAYER_SHELL_EDGE_LEFT, + GTK_LAYER_SHELL_EDGE_RIGHT, + GTK_LAYER_SHELL_EDGE_TOP, + GTK_LAYER_SHELL_EDGE_BOTTOM}) { + gtk_layer_set_anchor(window_.gobj(), edge, unanchored != edge); + } + } + + void set_size(uint32_t width, uint32_t height) override { + width_ = width; + height_ = height; + window_.set_size_request(width_, height_); + }; + + private: + Gtk::Window& window_; + std::string output_name_; + uint32_t width_; + uint32_t height_; + bool vertical_ = false; + + void on_configure(GdkEventConfigure* ev) { + /* + * GTK wants new size for the window. + * Actual resizing and management of the exclusve zone is handled within the gtk-layer-shell + * code. This event handler only updates stored size of the window and prints some warnings. + * + * Note: forced resizing to a window smaller than required by GTK would not work with + * gtk-layer-shell. + */ + if (vertical_) { + if (width_ > 1 && ev->width > static_cast(width_)) { + spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); + } + } else { + if (height_ > 1 && ev->height > static_cast(height_)) { + spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); + } + } + width_ = ev->width; + height_ = ev->height; + spdlog::info(BAR_SIZE_MSG, width_, height_, output_name_); + } +}; +#endif + +struct RawSurfaceImpl : public BarSurface, public sigc::trackable { + RawSurfaceImpl(Gtk::Window& window, struct waybar_output& output) : window_{window} { + output_ = gdk_wayland_monitor_get_wl_output(output.monitor->gobj()); + output_name_ = output.name; + + window.signal_realize().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::on_realize)); + window.signal_map_event().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::on_map)); + window.signal_configure_event().connect_notify( + sigc::mem_fun(*this, &RawSurfaceImpl::on_configure)); + + if (window.get_realized()) { + on_realize(); + } + } + + void set_exclusive_zone(bool enable) override { + exclusive_zone_ = enable; + if (layer_surface_) { + auto zone = 0; + if (enable) { + // exclusive zone already includes margin for anchored edge, + // only opposite margin should be added + if ((anchor_ & VERTICAL_ANCHOR) == VERTICAL_ANCHOR) { + zone += width_; + zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? margins_.right : margins_.left; + } else { + zone += height_; + zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? margins_.bottom : margins_.top; + } + } + spdlog::debug("Set exclusive zone {} for output {}", zone, output_name_); + zwlr_layer_surface_v1_set_exclusive_zone(layer_surface_, zone); + } + } + + void set_layer(const std::string_view& layer) override { + layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; + if (layer == "top") { + layer_ = ZWLR_LAYER_SHELL_V1_LAYER_TOP; + } else if (layer == "overlay") { + layer_ = ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY; + } + // updating already mapped window + if (layer_surface_) { + if (zwlr_layer_surface_v1_get_version(layer_surface_) >= + ZWLR_LAYER_SURFACE_V1_SET_LAYER_SINCE_VERSION) { + zwlr_layer_surface_v1_set_layer(layer_surface_, layer_); + commit(); + } else { + spdlog::warn("Unable to set layer: layer-shell interface version is too old"); + } + } + } + + void set_margins(const struct bar_margins& margins) override { + margins_ = margins; + // updating already mapped window + if (layer_surface_) { + zwlr_layer_surface_v1_set_margin( + layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); + commit(); + } + } + + void set_position(const std::string_view& position) override { + anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; + if (position == "bottom") { + anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; + } else if (position == "left") { + anchor_ = VERTICAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT; + } else if (position == "right") { + anchor_ = VERTICAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; + } + + // updating already mapped window + if (layer_surface_) { + zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); + commit(); + } + } + + void set_size(uint32_t width, uint32_t height) override { + width_ = width; + height_ = height; + // layer_shell.configure handler should update exclusive zone if size changes + window_.set_size_request(width, height); + }; + + private: + constexpr static uint8_t VERTICAL_ANCHOR = + ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; + constexpr static uint8_t HORIZONTAL_ANCHOR = + ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; + + Gtk::Window& window_; + std::string output_name_; + uint32_t width_; + uint32_t height_; + uint8_t anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; + bool exclusive_zone_ = true; + struct bar_margins margins_; + + zwlr_layer_shell_v1_layer layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; + struct wl_output* output_ = nullptr; + struct wl_surface* surface_ = nullptr; + struct zwlr_layer_surface_v1* layer_surface_ = nullptr; + + void on_realize() { + auto gdk_window = window_.get_window()->gobj(); + gdk_wayland_window_set_use_custom_surface(gdk_window); + } + + void on_map(GdkEventAny* ev) { + auto client = Client::inst(); + auto gdk_window = window_.get_window()->gobj(); + surface_ = gdk_wayland_window_get_wl_surface(gdk_window); + + layer_surface_ = zwlr_layer_shell_v1_get_layer_surface( + client->layer_shell, surface_, output_, layer_, "waybar"); + + zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface_, false); + + zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); + zwlr_layer_surface_v1_set_margin( + layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); + set_surface_size(width_, height_); + set_exclusive_zone(exclusive_zone_); + + static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { + .configure = on_surface_configure, + .closed = on_surface_closed, + }; + zwlr_layer_surface_v1_add_listener(layer_surface_, &layer_surface_listener, this); + + wl_surface_commit(surface_); + wl_display_roundtrip(client->wl_display); + } + + void on_configure(GdkEventConfigure* ev) { + /* + * GTK wants new size for the window. + * + * Prefer configured size if it's non-default. + * If the size is not set and the window is smaller than requested by GTK, request resize from + * layer surface. + */ + auto tmp_height = height_; + auto tmp_width = width_; + if (ev->height > static_cast(height_)) { + // Default minimal value + if (height_ > 1) { + spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); + } + /* + if (config["height"].isUInt()) { + spdlog::info(SIZE_DEFINED, "Height"); + } else */ + tmp_height = ev->height; + } + if (ev->width > static_cast(width_)) { + // Default minimal value + if (width_ > 1) { + spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); + } + /* + if (config["width"].isUInt()) { + spdlog::info(SIZE_DEFINED, "Width"); + } else */ + tmp_width = ev->width; + } + if (tmp_width != width_ || tmp_height != height_) { + set_surface_size(tmp_width, tmp_height); + } + } + + void commit() { + if (window_.get_mapped()) { + wl_surface_commit(surface_); + } + } + + void set_surface_size(uint32_t width, uint32_t height) { + /* If the client is anchored to two opposite edges, layer_surface.configure will return + * size without margins for the axis. + * layer_surface.set_size, however, expects size with margins for the anchored axis. + * This is not specified by wlr-layer-shell and based on actual behavior of sway. + */ + bool vertical = (anchor_ & VERTICAL_ANCHOR) == VERTICAL_ANCHOR; + if (vertical && height > 1) { + height += margins_.top + margins_.bottom; + } + if (!vertical && width > 1) { + width += margins_.right + margins_.left; + } + spdlog::debug("Set surface size {}x{} for output {}", width, height, output_name_); + zwlr_layer_surface_v1_set_size(layer_surface_, width, height); + } + + static void on_surface_configure(void* data, struct zwlr_layer_surface_v1* surface, + uint32_t serial, uint32_t width, uint32_t height) { + auto o = static_cast(data); + if (width != o->width_ || height != o->height_) { + o->width_ = width; + o->height_ = height; + o->window_.set_size_request(o->width_, o->height_); + o->window_.resize(o->width_, o->height_); + o->set_exclusive_zone(o->exclusive_zone_); + spdlog::info(BAR_SIZE_MSG, + o->width_ == 1 ? "auto" : std::to_string(o->width_), + o->height_ == 1 ? "auto" : std::to_string(o->height_), + o->output_name_); + wl_surface_commit(o->surface_); + } + zwlr_layer_surface_v1_ack_configure(surface, serial); + } + + static void on_surface_closed(void* data, struct zwlr_layer_surface_v1* /* surface */) { + auto o = static_cast(data); + if (o->layer_surface_) { + zwlr_layer_surface_v1_destroy(o->layer_surface_); + o->layer_surface_ = nullptr; + } + } +}; + +}; // namespace waybar + waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) : output(w_output), config(w_config), - surface(nullptr), window{Gtk::WindowType::WINDOW_TOPLEVEL}, - layer_surface_(nullptr), - anchor_(ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP), left_(Gtk::ORIENTATION_HORIZONTAL, 0), center_(Gtk::ORIENTATION_HORIZONTAL, 0), right_(Gtk::ORIENTATION_HORIZONTAL, 0), @@ -29,32 +362,22 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) center_.get_style_context()->add_class("modules-center"); right_.get_style_context()->add_class("modules-right"); - if (config["position"] == "right" || config["position"] == "left") { + auto position = config["position"].asString(); + + if (position == "right" || position == "left") { + left_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); + center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); + right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); + box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); + vertical = true; + height_ = 0; width_ = 1; } height_ = config["height"].isUInt() ? config["height"].asUInt() : height_; width_ = config["width"].isUInt() ? config["width"].asUInt() : width_; - if (config["position"] == "bottom") { - anchor_ = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; - } else if (config["position"] == "left") { - anchor_ = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT; - } else if (config["position"] == "right") { - anchor_ = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; - } - if (anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM || - anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) { - anchor_ |= ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; - } else if (anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT || - anchor_ == ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) { - anchor_ |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; - left_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); - center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); - right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); - box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); - vertical = true; - } + struct bar_margins margins_; if (config["margin-top"].isInt() || config["margin-right"].isInt() || config["margin-bottom"].isInt() || config["margin-left"].isInt()) { @@ -102,210 +425,51 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) } #ifdef HAVE_GTK_LAYER_SHELL - use_gls_ = config["gtk-layer-shell"].isBool() ? config["gtk-layer-shell"].asBool() : true; - if (use_gls_) { - initGtkLayerShell(); - window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMapGLS)); - window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Bar::onConfigureGLS)); - } -#endif - - if (!use_gls_) { - window.signal_realize().connect_notify(sigc::mem_fun(*this, &Bar::onRealize)); - window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap)); - window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Bar::onConfigure)); - } - window.set_size_request(width_, height_); - setupWidgets(); - - if (!use_gls_ && window.get_realized()) { - onRealize(); - } - window.show_all(); -} - -#ifdef HAVE_GTK_LAYER_SHELL -void waybar::Bar::initGtkLayerShell() { - auto gtk_window = window.gobj(); - // this has to be executed before GtkWindow.realize - gtk_layer_init_for_window(gtk_window); - gtk_layer_set_keyboard_interactivity(gtk_window, FALSE); - auto layer = config["layer"] == "top" ? GTK_LAYER_SHELL_LAYER_TOP : GTK_LAYER_SHELL_LAYER_BOTTOM; - gtk_layer_set_layer(gtk_window, layer); - gtk_layer_set_monitor(gtk_window, output->monitor->gobj()); - gtk_layer_set_namespace(gtk_window, "waybar"); - - gtk_layer_set_anchor(gtk_window, - GTK_LAYER_SHELL_EDGE_LEFT, - (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? TRUE : FALSE); - gtk_layer_set_anchor(gtk_window, - GTK_LAYER_SHELL_EDGE_RIGHT, - (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT) ? TRUE : FALSE); - gtk_layer_set_anchor(gtk_window, - GTK_LAYER_SHELL_EDGE_TOP, - (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? TRUE : FALSE); - gtk_layer_set_anchor(gtk_window, - GTK_LAYER_SHELL_EDGE_BOTTOM, - (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM) ? TRUE : FALSE); - - gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_LEFT, margins_.left); - gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, margins_.right); - gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_TOP, margins_.top); - gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, margins_.bottom); - - setExclusiveZone(width_, height_); -} - -void waybar::Bar::onConfigureGLS(GdkEventConfigure* ev) { - /* - * GTK wants new size for the window. - * Actual resizing and management of the exclusve zone is handled within the gtk-layer-shell code. - * This event handler only updates stored size of the window and prints some warnings. - * - * Note: forced resizing to a window smaller than required by GTK would not work with - * gtk-layer-shell. - */ - if (vertical) { - if (width_ > 1 && ev->width > static_cast(width_)) { - spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); - } - } else { - if (height_ > 1 && ev->height > static_cast(height_)) { - spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); - } - } - width_ = ev->width; - height_ = ev->height; - spdlog::info(BAR_SIZE_MSG, width_, height_, output->name); -} - -void waybar::Bar::onMapGLS(GdkEventAny* ev) { - /* - * Obtain a pointer to the custom layer surface for modules that require it (idle_inhibitor). - */ - auto gdk_window = window.get_window(); - surface = gdk_wayland_window_get_wl_surface(gdk_window->gobj()); -} - -#endif - -void waybar::Bar::onConfigure(GdkEventConfigure* ev) { - /* - * GTK wants new size for the window. - * - * Prefer configured size if it's non-default. - * If the size is not set and the window is smaller than requested by GTK, request resize from - * layer surface. - */ - auto tmp_height = height_; - auto tmp_width = width_; - if (ev->height > static_cast(height_)) { - // Default minimal value - if (height_ > 1) { - spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); - } - if (config["height"].isUInt()) { - spdlog::info(SIZE_DEFINED, "Height"); - } else { - tmp_height = ev->height; - } - } - if (ev->width > static_cast(width_)) { - // Default minimal value - if (width_ > 1) { - spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); - } - if (config["width"].isUInt()) { - spdlog::info(SIZE_DEFINED, "Width"); - } else { - tmp_width = ev->width; - } - } - if (tmp_width != width_ || tmp_height != height_) { - setSurfaceSize(tmp_width, tmp_height); - } -} - -void waybar::Bar::onRealize() { - auto gdk_window = window.get_window()->gobj(); - gdk_wayland_window_set_use_custom_surface(gdk_window); -} - -void waybar::Bar::onMap(GdkEventAny* ev) { - auto gdk_window = window.get_window()->gobj(); - surface = gdk_wayland_window_get_wl_surface(gdk_window); - - auto client = waybar::Client::inst(); - // owned by output->monitor; no need to destroy - auto wl_output = gdk_wayland_monitor_get_wl_output(output->monitor->gobj()); - auto layer = - config["layer"] == "top" ? ZWLR_LAYER_SHELL_V1_LAYER_TOP : ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; - layer_surface_ = zwlr_layer_shell_v1_get_layer_surface( - client->layer_shell, surface, wl_output, layer, "waybar"); - - zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface_, false); - zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); - zwlr_layer_surface_v1_set_margin( - layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); - setSurfaceSize(width_, height_); - setExclusiveZone(width_, height_); - - static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { - .configure = layerSurfaceHandleConfigure, - .closed = layerSurfaceHandleClosed, - }; - zwlr_layer_surface_v1_add_listener(layer_surface_, &layer_surface_listener, this); - - wl_surface_commit(surface); - wl_display_roundtrip(client->wl_display); -} - -void waybar::Bar::setExclusiveZone(uint32_t width, uint32_t height) { -#ifdef HAVE_GTK_LAYER_SHELL - if (use_gls_) { - if (visible) { - spdlog::debug("Enable auto exclusive zone for output {}", output->name); - gtk_layer_auto_exclusive_zone_enable(window.gobj()); - } else { - spdlog::debug("Disable exclusive zone for output {}", output->name); - gtk_layer_set_exclusive_zone(window.gobj(), 0); - } + bool use_gls = config["gtk-layer-shell"].isBool() ? config["gtk-layer-shell"].asBool() : true; + if (use_gls) { + surface_impl_ = std::make_unique(window, *output); } else #endif { - auto zone = 0; - if (visible) { - // exclusive zone already includes margin for anchored edge, - // only opposite margin should be added - if (vertical) { - zone += width; - zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT) ? margins_.right : margins_.left; - } else { - zone += height; - zone += (anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) ? margins_.bottom : margins_.top; - } - } - spdlog::debug("Set exclusive zone {} for output {}", zone, output->name); - zwlr_layer_surface_v1_set_exclusive_zone(layer_surface_, zone); + surface_impl_ = std::make_unique(window, *output); } + + if (config["layer"].isString()) { + surface_impl_->set_layer(config["layer"].asString()); + } + surface_impl_->set_exclusive_zone(true); + surface_impl_->set_margins(margins_); + surface_impl_->set_position(position); + surface_impl_->set_size(width_, height_); + + window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap)); + + setupWidgets(); + window.show_all(); } -void waybar::Bar::setSurfaceSize(uint32_t width, uint32_t height) { - /* If the client is anchored to two opposite edges, layer_surface.configure will return - * size without margins for the axis. - * layer_surface.set_size, however, expects size with margins for the anchored axis. - * This is not specified by wlr-layer-shell and based on actual behavior of sway. +void waybar::Bar::onMap(GdkEventAny*) { + /* + * Obtain a pointer to the custom layer surface for modules that require it (idle_inhibitor). */ - if (vertical && height > 1) { - height += margins_.top + margins_.bottom; - } - if (!vertical && width > 1) { - width += margins_.right + margins_.left; - } - spdlog::debug("Set surface size {}x{} for output {}", width, height, output->name); - zwlr_layer_surface_v1_set_size(layer_surface_, width, height); + auto gdk_window = window.get_window()->gobj(); + surface = gdk_wayland_window_get_wl_surface(gdk_window); } +void waybar::Bar::setVisible(bool value) { + visible = value; + if (!visible) { + window.get_style_context()->add_class("hidden"); + window.set_opacity(0); + } else { + window.get_style_context()->remove_class("hidden"); + window.set_opacity(1); + } + surface_impl_->set_exclusive_zone(visible); +} + +void waybar::Bar::toggle() { setVisible(!visible); } + // Converting string to button code rn as to avoid doing it later void waybar::Bar::setupAltFormatKeyForModule(const std::string& module_name) { if (config.isMember(module_name)) { @@ -367,50 +531,6 @@ void waybar::Bar::handleSignal(int signal) { } } -void waybar::Bar::layerSurfaceHandleConfigure(void* data, struct zwlr_layer_surface_v1* surface, - uint32_t serial, uint32_t width, uint32_t height) { - auto o = static_cast(data); - if (width != o->width_ || height != o->height_) { - o->width_ = width; - o->height_ = height; - o->window.set_size_request(o->width_, o->height_); - o->window.resize(o->width_, o->height_); - o->setExclusiveZone(width, height); - spdlog::info(BAR_SIZE_MSG, - o->width_ == 1 ? "auto" : std::to_string(o->width_), - o->height_ == 1 ? "auto" : std::to_string(o->height_), - o->output->name); - wl_surface_commit(o->surface); - } - zwlr_layer_surface_v1_ack_configure(surface, serial); -} - -void waybar::Bar::layerSurfaceHandleClosed(void* data, struct zwlr_layer_surface_v1* /*surface*/) { - auto o = static_cast(data); - if (o->layer_surface_) { - zwlr_layer_surface_v1_destroy(o->layer_surface_); - o->layer_surface_ = nullptr; - } - o->modules_left_.clear(); - o->modules_center_.clear(); - o->modules_right_.clear(); -} - -auto waybar::Bar::toggle() -> void { - visible = !visible; - if (!visible) { - window.get_style_context()->add_class("hidden"); - window.set_opacity(0); - } else { - window.get_style_context()->remove_class("hidden"); - window.set_opacity(1); - } - setExclusiveZone(width_, height_); - if (!use_gls_) { - wl_surface_commit(surface); - } -} - void waybar::Bar::getModules(const Factory& factory, const std::string& pos) { if (config[pos].isArray()) { for (const auto& name : config[pos]) { From f01996ae997d4d2aa8ce9904332d99f12f3e4e2c Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 28 Oct 2020 08:06:40 -0700 Subject: [PATCH 101/355] fix(bar): CamelCase SurfaceImpl method names --- include/bar.hpp | 10 +++---- src/bar.cpp | 70 ++++++++++++++++++++++++------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index df503275..1e3d37b0 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -36,11 +36,11 @@ class BarSurface { BarSurface() = default; public: - virtual void set_exclusive_zone(bool enable) = 0; - virtual void set_layer(const std::string_view &layer) = 0; - virtual void set_margins(const struct bar_margins &margins) = 0; - virtual void set_position(const std::string_view &position) = 0; - virtual void set_size(uint32_t width, uint32_t height) = 0; + virtual void setExclusiveZone(bool enable) = 0; + virtual void setLayer(const std::string_view &layer) = 0; + virtual void setMargins(const struct bar_margins &margins) = 0; + virtual void setPosition(const std::string_view &position) = 0; + virtual void setSize(uint32_t width, uint32_t height) = 0; virtual ~BarSurface() = default; }; diff --git a/src/bar.cpp b/src/bar.cpp index a684f12b..c7387e38 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -31,10 +31,10 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { gtk_layer_set_namespace(window_.gobj(), "waybar"); window.signal_configure_event().connect_notify( - sigc::mem_fun(*this, &GLSSurfaceImpl::on_configure)); + sigc::mem_fun(*this, &GLSSurfaceImpl::onConfigure)); } - void set_exclusive_zone(bool enable) override { + void setExclusiveZone(bool enable) override { if (enable) { gtk_layer_auto_exclusive_zone_enable(window_.gobj()); } else { @@ -42,14 +42,14 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { } } - void set_margins(const struct bar_margins& margins) override { + void setMargins(const struct bar_margins& margins) override { gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_LEFT, margins.left); gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_RIGHT, margins.right); gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_TOP, margins.top); gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, margins.bottom); } - void set_layer(const std::string_view& value) override { + void setLayer(const std::string_view& value) override { auto layer = GTK_LAYER_SHELL_LAYER_BOTTOM; if (value == "top") { layer = GTK_LAYER_SHELL_LAYER_TOP; @@ -59,7 +59,7 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { gtk_layer_set_layer(window_.gobj(), layer); } - void set_position(const std::string_view& position) override { + void setPosition(const std::string_view& position) override { auto unanchored = GTK_LAYER_SHELL_EDGE_BOTTOM; vertical_ = false; if (position == "bottom") { @@ -79,7 +79,7 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { } } - void set_size(uint32_t width, uint32_t height) override { + void setSize(uint32_t width, uint32_t height) override { width_ = width; height_ = height; window_.set_size_request(width_, height_); @@ -92,7 +92,7 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { uint32_t height_; bool vertical_ = false; - void on_configure(GdkEventConfigure* ev) { + void onConfigure(GdkEventConfigure* ev) { /* * GTK wants new size for the window. * Actual resizing and management of the exclusve zone is handled within the gtk-layer-shell @@ -122,17 +122,17 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { output_ = gdk_wayland_monitor_get_wl_output(output.monitor->gobj()); output_name_ = output.name; - window.signal_realize().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::on_realize)); - window.signal_map_event().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::on_map)); + window.signal_realize().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::onRealize)); + window.signal_map_event().connect_notify(sigc::mem_fun(*this, &RawSurfaceImpl::onMap)); window.signal_configure_event().connect_notify( - sigc::mem_fun(*this, &RawSurfaceImpl::on_configure)); + sigc::mem_fun(*this, &RawSurfaceImpl::onConfigure)); if (window.get_realized()) { - on_realize(); + onRealize(); } } - void set_exclusive_zone(bool enable) override { + void setExclusiveZone(bool enable) override { exclusive_zone_ = enable; if (layer_surface_) { auto zone = 0; @@ -152,7 +152,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } - void set_layer(const std::string_view& layer) override { + void setLayer(const std::string_view& layer) override { layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; if (layer == "top") { layer_ = ZWLR_LAYER_SHELL_V1_LAYER_TOP; @@ -171,7 +171,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } - void set_margins(const struct bar_margins& margins) override { + void setMargins(const struct bar_margins& margins) override { margins_ = margins; // updating already mapped window if (layer_surface_) { @@ -181,7 +181,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } - void set_position(const std::string_view& position) override { + void setPosition(const std::string_view& position) override { anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; if (position == "bottom") { anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; @@ -198,7 +198,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } - void set_size(uint32_t width, uint32_t height) override { + void setSize(uint32_t width, uint32_t height) override { width_ = width; height_ = height; // layer_shell.configure handler should update exclusive zone if size changes @@ -224,12 +224,12 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { struct wl_surface* surface_ = nullptr; struct zwlr_layer_surface_v1* layer_surface_ = nullptr; - void on_realize() { + void onRealize() { auto gdk_window = window_.get_window()->gobj(); gdk_wayland_window_set_use_custom_surface(gdk_window); } - void on_map(GdkEventAny* ev) { + void onMap(GdkEventAny* ev) { auto client = Client::inst(); auto gdk_window = window_.get_window()->gobj(); surface_ = gdk_wayland_window_get_wl_surface(gdk_window); @@ -242,12 +242,12 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); zwlr_layer_surface_v1_set_margin( layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); - set_surface_size(width_, height_); - set_exclusive_zone(exclusive_zone_); + setSurfaceSize(width_, height_); + setExclusiveZone(exclusive_zone_); static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { - .configure = on_surface_configure, - .closed = on_surface_closed, + .configure = onSurfaceConfigure, + .closed = onSurfaceClosed, }; zwlr_layer_surface_v1_add_listener(layer_surface_, &layer_surface_listener, this); @@ -255,7 +255,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { wl_display_roundtrip(client->wl_display); } - void on_configure(GdkEventConfigure* ev) { + void onConfigure(GdkEventConfigure* ev) { /* * GTK wants new size for the window. * @@ -288,7 +288,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { tmp_width = ev->width; } if (tmp_width != width_ || tmp_height != height_) { - set_surface_size(tmp_width, tmp_height); + setSurfaceSize(tmp_width, tmp_height); } } @@ -298,7 +298,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } - void set_surface_size(uint32_t width, uint32_t height) { + void setSurfaceSize(uint32_t width, uint32_t height) { /* If the client is anchored to two opposite edges, layer_surface.configure will return * size without margins for the axis. * layer_surface.set_size, however, expects size with margins for the anchored axis. @@ -315,15 +315,15 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { zwlr_layer_surface_v1_set_size(layer_surface_, width, height); } - static void on_surface_configure(void* data, struct zwlr_layer_surface_v1* surface, - uint32_t serial, uint32_t width, uint32_t height) { + static void onSurfaceConfigure(void* data, struct zwlr_layer_surface_v1* surface, uint32_t serial, + uint32_t width, uint32_t height) { auto o = static_cast(data); if (width != o->width_ || height != o->height_) { o->width_ = width; o->height_ = height; o->window_.set_size_request(o->width_, o->height_); o->window_.resize(o->width_, o->height_); - o->set_exclusive_zone(o->exclusive_zone_); + o->setExclusiveZone(o->exclusive_zone_); spdlog::info(BAR_SIZE_MSG, o->width_ == 1 ? "auto" : std::to_string(o->width_), o->height_ == 1 ? "auto" : std::to_string(o->height_), @@ -333,7 +333,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { zwlr_layer_surface_v1_ack_configure(surface, serial); } - static void on_surface_closed(void* data, struct zwlr_layer_surface_v1* /* surface */) { + static void onSurfaceClosed(void* data, struct zwlr_layer_surface_v1* /* surface */) { auto o = static_cast(data); if (o->layer_surface_) { zwlr_layer_surface_v1_destroy(o->layer_surface_); @@ -435,12 +435,12 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) } if (config["layer"].isString()) { - surface_impl_->set_layer(config["layer"].asString()); + surface_impl_->setLayer(config["layer"].asString()); } - surface_impl_->set_exclusive_zone(true); - surface_impl_->set_margins(margins_); - surface_impl_->set_position(position); - surface_impl_->set_size(width_, height_); + surface_impl_->setExclusiveZone(true); + surface_impl_->setMargins(margins_); + surface_impl_->setPosition(position); + surface_impl_->setSize(width_, height_); window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap)); @@ -465,7 +465,7 @@ void waybar::Bar::setVisible(bool value) { window.get_style_context()->remove_class("hidden"); window.set_opacity(1); } - surface_impl_->set_exclusive_zone(visible); + surface_impl_->setExclusiveZone(visible); } void waybar::Bar::toggle() { setVisible(!visible); } From f97de599dde49943d2742db2903b83769601deac Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 21 Oct 2020 22:45:03 -0700 Subject: [PATCH 102/355] refactor: header cleanup Replace a couple of header includes with forward declarations. --- include/bar.hpp | 2 -- include/client.hpp | 4 ++++ src/bar.cpp | 1 + src/client.cpp | 3 +++ src/modules/idle_inhibitor.cpp | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index 1e3d37b0..d4748d5a 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -9,8 +9,6 @@ #include #include "AModule.hpp" -#include "idle-inhibit-unstable-v1-client-protocol.h" -#include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "xdg-output-unstable-v1-client-protocol.h" namespace waybar { diff --git a/include/client.hpp b/include/client.hpp index 39b6ae3b..05215cc0 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -8,6 +8,10 @@ #include #include "bar.hpp" +struct zwlr_layer_shell_v1; +struct zwp_idle_inhibitor_v1; +struct zwp_idle_inhibit_manager_v1; + namespace waybar { class Client { diff --git a/src/bar.cpp b/src/bar.cpp index c7387e38..fb04f627 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -7,6 +7,7 @@ #include "bar.hpp" #include "client.hpp" #include "factory.hpp" +#include "wlr-layer-shell-unstable-v1-client-protocol.h" namespace waybar { static constexpr const char* MIN_HEIGHT_MSG = diff --git a/src/client.cpp b/src/client.cpp index 9dd93d81..005761ee 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -6,6 +6,9 @@ #include "util/clara.hpp" #include "util/json.hpp" +#include "idle-inhibit-unstable-v1-client-protocol.h" +#include "wlr-layer-shell-unstable-v1-client-protocol.h" + waybar::Client *waybar::Client::inst() { static auto c = new Client(); return c; diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index d94e9579..d2cfe905 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -1,4 +1,6 @@ #include "modules/idle_inhibitor.hpp" + +#include "idle-inhibit-unstable-v1-client-protocol.h" #include "util/command.hpp" waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar, From d4d35e6b2b6f142844e18c69164c38d6b02f185a Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 22 Oct 2020 08:04:57 -0700 Subject: [PATCH 103/355] chore(subprojects): update gtk-layer-shell to 0.4.0 --- subprojects/gtk-layer-shell.wrap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subprojects/gtk-layer-shell.wrap b/subprojects/gtk-layer-shell.wrap index 6fe68c3f..555fbcb6 100644 --- a/subprojects/gtk-layer-shell.wrap +++ b/subprojects/gtk-layer-shell.wrap @@ -1,5 +1,5 @@ [wrap-file] -directory = gtk-layer-shell-0.3.0 -source_filename = gtk-layer-shell-0.3.0.tar.gz -source_hash = edd5e31279d494df66da9e9190c219fa295da547f5538207685e98468dbc134d -source_url = https://github.com/wmww/gtk-layer-shell/archive/v0.3.0/gtk-layer-shell-0.3.0.tar.gz +directory = gtk-layer-shell-0.4.0 +source_filename = gtk-layer-shell-0.4.0.tar.gz +source_hash = 52fd74d3161fefa5528585ca5a523c3150934961f2284ad010ae54336dad097e +source_url = https://github.com/wmww/gtk-layer-shell/archive/v0.4.0/gtk-layer-shell-0.4.0.tar.gz From 591a417b7db973304e788ccf58bbbfdb289ed9a7 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 23 Oct 2020 00:13:23 -0700 Subject: [PATCH 104/355] fix(bar): rework surface commit calls for RawSurfaceImpl wayland log shows that some changes were committed twice and some weren't committed until the next redraw. --- include/bar.hpp | 1 + src/bar.cpp | 34 ++++++++++++++++------------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index d4748d5a..8348070f 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -39,6 +39,7 @@ class BarSurface { virtual void setMargins(const struct bar_margins &margins) = 0; virtual void setPosition(const std::string_view &position) = 0; virtual void setSize(uint32_t width, uint32_t height) = 0; + virtual void commit(){}; virtual ~BarSurface() = default; }; diff --git a/src/bar.cpp b/src/bar.cpp index fb04f627..8e5d7b05 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -165,7 +165,6 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { if (zwlr_layer_surface_v1_get_version(layer_surface_) >= ZWLR_LAYER_SURFACE_V1_SET_LAYER_SINCE_VERSION) { zwlr_layer_surface_v1_set_layer(layer_surface_, layer_); - commit(); } else { spdlog::warn("Unable to set layer: layer-shell interface version is too old"); } @@ -178,7 +177,6 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { if (layer_surface_) { zwlr_layer_surface_v1_set_margin( layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); - commit(); } } @@ -195,7 +193,6 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { // updating already mapped window if (layer_surface_) { zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); - commit(); } } @@ -206,6 +203,12 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { window_.set_size_request(width, height); }; + void commit() override { + if (surface_) { + wl_surface_commit(surface_); + } + } + private: constexpr static uint8_t VERTICAL_ANCHOR = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; @@ -231,6 +234,10 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } void onMap(GdkEventAny* ev) { + static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { + .configure = onSurfaceConfigure, + .closed = onSurfaceClosed, + }; auto client = Client::inst(); auto gdk_window = window_.get_window()->gobj(); surface_ = gdk_wayland_window_get_wl_surface(gdk_window); @@ -238,21 +245,16 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { layer_surface_ = zwlr_layer_shell_v1_get_layer_surface( client->layer_shell, surface_, output_, layer_, "waybar"); + zwlr_layer_surface_v1_add_listener(layer_surface_, &layer_surface_listener, this); zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface_, false); - zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); zwlr_layer_surface_v1_set_margin( layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); + setSurfaceSize(width_, height_); setExclusiveZone(exclusive_zone_); - static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { - .configure = onSurfaceConfigure, - .closed = onSurfaceClosed, - }; - zwlr_layer_surface_v1_add_listener(layer_surface_, &layer_surface_listener, this); - - wl_surface_commit(surface_); + commit(); wl_display_roundtrip(client->wl_display); } @@ -290,12 +292,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } if (tmp_width != width_ || tmp_height != height_) { setSurfaceSize(tmp_width, tmp_height); - } - } - - void commit() { - if (window_.get_mapped()) { - wl_surface_commit(surface_); + commit(); } } @@ -329,7 +326,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { o->width_ == 1 ? "auto" : std::to_string(o->width_), o->height_ == 1 ? "auto" : std::to_string(o->height_), o->output_name_); - wl_surface_commit(o->surface_); + o->commit(); } zwlr_layer_surface_v1_ack_configure(surface, serial); } @@ -467,6 +464,7 @@ void waybar::Bar::setVisible(bool value) { window.set_opacity(1); } surface_impl_->setExclusiveZone(visible); + surface_impl_->commit(); } void waybar::Bar::toggle() { setVisible(!visible); } From fe3aeb36c51267b87c8a8b8fa2ea827047c25196 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 23 Oct 2020 00:49:09 -0700 Subject: [PATCH 105/355] refactor(bar): wrap layer_surface pointer in unique_ptr --- src/bar.cpp | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/bar.cpp b/src/bar.cpp index 8e5d7b05..c2cf6d34 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -4,6 +4,8 @@ #include +#include + #include "bar.hpp" #include "client.hpp" #include "factory.hpp" @@ -149,7 +151,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } spdlog::debug("Set exclusive zone {} for output {}", zone, output_name_); - zwlr_layer_surface_v1_set_exclusive_zone(layer_surface_, zone); + zwlr_layer_surface_v1_set_exclusive_zone(layer_surface_.get(), zone); } } @@ -162,9 +164,9 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } // updating already mapped window if (layer_surface_) { - if (zwlr_layer_surface_v1_get_version(layer_surface_) >= + if (zwlr_layer_surface_v1_get_version(layer_surface_.get()) >= ZWLR_LAYER_SURFACE_V1_SET_LAYER_SINCE_VERSION) { - zwlr_layer_surface_v1_set_layer(layer_surface_, layer_); + zwlr_layer_surface_v1_set_layer(layer_surface_.get(), layer_); } else { spdlog::warn("Unable to set layer: layer-shell interface version is too old"); } @@ -176,7 +178,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { // updating already mapped window if (layer_surface_) { zwlr_layer_surface_v1_set_margin( - layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); + layer_surface_.get(), margins_.top, margins_.right, margins_.bottom, margins_.left); } } @@ -192,7 +194,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { // updating already mapped window if (layer_surface_) { - zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); + zwlr_layer_surface_v1_set_anchor(layer_surface_.get(), anchor_); } } @@ -215,6 +217,11 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { constexpr static uint8_t HORIZONTAL_ANCHOR = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; + template + using deleter_fn = std::integral_constant; + using layer_surface_ptr = + std::unique_ptr>; + Gtk::Window& window_; std::string output_name_; uint32_t width_; @@ -223,10 +230,10 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { bool exclusive_zone_ = true; struct bar_margins margins_; - zwlr_layer_shell_v1_layer layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; - struct wl_output* output_ = nullptr; - struct wl_surface* surface_ = nullptr; - struct zwlr_layer_surface_v1* layer_surface_ = nullptr; + zwlr_layer_shell_v1_layer layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; + struct wl_output* output_ = nullptr; // owned by GTK + struct wl_surface* surface_ = nullptr; // owned by GTK + layer_surface_ptr layer_surface_; void onRealize() { auto gdk_window = window_.get_window()->gobj(); @@ -242,14 +249,14 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { auto gdk_window = window_.get_window()->gobj(); surface_ = gdk_wayland_window_get_wl_surface(gdk_window); - layer_surface_ = zwlr_layer_shell_v1_get_layer_surface( - client->layer_shell, surface_, output_, layer_, "waybar"); + layer_surface_.reset(zwlr_layer_shell_v1_get_layer_surface( + client->layer_shell, surface_, output_, layer_, "waybar")); - zwlr_layer_surface_v1_add_listener(layer_surface_, &layer_surface_listener, this); - zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface_, false); - zwlr_layer_surface_v1_set_anchor(layer_surface_, anchor_); + zwlr_layer_surface_v1_add_listener(layer_surface_.get(), &layer_surface_listener, this); + zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface_.get(), false); + zwlr_layer_surface_v1_set_anchor(layer_surface_.get(), anchor_); zwlr_layer_surface_v1_set_margin( - layer_surface_, margins_.top, margins_.right, margins_.bottom, margins_.left); + layer_surface_.get(), margins_.top, margins_.right, margins_.bottom, margins_.left); setSurfaceSize(width_, height_); setExclusiveZone(exclusive_zone_); @@ -310,7 +317,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { width += margins_.right + margins_.left; } spdlog::debug("Set surface size {}x{} for output {}", width, height, output_name_); - zwlr_layer_surface_v1_set_size(layer_surface_, width, height); + zwlr_layer_surface_v1_set_size(layer_surface_.get(), width, height); } static void onSurfaceConfigure(void* data, struct zwlr_layer_surface_v1* surface, uint32_t serial, @@ -333,10 +340,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { static void onSurfaceClosed(void* data, struct zwlr_layer_surface_v1* /* surface */) { auto o = static_cast(data); - if (o->layer_surface_) { - zwlr_layer_surface_v1_destroy(o->layer_surface_); - o->layer_surface_ = nullptr; - } + o->layer_surface_.reset(); } }; From fc5906dbd4a9d026a6f746ffe37ec69ee5e2e7ea Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 22 Oct 2020 23:04:58 -0700 Subject: [PATCH 106/355] feat(bar): change layer to `bottom` when hidden Invisible bar on a `top` layer would still intercept pointer events and stop them from reaching windows below. Always changing the layer to to `bottom` along with making bar invisible would prevent that. --- include/bar.hpp | 9 ++++++++- src/bar.cpp | 27 +++++++++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index 8348070f..88df8b71 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -22,6 +22,12 @@ struct waybar_output { nullptr, &zxdg_output_v1_destroy}; }; +enum class bar_layer : uint8_t { + BOTTOM, + TOP, + OVERLAY, +}; + struct bar_margins { int top = 0; int right = 0; @@ -35,7 +41,7 @@ class BarSurface { public: virtual void setExclusiveZone(bool enable) = 0; - virtual void setLayer(const std::string_view &layer) = 0; + virtual void setLayer(bar_layer layer) = 0; virtual void setMargins(const struct bar_margins &margins) = 0; virtual void setPosition(const std::string_view &position) = 0; virtual void setSize(uint32_t width, uint32_t height) = 0; @@ -71,6 +77,7 @@ class Bar { std::unique_ptr surface_impl_; uint32_t width_ = 0; uint32_t height_ = 1; + bar_layer layer_; Gtk::Box left_; Gtk::Box center_; Gtk::Box right_; diff --git a/src/bar.cpp b/src/bar.cpp index c2cf6d34..f0fe64a7 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -52,11 +52,11 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { gtk_layer_set_margin(window_.gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, margins.bottom); } - void setLayer(const std::string_view& value) override { + void setLayer(bar_layer value) override { auto layer = GTK_LAYER_SHELL_LAYER_BOTTOM; - if (value == "top") { + if (value == bar_layer::TOP) { layer = GTK_LAYER_SHELL_LAYER_TOP; - } else if (value == "overlay") { + } else if (value == bar_layer::OVERLAY) { layer = GTK_LAYER_SHELL_LAYER_OVERLAY; } gtk_layer_set_layer(window_.gobj(), layer); @@ -155,11 +155,11 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } - void setLayer(const std::string_view& layer) override { + void setLayer(bar_layer layer) override { layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; - if (layer == "top") { + if (layer == bar_layer::TOP) { layer_ = ZWLR_LAYER_SHELL_V1_LAYER_TOP; - } else if (layer == "overlay") { + } else if (layer == bar_layer::OVERLAY) { layer_ = ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY; } // updating already mapped window @@ -168,7 +168,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { ZWLR_LAYER_SURFACE_V1_SET_LAYER_SINCE_VERSION) { zwlr_layer_surface_v1_set_layer(layer_surface_.get(), layer_); } else { - spdlog::warn("Unable to set layer: layer-shell interface version is too old"); + spdlog::warn("Unable to change layer: layer-shell implementation is too old"); } } } @@ -350,6 +350,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) : output(w_output), config(w_config), window{Gtk::WindowType::WINDOW_TOPLEVEL}, + layer_{bar_layer::BOTTOM}, left_(Gtk::ORIENTATION_HORIZONTAL, 0), center_(Gtk::ORIENTATION_HORIZONTAL, 0), right_(Gtk::ORIENTATION_HORIZONTAL, 0), @@ -364,6 +365,12 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) center_.get_style_context()->add_class("modules-center"); right_.get_style_context()->add_class("modules-right"); + if (config["layer"] == "top") { + layer_ = bar_layer::TOP; + } else if (config["layer"] == "overlay") { + layer_ = bar_layer::OVERLAY; + } + auto position = config["position"].asString(); if (position == "right" || position == "left") { @@ -436,9 +443,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) surface_impl_ = std::make_unique(window, *output); } - if (config["layer"].isString()) { - surface_impl_->setLayer(config["layer"].asString()); - } + surface_impl_->setLayer(layer_); surface_impl_->setExclusiveZone(true); surface_impl_->setMargins(margins_); surface_impl_->setPosition(position); @@ -463,9 +468,11 @@ void waybar::Bar::setVisible(bool value) { if (!visible) { window.get_style_context()->add_class("hidden"); window.set_opacity(0); + surface_impl_->setLayer(bar_layer::BOTTOM); } else { window.get_style_context()->remove_class("hidden"); window.set_opacity(1); + surface_impl_->setLayer(layer_); } surface_impl_->setExclusiveZone(visible); surface_impl_->commit(); From 9c566564e1c892b4f681be3787cd8a589f95a0ec Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 23 Oct 2020 02:59:04 -0700 Subject: [PATCH 107/355] fix(bar): address some of RawSurfaceImpl resizing issues --- include/bar.hpp | 2 -- src/bar.cpp | 55 ++++++++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index 88df8b71..8aab8f7c 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -75,8 +75,6 @@ class Bar { void setupAltFormatKeyForModuleList(const char *module_list_name); std::unique_ptr surface_impl_; - uint32_t width_ = 0; - uint32_t height_ = 1; bar_layer layer_; Gtk::Box left_; Gtk::Box center_; diff --git a/src/bar.cpp b/src/bar.cpp index f0fe64a7..771adab5 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -199,8 +199,8 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } void setSize(uint32_t width, uint32_t height) override { - width_ = width; - height_ = height; + configured_width_ = width_ = width; + configured_height_ = height_ = height; // layer_shell.configure handler should update exclusive zone if size changes window_.set_size_request(width, height); }; @@ -224,8 +224,10 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { Gtk::Window& window_; std::string output_name_; - uint32_t width_; - uint32_t height_; + uint32_t configured_width_ = 0; + uint32_t configured_height_ = 0; + uint32_t width_ = 0; + uint32_t height_ = 0; uint8_t anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; bool exclusive_zone_ = true; struct bar_margins margins_; @@ -280,22 +282,22 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { if (height_ > 1) { spdlog::warn(MIN_HEIGHT_MSG, height_, ev->height); } - /* - if (config["height"].isUInt()) { + if (configured_height_ > 1) { spdlog::info(SIZE_DEFINED, "Height"); - } else */ - tmp_height = ev->height; + } else { + tmp_height = ev->height; + } } if (ev->width > static_cast(width_)) { // Default minimal value if (width_ > 1) { spdlog::warn(MIN_WIDTH_MSG, width_, ev->width); } - /* - if (config["width"].isUInt()) { + if (configured_width_ > 1) { spdlog::info(SIZE_DEFINED, "Width"); - } else */ - tmp_width = ev->width; + } else { + tmp_width = ev->width; + } } if (tmp_width != width_ || tmp_height != height_) { setSurfaceSize(tmp_width, tmp_height); @@ -308,13 +310,20 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { * size without margins for the axis. * layer_surface.set_size, however, expects size with margins for the anchored axis. * This is not specified by wlr-layer-shell and based on actual behavior of sway. + * + * If the size for unanchored axis is not set (0), change request to 1 to avoid automatic + * assignment by the compositor. */ - bool vertical = (anchor_ & VERTICAL_ANCHOR) == VERTICAL_ANCHOR; - if (vertical && height > 1) { - height += margins_.top + margins_.bottom; - } - if (!vertical && width > 1) { - width += margins_.right + margins_.left; + if ((anchor_ & VERTICAL_ANCHOR) == VERTICAL_ANCHOR) { + width = width > 0 ? width : 1; + if (height > 1) { + height += margins_.top + margins_.bottom; + } + } else { + height = height > 0 ? height : 1; + if (width > 1) { + width += margins_.right + margins_.left; + } } spdlog::debug("Set surface size {}x{} for output {}", width, height, output_name_); zwlr_layer_surface_v1_set_size(layer_surface_.get(), width, height); @@ -379,12 +388,10 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); vertical = true; - - height_ = 0; - width_ = 1; } - height_ = config["height"].isUInt() ? config["height"].asUInt() : height_; - width_ = config["width"].isUInt() ? config["width"].asUInt() : width_; + + uint32_t height = config["height"].isUInt() ? config["height"].asUInt() : 0; + uint32_t width = config["width"].isUInt() ? config["width"].asUInt() : 0; struct bar_margins margins_; @@ -447,7 +454,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) surface_impl_->setExclusiveZone(true); surface_impl_->setMargins(margins_); surface_impl_->setPosition(position); - surface_impl_->setSize(width_, height_); + surface_impl_->setSize(width, height); window.signal_map_event().connect_notify(sigc::mem_fun(*this, &Bar::onMap)); From 96d965fe04272c522a976cc5bd6a39dc7ff2631d Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Sat, 10 Oct 2020 14:09:55 +0200 Subject: [PATCH 108/355] Add simpleclock as fallback when hhdate is not available ref https://github.com/Alexays/Waybar/issues/668 --- include/factory.hpp | 4 ++++ include/modules/simpleclock.hpp | 24 ++++++++++++++++++++++++ meson.build | 14 ++++++++++++-- src/modules/simpleclock.cpp | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 include/modules/simpleclock.hpp create mode 100644 src/modules/simpleclock.cpp diff --git a/include/factory.hpp b/include/factory.hpp index 853e6b09..1cae68c9 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -1,7 +1,11 @@ #pragma once #include +#ifdef HAVE_LIBDATE #include "modules/clock.hpp" +#else +#include "modules/simpleclock.hpp" +#endif #ifdef HAVE_SWAY #include "modules/sway/mode.hpp" #include "modules/sway/window.hpp" diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp new file mode 100644 index 00000000..aa9a0a22 --- /dev/null +++ b/include/modules/simpleclock.hpp @@ -0,0 +1,24 @@ +#pragma once + +#include +#if FMT_VERSION < 60000 +#include +#else +#include +#endif +#include "ALabel.hpp" +#include "util/sleeper_thread.hpp" + +namespace waybar::modules { + +class Clock : public ALabel { + public: + Clock(const std::string&, const Json::Value&); + ~Clock() = default; + auto update() -> void; + + private: + util::SleeperThread thread_; +}; + +} // namespace waybar::modules diff --git a/meson.build b/meson.build index 7f4ffaca..48faedad 100644 --- a/meson.build +++ b/meson.build @@ -113,7 +113,11 @@ gtk_layer_shell = dependency('gtk-layer-shell-0', required: get_option('gtk-layer-shell'), fallback : ['gtk-layer-shell', 'gtk_layer_shell_dep']) systemd = dependency('systemd', required: get_option('systemd')) -tz_dep = dependency('date', default_options : [ 'use_system_tzdb=true' ], modules : [ 'date::date', 'date::date-tz' ], fallback: [ 'date', 'tz_dep' ]) +tz_dep = dependency('date', + required: false, + default_options : [ 'use_system_tzdb=true' ], + modules : [ 'date::date', 'date::date-tz' ], + fallback: [ 'date', 'tz_dep' ]) prefix = get_option('prefix') sysconfdir = get_option('sysconfdir') @@ -137,7 +141,6 @@ src_files = files( 'src/factory.cpp', 'src/AModule.cpp', 'src/ALabel.cpp', - 'src/modules/clock.cpp', 'src/modules/custom.cpp', 'src/modules/disk.cpp', 'src/modules/idle_inhibitor.cpp', @@ -237,6 +240,13 @@ if get_option('rfkill').enabled() endif endif +if tz_dep.found() + add_project_arguments('-DHAVE_LIBDATE', language: 'cpp') + src_files += 'src/modules/clock.cpp' +else + src_files += 'src/modules/simpleclock.cpp' +endif + subdir('protocol') executable( diff --git a/src/modules/simpleclock.cpp b/src/modules/simpleclock.cpp new file mode 100644 index 00000000..3004fc2c --- /dev/null +++ b/src/modules/simpleclock.cpp @@ -0,0 +1,33 @@ +#include "modules/simpleclock.hpp" +#include + +waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config) + : ALabel(config, "clock", id, "{:%H:%M}", 60) { + thread_ = [this] { + dp.emit(); + auto now = std::chrono::system_clock::now(); + auto timeout = std::chrono::floor(now + interval_); + auto diff = std::chrono::seconds(timeout.time_since_epoch().count() % interval_.count()); + thread_.sleep_until(timeout - diff); + }; +} + +auto waybar::modules::Clock::update() -> void { + tzset(); // Update timezone information + auto now = std::chrono::system_clock::now(); + auto localtime = fmt::localtime(std::chrono::system_clock::to_time_t(now)); + auto text = fmt::format(format_, localtime); + label_.set_markup(text); + + if (tooltipEnabled()) { + if (config_["tooltip-format"].isString()) { + auto tooltip_format = config_["tooltip-format"].asString(); + auto tooltip_text = fmt::format(tooltip_format, localtime); + label_.set_tooltip_text(tooltip_text); + } else { + label_.set_tooltip_text(text); + } + } + // Call parent update + ALabel::update(); +} From abe1fa5bd41db67058a6a9606efcc9b4c1f99e14 Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sat, 31 Oct 2020 12:21:51 +0000 Subject: [PATCH 109/355] Custom module - only call label_.set_tooltip_markup if tooltip markup has actually changed - fixes tooltips not appearing at all if a custom module is updating too frequently. --- src/modules/custom.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp index 92eedaaa..ba55edd5 100644 --- a/src/modules/custom.cpp +++ b/src/modules/custom.cpp @@ -131,9 +131,13 @@ auto waybar::modules::Custom::update() -> void { label_.set_markup(str); if (tooltipEnabled()) { if (text_ == tooltip_) { - label_.set_tooltip_markup(str); + if (label_.get_tooltip_markup() != str) { + label_.set_tooltip_markup(str); + } } else { - label_.set_tooltip_markup(tooltip_); + if (label_.get_tooltip_markup() != tooltip_) { + label_.set_tooltip_markup(tooltip_); + } } } auto classes = label_.get_style_context()->list_classes(); From 4872091442e869769c5db05d96358d3b660e03ad Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sat, 31 Oct 2020 16:31:27 +0000 Subject: [PATCH 110/355] Draft fix for syncing idle inhibitor across outputs. The idle_inhibitor surface has been moved to Client, all instances of idle inhibitor module now use one surface between them. Any time an idle inhibitor is clicked, currently it force updates ALL modules on all outputs, this needs work. --- include/bar.hpp | 1 + include/client.hpp | 1 + include/modules/idle_inhibitor.hpp | 1 - src/bar.cpp | 12 ++++++++++++ src/modules/idle_inhibitor.cpp | 30 +++++++++++++++++++++--------- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index fdc5a739..d1077842 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -31,6 +31,7 @@ class Bar { auto toggle() -> void; void handleSignal(int); + void updateAll(); struct waybar_output *output; Json::Value config; diff --git a/include/client.hpp b/include/client.hpp index 39b6ae3b..b7631ccf 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -22,6 +22,7 @@ class Client { struct zwlr_layer_shell_v1 * layer_shell = nullptr; struct zxdg_output_manager_v1 * xdg_output_manager = nullptr; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr; + struct zwp_idle_inhibitor_v1* idle_inhibitor; std::vector> bars; private: diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp index 5ce324da..f1c690df 100644 --- a/include/modules/idle_inhibitor.hpp +++ b/include/modules/idle_inhibitor.hpp @@ -18,7 +18,6 @@ class IdleInhibitor : public ALabel { const Bar& bar_; std::string status_; - struct zwp_idle_inhibitor_v1* idle_inhibitor_; int pid_; }; diff --git a/src/bar.cpp b/src/bar.cpp index 8af6b971..747f0bf8 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -461,3 +461,15 @@ auto waybar::Bar::setupWidgets() -> void { right_.pack_end(*module, false, false); } } + +void waybar::Bar::updateAll() { + for (auto const& module : modules_left_) { + module->update(); + } + for (auto const& module : modules_center_) { + module->update(); + } + for (auto const& module : modules_right_) { + module->update(); + } +} diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index d94e9579..c6a4c78b 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -6,7 +6,6 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& : ALabel(config, "idle_inhibitor", id, "{status}"), bar_(bar), status_("deactivated"), - idle_inhibitor_(nullptr), pid_(-1) { event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect( @@ -15,9 +14,9 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& } waybar::modules::IdleInhibitor::~IdleInhibitor() { - if (idle_inhibitor_ != nullptr) { - zwp_idle_inhibitor_v1_destroy(idle_inhibitor_); - idle_inhibitor_ = nullptr; + if (waybar::Client::inst()->idle_inhibitor != nullptr) { + zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor); + waybar::Client::inst()->idle_inhibitor = nullptr; } if (pid_ != -1) { kill(-pid_, 9); @@ -26,6 +25,13 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { } auto waybar::modules::IdleInhibitor::update() -> void { + // Check status + if (waybar::Client::inst()->idle_inhibitor != nullptr) { + status_ = "activated"; + } else { + status_ = "deactivated"; + } + label_.set_markup( fmt::format(format_, fmt::arg("status", status_), fmt::arg("icon", getIcon(0, status_)))); label_.get_style_context()->add_class(status_); @@ -39,17 +45,23 @@ auto waybar::modules::IdleInhibitor::update() -> void { bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { if (e->button == 1) { label_.get_style_context()->remove_class(status_); - if (idle_inhibitor_ != nullptr) { - zwp_idle_inhibitor_v1_destroy(idle_inhibitor_); - idle_inhibitor_ = nullptr; + if (waybar::Client::inst()->idle_inhibitor != nullptr) { + zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor); + waybar::Client::inst()->idle_inhibitor = nullptr; status_ = "deactivated"; } else { - idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor( - waybar::Client::inst()->idle_inhibit_manager, bar_.surface); + waybar::Client::inst()->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor( + waybar::Client::inst()->idle_inhibit_manager, bar_.surface); status_ = "activated"; } click_param = status_; } + + // Make all modules update + for (auto const& bar : waybar::Client::inst()->bars) { + bar->updateAll(); + } + ALabel::handleToggle(e); return true; } From aa4fc3dd29544586482525e20f55c8c5becb82f0 Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sat, 31 Oct 2020 17:30:25 +0000 Subject: [PATCH 111/355] Idle inhibitor toggle no longer update all modules - a list of idle inhibitors is maintained on the Client. --- include/bar.hpp | 1 - include/client.hpp | 3 +++ src/bar.cpp | 12 ------------ src/modules/idle_inhibitor.cpp | 9 ++++++--- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index d1077842..fdc5a739 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -31,7 +31,6 @@ class Bar { auto toggle() -> void; void handleSignal(int); - void updateAll(); struct waybar_output *output; Json::Value config; diff --git a/include/client.hpp b/include/client.hpp index b7631ccf..b6762f63 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -21,8 +21,11 @@ class Client { struct wl_registry * registry = nullptr; struct zwlr_layer_shell_v1 * layer_shell = nullptr; struct zxdg_output_manager_v1 * xdg_output_manager = nullptr; + struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr; struct zwp_idle_inhibitor_v1* idle_inhibitor; + std::vector idle_inhibitor_modules; + std::vector> bars; private: diff --git a/src/bar.cpp b/src/bar.cpp index 747f0bf8..8af6b971 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -461,15 +461,3 @@ auto waybar::Bar::setupWidgets() -> void { right_.pack_end(*module, false, false); } } - -void waybar::Bar::updateAll() { - for (auto const& module : modules_left_) { - module->update(); - } - for (auto const& module : modules_center_) { - module->update(); - } - for (auto const& module : modules_right_) { - module->update(); - } -} diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index c6a4c78b..7a0dd505 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -10,6 +10,7 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect( sigc::mem_fun(*this, &IdleInhibitor::handleToggle)); + waybar::Client::inst()->idle_inhibitor_modules.push_back(this); dp.emit(); } @@ -57,9 +58,11 @@ bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { click_param = status_; } - // Make all modules update - for (auto const& bar : waybar::Client::inst()->bars) { - bar->updateAll(); + // Make all other idle inhibitor modules update + for (auto const& module : waybar::Client::inst()->idle_inhibitor_modules) { + if (module != this) { + module->update(); + } } ALabel::handleToggle(e); From 4889e655ebe5a58b18c294ef3b96d8dd6a46240c Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sun, 1 Nov 2020 13:33:28 +0000 Subject: [PATCH 112/355] Since idle_inhibitor's have a surface, we should have one for each inhibitor module. Therefore, the status is stored on the Client, and all modules create or destroy their inhibitors depending on Client's idle_inhibitor_status. Also, when modules are destroyed they remove themselves from Client's idle_inhibitor_modules. --- include/client.hpp | 4 +-- include/modules/idle_inhibitor.hpp | 2 +- src/modules/idle_inhibitor.cpp | 49 ++++++++++++++++++------------ 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index b6762f63..592af8f3 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -23,8 +23,8 @@ class Client { struct zxdg_output_manager_v1 * xdg_output_manager = nullptr; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr; - struct zwp_idle_inhibitor_v1* idle_inhibitor; - std::vector idle_inhibitor_modules; + std::list idle_inhibitor_modules; + std::string idle_inhibitor_status = "deactivated"; std::vector> bars; diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp index f1c690df..abfc9960 100644 --- a/include/modules/idle_inhibitor.hpp +++ b/include/modules/idle_inhibitor.hpp @@ -12,12 +12,12 @@ class IdleInhibitor : public ALabel { IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&); ~IdleInhibitor(); auto update() -> void; + struct zwp_idle_inhibitor_v1* idle_inhibitor_ = nullptr; private: bool handleToggle(GdkEventButton* const& e); const Bar& bar_; - std::string status_; int pid_; }; diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index 7a0dd505..fe7ee16f 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -5,20 +5,26 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& const Json::Value& config) : ALabel(config, "idle_inhibitor", id, "{status}"), bar_(bar), - status_("deactivated"), pid_(-1) { event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect( sigc::mem_fun(*this, &IdleInhibitor::handleToggle)); + + // Add this to the Client's idle_inhibitor_modules waybar::Client::inst()->idle_inhibitor_modules.push_back(this); + dp.emit(); } waybar::modules::IdleInhibitor::~IdleInhibitor() { - if (waybar::Client::inst()->idle_inhibitor != nullptr) { - zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor); - waybar::Client::inst()->idle_inhibitor = nullptr; + if (idle_inhibitor_ != nullptr) { + zwp_idle_inhibitor_v1_destroy(idle_inhibitor_); + idle_inhibitor_ = nullptr; } + + // Remove this from the Client's idle_inhibitor_modules + waybar::Client::inst()->idle_inhibitor_modules.remove(this); + if (pid_ != -1) { kill(-pid_, 9); pid_ = -1; @@ -27,17 +33,24 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { auto waybar::modules::IdleInhibitor::update() -> void { // Check status - if (waybar::Client::inst()->idle_inhibitor != nullptr) { - status_ = "activated"; + std::string status = waybar::Client::inst()->idle_inhibitor_status; + if (status == "activated") { + if (idle_inhibitor_ == nullptr) { + idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor( + waybar::Client::inst()->idle_inhibit_manager, bar_.surface); + } } else { - status_ = "deactivated"; + if (idle_inhibitor_ != nullptr) { + zwp_idle_inhibitor_v1_destroy(idle_inhibitor_); + idle_inhibitor_ = nullptr; + } } label_.set_markup( - fmt::format(format_, fmt::arg("status", status_), fmt::arg("icon", getIcon(0, status_)))); - label_.get_style_context()->add_class(status_); + fmt::format(format_, fmt::arg("status", status), fmt::arg("icon", getIcon(0, status)))); + label_.get_style_context()->add_class(status); if (tooltipEnabled()) { - label_.set_tooltip_text(status_); + label_.set_tooltip_text(status); } // Call parent update ALabel::update(); @@ -45,17 +58,15 @@ auto waybar::modules::IdleInhibitor::update() -> void { bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { if (e->button == 1) { - label_.get_style_context()->remove_class(status_); - if (waybar::Client::inst()->idle_inhibitor != nullptr) { - zwp_idle_inhibitor_v1_destroy(waybar::Client::inst()->idle_inhibitor); - waybar::Client::inst()->idle_inhibitor = nullptr; - status_ = "deactivated"; + std::string status = waybar::Client::inst()->idle_inhibitor_status; + label_.get_style_context()->remove_class(status); + if (status == "activated") { + status = "deactivated"; } else { - waybar::Client::inst()->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor( - waybar::Client::inst()->idle_inhibit_manager, bar_.surface); - status_ = "activated"; + status = "activated"; } - click_param = status_; + waybar::Client::inst()->idle_inhibitor_status = status; + click_param = status; } // Make all other idle inhibitor modules update From bb33427f6532dfbf09d7bbc6755ca3e2f3946115 Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sun, 1 Nov 2020 13:38:58 +0000 Subject: [PATCH 113/355] Making idle_inhibitor_ private and initialised in constructor, as it was before. --- include/modules/idle_inhibitor.hpp | 2 +- src/modules/idle_inhibitor.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp index abfc9960..a857011c 100644 --- a/include/modules/idle_inhibitor.hpp +++ b/include/modules/idle_inhibitor.hpp @@ -12,12 +12,12 @@ class IdleInhibitor : public ALabel { IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&); ~IdleInhibitor(); auto update() -> void; - struct zwp_idle_inhibitor_v1* idle_inhibitor_ = nullptr; private: bool handleToggle(GdkEventButton* const& e); const Bar& bar_; + struct zwp_idle_inhibitor_v1* idle_inhibitor_; int pid_; }; diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index fe7ee16f..990af2ca 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -5,6 +5,7 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& const Json::Value& config) : ALabel(config, "idle_inhibitor", id, "{status}"), bar_(bar), + idle_inhibitor_(nullptr), pid_(-1) { event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect( From c6743988d3f7afee8a4952b24817eaa59a08fe49 Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sun, 1 Nov 2020 16:03:39 +0000 Subject: [PATCH 114/355] Removing 'click_param' as it is no longer used. --- include/ALabel.hpp | 1 - src/modules/idle_inhibitor.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/include/ALabel.hpp b/include/ALabel.hpp index 6848d677..5b9ac541 100644 --- a/include/ALabel.hpp +++ b/include/ALabel.hpp @@ -19,7 +19,6 @@ class ALabel : public AModule { protected: Gtk::Label label_; std::string format_; - std::string click_param; const std::chrono::seconds interval_; bool alt_ = false; std::string default_format_; diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index 990af2ca..5eb94eb5 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -67,7 +67,6 @@ bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { status = "activated"; } waybar::Client::inst()->idle_inhibitor_status = status; - click_param = status; } // Make all other idle inhibitor modules update From 071cb86b45d5a348430feac0516794836cf77721 Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sun, 1 Nov 2020 17:09:48 +0000 Subject: [PATCH 115/355] Moving idle inhibitor shared stuff out of Client and into idle_inhibitor module as static members. --- include/client.hpp | 2 -- include/modules/idle_inhibitor.hpp | 2 ++ src/modules/idle_inhibitor.cpp | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index 592af8f3..902f6866 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -23,8 +23,6 @@ class Client { struct zxdg_output_manager_v1 * xdg_output_manager = nullptr; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr; - std::list idle_inhibitor_modules; - std::string idle_inhibitor_status = "deactivated"; std::vector> bars; diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp index a857011c..f5926318 100644 --- a/include/modules/idle_inhibitor.hpp +++ b/include/modules/idle_inhibitor.hpp @@ -12,6 +12,8 @@ class IdleInhibitor : public ALabel { IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&); ~IdleInhibitor(); auto update() -> void; + static std::list idle_inhibitor_modules; + static std::string idle_inhibitor_status; private: bool handleToggle(GdkEventButton* const& e); diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index 5eb94eb5..ce5f9914 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -1,6 +1,9 @@ #include "modules/idle_inhibitor.hpp" #include "util/command.hpp" +std::list waybar::modules::IdleInhibitor::idle_inhibitor_modules; +std::string waybar::modules::IdleInhibitor::idle_inhibitor_status = "deactivated"; + waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar, const Json::Value& config) : ALabel(config, "idle_inhibitor", id, "{status}"), @@ -12,7 +15,7 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& sigc::mem_fun(*this, &IdleInhibitor::handleToggle)); // Add this to the Client's idle_inhibitor_modules - waybar::Client::inst()->idle_inhibitor_modules.push_back(this); + waybar::modules::IdleInhibitor::idle_inhibitor_modules.push_back(this); dp.emit(); } @@ -24,7 +27,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { } // Remove this from the Client's idle_inhibitor_modules - waybar::Client::inst()->idle_inhibitor_modules.remove(this); + waybar::modules::IdleInhibitor::idle_inhibitor_modules.remove(this); if (pid_ != -1) { kill(-pid_, 9); @@ -34,7 +37,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { auto waybar::modules::IdleInhibitor::update() -> void { // Check status - std::string status = waybar::Client::inst()->idle_inhibitor_status; + std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status; if (status == "activated") { if (idle_inhibitor_ == nullptr) { idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor( @@ -59,18 +62,18 @@ auto waybar::modules::IdleInhibitor::update() -> void { bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { if (e->button == 1) { - std::string status = waybar::Client::inst()->idle_inhibitor_status; + std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status; label_.get_style_context()->remove_class(status); if (status == "activated") { status = "deactivated"; } else { status = "activated"; } - waybar::Client::inst()->idle_inhibitor_status = status; + waybar::modules::IdleInhibitor::idle_inhibitor_status = status; } // Make all other idle inhibitor modules update - for (auto const& module : waybar::Client::inst()->idle_inhibitor_modules) { + for (auto const& module : waybar::modules::IdleInhibitor::idle_inhibitor_modules) { if (module != this) { module->update(); } From a9dae931c73e44f6c18fa0fc8a3220fbea5f265b Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sun, 1 Nov 2020 17:14:05 +0000 Subject: [PATCH 116/355] Renaming idle_inhibitor_modules and idle_inhibitor_status to shorter, more convenient names. --- include/client.hpp | 2 -- include/modules/idle_inhibitor.hpp | 4 ++-- src/modules/idle_inhibitor.cpp | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index 902f6866..39b6ae3b 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -21,9 +21,7 @@ class Client { struct wl_registry * registry = nullptr; struct zwlr_layer_shell_v1 * layer_shell = nullptr; struct zxdg_output_manager_v1 * xdg_output_manager = nullptr; - struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr; - std::vector> bars; private: diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp index f5926318..2cbc6f12 100644 --- a/include/modules/idle_inhibitor.hpp +++ b/include/modules/idle_inhibitor.hpp @@ -12,8 +12,8 @@ class IdleInhibitor : public ALabel { IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&); ~IdleInhibitor(); auto update() -> void; - static std::list idle_inhibitor_modules; - static std::string idle_inhibitor_status; + static std::list modules; + static std::string status; private: bool handleToggle(GdkEventButton* const& e); diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index ce5f9914..96db8799 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -1,8 +1,8 @@ #include "modules/idle_inhibitor.hpp" #include "util/command.hpp" -std::list waybar::modules::IdleInhibitor::idle_inhibitor_modules; -std::string waybar::modules::IdleInhibitor::idle_inhibitor_status = "deactivated"; +std::list waybar::modules::IdleInhibitor::modules; +std::string waybar::modules::IdleInhibitor::status = "deactivated"; waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar, const Json::Value& config) @@ -14,8 +14,8 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& event_box_.signal_button_press_event().connect( sigc::mem_fun(*this, &IdleInhibitor::handleToggle)); - // Add this to the Client's idle_inhibitor_modules - waybar::modules::IdleInhibitor::idle_inhibitor_modules.push_back(this); + // Add this to the modules list + waybar::modules::IdleInhibitor::modules.push_back(this); dp.emit(); } @@ -26,8 +26,8 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { idle_inhibitor_ = nullptr; } - // Remove this from the Client's idle_inhibitor_modules - waybar::modules::IdleInhibitor::idle_inhibitor_modules.remove(this); + // Remove this from the modules list + waybar::modules::IdleInhibitor::modules.remove(this); if (pid_ != -1) { kill(-pid_, 9); @@ -37,7 +37,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { auto waybar::modules::IdleInhibitor::update() -> void { // Check status - std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status; + std::string status = waybar::modules::IdleInhibitor::status; if (status == "activated") { if (idle_inhibitor_ == nullptr) { idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor( @@ -62,18 +62,18 @@ auto waybar::modules::IdleInhibitor::update() -> void { bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { if (e->button == 1) { - std::string status = waybar::modules::IdleInhibitor::idle_inhibitor_status; + std::string status = waybar::modules::IdleInhibitor::status; label_.get_style_context()->remove_class(status); if (status == "activated") { status = "deactivated"; } else { status = "activated"; } - waybar::modules::IdleInhibitor::idle_inhibitor_status = status; + waybar::modules::IdleInhibitor::status = status; } // Make all other idle inhibitor modules update - for (auto const& module : waybar::modules::IdleInhibitor::idle_inhibitor_modules) { + for (auto const& module : waybar::modules::IdleInhibitor::modules) { if (module != this) { module->update(); } From b015836e7b55def65d83cba9b3367ce2c1636417 Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sun, 1 Nov 2020 18:17:51 +0000 Subject: [PATCH 117/355] Ensure style class is removed from all IdleInhibitor instances by moving it to update(). --- src/modules/idle_inhibitor.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index 96db8799..24d94f51 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -37,13 +37,14 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { auto waybar::modules::IdleInhibitor::update() -> void { // Check status - std::string status = waybar::modules::IdleInhibitor::status; if (status == "activated") { + label_.get_style_context()->remove_class("deactivated"); if (idle_inhibitor_ == nullptr) { idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor( waybar::Client::inst()->idle_inhibit_manager, bar_.surface); } } else { + label_.get_style_context()->remove_class("activated"); if (idle_inhibitor_ != nullptr) { zwp_idle_inhibitor_v1_destroy(idle_inhibitor_); idle_inhibitor_ = nullptr; @@ -62,14 +63,11 @@ auto waybar::modules::IdleInhibitor::update() -> void { bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { if (e->button == 1) { - std::string status = waybar::modules::IdleInhibitor::status; - label_.get_style_context()->remove_class(status); if (status == "activated") { status = "deactivated"; } else { status = "activated"; } - waybar::modules::IdleInhibitor::status = status; } // Make all other idle inhibitor modules update From 9785a8901382278c1832320a2c67cfec75dcf45f Mon Sep 17 00:00:00 2001 From: Jordan Leppert Date: Sun, 1 Nov 2020 18:25:41 +0000 Subject: [PATCH 118/355] Making active a bool --- include/modules/idle_inhibitor.hpp | 4 ++-- src/modules/idle_inhibitor.cpp | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/include/modules/idle_inhibitor.hpp b/include/modules/idle_inhibitor.hpp index 2cbc6f12..4b6c097f 100644 --- a/include/modules/idle_inhibitor.hpp +++ b/include/modules/idle_inhibitor.hpp @@ -12,8 +12,8 @@ class IdleInhibitor : public ALabel { IdleInhibitor(const std::string&, const waybar::Bar&, const Json::Value&); ~IdleInhibitor(); auto update() -> void; - static std::list modules; - static std::string status; + static std::list modules; + static bool status; private: bool handleToggle(GdkEventButton* const& e); diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index 24d94f51..ba5d6943 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -2,7 +2,7 @@ #include "util/command.hpp" std::list waybar::modules::IdleInhibitor::modules; -std::string waybar::modules::IdleInhibitor::status = "deactivated"; +bool waybar::modules::IdleInhibitor::status = false; waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar, const Json::Value& config) @@ -37,7 +37,7 @@ waybar::modules::IdleInhibitor::~IdleInhibitor() { auto waybar::modules::IdleInhibitor::update() -> void { // Check status - if (status == "activated") { + if (status) { label_.get_style_context()->remove_class("deactivated"); if (idle_inhibitor_ == nullptr) { idle_inhibitor_ = zwp_idle_inhibit_manager_v1_create_inhibitor( @@ -51,11 +51,12 @@ auto waybar::modules::IdleInhibitor::update() -> void { } } + std::string status_text = status ? "activated" : "deactivated"; label_.set_markup( - fmt::format(format_, fmt::arg("status", status), fmt::arg("icon", getIcon(0, status)))); - label_.get_style_context()->add_class(status); + fmt::format(format_, fmt::arg("status", status_text), fmt::arg("icon", getIcon(0, status_text)))); + label_.get_style_context()->add_class(status_text); if (tooltipEnabled()) { - label_.set_tooltip_text(status); + label_.set_tooltip_text(status_text); } // Call parent update ALabel::update(); @@ -63,17 +64,13 @@ auto waybar::modules::IdleInhibitor::update() -> void { bool waybar::modules::IdleInhibitor::handleToggle(GdkEventButton* const& e) { if (e->button == 1) { - if (status == "activated") { - status = "deactivated"; - } else { - status = "activated"; - } - } + status = !status; - // Make all other idle inhibitor modules update - for (auto const& module : waybar::modules::IdleInhibitor::modules) { - if (module != this) { - module->update(); + // Make all other idle inhibitor modules update + for (auto const& module : waybar::modules::IdleInhibitor::modules) { + if (module != this) { + module->update(); + } } } From d8dafa7ecc189dd203617e24441012e3ac54d9a0 Mon Sep 17 00:00:00 2001 From: Arnaud Vallette d'Osia Date: Wed, 18 Nov 2020 20:12:07 +0100 Subject: [PATCH 119/355] add minimize-raise() action --- src/modules/wlr/taskbar.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 8d6fa9b4..5c830e05 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -436,6 +436,14 @@ bool Task::handle_clicked(GdkEventButton *bt) activate(); else if (action == "minimize") minimize(!minimized()); + else if (action == "minimize-raise"){ + if (minimized()) + minimize(false); + else if (active()) + minimize(true); + else + activate(); + } else if (action == "maximize") maximize(!maximized()); else if (action == "fullscreen") From 82823850745d5ec367070e1a08f568c8b3a77eb8 Mon Sep 17 00:00:00 2001 From: Arnaud Vallette d'Osia Date: Sun, 22 Nov 2020 13:06:46 +0100 Subject: [PATCH 120/355] update actions on taskbar man page --- man/waybar-wlr-taskbar.5.scd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd index 55d2afdc..a2bff265 100644 --- a/man/waybar-wlr-taskbar.5.scd +++ b/man/waybar-wlr-taskbar.5.scd @@ -83,9 +83,10 @@ Addressed by *wlr/taskbar* # CLICK ACTIONS *activate*: Bring the application into foreground. -*minimize*: Minimize the application. -*maximize*: Maximize the application. -*fullscreen*: Set the application to fullscreen. +*minimize*: Toggle application's minimized state. +*minimize-raise*: Bring the application into foreground or toggle its minimized state. +*maximize*: Toggle application's maximized state. +*fullscreen*: Toggle application's fullscreen state. *close*: Close the application. # EXAMPLES From 374d5ae5a198611011b8f78fc97a20b7ece5a049 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 26 Nov 2020 15:10:33 +0100 Subject: [PATCH 121/355] fix: check get_icon return non nullpt --- src/modules/wlr/taskbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 5c830e05..a18c3e29 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -95,7 +95,7 @@ static std::string get_from_desktop_app_info(const std::string &app_id) if (!app_info) app_info = Gio::DesktopAppInfo::create_from_filename(prefix + folder + app_id + suffix); - if (app_info) + if (app_info && app_info->get_icon() != nullptr) return app_info->get_icon()->to_string(); return ""; From 05b12602d4f1fde4c13309a0b3a70afb010d3231 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 26 Nov 2020 15:16:55 +0100 Subject: [PATCH 122/355] fix: don't check against nullptr --- src/modules/wlr/taskbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index a18c3e29..bdc980c4 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -95,7 +95,7 @@ static std::string get_from_desktop_app_info(const std::string &app_id) if (!app_info) app_info = Gio::DesktopAppInfo::create_from_filename(prefix + folder + app_id + suffix); - if (app_info && app_info->get_icon() != nullptr) + if (app_info && app_info->get_icon()) return app_info->get_icon()->to_string(); return ""; From 85e00b2aab89381feda50f683d79287ec9f13e86 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 26 Nov 2020 15:31:40 -0800 Subject: [PATCH 123/355] fix: build fails with meson < 0.53.0 meson.build:12:0: ERROR: Module "fs" does not exist Fixes #909 --- meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 7f4ffaca..1e7e22c2 100644 --- a/meson.build +++ b/meson.build @@ -2,6 +2,7 @@ project( 'waybar', 'cpp', 'c', version: '0.9.4', license: 'MIT', + meson_version: '>= 0.49.0', default_options : [ 'cpp_std=c++17', 'buildtype=release', @@ -9,8 +10,6 @@ project( ], ) -fs = import('fs') - compiler = meson.get_compiler('cpp') cpp_args = [] @@ -318,9 +317,9 @@ if scdoc.found() foreach file : man_files path = '@0@'.format(file) - basename = fs.name(path) + basename = path.split('/')[-1] - topic = basename.split('.')[-3].split('/')[-1] + topic = basename.split('.')[-3] section = basename.split('.')[-2] output = '@0@.@1@'.format(topic, section) From 2695985da04675a18f21d2ba4e09bb2c232b1eee Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 26 Nov 2020 15:38:41 -0800 Subject: [PATCH 124/355] fix: compilation error with gcc 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../src/modules/network.cpp:22:6: error: ‘optional’ in namespace ‘std’ does not name a template type 22 | std::optional read_netstat(std::string_view category, std::string_view key) { | ^~~~~~~~ ../src/modules/network.cpp:7:1: note: ‘std::optional’ is defined in header ‘’; did you forget to ‘#include ’? 6 | #include "util/format.hpp" +++ |+#include 7 | #ifdef WANT_RFKILL --- src/modules/network.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 74ae9130..7d9da8b5 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "util/format.hpp" #ifdef WANT_RFKILL #include "util/rfkill.hpp" From 3b576ae12dc1302e7c86d2e1d98d8e578debf694 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Wed, 21 Oct 2020 13:10:10 -0400 Subject: [PATCH 125/355] Add "tooltip-format" to temperature module --- man/waybar-temperature.5.scd | 5 +++++ src/modules/temperature.cpp | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/man/waybar-temperature.5.scd b/man/waybar-temperature.5.scd index 86497367..7810a59b 100644 --- a/man/waybar-temperature.5.scd +++ b/man/waybar-temperature.5.scd @@ -50,6 +50,11 @@ Addressed by *temperature* typeof: array ++ Based on the current temperature (Celsius) and *critical-threshold* if available, the corresponding icon gets selected. The order is *low* to *high*. +*tooltip-format*: ++ + typeof: string ++ + default: {temperatureC}°C ++ + The format for the tooltip + *rotate*: ++ typeof: integer ++ Positive value to rotate the text label. diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp index dc6b2d78..84560e8d 100644 --- a/src/modules/temperature.cpp +++ b/src/modules/temperature.cpp @@ -40,6 +40,16 @@ auto waybar::modules::Temperature::update() -> void { fmt::arg("temperatureF", temperature_f), fmt::arg("temperatureK", temperature_k), fmt::arg("icon", getIcon(temperature_c, "", max_temp)))); + if (tooltipEnabled()) { + std::string tooltip_format = "{temperatureC}°C"; + if (config_["tooltip-format"].isString()) { + tooltip_format = config_["tooltip-format"].asString(); + } + label_.set_tooltip_text(fmt::format(tooltip_format, + fmt::arg("temperatureC", temperature_c), + fmt::arg("temperatureF", temperature_f), + fmt::arg("temperatureK", temperature_k))); + } // Call parent update ALabel::update(); } From a7056f7ccec0126f3b2a1c86b09a4d6dacef8cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Thu, 26 Nov 2020 01:02:06 +0000 Subject: [PATCH 126/355] Calculate battery state from just energy values The energy values are all that's needed to calculate the battery state. Using other values for the total capacity results in broken results in some cases. This matches the output of TLP and i3status, while also being more straightforward. --- src/modules/battery.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index beb0554f..93fcc8bd 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -80,18 +80,15 @@ void waybar::modules::Battery::getBatteries() { const std::tuple waybar::modules::Battery::getInfos() const { try { - uint16_t total = 0; uint32_t total_power = 0; // μW uint32_t total_energy = 0; // μWh uint32_t total_energy_full = 0; std::string status = "Unknown"; for (auto const& bat : batteries_) { - uint16_t capacity; uint32_t power_now; uint32_t energy_full; uint32_t energy_now; std::string _status; - std::ifstream(bat / "capacity") >> capacity; std::ifstream(bat / "status") >> _status; auto rate_path = fs::exists(bat / "current_now") ? "current_now" : "power_now"; std::ifstream(bat / rate_path) >> power_now; @@ -102,7 +99,6 @@ const std::tuple waybar::modules::Battery::getInfos if (_status != "Unknown") { status = _status; } - total += capacity; total_power += power_now; total_energy += energy_now; total_energy_full += energy_full; @@ -120,7 +116,7 @@ const std::tuple waybar::modules::Battery::getInfos } else if (status == "Charging" && total_power != 0) { time_remaining = -(float)(total_energy_full - total_energy) / total_power; } - uint16_t capacity = total / batteries_.size(); + float capacity = ((float)total_energy * 100.0f / (float) total_energy_full); // Handle full-at if (config_["full-at"].isUInt()) { auto full_at = config_["full-at"].asUInt(); From e0cdcb6e30efbf56a862b0b4dfb7baa5677bf35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Thu, 26 Nov 2020 02:16:57 +0000 Subject: [PATCH 127/355] Handle charging above 100% gracefully When calibrating a battery it's possible to go above 100%. Handle that gracefully by just presenting the battery as full and 100%. --- src/modules/battery.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 93fcc8bd..02e05b79 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -115,6 +115,11 @@ const std::tuple waybar::modules::Battery::getInfos time_remaining = (float)total_energy / total_power; } else if (status == "Charging" && total_power != 0) { time_remaining = -(float)(total_energy_full - total_energy) / total_power; + if (time_remaining > 0.0f) { + // If we've turned positive it means the battery is past 100% and so + // just report that as no time remaining + time_remaining = 0.0f; + } } float capacity = ((float)total_energy * 100.0f / (float) total_energy_full); // Handle full-at @@ -127,6 +132,12 @@ const std::tuple waybar::modules::Battery::getInfos } } } + if (capacity > 100.f) { + // This can happen when the battery is calibrating and goes above 100% + // Handle it gracefully by clamping at 100% and presenting it as full + capacity = 100.f; + status = "Full"; + } return {capacity, time_remaining, status}; } catch (const std::exception& e) { spdlog::error("Battery: {}", e.what()); From eb3f4216d402903b18c41b38cf4ddb8f0a72ad3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Thu, 26 Nov 2020 02:20:53 +0000 Subject: [PATCH 128/355] Show battery state as rounded number Round the battery charge state so that 99.9% shows as 100%. --- src/modules/battery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 02e05b79..eece435a 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -138,7 +138,7 @@ const std::tuple waybar::modules::Battery::getInfos capacity = 100.f; status = "Full"; } - return {capacity, time_remaining, status}; + return {round(capacity), time_remaining, status}; } catch (const std::exception& e) { spdlog::error("Battery: {}", e.what()); return {0, 0, "Unknown"}; From f45d5829577d59eb9980a31793f2feb2f0c15eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Thu, 26 Nov 2020 02:34:36 +0000 Subject: [PATCH 129/355] Always mark battery as full at 100% Since we're now clamping at 100% and rounding, mark as full at that point. Some batteries will stay in charging state for a long time while stuck at the same charge level. Just mark them as full to not be confusing. --- src/modules/battery.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index eece435a..2d553705 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -134,11 +134,17 @@ const std::tuple waybar::modules::Battery::getInfos } if (capacity > 100.f) { // This can happen when the battery is calibrating and goes above 100% - // Handle it gracefully by clamping at 100% and presenting it as full + // Handle it gracefully by clamping at 100% capacity = 100.f; + } + uint8_t cap = round(capacity); + if (cap == 100) { + // If we've reached 100% just mark as full as some batteries can stay + // stuck reporting they're still charging but not yet done status = "Full"; } - return {round(capacity), time_remaining, status}; + + return {cap, time_remaining, status}; } catch (const std::exception& e) { spdlog::error("Battery: {}", e.what()); return {0, 0, "Unknown"}; From 908fa2c6c239af7a27c53658940f1f20bc5fa5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Fri, 27 Nov 2020 10:55:27 +0000 Subject: [PATCH 130/355] Make the battery full-at go to 100% full-at was capped at the value instead of allowing the battery to show 100% when you were at the full-at value. Uncapping makes more sense as it makes the full-at value the new 100% and the scale goes down from there. Whereas before the battery would stay at the full-at value until it went down enough which is unrealistic. --- man/waybar-battery.5.scd | 2 +- src/modules/battery.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd index 917a03d7..c9e6e78a 100644 --- a/man/waybar-battery.5.scd +++ b/man/waybar-battery.5.scd @@ -20,7 +20,7 @@ The *battery* module displays the current capacity and state (eg. charging) of y *full-at*: ++ typeof: integer ++ - Define the max percentage of the battery, useful for an old battery, e.g. 96 + Define the max percentage of the battery, for when you've set the battery to stop charging at a lower level to save it. For example, if you've set the battery to stop at 80% that will become the new 100%. *interval*: ++ typeof: integer ++ diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 2d553705..031c949f 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -127,9 +127,6 @@ const std::tuple waybar::modules::Battery::getInfos auto full_at = config_["full-at"].asUInt(); if (full_at < 100) { capacity = 100.f * capacity / full_at; - if (capacity > full_at) { - capacity = full_at; - } } } if (capacity > 100.f) { From 89ca155c43eea73593cacfa4f58e687851a0989c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Fri, 27 Nov 2020 13:56:04 +0000 Subject: [PATCH 131/355] Support hotplugging of batteries Refresh the list of batteries on update to handle hotplug correctly. Probably fixes #490. --- include/modules/battery.hpp | 6 ++-- src/modules/battery.cpp | 69 +++++++++++++++++++++++++++++-------- 2 files changed, 58 insertions(+), 17 deletions(-) diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp index d4d20d1e..f0e3c39d 100644 --- a/include/modules/battery.hpp +++ b/include/modules/battery.hpp @@ -31,16 +31,16 @@ class Battery : public ALabel { private: static inline const fs::path data_dir_ = "/sys/class/power_supply/"; - void getBatteries(); + void refreshBatteries(); void worker(); const std::string getAdapterStatus(uint8_t capacity) const; const std::tuple getInfos() const; const std::string formatTimeRemaining(float hoursRemaining); - std::vector batteries_; + int global_watch; + std::map batteries_; fs::path adapter_; int fd_; - std::vector wds_; std::string old_status_; util::SleeperThread thread_; diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 031c949f..84bc973b 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -4,23 +4,31 @@ waybar::modules::Battery::Battery(const std::string& id, const Json::Value& config) : ALabel(config, "battery", id, "{capacity}%", 60) { - getBatteries(); fd_ = inotify_init1(IN_CLOEXEC); if (fd_ == -1) { throw std::runtime_error("Unable to listen batteries."); } - for (auto const& bat : batteries_) { - auto wd = inotify_add_watch(fd_, (bat / "uevent").c_str(), IN_ACCESS); - if (wd != -1) { - wds_.push_back(wd); - } + + // Watch the directory for any added or removed batteries + global_watch = inotify_add_watch(fd_, data_dir_.c_str(), IN_CREATE | IN_DELETE); + if (global_watch < 0) { + throw std::runtime_error("Could not watch for battery plug/unplug"); } + + refreshBatteries(); worker(); } waybar::modules::Battery::~Battery() { - for (auto wd : wds_) { - inotify_rm_watch(fd_, wd); + if (global_watch >= 0) { + inotify_rm_watch(fd_, global_watch); + } + for (auto it = batteries_.cbegin(); it != batteries_.cend(); it++) { + auto watch_id = (*it).second; + if (watch_id >= 0) { + inotify_rm_watch(fd_, watch_id); + } + batteries_.erase(it); } close(fd_); } @@ -43,7 +51,13 @@ void waybar::modules::Battery::worker() { }; } -void waybar::modules::Battery::getBatteries() { +void waybar::modules::Battery::refreshBatteries() { + // Mark existing list of batteries as not necessarily found + std::map check_map; + for (auto const& bat : batteries_) { + check_map[bat.first] = false; + } + try { for (auto& node : fs::directory_iterator(data_dir_)) { if (!fs::is_directory(node)) { @@ -54,12 +68,22 @@ void waybar::modules::Battery::getBatteries() { if (((bat_defined && dir_name == config_["bat"].asString()) || !bat_defined) && fs::exists(node.path() / "capacity") && fs::exists(node.path() / "uevent") && fs::exists(node.path() / "status") && fs::exists(node.path() / "type")) { - std::string type; - std::ifstream(node.path() / "type") >> type; + std::string type; + std::ifstream(node.path() / "type") >> type; - if (!type.compare("Battery")){ - batteries_.push_back(node.path()); + if (!type.compare("Battery")){ + check_map[node.path()] = true; + auto search = batteries_.find(node.path()); + if (search == batteries_.end()) { + // We've found a new battery save it and start listening for events + auto event_path = (node.path() / "uevent"); + auto wd = inotify_add_watch(fd_, event_path.c_str(), IN_ACCESS); + if (wd < 0) { + throw std::runtime_error("Could not watch events for " + node.path().string()); } + batteries_[node.path()] = wd; + } + } } auto adap_defined = config_["adapter"].isString(); if (((adap_defined && dir_name == config_["adapter"].asString()) || !adap_defined) && @@ -76,6 +100,17 @@ void waybar::modules::Battery::getBatteries() { } throw std::runtime_error("No batteries."); } + + // Remove any batteries that are no longer present and unwatch them + for (auto const& check : check_map) { + if (!check.second) { + auto watch_id = batteries_[check.first]; + if (watch_id >= 0) { + inotify_rm_watch(fd_, watch_id); + } + batteries_.erase(check.first); + } + } } const std::tuple waybar::modules::Battery::getInfos() const { @@ -84,7 +119,8 @@ const std::tuple waybar::modules::Battery::getInfos uint32_t total_energy = 0; // μWh uint32_t total_energy_full = 0; std::string status = "Unknown"; - for (auto const& bat : batteries_) { + for (auto const& item : batteries_) { + auto bat = item.first; uint32_t power_now; uint32_t energy_full; uint32_t energy_now; @@ -175,6 +211,11 @@ const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemai } auto waybar::modules::Battery::update() -> void { + // Make sure we have the correct set of batteries, in case of hotplug + // TODO: split the global watch into it's own event and only run the refresh + // when there's been a CREATE/DELETE event + refreshBatteries(); + auto [capacity, time_remaining, status] = getInfos(); if (status == "Unknown") { status = getAdapterStatus(capacity); From 31a4aff1f8328037ad8986e2ffd1a4a90af33114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Fri, 27 Nov 2020 14:23:37 +0000 Subject: [PATCH 132/355] Don't show battery estimate at 0 If we think we're done might as well not show 0h 0min as the estimate and just not show anything. --- src/modules/battery.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 84bc973b..c506171f 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -200,10 +200,14 @@ const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) c } const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemaining) { - hoursRemaining = std::fabs(hoursRemaining); + hoursRemaining = std::fabs(hoursRemaining); uint16_t full_hours = static_cast(hoursRemaining); uint16_t minutes = static_cast(60 * (hoursRemaining - full_hours)); auto format = std::string("{H} h {M} min"); + if (full_hours == 0 && minutes == 0) { + // Migh as well not show "0h 0min" + return ""; + } if (config_["format-time"].isString()) { format = config_["format-time"].asString(); } From c784e8170e61bc7cd36c64e0967372524cd0fd7e Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Mon, 30 Nov 2020 12:49:48 -0800 Subject: [PATCH 133/355] clock: initialize cached date We are currently using this value once before it's initialized, since we check it before we set it in Clock::calendar_text(). This was caught by Valgrind, producing the following error: ==8962== Conditional jump or move depends on uninitialised value(s) ==8962== at 0x138285: date::operator==(date::year_month_day const&, date::year_month_day const&) (date.h:2793) ==8962== by 0x135F11: waybar::modules::Clock::calendar_text[abi:cxx11](waybar::modules::waybar_time const&) (clock.cpp:111) ==8962== by 0x13587C: waybar::modules::Clock::update() (clock.cpp:62) ==8962== by 0x156EFA: waybar::Bar::getModules(waybar::Factory const&, std::__cxx11::basic_string, std::allocator > const&)::{lambda()#1}::operator()() const (bar.cpp:577) ==8962== by 0x157F39: sigc::adaptor_functor, std::allocator > const&)::{lambda()#1}>::operator()() const (adaptor_trait.h:256) ==8962== by 0x157D94: sigc::internal::slot_call0, std::allocator > const&)::{lambda()#1}, void>::call_it(sigc::internal::slot_rep*) (slot.h:136) ==8962== by 0x5177B21: Glib::DispatchNotifier::pipe_io_handler(Glib::IOCondition) (in /usr/lib/libglibmm-2.4.so.1.3.0) ==8962== by 0x517DB5B: Glib::IOSource::dispatch(sigc::slot_base*) (in /usr/lib/libglibmm-2.4.so.1.3.0) ==8962== by 0x5188B96: Glib::Source::dispatch_vfunc(_GSource*, int (*)(void*), void*) (in /usr/lib/libglibmm-2.4.so.1.3.0) ==8962== by 0x5CBC913: g_main_context_dispatch (in /usr/lib/libglib-2.0.so.0.6600.2) ==8962== by 0x5D107D0: ??? (in /usr/lib/libglib-2.0.so.0.6600.2) ==8962== by 0x5CBB120: g_main_context_iteration (in /usr/lib/libglib-2.0.so.0.6600.2) Initialize the value to prevent the error. --- include/modules/clock.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp index 643b7369..b3e2634f 100644 --- a/include/modules/clock.hpp +++ b/include/modules/clock.hpp @@ -29,7 +29,7 @@ class Clock : public ALabel { const date::time_zone* time_zone_; bool fixed_time_zone_; int time_zone_idx_; - date::year_month_day cached_calendar_ymd_; + date::year_month_day cached_calendar_ymd_ = date::January/1/0; std::string cached_calendar_text_; bool handleScroll(GdkEventScroll* e); From e8dbdee2385ee77c5b1f0e03dd3f3f912ee98a8e Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Mon, 30 Nov 2020 17:01:58 -0800 Subject: [PATCH 134/355] Make spdlog use the same version of fmt we use spdlog bundles a version of fmt. However, we also depend on and use fmt directly. If we don't tell spdlog not to use its bundled version, we end up with two versions of fmt in our include path, since both libraries are header-only, meaning any slight API mismatches will cause build failures and undesired behavior. We seem to have gotten lucky so far, but I ran into all sorts of issues when I tried to update to a newer version of spdlog. This change prevents them. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1e7e22c2..70067eed 100644 --- a/meson.build +++ b/meson.build @@ -80,7 +80,7 @@ is_openbsd = host_machine.system() == 'openbsd' thread_dep = dependency('threads') fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep']) -spdlog = dependency('spdlog', version : ['>=1.3.1'], fallback : ['spdlog', 'spdlog_dep']) +spdlog = dependency('spdlog', version : ['>=1.3.1'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=true']) wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') wayland_protos = dependency('wayland-protocols') From ad40511358ef057c1a0a8ff9b0bcfcf61ede6ff0 Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Mon, 30 Nov 2020 17:10:02 -0800 Subject: [PATCH 135/355] Update spdlog subproject to 1.8.1 Among other changes, this adds spdlog::should_log(), which lets us easily determine whether a log message will be printed so that we can avoid extra computation when unnecessary. New wrap file taken from https://wrapdb.mesonbuild.com/spdlog and modified to download from GitHub as per commit 99dde1aff8db ("Download patch files from Github instead of wrapdb"). --- meson.build | 2 +- subprojects/spdlog.wrap | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 70067eed..7f9db5f7 100644 --- a/meson.build +++ b/meson.build @@ -80,7 +80,7 @@ is_openbsd = host_machine.system() == 'openbsd' thread_dep = dependency('threads') fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep']) -spdlog = dependency('spdlog', version : ['>=1.3.1'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=true']) +spdlog = dependency('spdlog', version : ['>=1.8.0'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=true']) wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') wayland_protos = dependency('wayland-protocols') diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap index 750036b9..c30450e2 100644 --- a/subprojects/spdlog.wrap +++ b/subprojects/spdlog.wrap @@ -1,10 +1,13 @@ [wrap-file] -directory = spdlog-1.3.1 +directory = spdlog-1.8.1 -source_url = https://github.com/gabime/spdlog/archive/v1.3.1.tar.gz -source_filename = v1.3.1.tar.gz -source_hash = 160845266e94db1d4922ef755637f6901266731c4cb3b30b45bf41efa0e6ab70 +source_url = https://github.com/gabime/spdlog/archive/v1.8.1.tar.gz +source_filename = v1.8.1.tar.gz +source_hash = 5197b3147cfcfaa67dd564db7b878e4a4b3d9f3443801722b3915cdeced656cb -patch_url = https://github.com/mesonbuild/spdlog/releases/download/1.3.1-1/spdlog.zip -patch_filename = spdlog-1.3.1-1-wrap.zip -patch_hash = 715a0229781019b853d409cc0bf891ee4b9d3a17bec0cf87f4ad30b28bbecc87 +patch_url = https://github.com/mesonbuild/spdlog/releases/download/1.8.1-1/spdlog.zip +patch_filename = spdlog-1.8.1-1-wrap.zip +patch_hash = 76844292a8e912aec78450618271a311841b33b17000988f215ddd6c64dd71b3 + +[provide] +spdlog = spdlog_dep From 85df7ce2da2caa8910151a28fcd42f46ea150a6b Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Mon, 30 Nov 2020 12:05:18 -0800 Subject: [PATCH 136/355] Add debug log message to print each bar's widget tree This is very useful when writing CSS that affects more than just a single widget. Pass `-l debug` to enable debug logging and show this information. Example output: [2020-11-30 12:38:51.141] [debug] GTK widget tree: window#waybar.background.bottom.eDP-1.:dir(ltr) decoration:dir(ltr) box.horizontal:dir(ltr) box.horizontal.modules-left:dir(ltr) widget:dir(ltr) box#workspaces.horizontal:dir(ltr) widget:dir(ltr) label#mode:dir(ltr) widget:dir(ltr) label#window:dir(ltr) box.horizontal.modules-center:dir(ltr) box.horizontal.modules-right:dir(ltr) widget:dir(ltr) box#tray.horizontal:dir(ltr) widget:dir(ltr) label#idle_inhibitor:dir(ltr) widget:dir(ltr) label#pulseaudio:dir(ltr) widget:dir(ltr) label#network:dir(ltr) widget:dir(ltr) label#cpu:dir(ltr) widget:dir(ltr) label#memory:dir(ltr) widget:dir(ltr) label#temperature:dir(ltr) widget:dir(ltr) label#backlight:dir(ltr) widget:dir(ltr) label#battery:dir(ltr) widget:dir(ltr) label#clock:dir(ltr) --- src/bar.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/bar.cpp b/src/bar.cpp index 771adab5..7bd61727 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -460,6 +460,16 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) setupWidgets(); window.show_all(); + + if (spdlog::should_log(spdlog::level::debug)) { + // Unfortunately, this function isn't in the C++ bindings, so we have to call the C version. + char* gtk_tree = gtk_style_context_to_string( + window.get_style_context()->gobj(), + (GtkStyleContextPrintFlags)(GTK_STYLE_CONTEXT_PRINT_RECURSE | + GTK_STYLE_CONTEXT_PRINT_SHOW_STYLE)); + spdlog::debug("GTK widget tree:\n{}", gtk_tree); + g_free(gtk_tree); + } } void waybar::Bar::onMap(GdkEventAny*) { From 407bf27401c25a96cefd332fd9a5d9f1fef12fce Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Mon, 30 Nov 2020 17:32:06 -0800 Subject: [PATCH 137/355] Update fmt subproject to 7.1.3 There is no particular change in this update that we require. However, our previous version, 5.3.0, is nearly two years old, so it seems prudent to pull in all the upstream fixes that have been made since then. New wrap file taken from https://wrapdb.mesonbuild.com/fmt and modified to download from GitHub as per commit 99dde1aff8db ("Download patch files from Github instead of wrapdb"). --- subprojects/fmt.wrap | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap index eb79283c..71abc80b 100644 --- a/subprojects/fmt.wrap +++ b/subprojects/fmt.wrap @@ -1,10 +1,13 @@ [wrap-file] -directory = fmt-5.3.0 +directory = fmt-7.1.3 -source_url = https://github.com/fmtlib/fmt/archive/5.3.0.tar.gz -source_filename = fmt-5.3.0.tar.gz -source_hash = defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89 +source_url = https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz +source_filename = fmt-7.1.3.tar.gz +source_hash = 5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc -patch_url = https://github.com/mesonbuild/fmt/releases/download/5.3.0-1/fmt.zip -patch_filename = fmt-5.3.0-1-wrap.zip -patch_hash = 18f21a3b8833949c35d4ac88a7059577d5fa24b98786e4b1b2d3d81bb811440f \ No newline at end of file +patch_url = https://github.com/mesonbuild/fmt/releases/download/7.1.3-1/fmt.zip +patch_filename = fmt-7.1.3-1-wrap.zip +patch_hash = 6eb951a51806fd6ffd596064825c39b844c1fe1799840ef507b61a53dba08213 + +[provide] +fmt = fmt_dep From 29f78e04267f726363d11a3fb135d60aa4ce1f41 Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Mon, 30 Nov 2020 18:07:22 -0800 Subject: [PATCH 138/355] Fix a few compiler warnings There was one uninitialized value warning and two mismatched-sign compare warnings. They both appear valid, the first occurring when MPD's "format-stopped" contains {songPosition} or {queueLength} and the second occurring when the clock's "timezones" array is more than 2 billion items long (not likely, I admit). Fix both issues. --- src/modules/clock.cpp | 10 ++++------ src/modules/mpd/mpd.cpp | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index f3136067..5b2c3f43 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -85,13 +85,11 @@ bool waybar::modules::Clock::handleScroll(GdkEventScroll *e) { return true; } auto nr_zones = config_["timezones"].size(); - int new_idx = time_zone_idx_ + ((dir == SCROLL_DIR::UP) ? 1 : -1); - if (new_idx < 0) { - time_zone_idx_ = nr_zones - 1; - } else if (new_idx >= nr_zones) { - time_zone_idx_ = 0; + if (dir == SCROLL_DIR::UP) { + size_t new_idx = time_zone_idx_ + 1; + time_zone_idx_ = new_idx == nr_zones ? 0 : new_idx; } else { - time_zone_idx_ = new_idx; + time_zone_idx_ = time_zone_idx_ == 0 ? nr_zones - 1 : time_zone_idx_ - 1; } auto zone_name = config_["timezones"][time_zone_idx_]; if (!zone_name.isString() || zone_name.empty()) { diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index 710f23ff..98332dc0 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -100,7 +100,7 @@ void waybar::modules::MPD::setLabel() { auto format = format_; std::string artist, album_artist, album, title, date; - int song_pos, queue_length; + int song_pos = 0, queue_length = 0; std::chrono::seconds elapsedTime, totalTime; std::string stateIcon = ""; From dd596a5c6c15cd7fa7e7033b1dccf3c9868f9d1c Mon Sep 17 00:00:00 2001 From: Jeremy Attali Date: Mon, 30 Nov 2020 23:11:51 -0500 Subject: [PATCH 139/355] fix(systemd): restart when service fails The current service doesn't play too nice with Sway when it is started from [sway service](https://github.com/xdbob/sway-services). Waybar is started before the system has a display. ``` Nov 30 22:11:23 ansan waybar[1352]: Unable to init server: Could not connect: Connection refused Nov 30 22:11:23 ansan waybar[1352]: cannot open display: Nov 30 22:11:23 ansan systemd[1306]: waybar.service: Main process exited, code=exited, status=1/FAILURE Nov 30 22:11:23 ansan systemd[1306]: waybar.service: Failed with result 'exit-code'. ``` Restarting the service after the system has been initialized works nicely, so this restart rule should do the trick without tinkering with the target. --- resources/waybar.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/waybar.service.in b/resources/waybar.service.in index 2c907e90..af5832d5 100644 --- a/resources/waybar.service.in +++ b/resources/waybar.service.in @@ -6,6 +6,7 @@ After=graphical-session.target [Service] ExecStart=@prefix@/bin/waybar +Restart=on-failure [Install] WantedBy=graphical-session.target From 1fe0bcacc0f30f10c9eabf3f01782b3557c4446a Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Sat, 29 Aug 2020 23:18:26 -0700 Subject: [PATCH 140/355] style: add 4px margins to window and workspaces modules These modules, unlike others, have no horizontal margins by default. This means that they'll appear uncomfortably close together in any config that puts them side-by-side. In general, the default style should make configs with any module ordering look good. Add the same 4px horizontal margins that other module have to these. To preserve the current default appearance, exempt the workspace module from a margin on the appropriate side when it's the leftmost or rightmost module on the bar. --- resources/style.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/style.css b/resources/style.css index 99fbbae2..920bb527 100644 --- a/resources/style.css +++ b/resources/style.css @@ -83,6 +83,21 @@ window#waybar.chromium { color: #ffffff; } +#window, +#workspaces { + margin: 0 4px; +} + +/* If workspaces is the leftmost module, omit left margin */ +.modules-left > widget:first-child > #workspaces { + margin-left: 0; +} + +/* If workspaces is the rightmost module, omit right margin */ +.modules-right > widget:last-child > #workspaces { + margin-right: 0; +} + #clock { background-color: #64727D; } From 09c89bcd2024b29903ae2acc9fe13ae019f49e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= Date: Thu, 3 Dec 2020 09:52:33 +0000 Subject: [PATCH 141/355] Don't update battery list on every update Speedup battery state update by only updating the battery list when we get a CREATE/DELETE event in the directory or whenever we do a full refresh on the interval. --- include/modules/battery.hpp | 7 +++-- src/modules/battery.cpp | 53 +++++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp index f0e3c39d..08dd79db 100644 --- a/include/modules/battery.hpp +++ b/include/modules/battery.hpp @@ -34,16 +34,19 @@ class Battery : public ALabel { void refreshBatteries(); void worker(); const std::string getAdapterStatus(uint8_t capacity) const; - const std::tuple getInfos() const; + const std::tuple getInfos(); const std::string formatTimeRemaining(float hoursRemaining); int global_watch; std::map batteries_; fs::path adapter_; - int fd_; + int battery_watch_fd_; + int global_watch_fd_; + std::mutex battery_list_mutex_; std::string old_status_; util::SleeperThread thread_; + util::SleeperThread thread_battery_update_; util::SleeperThread thread_timer_; }; diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index c506171f..0b54e9cb 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -4,13 +4,18 @@ waybar::modules::Battery::Battery(const std::string& id, const Json::Value& config) : ALabel(config, "battery", id, "{capacity}%", 60) { - fd_ = inotify_init1(IN_CLOEXEC); - if (fd_ == -1) { + battery_watch_fd_ = inotify_init1(IN_CLOEXEC); + if (battery_watch_fd_ == -1) { + throw std::runtime_error("Unable to listen batteries."); + } + + global_watch_fd_ = inotify_init1(IN_CLOEXEC); + if (global_watch_fd_ == -1) { throw std::runtime_error("Unable to listen batteries."); } // Watch the directory for any added or removed batteries - global_watch = inotify_add_watch(fd_, data_dir_.c_str(), IN_CREATE | IN_DELETE); + global_watch = inotify_add_watch(global_watch_fd_, data_dir_.c_str(), IN_CREATE | IN_DELETE); if (global_watch < 0) { throw std::runtime_error("Could not watch for battery plug/unplug"); } @@ -20,38 +25,55 @@ waybar::modules::Battery::Battery(const std::string& id, const Json::Value& conf } waybar::modules::Battery::~Battery() { + std::lock_guard guard(battery_list_mutex_); + if (global_watch >= 0) { - inotify_rm_watch(fd_, global_watch); + inotify_rm_watch(global_watch_fd_, global_watch); } + close(global_watch_fd_); + for (auto it = batteries_.cbegin(); it != batteries_.cend(); it++) { auto watch_id = (*it).second; if (watch_id >= 0) { - inotify_rm_watch(fd_, watch_id); + inotify_rm_watch(battery_watch_fd_, watch_id); } batteries_.erase(it); } - close(fd_); + close(battery_watch_fd_); } void waybar::modules::Battery::worker() { thread_timer_ = [this] { + // Make sure we eventually update the list of batteries even if we miss an + // inotify event for some reason + refreshBatteries(); dp.emit(); thread_timer_.sleep_for(interval_); }; thread_ = [this] { struct inotify_event event = {0}; - int nbytes = read(fd_, &event, sizeof(event)); + int nbytes = read(battery_watch_fd_, &event, sizeof(event)); if (nbytes != sizeof(event) || event.mask & IN_IGNORED) { thread_.stop(); return; } - // TODO: don't stop timer for now since there is some bugs :? - // thread_timer_.stop(); + dp.emit(); + }; + thread_battery_update_ = [this] { + struct inotify_event event = {0}; + int nbytes = read(global_watch_fd_, &event, sizeof(event)); + if (nbytes != sizeof(event) || event.mask & IN_IGNORED) { + thread_.stop(); + return; + } + refreshBatteries(); dp.emit(); }; } void waybar::modules::Battery::refreshBatteries() { + std::lock_guard guard(battery_list_mutex_); + // Mark existing list of batteries as not necessarily found std::map check_map; for (auto const& bat : batteries_) { @@ -77,7 +99,7 @@ void waybar::modules::Battery::refreshBatteries() { if (search == batteries_.end()) { // We've found a new battery save it and start listening for events auto event_path = (node.path() / "uevent"); - auto wd = inotify_add_watch(fd_, event_path.c_str(), IN_ACCESS); + auto wd = inotify_add_watch(battery_watch_fd_, event_path.c_str(), IN_ACCESS); if (wd < 0) { throw std::runtime_error("Could not watch events for " + node.path().string()); } @@ -106,14 +128,16 @@ void waybar::modules::Battery::refreshBatteries() { if (!check.second) { auto watch_id = batteries_[check.first]; if (watch_id >= 0) { - inotify_rm_watch(fd_, watch_id); + inotify_rm_watch(battery_watch_fd_, watch_id); } batteries_.erase(check.first); } } } -const std::tuple waybar::modules::Battery::getInfos() const { +const std::tuple waybar::modules::Battery::getInfos() { + std::lock_guard guard(battery_list_mutex_); + try { uint32_t total_power = 0; // μW uint32_t total_energy = 0; // μWh @@ -215,11 +239,6 @@ const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemai } auto waybar::modules::Battery::update() -> void { - // Make sure we have the correct set of batteries, in case of hotplug - // TODO: split the global watch into it's own event and only run the refresh - // when there's been a CREATE/DELETE event - refreshBatteries(); - auto [capacity, time_remaining, status] = getInfos(); if (status == "Unknown") { status = getAdapterStatus(capacity); From bb60e68b9d39cb21b195cbd156d05b0987fc653f Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Thu, 3 Dec 2020 21:52:20 +0100 Subject: [PATCH 142/355] Update to the latest version of the foreign toplevel manager protocol There was an update the of the toplevel manager protocol. Unfortunately, there are no new interesting updates with regard to the taskbar implementation. Nonetheless, update the protocol xml files to the latest version so that the implementation is up-to-date. While being there, also change the debug warning that is shown when there is a version mismatch between the server and client version of the protocol. --- ...lr-foreign-toplevel-management-unstable-v1.xml | 15 +++++++++++++-- src/modules/wlr/taskbar.cpp | 13 +++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/protocol/wlr-foreign-toplevel-management-unstable-v1.xml b/protocol/wlr-foreign-toplevel-management-unstable-v1.xml index a97738f8..10813371 100644 --- a/protocol/wlr-foreign-toplevel-management-unstable-v1.xml +++ b/protocol/wlr-foreign-toplevel-management-unstable-v1.xml @@ -25,7 +25,7 @@ THIS SOFTWARE. - + The purpose of this protocol is to enable the creation of taskbars and docks by providing them with a list of opened applications and @@ -68,7 +68,7 @@ - + A zwlr_foreign_toplevel_handle_v1 object represents an opened toplevel window. Each app may have multiple opened toplevels. @@ -255,5 +255,16 @@ actually changes, this will be indicated by the state event. + + + + + + This event is emitted whenever the parent of the toplevel changes. + + No event is emitted when the parent handle is destroyed by the client. + + + diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index bdc980c4..0a42ca15 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -187,6 +187,12 @@ static void tl_handle_done(void *data, struct zwlr_foreign_toplevel_handle_v1 *h return static_cast(data)->handle_done(); } +static void tl_handle_parent(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle, + struct zwlr_foreign_toplevel_handle_v1 *parent) +{ + /* This is explicitly left blank */ +} + static void tl_handle_closed(void *data, struct zwlr_foreign_toplevel_handle_v1 *handle) { return static_cast(data)->handle_closed(); @@ -200,6 +206,7 @@ static const struct zwlr_foreign_toplevel_handle_v1_listener toplevel_handle_imp .state = tl_handle_state, .done = tl_handle_done, .closed = tl_handle_closed, + .parent = tl_handle_parent, }; Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, @@ -661,9 +668,11 @@ void Taskbar::register_manager(struct wl_registry *registry, uint32_t name, uint spdlog::warn("Register foreign toplevel manager again although already existing!"); return; } - if (version < ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_FULLSCREEN_SINCE_VERSION) { - spdlog::warn("Using different foreign toplevel manager protocol version: {}", version); + if (version < ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_SET_FULLSCREEN_SINCE_VERSION) { + spdlog::warn("Foreign toplevel manager server does not have the appropriate version." + " To be able to use all features, you need at least version 2, but server is version {}", version); } + // limit version to a highest supported by the client protocol file version = std::min(version, zwlr_foreign_toplevel_manager_v1_interface.version); From 18f129a7128ee7a3991fba316fe956c455177360 Mon Sep 17 00:00:00 2001 From: Till Smejkal Date: Fri, 4 Dec 2020 08:04:02 +0100 Subject: [PATCH 143/355] Spit out a warning when trying to set/unset fullscreen without server supporting it Previously we only checked when connecting to the server whether it had the minimum required version but didn't act accordingly in the various functions that use the functionality of later versions. If there were a server in the wild, that actually would not have this functionality, there would have been a crash. Fix this by checking the version before using the functionality and gracefully abort it. --- src/modules/wlr/taskbar.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 0a42ca15..e70ad9c3 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -546,6 +546,11 @@ void Task::activate() void Task::fullscreen(bool set) { + if (zwlr_foreign_toplevel_handle_v1_get_version(handle_) < ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_SET_FULLSCREEN_SINCE_VERSION) { + spdlog::warn("Foreign toplevel manager server does not support for set/unset fullscreen."); + return; + } + if (set) zwlr_foreign_toplevel_handle_v1_set_fullscreen(handle_, nullptr); else From 68b6136989bf102b30a05b7b1964c44bca59a57b Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 4 Dec 2020 00:38:18 -0800 Subject: [PATCH 144/355] fix(sway/workspaces): ignore emulated scroll events GDK Wayland backend can emit two events for mouse scroll: one is a GDK_SCROLL_SMOOTH and the other one is an emulated scroll event with direction. We only receive emulated events on a window, thus it is not possible to handle these in a module and stop propagation. Ignoring emulated events should be safe since those are duplicates of smooth scroll events anyways. Fixes #386 --- src/modules/sway/workspaces.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index 8d78bf50..d0c24632 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -291,6 +291,12 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node } bool Workspaces::handleScroll(GdkEventScroll *e) { + if (gdk_event_get_pointer_emulated((GdkEvent *)e)) { + /** + * Ignore emulated scroll events on window + */ + return false; + } auto dir = AModule::getScrollDir(e); if (dir == SCROLL_DIR::NONE) { return true; From 0d03c1d4da50ef248b197c29301e7cd879f98336 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Fri, 4 Dec 2020 23:44:43 +0100 Subject: [PATCH 145/355] Fix waybar-pulseaudio with pipewire-pulse --- src/modules/pulseaudio.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index 571a78e5..b5193f51 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -178,8 +178,8 @@ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_ser pa->default_sink_name_ = i->default_sink_name; pa->default_source_name_ = i->default_source_name; - pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data); - pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data); + pa_context_get_sink_info_by_name(context, "@DEFAULT_SINK@", sinkInfoCb, data); + pa_context_get_source_info_by_name(context, "@DEFAULT_SOURCE@", sourceInfoCb, data); } static const std::array ports = { From 50ecc972843fd6dcc514775349a8b733e1dd2468 Mon Sep 17 00:00:00 2001 From: danielrainer <34983953+danielrainer@users.noreply.github.com> Date: Sat, 12 Dec 2020 23:21:17 +0100 Subject: [PATCH 146/355] Fix typo --- man/waybar-states.5.scd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar-states.5.scd b/man/waybar-states.5.scd index fe6a7307..ae2df1b9 100644 --- a/man/waybar-states.5.scd +++ b/man/waybar-states.5.scd @@ -13,7 +13,7 @@ apply a class when the value matches the declared state value. Each class gets activated when the current capacity is equal or below the configured **. - Also each state can have its own *format*. - Those con be configured via *format-*. + Those can be configured via *format-*. Or if you want to differentiate a bit more even as *format--*. # EXAMPLE From 85ca5027f41b4c15a7c90a5ffeef3c1f5a2d2340 Mon Sep 17 00:00:00 2001 From: Harit Kapadia Date: Fri, 18 Dec 2020 18:14:14 -0500 Subject: [PATCH 147/355] Fix Sway #waybar.solo CSS rule applying on split This error occurs because of an incorrect assumption that the size of the list of nodes that contains the focused window is the number of windows in a workspace. The windows in a workspace are stored as a tree by Sway, rather than a list, so the number of windows has to be found by counting the leaves of a workspace tree. --- src/modules/sway/window.cpp | 47 +++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index f10bf1ce..64f72521 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -64,29 +64,51 @@ auto Window::update() -> void { ALabel::update(); } -std::tuple Window::getFocusedNode( - const Json::Value& nodes, std::string& output) { - for (auto const& node : nodes) { +int leafNodesInWorkspace(const Json::Value& node) { + auto const& nodes = node["nodes"]; + if(nodes.empty()) { + if(node["type"] == "workspace") + return 0; + else + return 1; + } + int sum = 0; + for(auto const& node : nodes) + sum += leafNodesInWorkspace(node); + return sum; +} + +std::tuple gfnWithWorkspace( + const Json::Value& nodes, std::string& output, const Json::Value& config_, + const Bar& bar_, Json::Value& parentWorkspace) { + for(auto const& node : nodes) { if (node["output"].isString()) { output = node["output"].asString(); } + // found node if (node["focused"].asBool() && (node["type"] == "con" || node["type"] == "floating_con")) { if ((!config_["all-outputs"].asBool() && output == bar_.output->name) || config_["all-outputs"].asBool()) { auto app_id = node["app_id"].isString() ? node["app_id"].asString() - : node["window_properties"]["instance"].asString(); - return {nodes.size(), - node["id"].asInt(), - Glib::Markup::escape_text(node["name"].asString()), - app_id}; + : node["window_properties"]["instance"].asString(); + int nb = node.size(); + if(parentWorkspace != 0) + nb = leafNodesInWorkspace(parentWorkspace); + return {nb, + node["id"].asInt(), + Glib::Markup::escape_text(node["name"].asString()), + app_id}; } } - auto [nb, id, name, app_id] = getFocusedNode(node["nodes"], output); + // iterate + if(node["type"] == "workspace") + parentWorkspace = node; + auto [nb, id, name, app_id] = gfnWithWorkspace(node["nodes"], output, config_, bar_, parentWorkspace); if (id > -1 && !name.empty()) { return {nb, id, name, app_id}; } // Search for floating node - std::tie(nb, id, name, app_id) = getFocusedNode(node["floating_nodes"], output); + std::tie(nb, id, name, app_id) = gfnWithWorkspace(node["floating_nodes"], output, config_, bar_, parentWorkspace); if (id > -1 && !name.empty()) { return {nb, id, name, app_id}; } @@ -94,6 +116,11 @@ std::tuple Window::getFocusedNode( return {0, -1, "", ""}; } +std::tuple Window::getFocusedNode( + const Json::Value& nodes, std::string& output) { + return gfnWithWorkspace(nodes, output, config_, bar_, placeholder); +} + void Window::getTree() { try { ipc_.sendCmd(IPC_GET_TREE); From cb7baee045d41d32bd4d90f7e0237f1ec925b528 Mon Sep 17 00:00:00 2001 From: Harit Kapadia Date: Fri, 18 Dec 2020 18:17:17 -0500 Subject: [PATCH 148/355] Fixed compile error --- src/modules/sway/window.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index 64f72521..e9203451 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -118,6 +118,7 @@ std::tuple gfnWithWorkspace( std::tuple Window::getFocusedNode( const Json::Value& nodes, std::string& output) { + Json::Value placeholder = 0; return gfnWithWorkspace(nodes, output, config_, bar_, placeholder); } From 4b29aef048b640f162cd4d0b7ad082fc20b1c0b8 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 23 Dec 2020 21:33:40 +0100 Subject: [PATCH 149/355] chore: v0.9.5 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7f9db5f7..839c1dc4 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'waybar', 'cpp', 'c', - version: '0.9.4', + version: '0.9.5', license: 'MIT', meson_version: '>= 0.49.0', default_options : [ From e4340a7536d31332d8e455714d160d343d462932 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 29 Nov 2020 20:43:04 +0000 Subject: [PATCH 150/355] CI: add FreeBSD to Actions --- .github/workflows/freebsd.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/freebsd.yml diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml new file mode 100644 index 00000000..7072c493 --- /dev/null +++ b/.github/workflows/freebsd.yml @@ -0,0 +1,22 @@ +name: freebsd + +on: [ push, pull_request ] + +jobs: + clang: + runs-on: macos-latest # until https://github.com/actions/runner/issues/385 + steps: + - uses: actions/checkout@v2 + - name: Test in FreeBSD VM + uses: vmactions/freebsd-vm@v0.0.9 # aka FreeBSD 12.2 + with: + usesh: true + prepare: | + export CPPFLAGS=-isystem/usr/local/include LDFLAGS=-L/usr/local/lib # sndio + sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf + pkg install -y git # subprojects/date + pkg install -y gtk-layer-shell gtkmm30 jsoncpp libdbusmenu sndio \ + libfmt libmpdclient libudev-devd meson pkgconf pulseaudio scdoc spdlog + run: | + meson build -Dman-pages=enabled + ninja -C build From f3911867496d4d3f119e5a5f464aa2ff30f90750 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 25 Dec 2020 09:28:05 +0100 Subject: [PATCH 151/355] Revert "Replace lowercase "k" with uppercase "K" to make it look more consistent" --- include/util/format.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/util/format.hpp b/include/util/format.hpp index d7d16090..288d8f0c 100644 --- a/include/util/format.hpp +++ b/include/util/format.hpp @@ -42,7 +42,7 @@ namespace fmt { template auto format(const pow_format& s, FormatContext &ctx) -> decltype (ctx.out()) { - const char* units[] = { "", "K", "M", "G", "T", "P", nullptr}; + const char* units[] = { "", "k", "M", "G", "T", "P", nullptr}; auto base = s.binary_ ? 1024ull : 1000ll; auto fraction = (double) s.val_; From 005af7f7b743731229d6e7d7866a5628650bce68 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Fri, 25 Dec 2020 17:37:21 +0100 Subject: [PATCH 152/355] Revert "Fix waybar-pulseaudio with pipewire-pulse" This reverts commit 0d03c1d4da50ef248b197c29301e7cd879f98336. --- src/modules/pulseaudio.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index b5193f51..571a78e5 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -178,8 +178,8 @@ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_ser pa->default_sink_name_ = i->default_sink_name; pa->default_source_name_ = i->default_source_name; - pa_context_get_sink_info_by_name(context, "@DEFAULT_SINK@", sinkInfoCb, data); - pa_context_get_source_info_by_name(context, "@DEFAULT_SOURCE@", sourceInfoCb, data); + pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data); + pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data); } static const std::array ports = { From 0233e0eeec03f9eb00b98bbf04301852431c0cdd Mon Sep 17 00:00:00 2001 From: Andreas Backx Date: Fri, 25 Dec 2020 20:54:38 +0000 Subject: [PATCH 153/355] Added waybar_output.identifier support. Resolves #602. --- include/bar.hpp | 1 + include/client.hpp | 15 ++++++++------- src/client.cpp | 48 ++++++++++++++++++++++++++++------------------ 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index 8aab8f7c..d6cd895f 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -17,6 +17,7 @@ class Factory; struct waybar_output { Glib::RefPtr monitor; std::string name; + std::string identifier; std::unique_ptr xdg_output = { nullptr, &zxdg_output_v1_destroy}; diff --git a/include/client.hpp b/include/client.hpp index 05215cc0..f5339420 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -6,6 +6,7 @@ #include #include #include + #include "bar.hpp" struct zwlr_layer_shell_v1; @@ -33,18 +34,18 @@ class Client { std::tuple getConfigs(const std::string &config, const std::string &style) const; void bindInterfaces(); - const std::string getValidPath(const std::vector &paths) const; - void handleOutput(struct waybar_output &output); - bool isValidOutput(const Json::Value &config, struct waybar_output &output); - auto setupConfig(const std::string &config_file) -> void; - auto setupCss(const std::string &css_file) -> void; - struct waybar_output &getOutput(void *); + const std::string getValidPath(const std::vector &paths) const; + void handleOutput(struct waybar_output &output); + bool isValidOutput(const Json::Value &config, struct waybar_output &output); + auto setupConfig(const std::string &config_file) -> void; + auto setupCss(const std::string &css_file) -> void; + struct waybar_output & getOutput(void *); std::vector getOutputConfigs(struct waybar_output &output); static void handleGlobal(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version); static void handleGlobalRemove(void *data, struct wl_registry *registry, uint32_t name); - static void handleOutputName(void *, struct zxdg_output_v1 *, const char *); + static void handleOutputDescription(void *, struct zxdg_output_v1 *, const char *); void handleMonitorAdded(Glib::RefPtr monitor); void handleMonitorRemoved(Glib::RefPtr monitor); diff --git a/src/client.cpp b/src/client.cpp index 005761ee..627904c5 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1,12 +1,14 @@ #include "client.hpp" + #include #include + #include #include -#include "util/clara.hpp" -#include "util/json.hpp" #include "idle-inhibit-unstable-v1-client-protocol.h" +#include "util/clara.hpp" +#include "util/json.hpp" #include "wlr-layer-shell-unstable-v1-client-protocol.h" waybar::Client *waybar::Client::inst() { @@ -59,8 +61,8 @@ void waybar::Client::handleOutput(struct waybar_output &output) { .logical_position = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {}, .logical_size = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {}, .done = [](void *, struct zxdg_output_v1 *) {}, - .name = &handleOutputName, - .description = [](void *, struct zxdg_output_v1 *, const char *) {}, + .name = [](void *, struct zxdg_output_v1 *, const char *) {}, + .description = &handleOutputDescription, }; // owned by output->monitor; no need to destroy auto wl_output = gdk_wayland_monitor_get_wl_output(output.monitor->gobj()); @@ -71,18 +73,21 @@ void waybar::Client::handleOutput(struct waybar_output &output) { bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_output &output) { if (config["output"].isArray()) { for (auto const &output_conf : config["output"]) { - if (output_conf.isString() && output_conf.asString() == output.name) { + if (output_conf.isString() && + (output_conf.asString() == output.name || output_conf.asString() == output.identifier)) { + std::cout << output_conf.asString() << std::endl; return true; } } return false; } else if (config["output"].isString()) { - auto config_output_name = config["output"].asString(); - if (!config_output_name.empty()) { - if (config_output_name.substr(0, 1) == "!") { - return config_output_name.substr(1) != output.name; + auto config_output = config["output"].asString(); + if (!config_output.empty()) { + if (config_output.substr(0, 1) == "!") { + return config_output.substr(1) != output.name || + config_output.substr(1) != output.identifier; } - return config_output_name == output.name; + return config_output == output.name || config_output == output.identifier; } } @@ -112,16 +117,20 @@ std::vector waybar::Client::getOutputConfigs(struct waybar_output & return configs; } -void waybar::Client::handleOutputName(void * data, struct zxdg_output_v1 * /*xdg_output*/, - const char *name) { +void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 * /*xdg_output*/, + const char *description) { auto client = waybar::Client::inst(); try { - auto &output = client->getOutput(data); - output.name = name; - spdlog::debug("Output detected: {} ({} {})", - name, - output.monitor->get_manufacturer(), - output.monitor->get_model()); + auto & output = client->getOutput(data); + const char *open_paren = strrchr(description, '('); + const char *close_paren = strrchr(description, ')'); + + // Description format: "identifier (name)" + size_t identifier_length = open_paren - description; + output.identifier = std::string(description, identifier_length - 1); + output.name = std::string(description + identifier_length + 1, close_paren - open_paren - 1); + + spdlog::debug("Output detected: {}", description); auto configs = client->getOutputConfigs(output); if (configs.empty()) { output.xdg_output.reset(); @@ -260,7 +269,8 @@ int waybar::Client::main(int argc, char *argv[]) { if (!log_level.empty()) { spdlog::set_level(spdlog::level::from_str(log_level)); } - gtk_app = Gtk::Application::create(argc, argv, "fr.arouillard.waybar", Gio::APPLICATION_HANDLES_COMMAND_LINE); + gtk_app = Gtk::Application::create( + argc, argv, "fr.arouillard.waybar", Gio::APPLICATION_HANDLES_COMMAND_LINE); gdk_display = Gdk::Display::get_default(); if (!gdk_display) { throw std::runtime_error("Can't find display"); From e5684c6127d2fb063a7171a35cd52e03d5187ab3 Mon Sep 17 00:00:00 2001 From: Andreas Backx Date: Fri, 25 Dec 2020 23:03:01 +0000 Subject: [PATCH 154/355] Separated name and description setup and moved bar creation to done callback. --- include/client.hpp | 2 ++ src/client.cpp | 51 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index f5339420..f2eafb15 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -45,6 +45,8 @@ class Client { static void handleGlobal(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version); static void handleGlobalRemove(void *data, struct wl_registry *registry, uint32_t name); + static void handleOutputDone(void *, struct zxdg_output_v1 *); + static void handleOutputName(void *, struct zxdg_output_v1 *, const char *); static void handleOutputDescription(void *, struct zxdg_output_v1 *, const char *); void handleMonitorAdded(Glib::RefPtr monitor); void handleMonitorRemoved(Glib::RefPtr monitor); diff --git a/src/client.cpp b/src/client.cpp index 627904c5..4240f096 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -60,8 +60,8 @@ void waybar::Client::handleOutput(struct waybar_output &output) { static const struct zxdg_output_v1_listener xdgOutputListener = { .logical_position = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {}, .logical_size = [](void *, struct zxdg_output_v1 *, int32_t, int32_t) {}, - .done = [](void *, struct zxdg_output_v1 *) {}, - .name = [](void *, struct zxdg_output_v1 *, const char *) {}, + .done = &handleOutputDone, + .name = &handleOutputName, .description = &handleOutputDescription, }; // owned by output->monitor; no need to destroy @@ -75,7 +75,6 @@ bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_outp for (auto const &output_conf : config["output"]) { if (output_conf.isString() && (output_conf.asString() == output.name || output_conf.asString() == output.identifier)) { - std::cout << output_conf.asString() << std::endl; return true; } } @@ -84,7 +83,7 @@ bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_outp auto config_output = config["output"].asString(); if (!config_output.empty()) { if (config_output.substr(0, 1) == "!") { - return config_output.substr(1) != output.name || + return config_output.substr(1) != output.name && config_output.substr(1) != output.identifier; } return config_output == output.name || config_output == output.identifier; @@ -117,20 +116,12 @@ std::vector waybar::Client::getOutputConfigs(struct waybar_output & return configs; } -void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 * /*xdg_output*/, - const char *description) { +void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_output*/) { auto client = waybar::Client::inst(); try { - auto & output = client->getOutput(data); - const char *open_paren = strrchr(description, '('); - const char *close_paren = strrchr(description, ')'); + auto &output = client->getOutput(data); + spdlog::debug("Output detection done: {} ({})", output.name, output.identifier); - // Description format: "identifier (name)" - size_t identifier_length = open_paren - description; - output.identifier = std::string(description, identifier_length - 1); - output.name = std::string(description + identifier_length + 1, close_paren - open_paren - 1); - - spdlog::debug("Output detected: {}", description); auto configs = client->getOutputConfigs(output); if (configs.empty()) { output.xdg_output.reset(); @@ -148,6 +139,36 @@ void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 * } } +void waybar::Client::handleOutputName(void * data, struct zxdg_output_v1 * /*xdg_output*/, + const char *name) { + auto client = waybar::Client::inst(); + try { + auto &output = client->getOutput(data); + spdlog::debug("Output detected with name: {} ({} {})", + name, + output.monitor->get_manufacturer(), + output.monitor->get_model()); + output.name = name; + } catch (const std::exception &e) { + std::cerr << e.what() << std::endl; + } +} + +void waybar::Client::handleOutputDescription(void *data, struct zxdg_output_v1 * /*xdg_output*/, + const char *description) { + auto client = waybar::Client::inst(); + try { + auto & output = client->getOutput(data); + const char *open_paren = strrchr(description, '('); + + // Description format: "identifier (name)" + size_t identifier_length = open_paren - description; + output.identifier = std::string(description, identifier_length - 1); + } catch (const std::exception &e) { + std::cerr << e.what() << std::endl; + } +} + void waybar::Client::handleMonitorAdded(Glib::RefPtr monitor) { auto &output = outputs_.emplace_back(); output.monitor = monitor; From 3fbbbf85416cb6755cd0b6fb81f84e8938b58658 Mon Sep 17 00:00:00 2001 From: Andreas Backx Date: Fri, 25 Dec 2020 23:31:29 +0000 Subject: [PATCH 155/355] Removed redundant log line. --- src/client.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 4240f096..ad281d59 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -144,10 +144,6 @@ void waybar::Client::handleOutputName(void * data, struct zxdg_output_v1 * auto client = waybar::Client::inst(); try { auto &output = client->getOutput(data); - spdlog::debug("Output detected with name: {} ({} {})", - name, - output.monitor->get_manufacturer(), - output.monitor->get_model()); output.name = name; } catch (const std::exception &e) { std::cerr << e.what() << std::endl; From c0361e8546213d8d4653859329a7d02da4f56191 Mon Sep 17 00:00:00 2001 From: dorgnarg Date: Mon, 28 Dec 2020 13:34:59 -0700 Subject: [PATCH 156/355] A hopeful fix to the module section classes when the bar is vertical --- src/bar.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bar.cpp b/src/bar.cpp index 7bd61727..10cf0fc8 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -387,6 +387,9 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); + left_.get_style_context()->add_class("modules-left"); + center_.get_style_context()->add_class("modules-center"); + right_.get_style_context()->add_class("modules-right"); vertical = true; } From 42e86677739a62abaeb078cfdaed773e6ce03eea Mon Sep 17 00:00:00 2001 From: dorgnarg Date: Mon, 28 Dec 2020 13:44:16 -0700 Subject: [PATCH 157/355] Better way of doing it by just moving the original delcarations after everything's for sure been set --- src/bar.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bar.cpp b/src/bar.cpp index 10cf0fc8..1dbd69a0 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -370,9 +370,6 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) window.get_style_context()->add_class(output->name); window.get_style_context()->add_class(config["name"].asString()); window.get_style_context()->add_class(config["position"].asString()); - left_.get_style_context()->add_class("modules-left"); - center_.get_style_context()->add_class("modules-center"); - right_.get_style_context()->add_class("modules-right"); if (config["layer"] == "top") { layer_ = bar_layer::TOP; @@ -387,11 +384,12 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) center_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); right_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); - left_.get_style_context()->add_class("modules-left"); - center_.get_style_context()->add_class("modules-center"); - right_.get_style_context()->add_class("modules-right"); vertical = true; } + + left_.get_style_context()->add_class("modules-left"); + center_.get_style_context()->add_class("modules-center"); + right_.get_style_context()->add_class("modules-right"); uint32_t height = config["height"].isUInt() ? config["height"].asUInt() : 0; uint32_t width = config["width"].isUInt() ? config["width"].asUInt() : 0; From 00046d309d25c29d8b339475c028685b0dafb221 Mon Sep 17 00:00:00 2001 From: ocisra Date: Sun, 3 Jan 2021 15:25:19 +0100 Subject: [PATCH 158/355] add an option to use battery design capacity as a reference for percentage informations --- man/waybar-battery.5.scd | 5 +++++ src/modules/battery.cpp | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd index c9e6e78a..869df32c 100644 --- a/man/waybar-battery.5.scd +++ b/man/waybar-battery.5.scd @@ -22,6 +22,11 @@ The *battery* module displays the current capacity and state (eg. charging) of y typeof: integer ++ Define the max percentage of the battery, for when you've set the battery to stop charging at a lower level to save it. For example, if you've set the battery to stop at 80% that will become the new 100%. +*design-capacity*: ++ + typeof: bool ++ + default: false ++ + Option to use the battery design capacity instead of it's current maximal capacity. + *interval*: ++ typeof: integer ++ default: 60 ++ diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 0b54e9cb..daf113c5 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -142,12 +142,14 @@ const std::tuple waybar::modules::Battery::getInfos uint32_t total_power = 0; // μW uint32_t total_energy = 0; // μWh uint32_t total_energy_full = 0; + uint32_t total_energy_full_design = 0; std::string status = "Unknown"; for (auto const& item : batteries_) { auto bat = item.first; uint32_t power_now; uint32_t energy_full; uint32_t energy_now; + uint32_t energy_full_design; std::string _status; std::ifstream(bat / "status") >> _status; auto rate_path = fs::exists(bat / "current_now") ? "current_now" : "power_now"; @@ -156,17 +158,20 @@ const std::tuple waybar::modules::Battery::getInfos std::ifstream(bat / now_path) >> energy_now; auto full_path = fs::exists(bat / "charge_full") ? "charge_full" : "energy_full"; std::ifstream(bat / full_path) >> energy_full; + auto full_design_path = fs::exists(bat / "charge_full_design") ? "charge_full_design" : "energy_full_design"; + std::ifstream(bat / full_design_path) >> energy_full_design; if (_status != "Unknown") { status = _status; } total_power += power_now; total_energy += energy_now; total_energy_full += energy_full; + total_energy_full_design += energy_full_design; } if (!adapter_.empty() && status == "Discharging") { bool online; std::ifstream(adapter_ / "online") >> online; - if (online) { + if (online) { status = "Plugged"; } } @@ -182,6 +187,10 @@ const std::tuple waybar::modules::Battery::getInfos } } float capacity = ((float)total_energy * 100.0f / (float) total_energy_full); + // Handle design-capacity + if (config_["design-capacity"].isBool() ? config_["design-capacity"].asBool() : false) { + capacity = ((float)total_energy * 100.0f / (float) total_energy_full_design); + } // Handle full-at if (config_["full-at"].isUInt()) { auto full_at = config_["full-at"].asUInt(); From f20dbbbd74316917b0541c7b64aa29f3d58d66ee Mon Sep 17 00:00:00 2001 From: Johannes Christenson Date: Sun, 3 Jan 2021 19:08:06 +0100 Subject: [PATCH 159/355] Fixing logic in getIcon --- src/ALabel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ALabel.cpp b/src/ALabel.cpp index 3a4063d9..9371a0e7 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -60,14 +60,14 @@ std::string ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_ std::string ALabel::getIcon(uint16_t percentage, std::vector& alts, uint16_t max) { auto format_icons = config_["format-icons"]; if (format_icons.isObject()) { + std::string _alt = "default"; for (const auto& alt : alts) { if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) { - format_icons = format_icons[alt]; + _alt = alt; break; - } else { - format_icons = format_icons["default"]; } } + format_icons = format_icons[_alt]; } if (format_icons.isArray()) { auto size = format_icons.size(); From ef9c3ef1cbb57afa2f64a70282fffe33e5519dfe Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 6 Jan 2021 07:03:14 -0800 Subject: [PATCH 160/355] fix(wlr/taskbar): fix wl_array out-of-bounds access wl_array->size contains the number of bytes in the array instead of the number of elements. --- src/modules/wlr/taskbar.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index e70ad9c3..46147bd0 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -367,16 +367,16 @@ void Task::handle_output_leave(struct wl_output *output) void Task::handle_state(struct wl_array *state) { state_ = 0; - for (auto* entry = static_cast(state->data); - entry < static_cast(state->data) + state->size; - entry++) { - if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_MAXIMIZED) + size_t size = state->size / sizeof(uint32_t); + for (size_t i = 0; i < size; ++i) { + auto entry = static_cast(state->data)[i]; + if (entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_MAXIMIZED) state_ |= MAXIMIZED; - if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_MINIMIZED) + if (entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_MINIMIZED) state_ |= MINIMIZED; - if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_ACTIVATED) + if (entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_ACTIVATED) state_ |= ACTIVE; - if (*entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_FULLSCREEN) + if (entry == ZWLR_FOREIGN_TOPLEVEL_HANDLE_V1_STATE_FULLSCREEN) state_ |= FULLSCREEN; } } From b79301a5bdafb2d0a7764990530898996a97c386 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 8 Jan 2021 15:07:04 -0800 Subject: [PATCH 161/355] fix(wlr/taskbar): protocol error when reconnecting outputs Destroy request is not specified for foreign toplevel manager and it does not prevent the compositor from sending more events. Libwayland would ignore events to a destroyed objects, but that could indirectly cause a gap in the sequence of new object ids and trigger error condition in the library. With this commit waybar sends a `stop` request to notify the compositor about the destruction of a toplevel manager. That fixes abnormal termination of the bar with following errors: ``` (waybar:11791): Gdk-DEBUG: 20:04:19.778: not a valid new object id (4278190088), message toplevel(n) Gdk-Message: 20:04:19.778: Error reading events from display: Invalid argument ``` --- src/modules/wlr/taskbar.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 46147bd0..4cbb8ce6 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -637,8 +637,20 @@ Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Valu Taskbar::~Taskbar() { if (manager_) { - zwlr_foreign_toplevel_manager_v1_destroy(manager_); - manager_ = nullptr; + struct wl_display *display = Client::inst()->wl_display; + /* + * Send `stop` request and wait for one roundtrip. + * This is not quite correct as the protocol encourages us to wait for the .finished event, + * but it should work with wlroots foreign toplevel manager implementation. + */ + zwlr_foreign_toplevel_manager_v1_stop(manager_); + wl_display_roundtrip(display); + + if (manager_) { + spdlog::warn("Foreign toplevel manager destroyed before .finished event"); + zwlr_foreign_toplevel_manager_v1_destroy(manager_); + manager_ = nullptr; + } } } From f4ffb21c8c364eea6589f88dbf49d7661d2f07a6 Mon Sep 17 00:00:00 2001 From: Kamus Hadenes Date: Tue, 12 Jan 2021 18:51:44 -0300 Subject: [PATCH 162/355] improve sink/source separation Add additional fields, namely `source_volume` and `source_desc` Add `tooltip-format`, reverting to default behavior if not specified Add additional CSS classes, namely `sink-muted` and `source-muted` --- src/modules/pulseaudio.cpp | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index 571a78e5..72327fe8 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -207,6 +207,7 @@ const std::string waybar::modules::Pulseaudio::getPortIcon() const { auto waybar::modules::Pulseaudio::update() -> void { auto format = format_; + std::string tooltip_format; if (!alt_) { std::string format_name = "format"; if (monitor_.find("a2dp_sink") != std::string::npos) { @@ -222,28 +223,53 @@ auto waybar::modules::Pulseaudio::update() -> void { } format_name = format_name + "-muted"; label_.get_style_context()->add_class("muted"); + label_.get_style_context()->add_class("sink-muted"); } else { label_.get_style_context()->remove_class("muted"); + label_.get_style_context()->remove_class("sink-muted"); } format = config_[format_name].isString() ? config_[format_name].asString() : format; } // TODO: find a better way to split source/sink std::string format_source = "{volume}%"; - if (source_muted_ && config_["format-source-muted"].isString()) { - format_source = config_["format-source-muted"].asString(); - } else if (!source_muted_ && config_["format-source"].isString()) { - format_source = config_["format-source"].asString(); + if (source_muted_) { + label_.get_style_context()->add_class("source-muted"); + if (config_["format-source-muted"].isString()) { + format_source = config_["format-source-muted"].asString(); + } + } else { + label_.get_style_context()->remove_class("source-muted"); + if (config_["format-source-muted"].isString()) { + format_source = config_["format-source"].asString(); + } } format_source = fmt::format(format_source, fmt::arg("volume", source_volume_)); label_.set_markup(fmt::format(format, fmt::arg("desc", desc_), fmt::arg("volume", volume_), fmt::arg("format_source", format_source), + fmt::arg("source_volume", source_volume_), + fmt::arg("source_desc", source_desc_), fmt::arg("icon", getIcon(volume_, getPortIcon())))); getState(volume_); + if (tooltipEnabled()) { - label_.set_tooltip_text(desc_); + if (tooltip_format.empty() && config_["tooltip-format"].isString()) { + tooltip_format = config_["tooltip-format"].asString(); + } + if (!tooltip_format.empty()) { + label_.set_tooltip_text(fmt::format( + tooltip_format, + fmt::arg("desc", desc_), + fmt::arg("volume", volume_), + fmt::arg("format_source", format_source), + fmt::arg("source_volume", source_volume_), + fmt::arg("source_desc", source_desc_), + fmt::arg("icon", getIcon(volume_, getPortIcon()))); + } else { + label_.set_tooltip_text(desc_); + } } // Call parent update From a7941a00c59035415066acf387822322982a3238 Mon Sep 17 00:00:00 2001 From: Kamus Hadenes Date: Tue, 12 Jan 2021 19:10:34 -0300 Subject: [PATCH 163/355] fix missing parentheses --- src/modules/pulseaudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index 72327fe8..7f4f3b65 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -266,7 +266,7 @@ auto waybar::modules::Pulseaudio::update() -> void { fmt::arg("format_source", format_source), fmt::arg("source_volume", source_volume_), fmt::arg("source_desc", source_desc_), - fmt::arg("icon", getIcon(volume_, getPortIcon()))); + fmt::arg("icon", getIcon(volume_, getPortIcon())))); } else { label_.set_tooltip_text(desc_); } From 9d5ce45f3b7571d10d19ee122f9739c6b3d04e40 Mon Sep 17 00:00:00 2001 From: sjtio Date: Fri, 15 Jan 2021 01:07:56 +0000 Subject: [PATCH 164/355] add option tag-labels to river/tags --- man/waybar-river-tags.5.scd | 4 ++++ src/modules/river/tags.cpp | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/man/waybar-river-tags.5.scd b/man/waybar-river-tags.5.scd index a02ddeb3..0f027249 100644 --- a/man/waybar-river-tags.5.scd +++ b/man/waybar-river-tags.5.scd @@ -17,6 +17,10 @@ Addressed by *river/tags* default: 9 ++ The number of tags that should be displayed. +*tag-labels*: ++ + typeof: array ++ + The label to display for each tag. + # EXAMPLE ``` diff --git a/src/modules/river/tags.cpp b/src/modules/river/tags.cpp index 804ea090..e96b2016 100644 --- a/src/modules/river/tags.cpp +++ b/src/modules/river/tags.cpp @@ -3,6 +3,8 @@ #include #include +#include + #include "client.hpp" #include "modules/river/tags.hpp" #include "river-status-unstable-v1-client-protocol.h" @@ -64,8 +66,20 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con // Default to 9 tags const uint32_t num_tags = config["num-tags"].isUInt() ? config_["num-tags"].asUInt() : 9; - for (uint32_t tag = 1; tag <= num_tags; ++tag) { - Gtk::Button &button = buttons_.emplace_back(std::to_string(tag)); + + std::vector tag_labels(num_tags); + for (uint32_t tag = 0; tag < num_tags; ++tag) { + tag_labels[tag] = std::to_string(tag+1); + } + const Json::Value custom_labels = config["tag-labels"]; + if (custom_labels.isArray() && !custom_labels.empty()) { + for (uint32_t tag = 0; tag < std::min(num_tags, custom_labels.size()); ++tag) { + tag_labels[tag] = custom_labels[tag].asString(); + } + } + + for (const auto &tag_label : tag_labels) { + Gtk::Button &button = buttons_.emplace_back(tag_label); button.set_relief(Gtk::RELIEF_NONE); box_.pack_start(button, false, false, 0); button.show(); From ce0bf6269b3b75ccc3a37792e1b4065cd15b98a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=8Cernoch?= Date: Mon, 18 Jan 2021 12:32:51 +0100 Subject: [PATCH 165/355] battery: use timeTo as the default format name --- src/modules/battery.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index e0f9acae..8b86212f 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -253,7 +253,7 @@ auto waybar::modules::Battery::update() -> void { auto time_remaining_formatted = formatTimeRemaining(time_remaining); if (tooltipEnabled()) { std::string tooltip_text_default; - std::string tooltip_format = "{autoTooltip}"; + std::string tooltip_format = "{timeTo}"; if (time_remaining != 0) { std::string time_to = std::string("Time to ") + ((time_remaining > 0) ? "empty" : "full"); tooltip_text_default = time_to + ": " + time_remaining_formatted; @@ -270,7 +270,7 @@ auto waybar::modules::Battery::update() -> void { tooltip_format = config_["tooltip-format"].asString(); } label_.set_tooltip_text(fmt::format(tooltip_format, - fmt::arg("autoTooltip", tooltip_text_default), + fmt::arg("timeTo", tooltip_text_default), fmt::arg("capacity", capacity), fmt::arg("time", time_remaining_formatted))); } From 0bd96f339eadca58142e694732ac2381cc5ea9b7 Mon Sep 17 00:00:00 2001 From: ocisra Date: Mon, 18 Jan 2021 12:38:02 +0100 Subject: [PATCH 166/355] typo --- .../index/ALabel.cpp.09E9F4748A3CBF6C.idx | Bin 0 -> 3224 bytes .../index/ALabel.hpp.81F9065828AA88EC.idx | Bin 0 -> 1438 bytes .../index/AModule.cpp.8C79E6793B0ABDDC.idx | Bin 0 -> 3206 bytes .../index/AModule.hpp.D8753B04060BBA88.idx | Bin 0 -> 1730 bytes .../index/IModule.hpp.E1245342A901572D.idx | Bin 0 -> 482 bytes .../index/backlight.cpp.8F986B9BECE3CA9B.idx | Bin 0 -> 5394 bytes .../index/backlight.hpp.0EF1448C3968172E.idx | Bin 0 -> 2104 bytes .../clangd/index/bar.cpp.499C72A404C3B6E0.idx | Bin 0 -> 11056 bytes .../clangd/index/bar.hpp.548C657FFF81C379.idx | Bin 0 -> 3490 bytes .../index/battery.cpp.C1194A004F38A6C5.idx | Bin 0 -> 5698 bytes .../index/battery.hpp.A5CF2192CCD687A2.idx | Bin 0 -> 1704 bytes .../clangd/index/clara.hpp.37039B002C851AB7.idx | Bin 0 -> 30604 bytes .../index/client.cpp.142786E5739C6086.idx | Bin 0 -> 3324 bytes .../index/client.cpp.90DC0642EC0F3846.idx | Bin 0 -> 7640 bytes .../index/client.hpp.B4D0F538B28EFA9A.idx | Bin 0 -> 1852 bytes .../index/client.hpp.F7B62724EF944420.idx | Bin 0 -> 2630 bytes .../clangd/index/clock.cpp.622BF041106573C2.idx | Bin 0 -> 4824 bytes .../clangd/index/clock.hpp.6C252B8E1A974E1B.idx | Bin 0 -> 1528 bytes .../index/command.hpp.11D8330C13D77545.idx | Bin 0 -> 2266 bytes .../index/common.cpp.8896DC31B9E7EE81.idx | Bin 0 -> 2080 bytes .../index/common.cpp.FA1CA1F6B4D16C67.idx | Bin 0 -> 1866 bytes .../clangd/index/cpu.hpp.A6F11840DCF8A513.idx | Bin 0 -> 1026 bytes .../index/custom.cpp.EA9CE9AF81C1E5D4.idx | Bin 0 -> 4732 bytes .../index/custom.hpp.36F2F4DF290D9AA1.idx | Bin 0 -> 1720 bytes .../clangd/index/disk.cpp.1F7580C201D672A2.idx | Bin 0 -> 1998 bytes .../clangd/index/disk.hpp.E57994872D8447F8.idx | Bin 0 -> 728 bytes .../index/factory.cpp.CEDE1C1627112064.idx | Bin 0 -> 2394 bytes .../index/factory.hpp.2AEC37A00908E370.idx | Bin 0 -> 904 bytes .../index/format.hpp.A472BFB350A64B30.idx | Bin 0 -> 964 bytes .../clangd/index/host.cpp.0C1CF26FC798A71A.idx | Bin 0 -> 4080 bytes .../clangd/index/host.hpp.D6E6FF9FFAF571DF.idx | Bin 0 -> 1978 bytes .../idle_inhibitor.cpp.3D718BD05B870FA9.idx | Bin 0 -> 2398 bytes .../idle_inhibitor.hpp.A4AFAA5C5DDDE471.idx | Bin 0 -> 898 bytes .../clangd/index/ipc.hpp.804BDBBDF260032D.idx | Bin 0 -> 1498 bytes .../clangd/index/item.cpp.BDF1AC58410539C1.idx | Bin 0 -> 7280 bytes .../clangd/index/item.hpp.CF2C10DA19A462FB.idx | Bin 0 -> 3008 bytes .../clangd/index/json.hpp.6C08A0DAD19BC4D8.idx | Bin 0 -> 750 bytes .../index/language.cpp.7CFC0E2AB711785B.idx | Bin 0 -> 2412 bytes .../index/language.hpp.045E99AD59170347.idx | Bin 0 -> 954 bytes .../clangd/index/linux.cpp.AA11E43948BF7636.idx | Bin 0 -> 1320 bytes .../clangd/index/linux.cpp.EBDA54C079A9D2C4.idx | Bin 0 -> 1528 bytes .../clangd/index/main.cpp.9D6EE073CE3F67E9.idx | Bin 0 -> 2136 bytes .../index/memory.hpp.220BFCF008454788.idx | Bin 0 -> 740 bytes .../clangd/index/mode.cpp.DEC43BA6A32D0056.idx | Bin 0 -> 2090 bytes .../clangd/index/mode.hpp.6A926FBEE534F2A9.idx | Bin 0 -> 888 bytes .../clangd/index/mpd.cpp.7FCBEF52ABE61287.idx | Bin 0 -> 6492 bytes .../clangd/index/mpd.hpp.F92558038735ED47.idx | Bin 0 -> 2124 bytes .../index/network.cpp.109ECEBB28F3CA1E.idx | Bin 0 -> 12826 bytes .../index/network.hpp.959179E628BFA829.idx | Bin 0 -> 3296 bytes .../index/pulseaudio.cpp.33560C8DDD3A5AD3.idx | Bin 0 -> 5832 bytes .../index/pulseaudio.hpp.C6D74738A7A6B198.idx | Bin 0 -> 2202 bytes .../sleeper_thread.hpp.B273FAC75439EB17.idx | Bin 0 -> 1672 bytes .../clangd/index/sndio.cpp.1174277772D16F52.idx | Bin 0 -> 3834 bytes .../clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx | Bin 0 -> 1304 bytes .../clangd/index/state.cpp.E5F8B9AFD9E7ED3F.idx | Bin 0 -> 7084 bytes .../clangd/index/state.hpp.210A97315D520642.idx | Bin 0 -> 7032 bytes .../index/state.inl.hpp.07C5BE693644AFA7.idx | Bin 0 -> 1336 bytes .../clangd/index/tags.cpp.901229A9EA5F0AD7.idx | Bin 0 -> 3004 bytes .../clangd/index/tags.hpp.38EBC6B49867D962.idx | Bin 0 -> 1076 bytes .../index/taskbar.cpp.3B871EDA6D279756.idx | Bin 0 -> 12886 bytes .../index/taskbar.hpp.3F1105A3E0CB852D.idx | Bin 0 -> 5366 bytes .../index/temperature.cpp.BB5C0ED5BD80EEFE.idx | Bin 0 -> 2538 bytes .../index/temperature.hpp.58F6012FF8EB97C4.idx | Bin 0 -> 818 bytes .../clangd/index/tray.cpp.02A8D890AD31BCCD.idx | Bin 0 -> 2114 bytes .../clangd/index/tray.hpp.469C1AF36DEA64C2.idx | Bin 0 -> 988 bytes .../index/watcher.cpp.793479CFFB135BF1.idx | Bin 0 -> 4334 bytes .../index/watcher.hpp.F4849F54352399E5.idx | Bin 0 -> 2232 bytes .../index/window.cpp.8AB8664D31F55915.idx | Bin 0 -> 3582 bytes .../index/window.hpp.E69A5ADAD0A0E8F9.idx | Bin 0 -> 1456 bytes .../index/workspaces.cpp.EC0CB7DF82BEDBA3.idx | Bin 0 -> 7454 bytes .../index/workspaces.hpp.0FDE443B68162423.idx | Bin 0 -> 2044 bytes src/modules/battery.cpp | 2 +- 72 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .cache/clangd/index/ALabel.cpp.09E9F4748A3CBF6C.idx create mode 100644 .cache/clangd/index/ALabel.hpp.81F9065828AA88EC.idx create mode 100644 .cache/clangd/index/AModule.cpp.8C79E6793B0ABDDC.idx create mode 100644 .cache/clangd/index/AModule.hpp.D8753B04060BBA88.idx create mode 100644 .cache/clangd/index/IModule.hpp.E1245342A901572D.idx create mode 100644 .cache/clangd/index/backlight.cpp.8F986B9BECE3CA9B.idx create mode 100644 .cache/clangd/index/backlight.hpp.0EF1448C3968172E.idx create mode 100644 .cache/clangd/index/bar.cpp.499C72A404C3B6E0.idx create mode 100644 .cache/clangd/index/bar.hpp.548C657FFF81C379.idx create mode 100644 .cache/clangd/index/battery.cpp.C1194A004F38A6C5.idx create mode 100644 .cache/clangd/index/battery.hpp.A5CF2192CCD687A2.idx create mode 100644 .cache/clangd/index/clara.hpp.37039B002C851AB7.idx create mode 100644 .cache/clangd/index/client.cpp.142786E5739C6086.idx create mode 100644 .cache/clangd/index/client.cpp.90DC0642EC0F3846.idx create mode 100644 .cache/clangd/index/client.hpp.B4D0F538B28EFA9A.idx create mode 100644 .cache/clangd/index/client.hpp.F7B62724EF944420.idx create mode 100644 .cache/clangd/index/clock.cpp.622BF041106573C2.idx create mode 100644 .cache/clangd/index/clock.hpp.6C252B8E1A974E1B.idx create mode 100644 .cache/clangd/index/command.hpp.11D8330C13D77545.idx create mode 100644 .cache/clangd/index/common.cpp.8896DC31B9E7EE81.idx create mode 100644 .cache/clangd/index/common.cpp.FA1CA1F6B4D16C67.idx create mode 100644 .cache/clangd/index/cpu.hpp.A6F11840DCF8A513.idx create mode 100644 .cache/clangd/index/custom.cpp.EA9CE9AF81C1E5D4.idx create mode 100644 .cache/clangd/index/custom.hpp.36F2F4DF290D9AA1.idx create mode 100644 .cache/clangd/index/disk.cpp.1F7580C201D672A2.idx create mode 100644 .cache/clangd/index/disk.hpp.E57994872D8447F8.idx create mode 100644 .cache/clangd/index/factory.cpp.CEDE1C1627112064.idx create mode 100644 .cache/clangd/index/factory.hpp.2AEC37A00908E370.idx create mode 100644 .cache/clangd/index/format.hpp.A472BFB350A64B30.idx create mode 100644 .cache/clangd/index/host.cpp.0C1CF26FC798A71A.idx create mode 100644 .cache/clangd/index/host.hpp.D6E6FF9FFAF571DF.idx create mode 100644 .cache/clangd/index/idle_inhibitor.cpp.3D718BD05B870FA9.idx create mode 100644 .cache/clangd/index/idle_inhibitor.hpp.A4AFAA5C5DDDE471.idx create mode 100644 .cache/clangd/index/ipc.hpp.804BDBBDF260032D.idx create mode 100644 .cache/clangd/index/item.cpp.BDF1AC58410539C1.idx create mode 100644 .cache/clangd/index/item.hpp.CF2C10DA19A462FB.idx create mode 100644 .cache/clangd/index/json.hpp.6C08A0DAD19BC4D8.idx create mode 100644 .cache/clangd/index/language.cpp.7CFC0E2AB711785B.idx create mode 100644 .cache/clangd/index/language.hpp.045E99AD59170347.idx create mode 100644 .cache/clangd/index/linux.cpp.AA11E43948BF7636.idx create mode 100644 .cache/clangd/index/linux.cpp.EBDA54C079A9D2C4.idx create mode 100644 .cache/clangd/index/main.cpp.9D6EE073CE3F67E9.idx create mode 100644 .cache/clangd/index/memory.hpp.220BFCF008454788.idx create mode 100644 .cache/clangd/index/mode.cpp.DEC43BA6A32D0056.idx create mode 100644 .cache/clangd/index/mode.hpp.6A926FBEE534F2A9.idx create mode 100644 .cache/clangd/index/mpd.cpp.7FCBEF52ABE61287.idx create mode 100644 .cache/clangd/index/mpd.hpp.F92558038735ED47.idx create mode 100644 .cache/clangd/index/network.cpp.109ECEBB28F3CA1E.idx create mode 100644 .cache/clangd/index/network.hpp.959179E628BFA829.idx create mode 100644 .cache/clangd/index/pulseaudio.cpp.33560C8DDD3A5AD3.idx create mode 100644 .cache/clangd/index/pulseaudio.hpp.C6D74738A7A6B198.idx create mode 100644 .cache/clangd/index/sleeper_thread.hpp.B273FAC75439EB17.idx create mode 100644 .cache/clangd/index/sndio.cpp.1174277772D16F52.idx create mode 100644 .cache/clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx create mode 100644 .cache/clangd/index/state.cpp.E5F8B9AFD9E7ED3F.idx create mode 100644 .cache/clangd/index/state.hpp.210A97315D520642.idx create mode 100644 .cache/clangd/index/state.inl.hpp.07C5BE693644AFA7.idx create mode 100644 .cache/clangd/index/tags.cpp.901229A9EA5F0AD7.idx create mode 100644 .cache/clangd/index/tags.hpp.38EBC6B49867D962.idx create mode 100644 .cache/clangd/index/taskbar.cpp.3B871EDA6D279756.idx create mode 100644 .cache/clangd/index/taskbar.hpp.3F1105A3E0CB852D.idx create mode 100644 .cache/clangd/index/temperature.cpp.BB5C0ED5BD80EEFE.idx create mode 100644 .cache/clangd/index/temperature.hpp.58F6012FF8EB97C4.idx create mode 100644 .cache/clangd/index/tray.cpp.02A8D890AD31BCCD.idx create mode 100644 .cache/clangd/index/tray.hpp.469C1AF36DEA64C2.idx create mode 100644 .cache/clangd/index/watcher.cpp.793479CFFB135BF1.idx create mode 100644 .cache/clangd/index/watcher.hpp.F4849F54352399E5.idx create mode 100644 .cache/clangd/index/window.cpp.8AB8664D31F55915.idx create mode 100644 .cache/clangd/index/window.hpp.E69A5ADAD0A0E8F9.idx create mode 100644 .cache/clangd/index/workspaces.cpp.EC0CB7DF82BEDBA3.idx create mode 100644 .cache/clangd/index/workspaces.hpp.0FDE443B68162423.idx diff --git a/.cache/clangd/index/ALabel.cpp.09E9F4748A3CBF6C.idx b/.cache/clangd/index/ALabel.cpp.09E9F4748A3CBF6C.idx new file mode 100644 index 0000000000000000000000000000000000000000..ce9ae3c77ff53668450d36c7f728fc9387c484cc GIT binary patch literal 3224 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 Cca^#T literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/AModule.cpp.8C79E6793B0ABDDC.idx b/.cache/clangd/index/AModule.cpp.8C79E6793B0ABDDC.idx new file mode 100644 index 0000000000000000000000000000000000000000..c782cda4988b99322fe60e0a6a72ab6213ae373f GIT binary patch literal 3206 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 TG_Gfs4~NChEKVPtk&XNfhRExb literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/AModule.hpp.D8753B04060BBA88.idx b/.cache/clangd/index/AModule.hpp.D8753B04060BBA88.idx new file mode 100644 index 0000000000000000000000000000000000000000..89805e901843f756a5e62f3548a9bbe530f5a76b GIT binary patch literal 1730 zcmYL}drVVT9LH}Dl+xa3TYB5l7t$6GVlc6ok*G`%6kl_lk8Mmhz+#wo3oUF`w?C%U zB@>9q#$+gtiLyXcHVrbye3T7e_`n(Gbi5LnhKvrK#5Nk-IakkZlYVp0`JCVRo!)-# zb>`>gb;S@w&c^($ZdZ9>G(iwF{Cdkhr78(QaDX7T9;n*4@HPKzZrA;me=arL`ab!C zyxU(zpKsSyuPEKr?9NQgSXcY%kCmE=+Z%SYq=g*QPYUb}g`H=rg4+DR{yN`a z)1EH!1l2cHJOA^i3vPVee>K0xH_$$zfA*vIs%MqFV?*q~mhWXx5DLED;SkAIIy2i14OW9rKrL zRxm&gxlv;@3L$dk&asQWMOlY+AlCF^M@GpiwIVm`YmQ}B+vE(OV7*$c)(9c;v|;zD zAjefQKnJ;1ZPf}P@+NcLvJeq|XDC$E+H;!&dR(uk^^xB{^42|F zcyRV}8ITwVhKwO;Aqe>kKO~G~B)oz=nHku_04?lb&=}%{5Ia0x5R|qJRRRw1xPyhY zL^_1d+PBYWt6HuFX3SXyON#ZO{#Pb%PWviYLWb@@JZ}_2f&s z$XfEHr*McQ#ac=vf{t-vwsF_t?!P4zW0ILzEG1lwjKmJYArf%zhnq60Tys{!#TKI_ z6&r{eLH*v4=leVY%$q#DgNnxQ?W~H&3s1SOIO_azP zWFQs~Qe++W48X-uGK$dw9kqi8<0A*ZT?XJVUY9~K3C4uf+NANGdjC)BU>9|)T2&h3J0Xr4Au417S<*h<(7*@z{CLnI$|4jl{%cY1B>W%Ig5CEURVY;uaR1G^l1 z2TPD|STk6H92p0{=Cn2sQ(q6Ke5vOF`Gzfyyhemei7Fk84Ze8u&=#=0s88OmE>I(^he!>xYq6 z`R2}capH2Dr=U#s^96C@R!+~m^OiCpabhC;z%%(Uu%7UGioJ``3q$qdt$~vH^3Ud} ZgsCf(lvAqIETN1bb>xzbTyl}i{{aqF*CPM` literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/IModule.hpp.E1245342A901572D.idx b/.cache/clangd/index/IModule.hpp.E1245342A901572D.idx new file mode 100644 index 0000000000000000000000000000000000000000..0cd620b4b98f7703747b40bbd019c8d09ed25964 GIT binary patch literal 482 zcmWIYbaT7K$iU#7;#rZKT9U}Zz`(!@#Kk2=nax1@01#KqN&fKVtiR@2&s2`{KA!%% zfdR=Lr_Xq9y>$Kh`4i`Tub%fmr=#a}h2MXTkC)D+^Jl!zY5ICzZGUy~w1!55w!W_0 ziRIH%ol@m^pH)F<5aV9Pf z24)T}4sI|3m;ap;z3b_mp4041jO+}|Y;0`2U;<`7BQs-BYFcq1&}f)T89Bi&gjvkU z2(}Pr4Anu~sx%xC0b=2GNRhuOl!1vZ_BnS+}{h@mJoCs7b+GEA1?VdQOz hpZ5&@GZYsk7mI_u1N9|{$^86&meSXmN7@)!7ywNGiB|vs literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/backlight.cpp.8F986B9BECE3CA9B.idx b/.cache/clangd/index/backlight.cpp.8F986B9BECE3CA9B.idx new file mode 100644 index 0000000000000000000000000000000000000000..99750d6c12bb86b1c93034b38e3bd765f6f71bb4 GIT binary patch literal 5394 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�sGWL1y9XvRP())8M5it?s8&pBSuTmIRdtTf5G~gWBl%; z9Gn({dm+pi@51opR14M~d0%Dam`MThb0+3YYXAKE0S&)QA$3=p{#e{+O`kOz8-Qtn zGq1^f9XsQnqallVP2CTR^p67um<2fCGVNKWxJ(pihS#edjN=ed2#(u8rwz=<-Egfj zD>9RHx*d(CauGqE0s0w`8E^cMTn|e1pe6TT_jg^dtmB{Gp4>*`jsoK-5I4U1*Qh!K z_#vSl9P7cQL)yXc8ZCYa+PhS7DLNs~GtZlu8 zWMVMxVP@SJuN#cKAWTlSrq*ETR1+T(K3GyGky-!e-2Y6Lm*An zZuK9nI`WH5N_s|SR%+TpT8e~AOZz#DPfJJ*#cA-IIWSdqf|`$$_askaHxqYjZBq|3 z`^kE?`XW0=1EYzW8oDm(I#V3Hw4BWiU9Bu_EL3I+e5d;bPE(dvq|37v2$qbL9Frld S#F-`Jb9n*z{y{Tl)BX>(deA!n literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/backlight.hpp.0EF1448C3968172E.idx b/.cache/clangd/index/backlight.hpp.0EF1448C3968172E.idx new file mode 100644 index 0000000000000000000000000000000000000000..70c3018bca32f25fb5a88850f9d31a0ed8d7205c GIT binary patch literal 2104 zcmYk52~ZPP9L6^5}dcFr>- z^(1ea=k+jSYFBHBJ#X;axTVhhyAQqBtC(0ac<)))nS}Z;ax$YUPfoZoC(gUSB`M>X zzVUHv=8L{Pkx!mC$8)EnAJ==2oCrH?G{oknl=Y3>FYfxp5>z~5yZCuA;eCWXIICo^ zsIq3C?8^}S+QV0-Sm?x;hNj%MQf5;1_1cgFb%wgC$}_9)4EVYoXqdVFsL!F>b4oVv ztx4w!b7GsT62CEh7uYlHWS_NeV3kvEg*oY2=uV&LGRb$77kTU zD9b4|XU3n)+A~;lHJ&Rf@6{<|3X2<8j@`aCt?Z}c%+#MrGA?I!*vPPA!A@n1_U@6A z;{6TP&pS2@9m-A3nmn`Q;OmwrrX3B#YyPYry*xH^t7`B;YVEbJ)&(zWlRf=mWn`w}1WK&GRxECDAv-j{8Lbe?hWZO4t}tard(2*Y zTs94SkRM@)m@J6sf6!$5H?U_Ql?ERE1T--wjUb|*Y=5%}JZ;jcfS+ajOfZlRl z&slP(QF5Llbf^P*R&NpnbpS{RnH+VXdgHd0O((1)4DiJ(_>=xnT%mU0iGSGMUJCN1FujqQGIEC|5$7GRNz_4R4Vr%nZ*^3?(-)FF2#cSaD0-`#eu^HIVq z8W>Oq!j0jR1rhzD+kEo5?~`g6puzilupUOyKUO8Zbj(GSOam=i-<$DP3nKbwt`9}` z!Pg%$z=-R0tjVvgu&pg{F@gWXRM(I1K~o7zT9uXQ23#y=kcDUwpX z!@!IG=(NAbqF%WWCj5qyR4U(j<7L8v_@>}p3L1E$JtDP{K7xpQHW={%+zz}x|hLhoN`C^s- zxwq*(-)0A*>^l8u{6x0XkZAfS6(ebRV zRt_bBv7t|9r|tTijrqxWiiXXW0GXBtbKoBa&(A_a)978w95UQd-e)UWF RKl@0=P32C}t_0;U{|91B|BL_t literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/bar.cpp.499C72A404C3B6E0.idx b/.cache/clangd/index/bar.cpp.499C72A404C3B6E0.idx new file mode 100644 index 0000000000000000000000000000000000000000..f9ba27979fa4b04752df346b68851a4f43c103f7 GIT binary patch literal 11056 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 literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/bar.hpp.548C657FFF81C379.idx b/.cache/clangd/index/bar.hpp.548C657FFF81C379.idx new file mode 100644 index 0000000000000000000000000000000000000000..7a342570df838745336e39c6c675faebf767d826 GIT binary patch literal 3490 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 literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/battery.cpp.C1194A004F38A6C5.idx b/.cache/clangd/index/battery.cpp.C1194A004F38A6C5.idx new file mode 100644 index 0000000000000000000000000000000000000000..72b2fed76eb57fa05079941546c3c5f580a3af54 GIT binary patch literal 5698 zcmYLN2Ut|s65csnma=zQb{BSGcWJu|3(|{N=m;oa2jv2yKtK=$6;QAXq6VTM9jSul zMI@RRja_0OFB*-S7&~@jMU5?rHE)i2=J9>ZoO92dHZ$j+nVlFJ5iwlGN zPhogGo)G`@@^fcI=<#?#hCE(j^O8wPvo{Vm{c~LWpXq;edimUcJXz@^(yo)a78#D( zxzGJ*@@mf0!tyuYC40Yn-{>-n+k<#b7`JvaIjm>^y? zxGfjY^rZQZ_*v_9VB!m}+$!6so68>kRJb8^vsa0d*`+E@D1Lbg8NqAU)n+z$Y@WKZ{^8^mlhXtDK9MgvP#!quUq?Fc#y(rKCt^{=TQj4L#ACd{{?M=9PTsXRbWJLko@icsuw-29QNHKr z_Hy2IUe1FhPQMC%x9`*Y(qwN(?VzNezOo&4#i97jL9t~~L)p_APeyMYY>>74(TuZ_ zirT&3TaDk7?CKSB=#(NN%R78x(wB=g+Xf})EC?Ch`fGx1-n{WMw+PcMRGnLP`Aiae zEQki>v7<+Q=Eb+9oIEgVQvJBofs%8Z4?a&_X?dz**^jbWdmY!UnGq5?(Kg| zOzXZ2V))SS@FM8*(_j6Rw;(&!5O};?u2Di7_OqrWC7H*$*tpoosXf%bJVW~I@UQYx z%YtauW4DY<#&Jf$*u^P`!swszZ;GYwx~?1OOi2QcKLD2p5EN(cVL##@i9`ES8(GJ& z3#McWN|eH=QWzhn_0SIeN1`X|g^9VhiB3*ZQ9_|mDC3kwsrS$LwM4kHb^VS_rX&f+ zBW)txpf1!gU^QmkvY*CCHXSGhUEn2 z0<~3DYFNSkrCxe0r<5!4v{CXXq-7v41C_O9B6&T`8^ zw;Wtpt^}+~K#lqUSv4qaOp1n;8vcC4faMHDhIj;_NQhJ_k|NEp%s_?Yi}JBuC@!>S zxrL&ID!cu;nGcuyuhM5YLt{fB!wHRrNTtS7r1{4ANEaF}6x!XNa%N|8*l0ZJb`Wg` zQ-=E$gujA``s-~64m8JRqK10Gu@~IzJr1=^R&R~N1z&*R1+WZPOr*ucj6q`wY6$l0 zh@g)01|n!6tizw{TQ*$G2{L53B*P>D!>tGYdN5+RCg3+w-U9p<%G-e7MtM8%+bQn? zei!9efw>9>j+xVqVp-D_s5gy5gATV$w9MRT<@S!eRm&IZG2AMmT16Zgu7bE$kf97$ zNgOMQn{(Xygbkamrcmn`cnZ)u27XAx4Z;PUwKqrUwcX36P9qv4^*o%t+u~}*Ykle? z>X%?odB95uX1NVSw}A{|xpty!r@VvcI>;d3Kg(YX&Yy1d(aYF#Aolz0$l5&j`_FKF zwOFl0>Z0~#IUS?JS2NafEP7LlMG6`-)gl$?40eW$<>vF}n^JSjmIL0Y1o$O@{VGsZ zfrDRW&4cy&D|g}!J)rCXJO7iv^xNq<{$$K@jF_=Nib%(D3b6v)3Z(*9b&F8ffuSJHA`y4;4A*O4HeC(d|+qFIqo$>K=j+_T#t!p+SX@R@|aq>A>J*O^PO+u?l z6va!YTH;BsGrXRJPGEzdyir}&rxuD8Crw=3ofCAX*BQHBDlhvOqwqu7>89m~`HU;$ z&2m$OQ&4lI;8049RtZLx6sj9Q&;VlUO@cnkAAsNi<&VMgG2jvY0;9jEToDlz5&T|6 z?23qv=ho~KOY!l9nxlySIR zf+7JSEFm-j9XL^ui0#DS#4vONWfG1iTPCA}r?{qgvRs-r%@N^mbjEmmRH_;HjAkol zqx>9;IjU(Z(q7GXel!gY-vN>iFiS4^^F?7*`5iPsCrCO0vGy{UUIz1&3rnxeJG{mf zC96SP4d$uhWvX|QPAfd1K3|`mF44EB&mY~5-SlzkTvlFKx_;W-71&MDr08ba`@D~o zKC#AbKUnmGYUUcd+%Q$QZ#Gr1X)XvIMc%PB2bDb0v5s_@G{l6S1A>k?4gt zH=d2{JV74HG=jVl(3P7()(kka738h7zX7Z_fbHxEVdVKB(+E7VdWhO@4k`TLAlNhk zk5x>x#l#-fK!#P5;S|>0YKS|7b{o=4hR!VvJf%8z`aSBYm55u3*{9qLH7X}^L*tL> zS?(g^kjiI|FdT5D#G;f?G$OvG#4m4QjD@UmJK(mZ#GsUz=DVo%A55ysLbs0hjmKx7 z@aThpJ_uV=IbS(rLWU5RnI@TLxz?fR(#3Q8D(E5}Lx$rb9>K#arM)+5JJj@A zzG`2L{z2*>hfldM7=H{8)!fm(>foRrT*ph|rL1mU>fy{m~2HM?UCajKc~@@@FJynX1NoGoX^aPe;O=nL6)*=mN%anJE!xB^iD zI&qM>eq8{4EB(E2&7{n>zb1-*sOr|wY_V}()Q(4wQ^yTzh)&z|I@_tKtens^RnFhW%jm&V?eEvG!LAHy}3)=CY-MOjB7Ed%Q^&@|h` z4Og%8rXf&iphV1yGKfN21_osyZXRAf;D2wZ86J+J7)L6it9v zXa-#~c+>Pr(L%>t!LgN&w}GOKj&A_>4KRYHQ;K%LHM_v33v@J{vbqZP+xk~5h`-T{ znLqlUpcG8I{HL0mHGJue>J$fw5opsR(xbnc?7JqQao`O~bwgw~jN6g>uaN1lFW<%w zYL#03@0_5CFTa`dfld;O)i_C(uKQGM=^6j8(qi%1I24m%G;{LqAQ8Kkx!g1+cBB4{J#pNd6d zjLM^xBFnu2mp9<^om)(s*X=KY^_c$!ZHg4Ztps!bRx+xUj5(aYW}zZ*_(XEywX0qBfuKFoZ>Zk2M6{O3 zPcBXx;jt*}3VxU`o-aEcm}myuf&;OeZ+gffz;04 zb13@(_#eRRQxT6bK}KYl+R!xhc6KxhSJEA4Lp^#*W!7(%AK?BmjL-Bm=eiYOm$ zjQ(QI+B>fh(5xA2oNv#!$0DN`42!|y(ZO9=6Pv7Jp7S>JLZY!+??N^nnD9v35ZKTHqh7``K@j|@UiwK0-VJ1 zSv;gzBgWj*+T0q`SX)C|1oR+X(2zHoW6X#8A9#tgbt0YFr=Ljh<^BEp2#eX1@EutF z^>$~;$+oc@DU@rKLlDZfQAo=`TLwdTx#_b~@Mj`kUhZdk8rq1XcYJa*dXm@yN0{{@e} B+xY+h literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/battery.hpp.A5CF2192CCD687A2.idx b/.cache/clangd/index/battery.hpp.A5CF2192CCD687A2.idx new file mode 100644 index 0000000000000000000000000000000000000000..b182c02d446b2968a4420d5a0d44d8587f8498a4 GIT binary patch literal 1704 zcmYL~4@?tR7{KpdOM5NXYXu8O0b6KGue7CQGP9{6E))hLZv0t-%9tQbWk3SO@y84u zRB$t(U_c=X!pIV2aYG$rAO^w6m;ss0gntg1LnJPd5jJ6)WA6^%@sfV|zWnZc_r1H{ zrEyUa5tl?57M2!Okd>a7BE&FE27ivc+`|lxVRHb(3NBPsw`ccj6lH~VR|1BfT7C&U zl3_}>A9Tbeo~7|qIa5rANEaPie9SQ1b^6E-XG)4DW%$JYPbB1>o+Rh%RnBPV z^mo65kV8!^``rj<$oKDgowCd&9W9@d2Z$aWOe`X%c9q7st;{Qnu2(e7sU`~R%n`*s z*E=j#?c4X>esfhZe_Zo?Z~Tq+{?Yck@?)VP15bKyRff{{uZWVXI_-U1x5hQJNQYYL z?x+@B#fvk3tv)%krGkv5FwN6^5=zcRtt2H* zmp-(2Zrf* z?4M`ljr7>P>=#y9vJiI^W~Da6XSMCXK!w9PzeoYWCX8Ub7%dktf_<=XZ66+a<|kkV z#Q^uk2wFtTxPVF4I8NZ9WpAsS798(Wz!UCZp)Fc2@H^NeA2vCEE2&lj5#(yMn&AS^ zBmJc360T)*P(TT}fi~#4!1J9&&p-XRO$fOcN`gWfgIPcP4@=R`!bd&pi#e{&2Is35n|wjeI>e7U|q>RZFRI0ZZ) zH_;}B3p{`M@?P>cgEucLfIGUs)}~#bZ}p#R&f&)0Ur;~@`^~i3#09=TH~mA09-8X9 zFyz&o>KTrc1S4jozSXJr{I25HU}+Yc$>5q_BL$65vjileR;f3^YvhbONf<>&DN-Dl za%v-^1yasrl3?E^Nq7sqrATFXCF?OV7nZEHNK{y|mLe}<$x0b73Gc~DS5&&d4V5Zy zlF-VuZ~z^n3nB@I5*dj|CF`0i#>XgAbt%Oxc5;npHV=xh{L?R0%oWSrP9%>pM z#Fdf3g8-utnT$&a)?g$q9Dud9eEIf#LhK7CfVX~28wqdiu2Ug-VGDcAvkgZ#f8N`B z0zNcVpvu~oxP=;Rz8`=K3AITb-uA4taL>$zN=S7wof{Gx_Oe1Fk73FBi?qdYg4GpS z3Ws48{jn`~UyitY0B%Kl(!R)1*vq+Y*st7?d%%&;CPcqSOmfUlW>n%TS4c@2C6-_k7OX82B^V}OPZjH_>v~G9 Rr_%M5{r7pb#3;eA{{b`Xq>}&u literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/clara.hpp.37039B002C851AB7.idx b/.cache/clangd/index/clara.hpp.37039B002C851AB7.idx new file mode 100644 index 0000000000000000000000000000000000000000..01026915693de5844b933966ad2224897c16e282 GIT binary patch literal 30604 zcmb_lhg(%g)938zz=exkdQrM!$KFefy&Jo+Mtu`wi6xd8BdCCaii(O@fS?H2u*8BL zK@kNNi3My}upk!HC@T8R?A~+m5BPkZ+!=P~?Afzrc6N4toBrK8cV0Z(!s5H1y3Lt9 ze&!g#!otD;|IL^={pY%}g+;ofg~gmr{|p&E)vcLh$(t{hj^|ycmk#;uzh2XXQL$qU zhr5mWd1KgEufC0ulSgF4;bwTu?y5n0e zaG7F!aj1c9{`x`ZmNe_y!Tm1>tCzPYWE^=t`c>u6E1Uk|y7Hg6Gn?b$4)q*!y~l<* z<9-|7{?{$@Zxl73Ir&iTn=QZpRGRqvyW6t^%DAIL?vHX^Yjd;7?)q_obq9F96l0WE z8}_7^Q5U5Hvo`YR9kNB_{S6J)v1f%EJ!nLBkh~8T|XW?wh|vFRl19t+?cK z`H3^-H6~87PhM?z#o>!R&|<9~d8QR(6|bV9Yg z8(Tj7aASdKB}c#%zk25Y+a}(PP;Q z3woriEm-=n&mdD);k#>2FPup4A=#aBqi4o+KM^&w-*0>SwDgE*@#$@yT9*6%T4ZYb z&gNy~-iw_buI;KE3?T*!j;%%N#rw{yF!j z=Ju7_-<|xSVHy`bYH!}y(|={m?{si!{I1Z^`AWvA(={jUzwlr1zaOS8lq*j5ANqXH zhO4KZx-JrHU)>Or*X?Me^_U|{Xph@X0&ELAl})p~cH-Cn`u?(Kx=Y<=!<{5oL5mK!miQ$MfBh*&Xg$bw&& zWLPE5ShV>*w2V*z2di-F?%xYt6?_U16)+XQA$}daz4!Yl| zfs!#UvSilc$j;%1|BCYU{AvEBcRfA_uL*W*lrpCe-|~Hz!r${8yptETTh{pa)mkyT zXSEER*y!EGr0KgGC+39sEjlzfZqI7#EsGnj9hv<6mzn=AO*qr6Rr9t#PCl_cS=pf8 zJ?}er!HL5Qx72#NA#;)S-CHM8=5`+ZL%Uw{8@z9spa!>}ec)PpYS8_tpsu}!dhdHU z^4XD576(#NGuk)r^4UguH{{dXdOfX&h1Hz(chRK>HmhyUpId*k|KAmd9xG+7R!wm$ zI#TG7`R?JIgDl?9AZCFWctt?v$Q8aQvCcWc=CN zH|jo4Svsjjxx@6G&kk;A`E zeV+x*bU3){*oe)mzI&JDyY{Jl6 z?1fu5{%yGFoh{ep_1R7Htaq&GQg+p2Ps7fWnyx=ll7xlh(Vr7o>gBMz^66O1NPRMH-=eu{;4zA<2e7`|i{sD1O?;jMs`?+WBJ$V7ALn^lJ^WuK2U6MP) zCu?txfBV%FJevH_Zrl;2>E<8W__VH8{Y2W}5B-0R>{vgucE-8%m4oI_nZQ-QaCv?; z%SSnZbLU^J_^De%(}OkL`yG39zv0`0F@0Q@)NNYqJL`{gd+qXN=SN?U$9fRAe@_pR!kLMgemz^|x`0D6A?@^0}uS}i$UAizj+4KW;TIlR;SCV!?7TmdEI~9;S@x>lJ?>TfCtHhd8&PZruk7G$ zG+HHAS~9?~_58n$#PWzCk3j7htr9C4<~OzCafFe);O2tZVPbcfxM)-tv#s6pbgD;$Dv?HixFvI! zM5{}pvqr0=k}c*;-?-31v>1oqkjmSp@*u@1{f3`ezZ%_U+^#q0@19m<*d}a~6}-&~ zlw?#d&v?E4h;Bch9AYF3$wHKSC>kD$FrFB#k}KRbYy0Fo4~=B{8Wc;F98#qk8r8+B z%}*;G($T}(mGsod++)?|vFbtVwvA(zv%hTmU$dPl0Y(x|)?sn$1j9N3MjfMiarXIp zez=*w@{#pQrfU88!5PWy&LcUf6*#7Oqjxs%Hoayk2Cj!|9Ab!v3=L6Nr` zIg&HnY$$E0^-$;s{H+q%FSqMCe%4YOavwh+nTrw(Q34djs4nOBcHeh@o$ve)Aqkw` z4_}GpS7Ox0xrKXZ?>x^DfAlbtV6qs?IxiZ|i_mC{>ScM1^~@i&b=z@g@|0TuVpjya zD*_B(Ms>03?UxVO7PKSKNd9Auk);^26ey0-D!HxEg(Ge9_erEFw(e2U>L|7@qgv&# zb!#MtU-Rt#x0R7hLWOgkGh9c##He1J*WRarF89Ct%ZhY}#g90~+Z^K^HL8nwJJd=a z_}@)~wZ&m>7KpVswy(i{;gy!0#jn%wmEQe3x_B=AeV>sW-c)J zjpP6w99KBQ6%Mo#qq>-H(`K>HYS;FVVQ^q`^tR~@Ux~lEh~I>?g}o^UB#Q6!Sk<68Fh7!)9O6mB1{+5I zWkc@Ls&)118ko%CuPzc8*lw{;q5V8pGIW8a5S|L&PlblMNbRA&t@zaN4-bh<`~zAk zl(!1yVZ<`3OV#;s;&aV{&(n?M6SoS-&PT!UQ2;qcb-B99hwO@!7Ta-cp{>79ao(rE z*kM$ct4G!q+Ma&nWNYyq?aVO27$(5$8P&xa&at$4v&;0OOlsnEismh&aUo@tPN(rq zj-)0U4Y9lu%Uf%-N~-@2u3>yxz9Shq52VUDyK>G+ zqg7G^Dx3>?^m*(`+UolIp=$F`twt->idC$|#{A`Hn@!d&#vED6L5q=5y|7lz9zFhi ztbT?jjp%~30Mytejet%OLn{)>kWmGfQ1j97}I+jsg zti2NE925LG)JWc;Vt}<>t(B)XOy>TP4F7zi8`_VvpLa^A-XDiA=mzsxdMdjGV^n|VcVYX3C%&nD&`3@&J%3*^+?SxY7}e!EJ$L`@ z@Q36;M>2$3Gg|~@ivVJb>SEuoiM`qWV}^~jMI5y(qD5mgt}cv1$J$C}%c9E)rx&9~ zN2VLeS!xQ5v>OQxhrfDZU0by{yQJ&qrbbf2(NVrkHY}4tJu_M*_qAG!n!9@ZiECOg zw%aMu;S|1=QC+Uv^6gh|F5NoUiuA|X5F%QJh|mj+emfhw*YzDIHVMw<4_nr5fvuq@1IzvRyE27vM7(t&;n%-%-O%$A(4{Mre5}6~js#PK@eu zJ=z^U*nLC41S5IN-g{9tT$DkMQC+TQtJJ&X_|J2U(A zp}!5eNUiq|ocjmPFPURh7wesS>vTf90bgy%18zOG-$B9VAbtj;x?G>x?gRH6`>~&B z(G%OROt38zJT>}l`}Nr;4{=#NYJ&~=m!o^6rIO`R3EGcQy}-V;K15_sTymir`G9~m3NN#@_};ur zvU?$b0*UfuwyV%hM7@k1R+=jHg?G*L+t!Ng=#7aOwG-g?tqxwa!|LM`)r(Jo(v z4`x&s8#>dXZBA?mY~kLq*I&BNQxP29b< zHSB=sdY8;?Rt=j~=nqD#l9~c&vTyZ7-^EDl{N%q(zS6L<_8_Zok{AhoBw7Y5jAMQ+xlMXm<{Kj8VP3 zF=Y?$l+3;6XCyD_yvQMj98}wk>SALTj&c~&_V@yc)W_GJ5UoyNH!%9`YsU?*@VWB* z{3^|@kty3{qOHcLUf#IGwAnun-7>|77L*XCM2c0 z*o3G_&&1h=P_6bEvRww&o>5(FV$G5N1&sZ;(MX=tZr{S$ZNa)RS|t{;#<~&Tqq?m{ zC-W3kUI;MEUkFI6#Gab^##|n2tXGg>8fuYF;SRX=-FBab+`RJ@Z+?MgrES9-SH3T+MxM|nxhR+};!4b@ zE;iZzeUl}_9~4`W_So}_M9W3EC1>>8o}WC2?=oUu*QPe)9&MDtc7vfw@K-NuN=B#q zzZ5V0%aIJCofRP{5$FeCR2Q38FJ|XR;r3p%!023f&l}$JFen+Vk~`Agus`rarVV*W z2T?cMZcu;xtr96}+v7Jm%hHiF!`;eR&h9MQUySNfzqLB_t}M6vLPyeuwpg%i7c7IW zWK1}Uu*aOZs_HNxzx(~+(scY_Ym3)({U{*51*A?g$0)qmPO%6fQ*pzwq~EBF z0lf_4ak!%==m2MT0JRCDdWoU)+%5-&q`EngNJ8BeheYEc5&Df$T`t@@BG;+0|7P6C z)2(TRV5mTq$Y_<^@qJ}sW6n&qAsMWtPw;jp(3!%hF1Ix4w<&hlBZgNa*;G&D38p-> zbr{vfB8HxwkznXlS6iuLL}Lst5sbnI8wB%89T6G#%i!d&FEVL~U9wNI+$TYKjDnzt z$vjRY{;~MO`lqEE&^ti;xIi%!U>`GD_3Ep`*ETfRx!90GCbwU4*{^_hXS7PL%*XQf z>IuIa$zEntUXcw~WT+#fx?E)YF)?2X|8qBzXS733adxM$Lm1V?R`w3MwQGQ}gAFNW z4S14wJIU9Cog$^W+$xVd-j*Z&=jKRy(f)WVC~r~gFv^yB ze1JxEvDL2aoh_Q2US=ev%;3E$8Lpzi%V?EcdYNnH#XJ{n02Xq-g&Yh(MxmLFvNix$ zzkGVcJKAook(^^6a+)`s=0Qy|su#KD{Y}&1BQM@bq#kzMUD4{U2vUqfiBvz}h>rd_ z$?AUA-yxb&xmQ&7qEX4HUS9OV_Evi?M*L$#F3@)F=h_cC4S#i!wZ|g*CAF@ejV@5y zc$I>4C5}Eub-8u9{oB47J?D}u>96mgpQ$#_R99NBfy^e}SdqH)$hbMMs|+Tgx;{H5 zIvf){^rALxJeoEAK+YPp=}^nBBGp#m{-4n*v3*laQ`=Q8)fR)r#CkCSQ-RScvG=k4 zdVabDYg8Wn#zFRjKqup`F0v)wZ^W>*j!&^x)VRJT8m^&hmQh_U-q$7N?zq4fsCuaL z{+?)a51WA}12U-!&)B(-s4pDEa7qC<>PU25yf ze@cYfNmE=&SG}Wds5UoLJK9mctfRK>J2}qczZ6($*%mudP!e&A&8S{jlH-6rx9SDK z47|nBg}Yp;T`n~M{|cqL-1h%{oVRYz{Od;YhIT?aXP1r>n$aq;mAAV8Z`*`1V5aMJ zD^hKW%ysi&b=!WtQM9~b=4hGt<1C1kEo0FFXY|`ykgRlnG1^$G0G+tF;(g|9K69X7 z8P(sK?6N9-$(L6DX&aYf-mVxuj*RMJDayYY%bEr5sz$z0HGD}hT@q@*i4mn$VjbH~ z8DD$X44DLC?M@4pr*ZqrDAcZovst;O46pxZ&Zs|nqkcfiaMcv9!fP1?$!e;mA9h^* z+4a-J6-FD9%T!K=WXeDXIHUTzciN77e*g7fw`|B&YLE4>?Ey0te|3@FKipmYSN!Pi znx*wwvippFVMeROhM&9jcR`QK=p~?|(hy|lQ|=Fe{>(i^`aO|eQ- zV5MX9+rCJ%@mvwOf-dwFpwG5-+Qpjn=Z*+ z>|l)uCe-P$LNcttHG)xH?$F$7u^zwAJFfM{M@ji8!3Kpkc^2d4ccXRPH7zc7T zF=P{H7DlVYl7$;HKb$riNjzIdN_j&m4+|Zmy4+E6q=wDQhp(*27CKBaIh#xlH3g+r zV$W{8cQS46V?&DQq#a;C00s*F>LSN7eyQjgk@#3ULtDo=tm8n@F{+Clw+)OM8+ERe zOvd6UIm%leMT?SA+N*x7CysBvR^o7F7wB~64A~|*Swc2o zH|*g}dvLGLXqDWR2@8CjAHgBPFKE|AaCQ+KxE&d-lDg&PKA!IqiAMHjeNhVIUBkXH zvQIn-jIaMLWVw-~v!l@h(NKWaJ)>2HJykzdtNGt6%?gVUjS*;tF$&*m&6};TQ@}n|Gl7KqwA>^}TTqu=U~JZ50Ds=VP>58r4!!o`aGfaL{?mch7(VD#Ja&R=lfxHxV0EL)2aW*36%3!xUe z5RmHS<&10^x2^PiPdv1OaTvi{Mc@*`XqD9C*@ZhEEr>IcL$u3B+l_{v!e3qF!rEV6 ze|RB6^ul5qAM%7VJmFxjFsh5?P3eCyqGk6tGHHf-vWsOGs6GCETlc)j!yB}^>0if& zoM!sqIB$0xU2=@-h2;w&^S9YHfn)zWv|9b```1Y3@V822LeK1dZ=Ni-fjteKal83y zyK%3=s4jQ4=S2UxU&fuo-5#t@M+M8HxZ7j2O6pyF%?%^lyp%`~w*EoU>LAW?M!)@n zs}(kT{`}+EO?2L3Z?2Ur*P`#1QN6r^*^`Qf?D?*{4as6^IaD--;^bshm-}~m{oPL! zlb56K7HaoSw0eh9j8;j_>Url)r*${A5S?qB;Tj%=GpdVSJK{dBX5*ia*jjWqAGUcU zNU-ZpkdW$P*U6yDsq%>*tt}qY#bv*2+%Ln>U=%*qidZZnQ#i2NZ;Bh1rI#M=>I$~D zemeS0aD66Jb;PZAL%(nEL!pGh4LI3DIlEAFs4%L(^>*T>u5n2x{**~yY~kaQ<#9Yn zVH95KVQRrN?(L(mmydkt7i2y~+rleb@Dz>Fs^T78b?~V7$9~Nm+$1QQ&>Un`7rQfa z)u%`I7elwUvbwzCvJIR282uPV+K;0WGF+I3Zr^~_krpi8T;`xg7-tjJP= z3Ob5Ziy}}%Ms=}Ay?)sBFl-N;%`gYUR?coKn!k)ziA9XNTh?qcoZvm9Fa4X?{f!$R zMs=~0_Hz=OSTz}gFU29SimSE?mv2U^#O74DXmh^DSv-bBu{B(^H5{lLMs=~r!Jm7) z4*hFBZZ1$PimMjI!Q^067kk#EJa%8Reg^b?QcFKnHiV+{lTlr+wBy(4^Fub=#w|WI z9Iq*cYYM!U(JHwQ?c4qJq{&4aa-Eg;TJn1>!BAmTmwVnnhxpI<`q0**mN|6IxC7&= zcJN4bv9f}Pf4yokWWTk=5$f$}ZEOwSfWOeIy7~5kY|I|?YQDej@jIm$PN6@8QN6Sm zlat)vFYmn)&nvM_qPc3(XgDyci@hvPuz9w_j!js4n-~?Z#q9(qgL(DWLryOag;R6Ihif)y2xUo+(jY{wxwQgRQDi z!={!^ZME@h@uuMQ`Su5cz@6}hmJ>(p;&2=>s+aTTc}U*(i5E{>kpLR9ww$+Fj%FF7 zRbn5Fzf8Am_7L}YG?e6&^qL-1pVyjI#Zz#v|7}e$8^_!I5 z>3Ja7#$n9co(zVu1WP`ny4-&!rFVHio@1VQQF|ZuO37BJF&GD{QmRgW2sBh-k0%nm|XOY+x zm@v6cn2b!4+#pGA3Cte3!5+$dlv{t4JEM%!I!r-ksnU3<(iWIVrB0-RPo=4i($qE< zJ9jPY_i|coD@YmZH?|g#pL~C+31pi8v_K$9oKF%L089!On8MWqW+&&nlS7GJq{c4d z3(RiPZa4W3n9F>l%X~9n^7-cZd~0AnDJ?%KZOLze_r!1^LWGpFT)VSeS70s>#|xx7 zFuAf*u3Q6{V~YJT#T}T_isNaex)#pMK|8QeUM+Ih6;fEZE(o)e4qzZuD^hR+CR*@` z7U}}CNeI{^Gz4ag&~l5=379y+HBP`fCkjD{0@g4YVuEN&s$iWeI6}$}!F2~sIV#jT zDl~$W!FC*I(?BDElsMiaj`s#8o_C4oJ++`^d>0E?hO7uuKY|1SlS-PU5*&Ex zq**#?shUHVIRbq_!FwYlq^nL-Ek!lyOL~7-cJSNU{VeEFKwzPfE&3$(}O4C#Cwp+?3pJO4tQ= zB=e32r|n>tL35rn47ZcrtFAWvimLB z6PRM9R;g*_8!C>H7r z<%FnpLe#o8=1^zMVqwmZb($DY6K5^F8JmU0Hba3dSisgC(`*S@ERY$pcJs<^9*0CO z-zb+(#yq}J9%TynRt2;RuJg^V^X);Vh_7G7HwR{$?72dt_0-{akIA{V@Wzo+dyk4+gFF2T2yx%4$K23;DLfFZjI`*Mn$!qsJ2Q} zI{>po4cMX9)k3Cmw6HK~$O=}w2CKcDGJMk>eK)%uc3e1d4<|mrY#{C%h>sRQjZb0R zGa6C_y7G^E4{#yF}vlLce4S%(^TP-d@S+)J4&LW3&; zE|k=l&kke#BPZ zCN|$D_Sd4URp=xZSq)k7vR%CF1gGWl}#eA!zI-o_!q;?{N$l65eZz7Gg7;e!1*2Ea5ntI8UNvMp-$&K(>Z@&PH~>6D3i%m&!mRTb_=M80|6t^fkU(1#1<%+MLaQVXhs4g9_oSh_KC#mVz;CS31@07uq zvYYtsCVpDTIbAbpl)0ZdxE%X{#goG;ma6tk)f!qnId12(1ph1nzdc(pWed(A%%aNu z&B5e6G%X7thY`sl%HgHK>JP!{K!0;2Ilh8Lk3%_SihG$7phb^k&#;(rEmRzZS#&rE zzmZLEWH&83T!t)+35Sf4ok#WoGO6JtvdQ(9^P=2#^bSRPos?f2K2U2Jf0k1>wH zp)uAt7Re;zBqZxO<9ZI67|s|&nK;fEN11re7*Cn=ob`DQ)$I%3`UQ{78{Ya2WwHh9 zYyndW1?xh}6baTvlqnIcODK~pTPMpXvsJa;s#XhpxnlXl4NZKpXA_A}BJtCL-f={; zNOvv39j6G3X@|%6s@{85G*J(!{SK+4fyq)QWT~_2hBghF-DLXrXr?Wf{g%rO>xR`o zv)R(klBV!Om-9brk?=U}S@1iSqgWqO(AK!8*xgf5y%sBViWOXDcdORBRfoDCy~2k? z-5ZY`>Z~~96lNM!3z)}g&VuA2D^D1gCrk#WPzWp(8f($=Xl}6(dB|dc+Q2X$6EMZR zXE8M+cS@$65>7~VMx({h<11L;JU&iOdVtB0du7NYwD5T}16a_!7Aubn)>*;(tWXag zXMysKT@DjHfb{?* z1FZ)l8Du>O$krfjs8FmcD3hQX6I2}3iE6b(727mLHKx#%1FFLT)vfWXzFF72?sgI&>#P!R zR>28*PVqXY;42Ch??T0oGMx*RZcQ=_O+p-Zl;bF{Q|xL(MmLvktu?#>CNr!7WZaQz z-H{qLF=GsP=of}8fUI4T{Vv+Shtx)g)aDw*07qmv#TS4K+Y115N%Fl!t?~aP-~T8R zBKw8N4K%y~zLY@>KzO(6xLbA6AqJ4ea0QSBk$l@FY|(vE&3&}lp2{{)Wo(i(#gwLa z0<%%I*+?5HUNy$6t{MUX^(;djXkY`JpKJiPFary)8VpqclQ~3n4pD2gFrx`@OfnRK zh8)1h8CsyF=j)tF(wNsqc^HgzrN}1=1({lw2e6G}auG9nOh2r*tX1!LN zUel~Miqjj)yjASqDh?WY0jtUo3vEs|%o})YsTYCA&+^8zd^KP`^QO)hx=9?W z{S?k8#q3|{n8Kl}W+&&dlk@8GqOkw%!3C3WGJ^$@#p4@`WalCo726ucWepwX_Z07Y zN}m!!;FmKjg9c%6 zgA|5a0O1I+ON2N8m?+UcO2o%ki}tH26D{_O7Jr14b)xM$5octK*gZxZ1WdeWA5Ucx zMB4mPIxbV|DG}xqJ0IG`6BlCBBJTMLTa=^!U8u*ew!pLCqfR2kkRm1 zCp)c^v5U4TPTLe@SWuIO%D~oOKnx9kfn$Y1F1nkM7Cb!lT=sn~*8yRMvVfG8s`pAY zP(xV=@Du}9K&PZCrc^q`Qx(@#1@{=KN{v*-OM_bAOBuRC1681rz`sj`0ExlC46utpZx#DS|OYKtIGz!EqxUFLT0}UyHvw(p^ zAS+S|ij>eOT`6^2DfQD(BG?5C7}D2_2f?Qp2n2)|NrpuduKk-O`^{2~epfGby*K4; zADnRqiPJ&is)0k$GGc%b5Dt^Og~@$^Ns@adQC~%*(k)WKlr*((nu=pJUG1E%_Uga- zPOnQ>yq2Ji^OE;^$>ZkbE${u7576)=SVM*(8K8cDeDZkXie4bo!qft*)iR(Zs-HHd zHuzWDfVTKo2U7?9t7AY%{Hv==SDd{){Ci+$j`SaiB#avy#{CbNa4sO6?x7;MS`i%j z%p$m+5nwGri*fFe)XG`K`L3cHt{ARG42Sb;3s+|gb^M&=JkL@C=n3clgu{}fh;I}@ z6J#5yvyGr}lSCYnr~$Ntc5yl^M-Xi`ta8CF6()$ z_!hp_79J~>$onNyeYl4=?4dHp_`qX44!?_h-HSZBY_ITMSE!AZC-~(Fs5~zT0hg#( z_^J?iRY2i;g5jQkuedKXye~8ZCR8+pikK268p0?OA$muMxXX(cy`#-cn`rSnNQn`> zV`$0-(XfFEZxg+@(UfDN?=ca-{k-UYUZe)1=zfhdU&O{=#Fmh?LULarVOEOdl|o&T zrzOK_>bA^~3>lQkmVC3RIhZFk$dj6a@Kwq4s)Y7jndDt2VZ~lc9wryr%Dj}p#{ z&r=Z$lk`;1;74#Tki|n$6%IueY_RDDR z?w7yYFLwjxgzR#HW}TD$&&k-iIkIaG_1RyPJuk{wpL?>~JsDTWQrV@H3U5|jHmlVK z9L=e0uw-Z6`J1}2-g&*stOdBQh%!UqBKiFf+MyZq3*TELT4twkf0)78)w zd*TCU_`o5vkk~CGsKtVbT`*{2?)N-K?dX%d;UrDDBzj&Fv09f!!)4kx`J!LG zh~wadY&aoffmh@@S7aQQ`xV1}1yc?vh69wjrqsEnVAgfT?z-YMFurZmzYqAV!pRxU z)sCh^e+{X+&lTenlH>nH;oCZUoF~*?P5X z7?IGp+MN*x`r)!u$hj3#-B8FiE2KO70^(Lca9kIVW(5RC-(AJ)F7?lbtA61s4xezf zU${C%gL>g-FnE`S>cYJ~Lvv{$E?iC-ZVRgMS~k9xs{`{z_V^;#0cNjizgKk``SY() zyV_sgj^Dgev|TCMkNkII-R8Fk{Dmp3z|kWI1|&W{-2~V0Vt!09{}V80mBD9~VZfYI zdYn^wYltxPJux^KWF3?Jj?t;ZkV}xl09g1Gy=Vp)wi5v6qTJ%5j0;hMQZ0dQ#}gIn zM8y_Tk`?D<1#PAMifO-s1NxNWa*CdNv8Y`QW`+ZZLCZ8m88!k#k-;ZlCJvVgx-_2= z!!u$FOeryx5?c*dh86?^lff(QimrF5LW-6=q9t4n-pQ@r$vre|8Fm5t91TW>k0W>t zM8mmu;T*2K>$%43IsB?T&N`1XjWff^a9lGC8DuRc^%fJf4YEmxY|=#olcA4@0mvXL zLNG^1 zs?ZfmW|%X`dMH>w6kIjT8Eydd-eMh~;mq)Wg<;E};dYR~9i;X|Gqy~Hrx>0L3S2EV zT`i&=vQ7+IM~&44F(`pDC1TSOnpGh-tza^8%XQRayGQP|hc5R^m3~W=ArsATG-^pw zB-;PV+8yrSW~74S@)+Of7~esIqG3-k_}MRJ)ETBQpxLDUqw3|Ck9vtJ;koGkTtu}W zBe};&J{t7Q2*M0*23e~`uhmp$o#?U7Y>j&)P^LumDxp~wqE`iF!sMD^GOk(cWWROv z2q;OelO*G!yhpCHhcX}K<{#+^bC}XROuO|74% zHq^jwXj?Lb8)T(OBT}TP!0eP7?38dZ4V8O^%IN+IlkLM~G=8?oy|>6?fJu;@5@^Me zWTzy`?2?^!QD%?qw1+aKa<5YQ_zT(T1x@)N`+T75+DF;vBW1qIK3^#lqWFZ+Gw>yf z&l1XnDL!G8S*o}#Rq&G|75hj9tFc)fxLHL5DNS`vQ*q{Gscux*Ztz$vdFUpj}O+0wrfRn5EMwR1rqK9R?DWmMX)RDkG+u z0exteB8(5po#Hq~WwFWSYROdx%4Gr&ygOy?Yew)+wl6y{mC06{lY=2ueP5;BP!>aPKXdJ$= zqGv1}cClj1Sh3yo0^iNEf>%*TaEja`MeYqU@8p5+4oDo=DvmDCXFAT3hi=*4!~RyI$sgG0&`37zeS%a5duqu zIIkiu$v5%Tl z`$c6xP1!Hj*iTaqijD_GFAX}0)&|2%LOE#6ryKN2$*)oh(r}b`GRnY{ zApA;d@Jd4SoCVPX!>|pMssEYU#ca$$O0e8GSjK+erx^Fq<@KQAa*!U&u<#lUfr%a@ zhP%|@mS__ECs_VRgGfFKZ9WRUp&ATxIq%WUoeyuO{twOA3f`}R8m(s)kF$zDq?}Xm zq!yS$#iLO1`s4WYz};4rd4Qw2Qt_x%YRos| zG;v-tXeKo>!L3zU8tXq%2hGFH{=LH-j~?a~VE!Vd>yY*J~6NGeyxglIx}c zHF4B2bSAuu1$Y9(++UP&*U_&7YQv-PF>dC2HKZ4sDTibm-`!VL4Hr!8bM3Ccc*eH9<68t(~so zCNe|y$xs8r&4^7jPZ&rOva)!WEZ!5CY~C@OM^o(q-|hhon0UfBdP3tQO8L&EJi0DE z@vfiv>KdXGbtOY_Le?s!`YHuCQqhV}G(D}4ReWNVx*Dz%n}}gKHT)(%&On>+)N#q{ zxP(gSmE`t{y36xaHBa@3hz-~=q^R|6?C4CnQKsBfLv_;Dqkzr`Gkz0iI)iLNIj0rt z)6^C{t5}~kGdO@D>#WlFEOob>ReGIO(1CYD@w!3R^K!+ZocbD9s6H#G^`5BKOr&R4 zscJx~+91M=0Yy#7V4v{#O~vP?(olna^3W*^>IrpDB>}0V7BJ}~Af42T3~mv-uyh-|Fj6d^t$4AU8%LQ-MsqK%L;$Pl=HmLdEQrpjH2Pg zP@?d725+6gT9@9=^u|ChY|OCD9?8{Xj!O?k_k-csQYyzv7)Rj=TU6=nwYgN9K>b5f7q`+o`A zTh+k0@AZWHUr}{j;Ok!CTdpz#T~XOGkSkv(#wSIqL7G_XaXw?+Ol%hDSHbY%;L@{`)hG@mv#6YZ2@d)+r`^qS>ca+!%n0WEmcyV&HcdkpVQ=#<0{3`ErmG{+9 zuQ*fKVx$3F?H~nVtx)bT<1jS4Mz$G=tNf&zlhC&_#bXL~dl=U-j6*MdIM+0sZco>7 z&DU|b*skZC*HbfXJy&}@hju{>=Nv;*Vz_QG9Iml3+=v(sH;8du%{UIrP2+sisC(-K z=Wv2UH|q(m<_WIBTBk6_4hu{R@UxPLdlJFzX%g{DA~iL@E$Xdzg5^5_y&Dxm(+Z(A zd;~+?t}PBc)&9iRXV|5Yq9Iar(crhZOfe62?4k4tjvXHsSwqQq>28JDb1H+EJfnmqqz_4R)VA!!YFv+l=m+>Ts9cgRGUcA7H;d!BM(XwYWwa$0Q zzB{NVXpz!jk0DI1Mou0*`!`JM68$rycimTuw5v3s&OiwvrKcE zhQ`jcX47z&`J3Z!sC;LbX5dtw={^%DX*}l@&-rTrUwj|K^lmx!{`Xbnh2>AIHI4rT$x`Aux+o*Tt&4hUS%^WCr1dEVj7; zhV5y9VLKRL*bW95woTDszBnM5qdVPMG$=3nSQva4o?-(97~P_dBc5>tSE#><=iih$ zOuP?Mzw$}qcaoqcKShkE2#%sGQay{{*7F?kJV%9@K@KU|#66n^D`%5t*`%F@5XL@b zs9=!UB?a!1nrNtC+%YjEFl0rEUQr^xD_-=9r_5Km`Bxd2st~1lh=NR(+8|49onl4{ zegH&)_~jEHNY_r00uJFaK$*n8I%~FDv+!TX!O->+55I!U&9n*e<6|>B*M5J zVI2CuVmPlDs^?<3@iE*?NXh4{^EtPjpACJ!7I&M5?PX95sCGXn-XE0K8u}P#0JF+> zn}Nod!m!1=AB67WC-_gs@wJ>Ey`29^0~y=FAWD?166x^#M+*9f`mYa5L5HR0@Hhh< z!&3*9CI=NLk1D9EPbqazQ6@`q$)bmvSxQhAJr=sC1YM*|u4137pz6q1>gH47 z0wt(`W`(Ok;c9cp%2RvisXqX7NwvMCq7GtF)*8AQEfECy^A(Gc4#Hrp(=piGa=VlT>!*es4b*mPgaA6K4trCSQoHBxlfV9?mP4EcQU zV?u)osQf0@pV$D%w5HRV0h!lwUMnC;T%#lotCzxc zP2su$lf(Pv@VJ+{%-6WgdjWHmuX~lp@-`^W8x$7}S&dEc%|;OSe;S$^YsC=MhdZyG zv%CG{8yLLZ!lwngh}-zI2?Wx?rvth#%DHCc9DXtj(gx-VU+)Ut)vZ!$uTrqZqLup5 zN>5;7mHM$tUtqv8N>T7@;50XthFHL9ZmNQ7J)GvIDzy#|{rio>@2i|}6*{Xpo}~)! zoML~Dj>AI5p-^!Z5fXHaMsMGLpRlYhbC|Z->8D_Fbb7Mg-UY`*^R;s&3)7i z;x<7FLbu_Wsm@c;5}DyX16RnIzB5t7%n6!IS4TCd5`xr`0}j~_*TH((nq1@M*&sD7eV<#kM~lf<|)+4$P_$eg~~NUWt7<> z*V-aC2BuW5SxQqjs|_}*tu)v=Hal~WXb5%ODKbzxJhek^w}UPMZ)EQ`)Mxrtp8Qpw z4p||}TZgO!&MASbb;1l=N6o;%>KaBJtHEID zC(LMcOkoK0ll2C~1wD#rk8Z_Cu5Tna5EzCy0EQtBfGOa67x4Xnxz2aL&i4kUi0@Ry zcLj#I(Sc#!b6_@z?i)mJU~(ku90_g0%aZkF%9Ke#Wm0oU(GP`I%8n~#3{pBG+aIB> zN4CyraCmGn1i{01&NR)$@wLEt0gl&T&N-M4#aPZ1O9xB>*Dis>wR9WjvJE14&1iYF z5g0-qvX&6z5`v|K6TfhJX1t69EF)-~uOr5FG;2NaSx--qHxR!KRAwUy*hpoPNkB4X zQixXywIfnVU@G+j9w7loXjVE2Oec*r5I(AR#NNXTHgLub)Ue#knf7v?r@ObF+4}T@ zNg{lFl=yv=*cq63aa_Fk6EI)p@n7W$z=SB{Llk7P)PY&*pwnjPK9}*QP4 za6eXy;rTTfKYA`0b{~XK@}`q?`(4I+m(f%Ba^9z$uc<-#@m&nQf7XoJ$4xSW>civ7 zQmtg_??{$fBunVkU8#7jq-P4N6sJ`Rj-6=5Em}cs7pu6%Qf9g8wOmExFGjVGQC+g7 zt}p8MEVB|J<&>3i*R0JM$Rg#hqWh1{-! zI;2CDcA*L?zimp(ZAv#_GSs#iYA@}s06Hn@MFBbHdjW8k<81&SIwxRGL+vgA6lD1S z+(|WN%l+HG#3eSK_{0;xJfA?U&rD0S9jZIbG5Q*P)9CTJC_EYUEzYR(CGI2{Aq)=oEND z{GJdzat~I$gDLoCk?Orjt*PB&fF?4#xBz6bc>64>{?UE!zX;*Cp0Fcl};VpLypiB^guG+Z8;A@~m0O4)2<2D(0rLX12uW2Auu;Lf2 z)Y7h6z(K?AR{$BtTzzN0Ujee%r3#P*SJfR7vG1VHYxh@MFp8vE+THpkmyGCwWEKOj~&SExgYi^A!zv1jFuSfUHG)^+hzm zia{A5gZXp6oFZsM(n_h;N*ZCeUUFJbQ(~mLG3KEbxLInYUG9MOVfQ&e zInNcp=Sr=+*M(25&R=_ttzoHHx@z}3;Mif8I)LaExzQEcg4dKr*C?#{y5f9Y@zL&h zz_G*bbpYW|Vhp7UYCSQoCtlhG4=BSfbpV-F#C;X@7px|pt4U4mb_d-2u^SygdmQA9 z2RRI0I!c_664yr&>}m(>BzB#{qg@#ucmDZohX=ipoKqx+;oiH6|8DB+-cNk?6aPmS zMAO@U(*MFS_)+ruC}A{ArQ}jcW4bcs=9%($+HDY6Lv{lM$gJkvS5wr|8qRYKSF^-? z6$CaDyZ%AD^#N1ZO%IRHZk=}8w^nUgVltaCJpV-}}dOKgX%a=X1OCazmcJG6B z-2b>IpUhywA-|&Ea!7g=xtdElEBMpp%2%%*%PH2b_S}of@Z@d0-M(&|9 zJTQAKIlyQG2AoacK?EjQb_D<#FmGiK0FY^SLg2E??ty@E^7yuSd}m;a_?AU{M_{(e zwYJF(feBWc2P^H%W*j}ZV@^OZ_$>jHTqAU4B7v>NZjN}F)7-MS$*|Qb zJkzp%OWablt=|?&$NC+S^r+VZeT!k-FJasiV8Xfj;bv!ZhZuS+eUWc+k;ishAva$k zw|;59f&!;HyLAGxm>CWXGsA&lW;ifKvR#pkw#_ZM`YqW{yO{z954(&4vRI%zFbq$l z-AaLGHM@xdvcicmoCaq`5K{!jOy4K!sFF>RtL@x&>fhIYl1I`IT|mx;tFk)|Y) zI*BwTl{kaV30V+P1EwZ0>BJdUUSMF>z{>mj=`1pP+~r1S@!V4EZz)dYKFuowSNY#S z9Td;kis$Q;_vC#3ZGW4lRPde^fUq;)fPtOCZoSYhyTHz17hJqC-)n)Ii(O>_1u|3+ zFy|%f^VH9DNwU5~na7e5MkZt>!!7u9K~9msPoX;ct?UdV6SCgPecsVXp3ic>&+;Jc zN(?-sWw&6!SL~46z(x?5*K!an>A+;EvthTV-HU)tegLFI z$(~WNuXZ^G4ghu`24p2m9g^t|I7W4gQ9VAJZ^ppJWVc~xmta`Kiu%3f_vj=p;Tn~2 zEuj>469%MIa`u(f3S3Ma7ZYrqwWRu5syA~;P!7RCoJShw5p=9wBG#9PJun5NQvpH0 z<`dHP3HctFr$l*5Y_;n&u>aT<8ehyeXJED1Vrwyd{I6s1|6-%v{9vJ-Y3m7^(WK#R zEi|0Go}ht}^aL$5K?4_AXveR5g65yp0s$?w5KcWoW3*^H3k}+)CuoOZTF`}sX2WSQ z4i*}teUpXeJJ#x>OXvxjg`)Y~Ei^{k8dzvfN$qVG+GpztS`D?bEVOUY6SP7#Q@}!J zW=tP9gWk8l%Y6SE-dD5x8-C9>eA+jB>Not(Z}^mN_+-vv;N@|F@4^--JHfxSi`xTs P^$u<~I0-FwRLT7xaofoO literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/client.cpp.142786E5739C6086.idx b/.cache/clangd/index/client.cpp.142786E5739C6086.idx new file mode 100644 index 0000000000000000000000000000000000000000..37c6e6aab07f00cb8525460edeb8bcda4f102967 GIT binary patch literal 3324 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 Di_2`y7(k7z-P_QEjP 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 F{{iVbf5-p; literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/clock.cpp.622BF041106573C2.idx b/.cache/clangd/index/clock.cpp.622BF041106573C2.idx new file mode 100644 index 0000000000000000000000000000000000000000..f3d91abde97b6acdf0c9b6eff3dc3fde49e659cb GIT binary patch literal 4824 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 Z_O1^;T4g8_TS&|a@#`tkYt!Pj`9ELwhj9P^ literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/common.cpp.8896DC31B9E7EE81.idx b/.cache/clangd/index/common.cpp.8896DC31B9E7EE81.idx new file mode 100644 index 0000000000000000000000000000000000000000..979dd505d75ef2854733a6c0de076c76256455c7 GIT binary patch literal 2080 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 DsOkkm literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/custom.cpp.EA9CE9AF81C1E5D4.idx b/.cache/clangd/index/custom.cpp.EA9CE9AF81C1E5D4.idx new file mode 100644 index 0000000000000000000000000000000000000000..17765069753c33553cfbe832fa938bd6e49f04f0 GIT binary patch literal 4732 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 Dixt6V literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/custom.hpp.36F2F4DF290D9AA1.idx b/.cache/clangd/index/custom.hpp.36F2F4DF290D9AA1.idx new file mode 100644 index 0000000000000000000000000000000000000000..577765f0cbcc915e74477c2a1cb397e5c0942530 GIT binary patch literal 1720 zcmYk74^R|U9LM+G9lQhf_7?6B+&}KPs_Pdy{hcWdhCGAggO-ZpkFZrszboeBjcWo^3=QP!HuAz!* z?N~6iJ8pSs&jJW{*T=Mc2k(knFfs;4MFTZ*Ljy_DbHr@3>Zd z_KB2}e{UT&)!UlyE^dyPNdNK0@xsTg(@k&IOw}Eoh(CMmfvfG{Ya8!n)lK-76kT>v z&J9IxjKawTSvpS0zF0QSBBc=y4H^!_foe+19V0Z2W%^9^w)=eyQX463)mhDa2wcm| zT6TRX-@qa{86Sj$0t6nGELm>&<~cWuG=%$Of5yYtrc_{iWetn`3D;t+Lg10HrM?B# zqliHa+~2G-2lL_K&Ckpk7}8#6kPf&_Z8Pv8@aXr7zDxJ5En!dqaJ^1%;zQsu<^S~L z6<5w-kRG^EXSDDk@Mqs?IONW68e&i&@DN={7#{*pq;RO?^VoC-A>hHfU?U#_FQn!c zT&=yE%^(HvP+h2*4-dan{iOb2cpr-lWdAH?WdeWe{I1Hc?4LHWNJ6*@s{#dH(bnA? z(>gnlMJ(YOtnr-RuED{$;U?_IA}_*~Sm}8_O^2SJ{7~dvgpnwi!n8L{^FjGMdj29T zYUyK7eA$~<%b+0GfkkIA@*%9?ob7G%pSR5S8Kebn&>2j82>g6|H|j6w#Vk^h6{xXV zCGdfSG~ETw`?-P0M7SKu#R4Cc?_5>i!){`b80I(WOd)&-{EGX=*w{5kof?VAc#uUZ zaECq5Y5bq*A|KvxBDTnv7n*nsl=Ih`aNwiN4OixgXl#{Q1Bk^yIeWuqq=k}`l{gAh zae_w9Cp`Yw}~Z*`re7Mp~uTOmqXvxkl`Ql2dD`&%E{`J6nTk z%qSTx%>g-<_EzB^`>QJze-tk@g=h!;|s= literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/disk.cpp.1F7580C201D672A2.idx b/.cache/clangd/index/disk.cpp.1F7580C201D672A2.idx new file mode 100644 index 0000000000000000000000000000000000000000..b5c499e9b9b886a69e4abecc68594fe3720035ca GIT binary patch literal 1998 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 A=>Px# literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/factory.hpp.2AEC37A00908E370.idx b/.cache/clangd/index/factory.hpp.2AEC37A00908E370.idx new file mode 100644 index 0000000000000000000000000000000000000000..330bbbae66fa651d2529daf66b2f3090d4257bb9 GIT binary patch literal 904 zcmWIYbaQK9W?*nm@vO*AElFfyU|`?{;^LB`%-DbFCz$;nu^Ai+m~xwca@g7{S1q_FIR5|Gt9x@#3oExM@5{B^uN1paH*Tu?H{At1?AzI+wy$E(cHKLl`%RhYl-W|5 zL6%vX{)_zjY7Wf2zEa5#D0I4kc-?S){5O zyJ51+HnD)|!B#S64pGu;DmdlZvlEs-*%|NbuC3baTw17otcNvA`_+=_if_T+{!d?1Fq7hnF;{Kw3$$IlqQN!+{4P+Xatvbd(lOcx9c2l7hsZ> z1#*Fa)tcK{lz{^jP(Wa>yX=avet0B16Qc|Rs|A|{FPLE9gvc|pGG@xp@4q-pY!)9A zvn&Ivy{Nqmn1Gv5Y5eQ=Q>CdF_?Vc0@^+$jl3)TZzrg97kLbQxpTw9LVJ@&@vf_lx z7p0~Z&jh&y>QY8dunS=hW8wlkh=&!VDVWoBZ*HnUA0rQ|wW75;%xR2VU?-Kb_rGz< zz0Su3R4ia6%)@HOVaE+~9#9R)ZIkC!8+RQz&UD1r$}?@%BNV=yqVBbWjR brVxV3g<$d^n1TqV6oSc#V6q{Y{0Jrh89dNC literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/format.hpp.A472BFB350A64B30.idx b/.cache/clangd/index/format.hpp.A472BFB350A64B30.idx new file mode 100644 index 0000000000000000000000000000000000000000..c466d85fd1d2e778f6ae4d6593714c58bc24e7dd GIT binary patch literal 964 zcmYL{Z%9*77{>4Jx!rlsj(2}_bC_B=7s_gD2DZ_3St%~(GOeVjNY@liEw&X_WFNAE zL_d@bOwGVF38BC;DowF36;c!!)dwreD59i7L;7RyPTqClJoj>*m*?E~{hcCLZtfsr zn00$xbv3?VDaSBOG^{|-U)c=r30QUQ1x?wwVFk$v#3~n`9U{BDA>*?=G#e;u6aGkm_2dEfD8WDZB4$UCpEeWSKGas~=B9`Fah@nUQLaZCN( zjW}?qrfjW@VRk;>@$x(GO%d5>1%t2(YpF0%;opa+%2nChG1GNSWC_n8jY6ZO67f&= z{4DEwUDPMCO7LTFjFL*kZ>oGd9Wy*`SFr;4x;R||m56`l;=NymPJf!nig3Ol3K}XA zKXmlNcDAJ9osPxe^BgZy`R{j(>5e=RHj69^zCuu_s6_m+z|8U%^Wg(3Ru1QzqD?VW zBL1r{osAH)_68ygMKpRX_ zQ&&~;aMPnKmLR9y=_DxIp6#@b)C}k+DrPx?^0oPTg4|j+Xo0o>)T8z2i-nw_8lS2e z3U~vbMi3UTk|2lDp@rg9w^;%N1#-1qhbbO{?1}bd$T1Y8N`w%mWC)5U@hXBcHJQ4- zb=5EYv*lN1P;aoONvv2*84+Y8MzsV;hA9|{2ZG~xImVO*K^CJWttIY4MZG2HVL9Zs zy3;|k+|F}xr*zr%vGuU&&^Z!d)8JkzL4(XNvCupt9x{{UMobA2WY(J(5oAlWr9h|a z-T5#OtH(BMF78a9Y+NJbXulFahzi4#aB-Mof}ue^L29iUqD=9o6p0q}7)AvaDC754 emxgb1!0!#jg+I`ZMsL!m?u>L9$IRdK@b+JBxZpPc literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/host.cpp.0C1CF26FC798A71A.idx b/.cache/clangd/index/host.cpp.0C1CF26FC798A71A.idx new file mode 100644 index 0000000000000000000000000000000000000000..f29f9b635674a94d8aff6d76ac7ae5b91a940abe GIT binary patch literal 4080 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 literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/host.hpp.D6E6FF9FFAF571DF.idx b/.cache/clangd/index/host.hpp.D6E6FF9FFAF571DF.idx new file mode 100644 index 0000000000000000000000000000000000000000..3d38ae58573fb8663b45953337bb66f04bcd3460 GIT binary patch literal 1978 zcmYL~3s4hR6oxl9Kv=T7#0_~Y2}yV)5iJ55d;kV0N(BXxM{PtI5kWeF%3}noL#>5& zph{t+I<1(hMaPa-9jh`7Dle(jQmGHLRUczqo0? z@0>Vg(~eV>#kW$^??nw)Y`mmd5ofF__b_H|nHd+J-Du4+ow?h(%|F`d{FT+V<=2wV zD;rAM+he7FmnTXOHzcp#F+!!*70+k3kLTanR`W{K$=uacyi_q1Kopkdt!alY zI*pcpb56NI$0D^CG#Cb{WRz;cm2Wu=*VL;M#|~~*GRVb?Abl;qk&Ym6S#8n8wz2jz zERx}THKW!FJf!hX_3?r?5fUWQ5~S2c>gEUp`SyGfDY72wYKz;m=&TGOe1g`johzIW zRS`Gveb@LB25F!IAB#_fBM3YuxSzW)yXppurr>;z;dBCDkuh$|8`{24hTJjNm^D^` zr)lZ+^zkRHG9<@b&d5Clp6+*hY3;2)K4uUL_v>NiJ^otYcUv53R@Dn>P# zzlIu_f3c&MV~`W%>n-~Ejv(Y`rX@W(Vtjf@hCFb-f>BK7SM~cR4G)iMRY-@qJ8~Bb z`TK^slYLF=hLuQ!IgMx+f!kZU{F@iG6w8npbCzK_fgf5QbosBMIXf8S4E1?iydxb! z;6IeVjOShrH8My6++Z<8I)cEPs`lFxJpajOkOa8VVhnQxfp_|BUH39aQ^z1BaFfLp z<_H4s{?RkIqxbSCgH*uH7PHk61U`~>r0>t&5eW?P1ny_?3wH#87i47@dW$EOEFv8W zmh62mm>Ftk#T3b!*mo#WZk7j7q{6HSz?v4hIkfCLHfU=~%qe!FNIINeK#>f~cv7T^ zHYq65Oq&&0<8U&s?Wv({wq`@7!5Q|ipwnT05M!Z8olfTiS<_8{kTu;Lh?OsXt9aN9 zZ-pY=#qN^Ob(i8oZVv226sZnWLoOH0&Bi`}TX_9r*+Y@M=CR6w^6HK`SMfM^B>P)< zI+~@`6zMJTrYX`#;zK8s3(x0e$*SQl4XXj9(QAwl<1~pBskLh10rj+APLT%MAWunP z&G&1=okdW;L`P$*ktH-ygY>>Jm2FdQ#ZQ| z4p+`phEk-;q6&u^=BOi}hIw2RwuneX^48cHF{4FnTh$EhRdPxL?ANG#cGq37x^;S6+n4QU=zTScL3HrEP28A{?uH(JIKR{FW6TJ`cWBG!Gl50&n51vFL;?P zrEMTHBLhe$*Li`=45n!yGlO{=wg()=d*k1eubw~etXam(elGhiyoh=7Xm|zl6wyRM zR&ECWn_gIuS(waE-1zWzxZ(*xP?J;AOZxD;pv>zHF0K^KNZkl#lJWn?{|_mi5X66^ CzWHhZ literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/idle_inhibitor.cpp.3D718BD05B870FA9.idx b/.cache/clangd/index/idle_inhibitor.cpp.3D718BD05B870FA9.idx new file mode 100644 index 0000000000000000000000000000000000000000..37ee31cc035a559a9c6e96c383fc26aa27433d0d GIT binary patch literal 2398 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 CN$E-e literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/ipc.hpp.804BDBBDF260032D.idx b/.cache/clangd/index/ipc.hpp.804BDBBDF260032D.idx new file mode 100644 index 0000000000000000000000000000000000000000..b15922d2a14892ab203b9d98ea7b3b522bc87507 GIT binary patch literal 1498 zcmYk6e@xV69LGQRcz4_#cRY8;_uzozqy;H0H)1qutmtMUV2*_F7s)TZzzkh?SiqJ* z<-VIT6gi9YlmKABkGt5lH(3F&odA?HJJUB;4@XFgX)|3nPS?E~pLVDI z;L)r?-T4PEJpNOCTaIV`TKVOkr`9dlBStReP1jUaEq$`2k9pJY!+jZw<=VvO@4}Ax z!ER;R2G0)`uTG`&?OHolS!-W9xQTvMsVS6JB5k+46`J6zMD5y@D+!)!t>1XEh9j@; z`8CF5*rnK9+U%;zZHcCPlWgzb%e{YPq-=B~s<6A@-0BYo6XGJxyW1K=YxTZ~tAj^k z&gK2`+Rs_{w8ys;jMUtZIDMw~UqzHYBX%ZwrnBJ4d&_6H_c3lc_Rq&#G21fEzkcJt4vXDFzVuoA18hwO|; zzW>-!1$R3s1R`M|1``k28Bqm|O(D-dIz%A|2@TOu9x~#I1CIHADIu8x{yeLV*aCUT zo)Y)4V!oj{=WPnBkO(7THXbs)plEA3I!b!!6ewi zLq=qTec`>CnQ)#0MZ%x>Qy!f7|JJvv=}^k5u}u{GkDQJ-h zC81^>vZplm1)W%3lQ2gi0Es{nXyn0(FuqIciuY`G_{Mq)CL|;xQ64g)cV9D1F87sE zFe0HPS`!c1_vqgi??|@$KTQE&TWbgjG4haoj~j*C{=RrUGM2J8*-8mD@{pY|(y>46 zR@3h$6@((8R4FYyIDs!eS~xM+LDF3Rcqo{W&=Fk#57`;B7hBUGbdDdVAR*yL{3ISS z!sUF`y#xP4g!2j=cU=gMmDw$9#>!L{>SATy3Qw^zNrjYHnUTUktV}9;a0@FF zONfM(StP8%%9Ig`U}b&?AFwhR#Q0d*@?vSMY-TYlR<^0w5Gxx{42G4hH4xrj@Z!nm zrmzwXF^jRVvZcf_SlKLM2CQrYapzdsg@eoadLHftZr5%%dW$=}QLb$1S$ud1;6E}e BgHr$i literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/item.cpp.BDF1AC58410539C1.idx b/.cache/clangd/index/item.cpp.BDF1AC58410539C1.idx new file mode 100644 index 0000000000000000000000000000000000000000..cc3ededd68a1ae68fd692b777a7332dfadf756e5 GIT binary patch literal 7280 zcmZ{I30RHW7x&rA=~U;uoz6L(PIXFing`93N)xFoR|C4f*IK`|*WOe8e0^gzSS+tO zeyQ;>i)XW0ES3WPrz}pMPq6bup2bQnTp2Pu@rk40W8mRX=hwR{#$@)#m-ilG>z}@r z$ri?*{d7H9G)gjA!->xu`shHW8YP)#u1iboOWUK?CHK_(twNCFHu+cP$BzroXblGP z)h0iyP8s_5xb%eV`$c{KyuY`qV95W%@Fp9B?gLNL?D{?q$#!bV6pwD|8*WhV(R6?s9F#Kx08;Rf|)Z*Q2EwHp>%S0?VD2)?E4USJlOI3eYl5c-)XrMHX9Hi}(|WL3^TWN!jEWY8FAulxy4`&H(YdyohRWU?gSX8` z-1U6QQkQ(RJD555<*Qj8sn!spubS;S&zIA0);IJ|#FZe~t&Xp!Wi9TWA9Cqh!;>(x z`gLngZcni_FHOo#xj+9w!47`OvUs%@b_wd;wlYs@4TM>CffiQ^k`1ySui9GEck;KG zt)}O@<%6yp?DCG8EiIq2`32qN{L|VAuHD<;Scg3=OgxZ0yPkJKyZ^SwqO69^iP;&c z<@+bUTAm?rwdS+FWC(vt4f-%D?zM8y#(DR8bb9$q7oUvsRE>RK5gKg1|J}!rBH7H4 znxOn`sh2kID!KEE+p?8|YXVIgN+K@XBrWuKA9pw5!}ip8+o_Yw4%*sP@455KbT6uX z+(EU3Sx;nU)pT|~-v&B=BwV^5p`3QRc1%TosM4p~(Y~kp4fN9b{@8LZ(D!9v)Sj3| z@4cr|YOcCzg$0Oy+inmt=z)c!-5=P zgt#)G%{+g{9UV%hDUBcWeAz+O%r@_np7|zo9lJ|^nRJ0w9;%)^Gvr8%pJH|SfS_<~ z=0@{#&6BQhkK8zS-Ohhz(jL8q20?S{3RE`EXkLCkG&ni8Xy~-C*{py)^qxg39vGH7 z-u$py(s!|@-t*d@Gau@yJoDZ+AnM%U64kEdTs^R5wC&zILu&W)o3slCSxw=ryP>Ai zSMrbe^)fRSU8%^A5d}F!c@1&f)2;ijDR)Lc+waUc+MiPKjjyCh+x0ptB`rSc46s=8 z!Fz)F&*Rz!upo*>E6OS=eIqOulQQs6vARZT(Rtci0P#y$bOqs65T$SjSqDXy+;<7# zMV8I0C2vawFc&3ugZ6GP4|mmYH6D@BY?&FKVp5$XfSD*!N3`pRdAN&)%l{-y1}AI? z`*))+#Y$MrqH76NOSHZ>BbwOyeU_>6-smZSIngXyPF7Cg8yWc?w)P_RlgA&&B`_UV z(dX!M!-XK^jA#*i>Z8V?qOg7e%*XF7z-s|XxVwhC;fTb7W?k#$jW3T2U?ECW1FssC z!re67^hYF;;+`wj+vv25APyy}fL8_5@NpXBOh+VE=LMJUShM+r0FqE5f)^nPx0SUO zjeK8g^gMF0%`$fd)(qUKuDY(}H!`w|(zrglg#YF`2V!PVqd62u`5PJeeqtsyzx>(a z_00EBnoseSzmbvemsW+otqZQ1i&jE^N@OJp-^j@KYmWCLliSn71(1mP6%k$$(F?bi zwbvTausTmWif1snkz&Q7hBIJ>!Z$K9L+!+Sh2FOOL;)rn$bUoIhbMb~}lvljzGDcLcB4 zSLlR{baA?#Y}6MEPu4~uo1%Xu)UQN9(K&?5VcOG#I?c3a2z7=CWOq#%%YS}VBumj4 zHo6qr*QAJ8Q5f@_IzmzOO(MKWR4Dp0QT$AlDMSlrHz5Bk$ejhg{N>2@S4kIt$7Mx< zqG{ZtZ*IEo9Dat~mqh+05%S*LRNEh=;)9H0qEbwx3J12y_E-P?0vYw7Q4jk34~Kkh z-G^@?ql6fj5VIff1&a3b^_$H7j$mQB%jTw?9xkIOI%Gyj1VwKp%3FyVvk%8J#PtWH zaa1mdazTsx9oI?+@`g>_J|4jNzY@8xM53Izd)N7s&Y!sy&DY=?QnaGBqA5j7q!I&) z_NKgXuQS9mv?zL};!G(;M>s}!G0IyN6Bmj;OsK<*HI5O}W5ix^Z|pKV@rrIXo3^sD zvSrgwdQOIHx{xRq5+yeM4>A6Sn5f5jC0vf>g`na)h-3#bq3BAYT}f;y`W8rUfrZ9E z*y1fcPqPJVI!Yl*kxkDL&yld{x#GDttFJY3?{pQ-3=JmJ;3e(t`S)GDRjK~gn{<}_zwW5>jtVDaKav-dO%?0d?l<> zJ6c+N;FvD)D6UhqR7pQkV;6h8X^CknRTTSAk3wV805~s{m0}4KmeCzXfDk zK;CG9(~M&iFRnrB*op0QjWhq;pR#`SvQcc>UeDf?O*`m0Sg`4IgLGT7)>qVEiRF2e ztOJWWaI*Mf>9yu3-37?FO1M{vs-;`|%K-O;edt9iBP&bXhOVFS*j+j`W2a3mK`A4S zk(yojzGS=Gy%VupPoSRg?UtX{{AG5d3);b-?~kU6bc}RHIwf){MaOVr&0cmL7l<_zdIou5Xg|U8Yu+zsiV#>90tGmsu zuS}Z*+#FD3(w1BY9z z!EW(fdGuQVKLFPcqJj`7Ayf#`JmBYnlH<*7FUr8ES%#uHh8!!3mgmWfG3}Z1G5M$} zs3KUU3Q~#F)@W6W(B=Q&)bEJJJL2dPoA+{uOlBD}Or@sUE^E`z_=UUgKtsA2x!Ev2 zw=W{&$4xG2A5hW5(ucOBEG6UO(=WL{J$)Cuo~EAO;|@H!G`Q!d4cNU(EUpqew-QU~ z@s2@TJlbv&-c5pu?lY19OcdPu2i$HXy&Ol_^eNz+0)cyGPj%xxl8-}MVN5F+x;G4V ztq|>rLmOTK?jDyzcu=V|PT z@#7=%5wmGOfu9JYNR*Dh5m>tj;uwL2cw{5Cs8WJhMqnK!i1PIyS`R3<35+&@3Ddf5 z0uMGOMYU`|gcrc*0?=a9dx6>uIIalPiWolb;}qa3r$PBNAo|aN;yJ+Va2_P*L6wb= zq!5*Cgd`VH$wo+W5tW|8`zvdP99JV|%fPS<>?yh&49WrhRRMYxVC~Dh)3$e3$SbrB zs=bTweO-1X0+F~NO)K)WF#=VA6#Cds81wYhTDjywD#*!r#;%L&e|Ae3rPauPHcm*`ywqlwMM(uY}Xy|`XGfp#WsJtmrui9SWYA{^A)|IzGeWA$_< zV>GpbdMoHKty?R22U-?fGh6p}0`A1m%Fkg+r1Qi#Myhfc-zzyQ5jd-OtMEK#u+OY1 zdlDo;@;+7ZF@hWnevUl{v%S1j9u?&~^HFJ44OLx?Zw)C@eThCQsBf;1!5gg`ZG=$P zh(Z25t$BFp&)1$mhN9#3;*BXf$uwy!MK3X5f|6+#X}Hu%nQ((YBzaGto#u^uIY@X1i8xG7b?|H6oEBsZ zld;3Z{YULjxZl!l*aLm7qK%a@xZ9~JQ&HIsL}dfPwv4EhG41c5^gF1A(`ywzZ5*eJ z3GoJ~-T-YjW(r;OJ4boKy}itfQpE)G~SzCKSDssP81W z`C_6|Owbe+M7x4u9aKR)D~KPhFRp8PJ#{}S+6sQHFlko0+1>b)O}V&7Yp_O$IqNxF zMyqsJEoHyoiBd~AOVnbP4E>^Z%CHB!9Ynr^XvEyJG~M&%-E;@KOAr&+LGwE3QgjX2*MRen+Z1rW zU!|DS$GHytk`kiAxWmfRaVjgy${;D#ty!bKbqJGPx_-I=Q^j+zpikyU{QZ}UtTIYj zYFL^l=caGIb6iV;$DaYm08Psra+uCt1H3Vvy9Z6cbnYI4G}0&XCkB9;Sp*|>3(?%d zv^8K*1Li3`^EE=ZZkUQX=YSvw5DdA%&t+<+9l+fI3Tc18OyB$Og?qSY7m@2C%F6~6 zvQ~9e-N6x7_EvbxI~hA6;tPp#A<jGXa&&1?^lg z&dTDfb{K!)FEp^Xs`qF%R_3aQiB48w!feNQs4%(`5m*I=RbWBU7s2!*SpUCJ%eg+K(%9^? zJdW%HK__T$8G9|+ul&wBWb7mgJ25>*9<%)YkAcO=uvN1iox8?SSKd!!FY3yqDfYJn zm3ycEP)4YP3ED)9MC;%8EVtQs`En+9^?mdw<>}s3GrqijJPr|Ah%Avhi(K*+{XOV& zJLNnwO(|2XI?W_zD%&+@i)fzAA+%c}ClQ^V4+{B!UMm200aI5LfC$ehCK&iTKyCZ4 zXS|-iz37Ce!+!~*h%+&8-}Js`$jAV32B_`}44W5J_c{$V5$TGI56Ex%yye=v8Q5(g z&_EQ6<+3EHdG{6};~jB+M>h ziSoue#)f|;2gyAP$#O=A_=tTl?cix!N_0+EeUSUj=p$1-%;U`Com%ze(7VNT?WomN zVsw?5ojMTv>#79RL1g^5!E)u-Q7b#`X5#=nZ;QbA%rAh=`^wAcEtO&;h@2K{V$3}=k+>V_>V4LYS)aTiIPB$Xd;AGn7?Vp>SNxZfW@ zY8FXuXV0s^Y6aEc+yIr@(F+Er9@}>x8N)&rn$^^3&5;^xvCX_Ljic)v@qtVwhX+i%!{4j*oHXdQhnc^{yAwR=ygaz=IS5i$&;qP<=4tp7Qg| zJ+m=88*_{?JEqH}qn>*Ku>NEMP7&)*>U$lHw_xC5{rPC8fBlJLXI9`Ws@AFwk97kK zy{pwdQOP{;%mc5-g_nDF^f@`Dij45WzL9U!BW-EYG0XXUbC_P|mlWq`pGevO^2zx;P$72~9C6F74 zmEB3gJxP?g-`~xizDvJ7L7^)e)u{oC8n9+sml|;YYdE%j!S=B>xDPDBH^HRd*jK%e ze0F;w<1JBrON@G#wKvV&)5IiR3(7*V_snzg6{B(Z@`aBRW2%Vx%UicrWV@b?M#e(U zLd92N+r0yaSWJ}?Nkt-}FA(kpqWEf-+FgCaV<%8*Co$MbOkW2+3@DXT>_vvPp0#oR zoY1g1_v-a%!2fdSJGYAB5~YLVaUQ$_>}9UGSnHnyop+CqiVQY|Y{KNsfSdYuf5ijd zH{fSH;QfMv@qqUW3I3$(HsR^4%WrZ1$Hee4vHWEH*BYftn28L$gd8P$pIS@|sW$>X zGS-3OI*|NZDgCMO<1bf`k;X}retGfaBJawVrKkbkHckVg6K@&kLFdcgJI3&it~13C zwZy)bc@lX@sE0%}B#Cb=JhJT^ZlajD6_Y7LZI*&Z4k-*ybtdUd9`yxZ6)iT@N6$qGyy={R(X8Z{xY^7Ld`fb3iVO22f+7F? zMgI7~B6N=BOsyf4oR{qIS&*+Z Xm&2A9D^5`n351hV0)l?}ne~4FBYGur literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/item.hpp.CF2C10DA19A462FB.idx b/.cache/clangd/index/item.hpp.CF2C10DA19A462FB.idx new file mode 100644 index 0000000000000000000000000000000000000000..561786e2714d5bd34cb93de1f1ea5eadb1321955 GIT binary patch literal 3008 zcmYL~2~<;88pmHQ;0uzxyu<{^LLOO20>?|wHoH~0K9 zEpx(zFMS9ieL?2ZMY$zTPl6!C@N$(Dzw?8DAX4Ftr5o#~PhN95kiOkLbeF#Wv?1rx zt5o*xuXetFFmhF6-$Q46g8Es{PyK@Pr|+MeVf1NJ_KOCFmnF~%j~gpr=z8#gYHZ`YqQpGIS_U8YZ4o+AdHKnKh+?BS>Z6CdvOg|OwPwhW7 z@LOB>-9wF{48N`gy0f>Y{L!;n`EO);n%QNBlTkSGfOq_LR-5 zde+D<+%1{^^yb@h*M)ZM3tw{nKy!&F`Rs9{>cQ=SO<$yaFu8rbGq)+esq|ccs^ICx z{H)cLe=AnD3}q(Vl}O4eX7}9JH}u79&mXr(Q$@9OR#cpO_txFZc^6jx}KM zPPb}5iT6#;>NOWxm!=xt*r+=7%{DJZso%Z;MSz!T>Na_wE$ofP2ff~{^0g~_j(`5k zSjTT0{}6pV|I_xxBh|}i&HT_he%HV$XO8QgjKTkDYkzL7j&{}T&Pcg1oYlKEPUsr z1z)vMDAG!Z({<^QT)279+(oXClSMT0!TmOk&E2nmA)2y$_H{XhNa$D7YJV>He)BZn zHl;_zLJExqo~lbVbHQ^{$^!p-=h8B zuA|T>=ugw7g>k|29KY+w-}U_UpA_-{9>fGibHVex&!1>^Y|eT>BNblXp>ddbzOY*# zUDkDPFO3YCCu@?8JTIt~Fk@G^S}0_M^(~CWzy;3>2el2Q*&_%1P%Lm6l6i2!^P>Da zW6oK1y)tCN>nCZF#`3&)UFE8adl_E}c|pINlKXPO^QwmFJ3m{tY9Eb4aeoXMBjfpp zpPccC|6MvnAvN^t7@dU+p0C$BW!XMnJ1C?9u4nWiT=2ZbxAS>@-=QlAp{SR4UMyCN zwfF`R`;QL^*IJ(RQ79bx8HO=(!S^4&{14;pEwBBBLSeuI=m1|Xc>d+Md&1qz5>qH7 z1Rl%;Te#qP$I3My1YJ;dP{;z@$QUEJ;CW}lmA8s}E9cQD7=QmbGLGT-nT$&t$H!2G zGz!7oN?N5n?O;trJg#zI7{b)ZW7d-Eo*j&)x+%T6y zqk*evm68jdpZDtA!>C_;Pa!?wp+{zVRjVxT{e3AAv*_dmYYA`7aUQAeR5;0j8i7pTKfT~Yp3e*@6Eq2t*tLSuoMW|rsuh-E zm5NOYl+`E}CzPx;u_rxW`cWii9U~IUJY=LuoD`ZAi8TrHSw~_kLdhx-OAt!dfN_O? zjjhkMz6Kj}SR8S->dM2J^BkWcI1r;X0uCfPE(v=PT39J&mYnX67}_-oT0+PWA8bXS ztP)@Me&zV0Tza(xHYSt$Lz<*;q;gU&7Ks(40#Z$?AvL51GJp(#WJm^5N9rJrq!BWR z41zR~CP*`BhP03tNPDc^Ha*3*EY0;HrGKZQArHg!f=@E$;@kt zxW3jTn&$yO1QTNtiQ_f#2FT?2SFn#^=d6seexYRDn|mo@Y}3f&*|2P?DwVOlH-B zWdbE@66_8rS#c1>x%p1^Kf+a<<66!RXf|FxQam6Ck$X7CJ(RhJ3ipt54<+uQ+&vVp a%)Q!|y)|doXb~l$rLr+{g)iaj=KlxF3+n3t literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/json.hpp.6C08A0DAD19BC4D8.idx b/.cache/clangd/index/json.hpp.6C08A0DAD19BC4D8.idx new file mode 100644 index 0000000000000000000000000000000000000000..6e8fac2aacf1fb7814ad2670445d32155d035b25 GIT binary patch literal 750 zcmWIYbaQ*g#K7R3;#rZKT9U}Zz`(!@#Kk2=nfX9^5fE3*iS0Yc=U^b<^1b^_t^L81 zX9K%LwXd2*_wM*nrqyKOmv--rgXG@TJ#JwclW)x1+UTewtkhSR_GPY%X~gWcrd^M$ zW>+2C(sA@d`ZC7_kS3Y)SV`5}uU}j@y69f|soDg|NW=7}V z?G_VsFLH`8F#=6sXJY386L1syCe-@mR+_#QXW{_Li!zBag9*6&SrN`}duJt05MW{j z%5#cvN`eWvd{JszaWf;(DQng?1imlOX5?WOuorNKIh=`yna`NdnhWe~dA>%=PL4AV zfocRL1=V1VXXXMs8sab>W>IEQUfYU@=mgQ{CmC6oxdgaGV4h&)0z2OQ-L0Uz;a9SO z=5X_J3wc~wEtUJ@ax_q}popM&FsJL@+*E-+pw*nJoZ39h{G9y!l^Nw>`;$7h0@d*8 z@EO5;&Bz4y?c{mY#$5*vw1TwoaSHP=b8&I;PZe($bF34o18U*d;n$y5rL7kt_$UEr zDVH>t+U(pdM<1|nI11$Q+30_s50K)@6hc0gx?0`B?)#x-1O z7v2E12#5>FJT+kb!p<+=4Kjg~PxxhofyArJB6=XM6ral1+?!F!o2SfXVqxat3I z7UCA-|JC`a@15Q)f1r~DLk!ECJfTkFbFaUCG!fXHl literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/language.cpp.7CFC0E2AB711785B.idx b/.cache/clangd/index/language.cpp.7CFC0E2AB711785B.idx new file mode 100644 index 0000000000000000000000000000000000000000..6d439f1fe050c8b1c0e51815fc17816cbaffeec3 GIT binary patch literal 2412 zcmX|B2{@Gd8Xsf6S-;sC%ot;a!I%w`7-MW@Y?DecUn$9w(jrUuNLQ#-Ze^*?J(1+N zm8g_+RVZaCI&KaU&81FGt|KWOJ(i^9{-@`u?|J5Z=6&D)_j{M$@Bf7bX*6*J6lzIa zQ2O@xw2c@P3PlFL)U=c>HpVEF6&{63FU<_^-7)B7(p9O=9KX<+{PR$?|BD<(pN2#T zEX)}A90=%B z&NfAVz63ozwA<6S<@PaNf_JU=x(a;9@&|K~dLFhQ%88OJFKcKU&C>5VrF~ZP_UGt< z7W7@Fc5Lrak7UdGD1F|TEMrF-q2xgCyDO~^_Gnge?j7lSLAsmM*1X{beYUN)Ct!c% zv3skYP{K2asVbQ0l@zjdIvK?OQ6V6>e)%f|* zQ`rc+e{HTw2YyR^dpR&q|3tAjb*+Dx_JPF}47X}_q z8&%!t2~6_s#wQfp-8sw5)2C!mE*ubV!BCgU8Y}$<>QB8J8}|BiY2u!_&``UH zkS2Eb{WC_=ce~!UZg?@%8VLRR*jRiwbi1>UlOiI3nkYb_2&lSx?a~gNa~9$ z_PdOp7wk;#flri>61f@no`)JwjPkZ#HZ^;g)3bWuL;G#LMn3C1)!{hQ>NYF6SU53K z&{P}e)p>Dm1-H-alFXs%RDYRYACI>%a>09Y_U5Q_Z*smezt2_~dMl};_A~lSO!;9{ z>hA3^+2GEoyN?Gx4O>@1L$8ZMA#PMRQympYC8O|$O9h^|k47C~EZ_gp&}%`SMP-@j zm^dcDsZbg1@oQ5g-o{A%>2OCKJEsb53$5PdNSgI}IHP@*=8;rDNb2l<)bJ z_)V!82!%4<)Lr*pT1`j8h!Ufuz=$`-n?inS5kJEFCCC_qSkf%%7=&xeWnmD$6`x1d zo^ALq=S>I}MsR2xuy`~cSOS^=ED=ov7DmIsQm_;vJxg`;w-O(fF^tgcXpS%l$wdpu_84~=_WfGf5TTUl8YT~X%S z5&#Yp&BVZn4aNqPaK<=eZKidyH=FkN`f;nWVs*xepf9 zh(L;?;JCqvrGupeMz~V0vqB6zK=_boP+Gti2w_BSB^NE8$)9#j+hk~!Mximm$gq$O zMuru1^#hbIV}Aa$5eAVkCG2ksFd}}X-|u|;?x6-=Fc_IaqObxc2g9D}9&ZJ%JM2ym z88rRZ<%1Djz*SO}Ol=SCd63`o!@yMuRH9V`|EBHnw0z(~R*-E((%FQO`BqoZm^ss& z4Sy}S{+d3{d25&+0-Q1}O#r9nTnoUdkZ*@Uq*N&lgUAFjn`j5py`_>vVc{~}wF{fV+YihndW=Yn$3Vn_ueY$BTqxTA2GCwI;+ z_z$Eu81^rf$ch_T`Mg5aIOvl|C2~vJa?f--4R?a9*jj8`%F}rW3Ki=?R!k5x&k@$# zxMB6r9so-5f_#V?_!nXn~VxZA$U>6QdwN;PO+}ZKGI@<#Stl2cjf&fFt4qRfLO?SZ0Z^J8FDC!hxWsFnGj~1N@5B@(41oqxR7up*8PjuT)Ce3E)l%wNA#ohFQKOo zw*F9z18YP!5!=zVu8*@kO){e$c;RZq;zh+KNDqu6`F%PA`wa? zLr13N8M_*?4IJ6C6yUr_4DAOd1&1llCZxU((g09#z$~ zVy;nY!kzLfn{S>~+;U-SzU$PBZ;G^Y{|4}=`-DdYuz&Txlk{pn}o20IGAAI0C^DzY|l^fxDyn! zNPvl75F*0H&(6;amk-OIpZ@sgAyYmkKA?UvVKFH%0hdqt!+1PM%<+i;6Aw(kFuO1h zTt0K_?2XUQ_LqqyAU5-eoKmgQOK;&?R-pJK>eb^q7q;NE`RKF#lLlHcWCo5aRcSWg~cVo1YG{A zvtY%oL*+BsnHU8a*tpra`M?ANCnS6r*%*sb(~6CdLXwdS9D=fwl3dDn)fqAJu!*ya z^QhXc?vAc}>K|ytDby0L7`|jf) z7fNu;!NQ7}3mis36M!z^VdG=wR literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/linux.cpp.AA11E43948BF7636.idx b/.cache/clangd/index/linux.cpp.AA11E43948BF7636.idx new file mode 100644 index 0000000000000000000000000000000000000000..0d5bb13a714a3438af20f06f58ac7e2065252eda GIT binary patch literal 1320 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 KZuIlo1pNacCRURG literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/main.cpp.9D6EE073CE3F67E9.idx b/.cache/clangd/index/main.cpp.9D6EE073CE3F67E9.idx new file mode 100644 index 0000000000000000000000000000000000000000..986d6c37ddc99c10c7655b0e407765630e8d5417 GIT binary patch literal 2136 zcmYL~2Uru?7RQH>NJ1v0fguSgfK(AefMDnd2}y)V5r-OSL5eI0ieh<+C>B%@WcR6v zyQ~DkMMaQ~f)#iDD0V~zL1cxMeTc9U72k#TJ(=&D^PS)P?>TesoO|yCO2uM-EChMQ zNw=jaH%Fr(2qJ(xV{>|;XlS&`Cy>lY<$;I2C*wKem`vh8UumvY)_cK@xe<<^uvV_*8#J`s2Aaz*L* zr%lAEHpS(T?Z+SH84qOUC|c{z+_f%op5jJa57uwamp{Ywj@8Zno;=w8&y#!hlY8Gi z%Mfes_r~|*CyEkz>l;gB9e0%U^ts4O&el-Xv48Iq6NmqEqUo3_+r9Q>+Gb32BuBiyu|m#O2)3Xl);_=)7;@Z62vurYDbpm4Sv{Y2&TH^Dai;|Rk-ID zVUL~Ho;U2IcdnP~(gMtf#)ZcpxZdmTfXN+Kqgpy|kI_fAD75Fi)2*s91Z&1+$W^lb zAF+oH{DhWDJ+qGo7gJD3H?6Ljy^7E z6F%vESvS_`Zl^M734Ks_Y3d{UAJ6hHQQf7nPU<)E{NRDgH}upc?;V{~l7E+LpdR<= zC8<(H&!}a~w3PKhe9Y!$=;LpTa$W;R|Yn|8fj~KHAj~}(yY$z3pr^KPA}VCB$Jwa zGre@)#4Uk(fnTxnvwFkCN8w#<0WEP_;~SH#+}B(3(BIFp9|`QtnM^nwg{1QB6!9dXbHUrl|`syEE zndyNYw;t#?GEQ&7Eb84BS0(1f9WbN-x(F@8E|~9n{@1|H+>E$Z7>WV9HO6}Bg88lw zG*li)dU#nxfTDno#bc=p=DVJ*jL*mhyBu}K?lHPAsz?Jy7$k-s>Y~4I();5309kC7 zv34-g&GPhe96&i$&cqA%eaL1$T7iNQB8rHI5k88KC-ny%XcU~v*Mt!tBOg;3k(x=D z!-&6y{|fSM=ObOGJe)yzI3t`*acb>$Jwj{;7(fhQ(gd@V7g@J60dn=ZET$KaNlB9| z0Z7rNkeTW$EqS5tTLDJWBDt)>81Jpk|KbD0VzAomf`ZoHBdmxTXoMwXIUC00M?_VH zbb}gnEp_=YA`}VzV8p}Q!`CeN0x8zTCJqEjND|ue_wg#*PwxoKpG^mr&$dG&93jUkr724%_+Vx*$YVe?prxv+ zUWZ~M)&X=yx#IUS?5YfWYBT2h$nfEUK60ccppS5VIw&0ijM$=V3DtgXOu?3o1t3I5kWm|I%Slgv z+{pvzhIL!oI-;H|D!Tm^AP$4WbzFfgj{d|s3yLRFi3}K_O6vUqkNSKl1e2Fy;z)=!AB{!iXo@6FX?+Yvz56xe8RJuvPGfT+*`H{nWeQ z6^>X(+S|#d!R;xT)&SY2>=omk*Ihn%H;Vu=DNNez%hrmin&?E3kboj+!w3(>(^en) zaBRZ*`5F`&k>Os580{nN=V>7^60BImk7#-*T ztXHqs3JDF1hzwr`h0g2$yF&i&Kv3AC8@}j9EV_}4?z%-cHYIK&0&s0`u!awv!4x}- zcwUws%RTM6R;yO5v^5c!8ag_eSs1ff%iIi%T!r2o7i)8OJHCUB{+gvy+3G-v9)^m- b6LerLtfux7G)|Z3Pot2?@>t&>zX0gJ#?bcP literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/memory.hpp.220BFCF008454788.idx b/.cache/clangd/index/memory.hpp.220BFCF008454788.idx new file mode 100644 index 0000000000000000000000000000000000000000..a16e087593e14b38a14b55d1c49be96500af30d7 GIT binary patch literal 740 zcmWIYbaT7I#K7R3;#rZKT9U}Zz`(!@#Kk2=nOlH#Eh7U%#hl&=8~F|^@VNY(xz6J4 ziEHQ1-Z3m{67&$5z!)0&>#eKjl2uvl9&tJQH`l0FaZMCYoTJXlV8+&DvGWWEe~ep7 z!RIHd)ppz~RMF4%a(^LE`gMxpn(zIqvI^xkse2u9-srPp{}R*s8!tr&`I7rvdWtJ^lO6%xZt-fO`RlJnGXqFC*AsB*4TC)6d5aR0`8ycVzyyzD52A#h4gj@;ppD z9B}yyp$Yyuyqo0sn7DxEi;9WLf(f|%<>IjQaz-!Z*qIo47?`=(xOl(>11H3NjLeMp zp8LzkNeb`aW8wgsAZ#dX2`1ns6s4vW9|QUX=2J#aun%D#V`Kt*D45fAZ*HnU9}^EV zj|h(x53{h8uma3;KrJ9orCiX~xfrv9myw5AltWY$<~5)!$V-#wRU3C5IM51|<Ms0C;O4>K<_FDJ}DK$RfRJZ{fk*%`Q& z8EB3$yRb-6YEB|3UW$v7i`_vCXgq~({U%t<8 literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/mode.cpp.DEC43BA6A32D0056.idx b/.cache/clangd/index/mode.cpp.DEC43BA6A32D0056.idx new file mode 100644 index 0000000000000000000000000000000000000000..e7e0326f79eb056af44246c53a79b5ba56c0a454 GIT binary patch literal 2090 zcmX|B2~<;88V(^Zc?mBYgsd+K2_S?=K*C}GK}1AZB%%#@vWWs|1<@j?fC3c<*%X0s zBVy|U3aDtUbzzKRL90wbs-n0c3d2N&GFng>6zz@Y*n7_V&;9QA-~ayWTM`x;Du)S# zc`0Ez8L8PTNCX0b4!*4Hb*sddU<0_Ex_oWI+Cep^OCxxbxZrS?l&AZZK zi*h{==OmKuYZu{CRUoyk=TdH6AksqZFTSf5x@VT-q zx!v(`(V|;R|1re5^>JKE2@t2RU&UImb-(|+lK0H#@7ktho07afy&gUlSuG#f{Qp*a zZP(rVR~7|G(zR;I&ZS=MJFmKmH-FMUCB2Z%nCE#Ts4#wfdfGC#x?-D3j1JcYFHBp! z8=dI)_rF7_e-extp#bdCqg8|Ny{pTV$L=RZU8sq9)mMKffOqClL(QhB+UAyJ2JhV` z(;E24nT{hHso!UIo_glpUsQ8N-__~E>q^Uf$1RHJ;e6-|?lN8&$ zSLb>Q+g~*v{OVF;hM)+Y*wNw>30q|h+~3xyy?4o&Fcf>JcCylzu3j_Lg1t?MG8#YG zeeJZrC2YvWhn^=4*)BJoKfl+hp}4NU zAm51OK1&w$xAtD2e!Xw^YGaC{reLb{ef^n_DP0w151x-_yW#no^xBBzv&;We#U9?n zD1EcVtu%9>h_^|uhEgy89xbyvZE9XqN;tcx)8e9KOz)w_n^;w`S{)?)_GUzX>xo(A z>}jv)6E!&c8*-t~q z_`7^hakf+(N!;fhzu43_YY4iVP*>KyF(!T{GdM16Wbc?2EXC3*o;>)mKDb3w zICi}ndgz&7Y^bR*`2KNek#6(L@)-3A5^kMKpZN9J3&rVam~t*jjaVLaEmM8N+g2nlfIP>RPYd+$OgA$BpF$* zJ&=DedeYZ|g!9Gx8TJ!8x6EBZYrz$m1B)DI8h?n9H|dBZT*weINjS*#vW`C$D3b)*uWDRMP}vt_)&*9x#TzSD1}HN1LH&(NE(p_ zBtk}Lo*3c`!4XN|T~vZ9eBM+}cxUU)t}+-58;}#ko*mq9J@?T?X*ke9tPt*kv4>0g zb$8PNbVi)n5f5#ToY)rA1)zedu!-zp4TJ@2N&&>=m|`h)zA+<}RS6)(h0ui4eJLL4 zOZrG4Y9^mW!Ub%BHHeWXa5+~lZ8-f+ z_3a~>iRM}h`RJFf26Z&|Ph*qIA9;tZt3a($7u17 z_o!mRJ#YQR?*QaDay%YCTcfgh9(WDJLSxgc`}+naS2nlb1FS3T%6%%2bPDMZ1p^jk zp`79QDeUNElMp}{h3#JCzf?2&OOFC&t|J#4ol9K)_7R>6ppvc>zfFFuUTCL@0G%m> zg>+Cp7zI*FmRf;MBRd0$Vc1Nd47&Zx literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/mode.hpp.6A926FBEE534F2A9.idx b/.cache/clangd/index/mode.hpp.6A926FBEE534F2A9.idx new file mode 100644 index 0000000000000000000000000000000000000000..cf2c74c8b009180a3859096d38aff9992ed720cf GIT binary patch literal 888 zcmWIYbaN|UW?*nm@vO*AElFfyU|`?{;^LB`%vC^o4-G;Bo!yTJinZ z0XF00r)uk@rcD2|pyc6gPi>VW4I-UKKRu57?a}6afobwarw$8tb%`k_J3pR!eS)($ zd|TGR$1~kGwp$*PD?MGk^pw=crQvUz)`b~8YYjIE{F|KL`b8?+P%Pi_hraV!`J+#` z{1h$o3@)5tyYX#%M7Iqa$G?*N1p=0-p3GNP?Bvk-ExE{C;-Z_|m(}}gSNqQYeLXI% zd0tv^Wp0uZ(6!Reg11&i8~d{}G4eC8akFuAfe8jqkk=R(7}*##mQ`x;AJC5wVB!-1 zi!reAv-9&Za6nWr=-jz|#FVZ53?CDx00W!2u(&vwfXlZ}G<}*TfABsZ6E9F+R9I9B zOu*%r?_Vz)%4)?U#>5CSpO=Z34K9D~?iL-(FTS_MnFN9Q`Iz{a!313XW$h~qzPlaE z_?WnX@?yebl3)TZ|1J5Bg@=N_Hy;xhP+mk>L;_5}<^P(WF8vkvUq*n52WGzzyAU5- zz9==VSR5&&m?0s=!v=CC4;vpdAG_?NB$x7Cbw-RlY+~$UJgT;LiXLq zK?aI&OTogFkqI1@x4XaSSC#H;0Lls}3hBZ^6lfhNIAH+@Z*YAehiJ1QK8~kTt(^Uu$O>8wV3J3oAPV6G9mPPzTnx literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/mpd.cpp.7FCBEF52ABE61287.idx b/.cache/clangd/index/mpd.cpp.7FCBEF52ABE61287.idx new file mode 100644 index 0000000000000000000000000000000000000000..7d6d83705a258ce42ef152a027165062f9050ef8 GIT binary patch literal 6492 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 literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/network.cpp.109ECEBB28F3CA1E.idx b/.cache/clangd/index/network.cpp.109ECEBB28F3CA1E.idx new file mode 100644 index 0000000000000000000000000000000000000000..5f659f91839340819147bc27ba2dcb52d4f6e1b1 GIT binary patch literal 12826 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 S(viAaGWm$5!$u7cQ2RfNKn(Q& literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/network.hpp.959179E628BFA829.idx b/.cache/clangd/index/network.hpp.959179E628BFA829.idx new file mode 100644 index 0000000000000000000000000000000000000000..87fa996cefd4a53e6dc1c454aac85f53cd8b0e89 GIT binary patch literal 3296 zcmYM02~<;88pp#034xc#llNW%2?-EL*q1=q!WI^h#RbJytzxSPb@z}cF0ERpE(I4T zt_L{7P!~qgQ^(F&go;>ZP;^jwY8|(6FI8NMB5HAL=etkuOU}vv+%La-zqjP&cQY|J zJNq&vkz~%!UB0kn$xJ7SL?VZ`ZHaa6H3x|#7d}{Czhlza#n+;!pCS)ldK`Uk=jYPd zIce40{c;b_ipmk^YDRZ2wO(25!ynJz7-uOz5}cZP?$hVnMh(6?GNZZeXZKUPuA0Wz zHQdn-atGMzi5KbUTIsO1$l_nl{QKURMLQ}A3ld8Q`sHT&>)necENia*GHlMF2Pxwg zGar93SG)Fo-uK?J*htT3asBk*=0ktl67$)mptZrrJ!Wh_yteJp_9MMXYwq1oj@Y|> z;iC!GKPoJ#on_L1qTbb}pk4DXH=dlk@wTemr{})0yWq6-adC0^3`13d?}6(_xxov2 zip{pQ&bOQf$G)EV-xpJ_=A=y5CAf7Jv=$64QvPq3uA{BDJH>_%Ll%`-u}Bw>49G*UvH=Dl(rpEpl12#nZHAD5bBjBqU zEOBfmCCk5&IqTc=Y(Yu$t%nN7g75dYv_+i!+jp&3TT|TF2i&By>t_N&iw?!0_>@{YS| z`(~ZQwqoHdQ;!WN{h+MUKihp9+iuE2Sfb`eM zHC`fDAGmldRJ#6}2htO+m1~tE*KOHtb^QBc9|pM+9>qmzMXuL={3a=V&j61Q;VPxd zSL7il%Ove9@=IwH2IrSWXDNgbd2FSzKi;u#CXHf&TWAX>gvjH(j_PustQw|~JMct4 zQ7weX(@K9#>kb?Il0h!y_z_%$UgQ?frMl+Z`!X36O1ObD_=`N}VtcG}#ljT~iXuFi z3)YBy>(h3a{L4M>81aJX? zA}`?#H#}cI?O~8V;bB~u{SKEDmAs$5bs_hj1YVk@siStxRb6R|<`S;QBJ@OkN0)Kbcc^Y|N6P-)N)-oOK6sr%>M?;$Q$rNh{HN-&18d4}W z2j#d@@*qpyO`J) zt`u8$c5i6d57S%Za3}Lz@_35Pcgg38fng3dFA*-3ShU2i&=AX&=oBc{D6uC{tWF|J zD6uIwymKQ=#!lS$>YooLO?bJ^kz!TuDh0)=-PMqz(P$a5B+SHiBvN#6V6hCh{rQua z%8rip@bK^MV2D?s#6Ed2r#60aLu(^6)c9!vDOT&F z)f2bC31hJkl|YF-Vl7!P6aOc)S&MB|c;JoW?TaG=i9}-`df105`%q~gD(pi~`_Rii fSS18rqo?a@A2PgSI^xQJo literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/pulseaudio.cpp.33560C8DDD3A5AD3.idx b/.cache/clangd/index/pulseaudio.cpp.33560C8DDD3A5AD3.idx new file mode 100644 index 0000000000000000000000000000000000000000..a0d951ab1d34d5ca8ce517492c946b6e919fd9bd GIT binary patch literal 5832 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 U(BNx_3%EMEVN*jQL&vK87hG7Kh5!Hn literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/pulseaudio.hpp.C6D74738A7A6B198.idx b/.cache/clangd/index/pulseaudio.hpp.C6D74738A7A6B198.idx new file mode 100644 index 0000000000000000000000000000000000000000..40bf5907d709a90dfc20cedeb8f98395162dbfd0 GIT binary patch literal 2202 zcmYM04Nw$i7{~YCQ+7G_Ue4vXPwu!oj&Be26eWceNc>0>WXz95M-&;+69iJkPfSw* z5h2A93e8Hb{9uf+2m{nc63Hl2kRg+hAuU2CKm)O77vJS(_|HE3+vnL`xZg7@m>nHm z$WT<&>e-o&#Eg}rD2kH9PkKh$+Q|}%szMZ%S$eQAJVk0|-+w+K{?Nof9FEho&MEz) zX0}U;; zt{yDz{yo(kdw>g0DBQhvRr#aR{`P{RiT>#2o;dojKG+dkx8k>xQ7!+P!y>0H_&%ZS zq5aQ>`oi;Pwk@r`d#!9yL*!06rFv)e9kVZT|Xu zB~e}XXe6;xjEj?tLI}!vc)o;@*ts&#FpHxaBX^i!!4{1W;)Kw*j6)qw)<%pxfCu0J ztq>v)-!`CbL`hW`8G+ld%~J@GNA2A|*mI(}Pk~&$hu?|ODRrJApRczxD*aL{7>$Ph zU>s}_LgXfc_9T`2VB`ec z2m81QA@YQ|ZN)nk;cjZ=L*`?Ir6Nz95+C!#SP+VlC-ev6Ko22AzP)Z5AD?U5YPkbWgrYD9i4CNdzScFqor#z4P^#=|Ux$iHf~=g#QOzl4z& za5FZ$3nB7KsZUN>(hsk3NKNLeuu3QLD-TK=j!%u9${`)$?$~{V*Cd5hCHLo^#7GMB zjT)m#2(ka_zWZy-v(7A2AO-2yDzzq&-%fjyAGT=AbNHh`zc=>Q2_f=dKF)XU+Up;L zksEMd?5h$&R{jqqiP`?r)TBq3am6~dq55YIbSY{cn=rzzQ;MwxZ+4uZ~45EV|gXv&7*%fd{eo>Is042W{ z$R?0T7=8l~@qzNz6VIXKB_~?LQT`!o|F;#7`)BIf;(Y%WFvNgOaz7$OaelrV+P*@=o3SBJG`x z^tU(QMlL!R6EO=e=CvXsLCIV6tL1d}vGymQz{T!C?qNhD7{%*DtbvmMIuS{rmp3FW zas5hu*QckgN{{0Yn6Pto6+3NbQ=ME`xwDL>Wc=CTj|({%{?Fo7#g3eH9yz2(4*v%d Cs1;-Y literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/sleeper_thread.hpp.B273FAC75439EB17.idx b/.cache/clangd/index/sleeper_thread.hpp.B273FAC75439EB17.idx new file mode 100644 index 0000000000000000000000000000000000000000..ee3351c34d12016680e3261376da49be2729a29e GIT binary patch literal 1672 zcmYL~3s4hR6oxl9H}9Ke6G%1*C~*@c5=ukEK%hh!jEN{uEme!v8c>UG30AR;#aCyn zW$L3^YjLdN6SXtgQAAs7u``H{qjoH`q7l^k>S(PU#bR4~cI}3p$)CIX-#z!-bH6h? zF3<0;lT*~lio7Lrr&mwI6h&#_7pktRyaNB1B^0%!p?>|jS*LTzs3-1U-m2XE;kKESld7a0<`y}wUG`)G-m{85!AVL(C zaW1;9Y~eo_jYwjoFpcOaK`13(3b+CX5A1uoJtvk%2>b#|0VhbrAN%{i`5J4glYHFtyF6=JZ%^(84QD-y@ z67e^bY`023DtkyHE%?Qj;vs@W{EZXObZ^WV0Xw9@=M)?xNW|Z>Y*Nd{OGPCtV!`(z zpHz^D-*oiZt0wkl{mTjyM4~V+5x@OR!pe~iX)QF;!25-kLaQJV|FQM!`;C8{TtFi! z_(hhYA%YC}q0?thevo&VK@9lmigb-25&ub}q3MzG@z z$K*j9g1*Jam%Sz>*cI!t66}fffEFqWNqp+&mg1D$AjI@qyoubSrlb0&yH>%iJ;olF zOqN{eQHHljFlGs>6;YI^1q8F@w?fY;dl9T{j`tsY)x*0tQ^sfK_YQ7wLlsXP78_vtpPr(UluY(GT7om>nUDZaxX3hAfCqZ(>DAjVxO&ba zj9r{70b>v6Noa_lkj1TYzYSTrG%f=itHxsxVTa6l()T?Yy<^JC{a0WP8_mK_^A-78 z5qJpBgMMh~?n-}o#sUbgXY@LZEySWdv}tOI*4NPs5BYKd05q#>{%lx@x9#j&*q5L2 zo5aR|v$mORg8=|j5~ypaD;bg*>Pc1$jnduT(|+ej;}HmDGuT*+lMG30&ji`^y0&s3 zgmT6>2a7!fC1P}piC~k~1VmXm>o6!(u00Q?jdhMAI7^-dCE}ax@&9dw)IvKEJPMCe xR!yHXjqjmQRe31D53ub<*AMFxA7YtIu28Bd_?C#5LL5+(a$u+$7|I5Q{{f$nonQa} literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/sndio.cpp.1174277772D16F52.idx b/.cache/clangd/index/sndio.cpp.1174277772D16F52.idx new file mode 100644 index 0000000000000000000000000000000000000000..dcbcf66a93e0bc7fd46a9b8fac102640380ab6aa GIT binary patch literal 3834 zcmYLL30PCd7S4nuKytGO5<=Js`wjsj$S$%dD2sAIP+644hz1l0B5I4;qM?dd73u;A zr6ROtsiM{Zu4qMgQmqS?;{HG_uUKrK_|D}O&G+TZ{4;0foSAdxKQ|^kG<1SRA_b?1 z7b-IHS5inM5)=M;`O2&uEfVRj4vAD)vparZ?Qhk@l3F!yQ7-;bs&6G$tj?zfk# zTO^Gw^}QjV9|(?99e=)ItlMV$iPHO5zi!Pr>GY;D|(;fhOrcTy^Yz-tSy$ z$@|^o{lv+DD)WhZM}G3H$%=P5^iygs)q2{__}$d7CNjGEl*B9aufNi~9^N+DF|lvx zz_Z$_JR76>fcO}fZ;My0B7LFC-}Q&ZGsBVEn-?nb%vV+jj(lQU8zbu8xTkz5)+&2h z#P1=ldxqrYm0fNN$1TmWm+$SC2J%0DF0UDxzi9Aj{qVs}1I_vcX{KM3WR3lo%{y0NB-wF~c*iAr8le>+;L zUg{Cq+8P}l!H_q+`|t1BS1Kjd&zw$Ly>v_q{r=kCJ-&~gTfD3cpS*h5T7B?YosV_% z=BTQ$dHnX$0l&aOCr8e6tp`V~N(}psaOy<+vRdq&ybEh%hIXRnPul~swClhaV(VBv@I-7yVv(D0aNu^V*#*`+aTv z?*sa7>}DQcF{bs6oh$#Bk=kPA1y_spc9U0*C4AOr{X`N`+ThpSq_}j97 z^DO2yJIQz3zy6iJDet2Gj_o6_HOw7fh83?pH1%qdRI0__GQ5VASENV{MI@5xf3P6K zf@WI|IX#nv7hy$$1eP|7P0}GAC;UELq;yXknz4t4X*nRhKa%NTh!(eCadp6QaAJkweaa z^_f^EFM+AeWPVs*Yo0r$ng8!v4tY7umm{nkJm6?^K6+5kZS@$)In5K2vp^$VJ6$IM zBV$@0c4*6Sy?)@*DQ}FF3LfyNJo=3I;KA6uT?MCZH7YpdG+1ATurkC?U~98kA9k3i zjG@#?22SXcmw<+iwhflRATzW-%qufi<;CfeNLs7<+ov4A;ZiW%o$QWbxQr|V=}Gnk z=}q>=7#@ASkNnNL5r*$a2K$i_!3#N7+#HN)da3Vj2gtl z@D4=lKuoSWeXmoZ*;&{@WF~Up6=pB(TYSS0pwd8T!spk=+rC@63ZOgFovZK0ym=?f z`aZyFWK@mJ_3yf>WP(j2WD4#@@zSB-a*A9>*kk$aUE7yof1e+{{>Z}^fK5oygbbYhZoOFGzxEjT=V{?-2Qjksc5&4x zIz_{)-@;&?G|vXZ^QHMV9#hX$!krGaur!z+%=XM(E!&;p9tE%s8MGm5uS^oTXJkqX zBJWIdhNxvnXD`9^lO zv)3Y0&RC7Ch&EJ>qKH%zcOdhaO+T*nztw9GD{u)ejn$oZPLaV;gT9T(2I8#JR>47w zwTqccHT&gGZ|qisrp!oYga1(*@MK~g1E3$N7 z5zUCdEGl&Q=|?x$0uOdS9i%nuf2*nF{WFnD!8qRa#?E8@KkZSi`vB-d0Lh%A3bN+Ij$G5waxZiJ+IC4sJgMruQS}ek8>3dc>?J z+6E+OK*ojrE}TxPgD2>l(ad;7n^s1xzqj}}*z%$KFjNm*0wveD#M_i|q=u?j%+EFt zox1}u^P+o!`*OORTO5{AS9@yYJ?NCkO5~e`SS0n!6+U25K~c~lu9RGmO0rUCn?Cu) z$X7=rL9-kglq2g|YKHyfW^zaRKkU3aakU}s3$rCK9KnhJ-bm&o3)KGg>PhdUS{8=W z#dH%4=ZpCug;XKzZbPyG`XN{iJQI7txLhm;nNCWF@pPSZh;k-16EuscMIg%%wG2U9 zj;Q5C+lHuZh(22fwCFQM0K;9$u3&vJeX)3N&MW5i+tsabDj%{ByxM4Hv;dNdj&my$ zuH35(@F#K>=i!Exhl|}m*Jyx)aT^yK*}ipe{+{=9-f5r;phh)f5v{u#c~F4QnAHRZ zYOFzg3ZyKv1F@=X>M|A4;VWUipR1qOY;8gGnZk0waQga-(x1oRR8q238^i5s_V76U zEd1b=2XTV*Fg(mU%;A9Zz{OsXl^ooSq(#CR;<0!UhG&p7SO?$ndzM?^M84#j<~r2O zQBV0k^ApCbv zVj{8#=*@s;0GDbcFan!qd^1QksYD8dYDcq!aX%wJGjP)^ObXudBVl#{Z2^qOvEm3% z4dQ|PmS9Ub;4eD^_N+v-N+L)th|_}L(z_6?i@+Mh(;$7~4e@%Aeq&m^V~c&5Gx#KO z7WsVLWH+v=<$VF?QVNv9?_Ozw#tw$Nfpac27s!&Mh;|e~+lJj-m}@eMt29lFN4wvaxOBJ1{2=TTEbr904B38MrUzr> z9SQ}v)w7j=G`Dr6;3}4iN5P9(#lq8Jin!J^;dAh>2AS6&>#os&rjp(YqBi}^HdLomHKVQw31ux2i^EuKS2}*a#_QLQrv^CJr_spM*;ad@9 zD?#r&5M>9^9zpygNK9Deoks?j6obJp9$kbaz^jmc6*9l#e$5w8=z9tSDt(o>?}RdG zz4n>Qa6bfbVfaS!MxBASfYmAfubH3|#0X*!dEzHKvL~_uZlrJI+|@rnt@1ZjL2CNh z`ZveeD4 zB%s1nVf*A^h`Oxz@piCCJfzvrC^(KlN5H24^CdO=?F4U-pqM}WUQ$my+(m{xI+36g znNAIOzaE?}+5iLf$ezU@~zDi5Vzgn?qiVpCeBazGf-FxcGQ9-#}~_>NC$J*e<|6 z(8JUr$kE$X>S<->HOJc4!q~{tPhvh-9%AC_WaIDdCUX`=>xV}~#)Ron`D6x@g=y<( W(Pt0 literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx b/.cache/clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx new file mode 100644 index 0000000000000000000000000000000000000000..a6d18d34376287f1e1ad737d131bb841036f3a23 GIT binary patch literal 1304 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

tu4dSZ;#O4U-L&~5c0|64 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 B9!mfK literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/taskbar.cpp.3B871EDA6D279756.idx b/.cache/clangd/index/taskbar.cpp.3B871EDA6D279756.idx new file mode 100644 index 0000000000000000000000000000000000000000..da30b7b2c157c04d7033cd7cef0ad65e3ca015fc GIT binary patch literal 12886 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 anU}Dhg`JIwg@Fwu1_A6a1_J{Vf(Zbi#?Pbx literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/tray.cpp.02A8D890AD31BCCD.idx b/.cache/clangd/index/tray.cpp.02A8D890AD31BCCD.idx new file mode 100644 index 0000000000000000000000000000000000000000..d907a6a2994853609beddb733ee264a4e73b4236 GIT binary patch literal 2114 zcmX|B4LDTk9v{cdIdjgO`8a0GFf+^yGa8K~bSFeo2qhn7hNQ&oh`2J^lyY^^E|%33 zd)NB7MITnN2$fbB)vX@Vx?8foLaUbAv3*dfbl>qjb)IMb&-~us|NWoe|Np+f6XNIN z<4Prw*2VgzC2CTm$s`hq4t~1Sl-&|z5(xraTKVCveMw~woXOBLS5reZ!>5L7C6hNaU#3mNFYPlnW>`IpY9sRg9r_Gnf!vT`4JS1YJx z{$BQuJ(9W$3h%oyyqp#O8E(w#BY7ol1GKEZ`*m-xy@!t)H(cF3V|zQ}(0sXnWNg{y z2QKyTOMm)L^K4wzmXpbjxg%uvG{4pJ3oSX;D*B41p|uC6V_F~ngLy0O8)bIwnD~jA zS7cUg?9RB+=~79@EH{2?nOWTUYSs1E0alaSeC#`MC)?(+lYT#?|JQq+zwMXb1ch&J zk|r+Qe&0VNVkW@#8QV^iy}c`;i6Tq)D=SH|&)YhocP6t>*bd~ke%<26|6xZuS^HzF z=lIN)n$D+TACYTW{|srW>enRytWvfO2KBCN&e$QaQ|*2^e=t{(^XGM4g!5QK!O+zK zrOWJ`zM?$R`EWb7{7nVCEPwXIljRG8P9eGZEx(vgcnXF6?CM_kn-sIi3Da#_rSi#= z)7j<283)=UUi92_ZPT4Ad^fXV*>4B@0xUngvV6T(^P%$xE&JELvs2}b)0O>J?7F^% zvBP<%!};PZNLxqUJMQ^`=w7P)LO~uDoM~}X9k4T z_G{XYan4=LJyjAH>tht1lFDDLiXZp9)9PMVYhx`-O8$Gz#ho&znuWXkK!w^A?>Cvb zbKZ`AiEzoWiYd9Cytjz<>(RZtgo9_!XV&H(t2q>NV^xdzUPl&+lLQNt=tIG}y2`tjB?+f;|Z`#|_c-}fOeD7Fz*cHES z#|4P?ri4k-9Z1}j2^|sF> zfalZrER_jjf`8`kY)ZUX@%*a^E))iM3QWONbchar=I7mQ9%r{f<}4@@@KTzTP%#lE z{WG7U`9e1Y9Bcf=-R3vTY6&A;&4idZ?PO4^`-TJz!qse;O~=(7Q;v|XmPI}FnUsSZ z2Et$xjk?T9be+8sS&hI5X1@P%b7#WkM}Xy^9FC>=u{xJRDQb+Xc@U3`tA&sdLCKm>%ZelTQ2 zbuR%x7RF-weQXIxkKSJlAeBQE1nhUz3Z_Ps01_y{4;VD9K7Taq4uCeO4Lua~Zco&( z3IU{WDZ()8EBk-Hl@bb|7!lJyT_d0kv%qB7;!WChTm7%+dgD=$gNP8P_@NV7-NS*Q z2K_h+=EjA%w0+38&%6>JFbrko6h+RS{1^2hfztq@FiI}MjK(-#neLR= z(UD_F_MogQPM&+`-LJb0k=1NEn?Y7{gdB_FzVOzIXU}Osj*KSb70;c)M{o2N0Vqf1 zM8%YO!|-M86qt{p{;9tX1}nN=-3BZS!}NOM%xsynJ_bMqO+nOmz4~sbRN?_3;)VoY z@+nEH_k1z{_QG6Pc)6v#s`%2vF2GV@Dx3*2a9|zUktRFi>x2xhoory@p8}?VM#3c(Udi%l6K#71WFe9tQCSndLMYAW`@Ga4$#OSOIf5Hu6 z@i9`5w_7`H`YqQKQiYRLpO#6an8esU2DoMGRwG|?zQD)L+hN^OPsLhiv7OhlRV!qF zvymuWm)KfcT1Y*FR_-qAMXT-QYn&WcE;rlE_45x1*i_@% literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/tray.hpp.469C1AF36DEA64C2.idx b/.cache/clangd/index/tray.hpp.469C1AF36DEA64C2.idx new file mode 100644 index 0000000000000000000000000000000000000000..3a9e9b296bf8acb6781cba51d2593c36d1bd5568 GIT binary patch literal 988 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 IbXX+g|A~rsG5`Po literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/watcher.hpp.F4849F54352399E5.idx b/.cache/clangd/index/watcher.hpp.F4849F54352399E5.idx new file mode 100644 index 0000000000000000000000000000000000000000..8ee37cc490750e62eca5bf907dd91e1d632a4f71 GIT binary patch literal 2232 zcmYjS2~ZPf7~O1E$Zj^tW^+I|5{^Iu2?hv=RV)aIq5`7`ii!*%bp)vzP^lJd9T{&& zDa8YHP^s1f#8#_LovJw01C^o{(6NdZv?3lO;#sxduKr7RCNI15{`dXg|7G9H#Dw_x z1__46&P*sS$SukuFbtEyr?AK|d#nh<7T_3GTwOM?Iq6I=^L)>|<+1tX{0nt4C0)@Y z!*<@C`PmEq^sbK6GgA5+kN$l)v1Ux!)wRD5|8;-*&)qR|W;MMVt3H@qcxdrWb?@{G zYhH_|rAk;eYsL!)Kd0+(Au~f?SUAv?*57SLG$(m7oR`s$Q;|! zyfVJ;@^HrmUHx}+*)bFGhY|}Bb=}iBvFfDTj#U4=&bq6u(VeG#4C^u?rslk=uWLQ> zsB7WkMKhzEs#A5=6+el)_50SpDaot3xqCq!o@UsUUh}8#%ix~;jzjTN3p#aqG*Q}( zzbkhvs|-(2EX%q}zF{(JoBpUR&Uo##I?l8=OZ2bv?&G3@f^VvGuVwlzoO-2$DY_ln z5X(N$_Nvc+k#CD|4$BY|nM+x_bV@(vy{K*GnE|AEUZ`J~{4bz^E`;n1%;T!i^p-r+d%#*4lSR%W)O(p|VgF4+5{x zJzjIGs^_pAmjE9k3(@f)@W!0-*a=1EFeyd=?=j3{6b}M#Znh7N8#K}`$K1Uz%E%a9 zc@TKpTX$uDd%wRFcLlvdqEPZ6@X;;wxhEsKF0wdd_}DRJVJ#j4pYY+xxFuPODxC2_ zdW@1dNn|`=aIQZ;j|d(FzS5%K61HxMfx+ESeVemw zU_wWi_OzR{0X{6QLA;f<>IHqHdw5FJq1ChHm=5|kFa|Xb0)IB7?snBd-()E!hW-5r zKPe9ae>o+*?Q$BC#NrB6KZp$)m~Z>zh`e_ZlPg$U26{%t=y?$Iw<~*^PSsCa#o$gz zZ(>aY`tD23MBkUigIHXNcr$ArnBTq4RsWQqEZZ!{oS}ao#>bThq5l1)^~L4Rv;AFg zZ={#uGO@tFy7ww>h;~D-9Mgi{m+^JyLEzt}vW|-Q{lCaD58%BRFBcvJ-jVx7VfFu< zCZc$U5vkX91ZT5DahfudW+hDpkO4{}_s;1F_Hipj1f}#*`Xlp!gma#A)#woU{YF+q zQ>H*uFm>SRrO2)C@4;gT9zw}PgVP>L`V&FxDs@$=d$p#*$v2L{qncDJ)O~X@hOM|2 z2aA=A(iPbjDs!II7rG}JzfN?6#TuDLj!Y}2c(c-!fiNg&%HnA;Bfo->Gwa|XN`2X? z`SnoNYOoGQZpA6yr8LEm3_EPr*|FhmceYV9?0`DtDUF7&QKXR*jveya+ETbmeEZLRWqPfR@RY z8Pi(H`FEDPO@SZF=4pe)VR)Ey`gYr$4gU0W*wi$^GzH}dbjamLfy3~2r&E45H&TU$ zMJWPv<07QsQ)uAir{1{T=l#&`cBTH}2{8;oA84ehP&`yZQ+C`gK_LQiE`8sGwC{ioaj2^ShDCb$M5BTy>9VlEB#KWThm$b2g0-o{|_ zC^&m?z$laqu!c(n6a-L#O9AA2cu6?ZL(gO&1LGns%sHnqk8R^0N#P(0ox&I9OsZ5c zVYNn&(g135DS*rmH96-auLH|@yz_kp;W!gA5@x8CYH8$jU^#~)V}q7+HS)1YL~;H_ zwgr~+EOIG4au)s2@aFmRrVSIg-!9S=@5r5##r=B}I&una+zrXW$4iQCFpT;zhdHyY O{`49#DWx%bfcOukpfkAu literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/window.cpp.8AB8664D31F55915.idx b/.cache/clangd/index/window.cpp.8AB8664D31F55915.idx new file mode 100644 index 0000000000000000000000000000000000000000..d84db141d9d657d794a181c0dee61d88f723af36 GIT binary patch literal 3582 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 hpvJjfWQ=S!DT4u2HisWKM-|T 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 literal 0 HcmV?d00001 diff --git a/.cache/clangd/index/workspaces.hpp.0FDE443B68162423.idx b/.cache/clangd/index/workspaces.hpp.0FDE443B68162423.idx new file mode 100644 index 0000000000000000000000000000000000000000..e4f37356d26c43375d9da06060c2ecfbdd3eb81a GIT binary patch literal 2044 zcmYL~3s4hB7=SO!BfwoQmvF|AkS9$-F6bdaUVTs933lDo91F4ntoG zQ^ZoJqs0f-TDA4jQKSk=(F&p{Fde0(!$=jh)@pU46&2gP)4kjb|LmXdcK6@S_mhm& z9jD4GYG;Xj_s?R5>U1 zZ`E$BO1)o852WPn*(*JBx$*B~1`=yH;raF*B^5E)sM^&Oo+FEGuV|3;9yqxpfqjvA zAbi`xZ9Od$cH=qk+`i+_=T_Ls;&&_3f9rV1b&oN0)fC@TTr9bsKQs5zSY4B}8d&om zyx)1*JUG7SsB2~Yk-6d(_jR+64u6=x)Bl3^iKX7f&7sSKeu&$fWs`iCal7uz=FRuC zKTY0u`y8{nr|%RotjzYFy0v#x^`SO(PrK|ui^F!Xdi~5s=Mh!n*TxR|So?tb;_*($ zcYogM8NV_!>b|0LJnu=)ADUZ{)Y1Ob?1TlT%gfsyK6`*aE_;xAS~R%O@)UpSc@G0wd%W)-sC^0*}ke+#pH6`V9#TkegX^3?Bp@pWhR`=e=k9 zNZ<*1FdJ;=gTRv#Vya#XDBDhfKvchxHkt&UmUJ~dFMeG)1!%+#w871@M>YDE+LJ{j zP{Z}DtTloU!u(|pI?BH0>I4O3Xnr6a=)Rxjl67)bzw2k~MEwNr6@MW7GBD2^G zU$clUlI(&RuHBTS29_iZl}01sVZog3$ZuE@=QYw9rkuveUYK&$mNJgCn>{HkTuMJn zpHe2?d^f>)jRdfMRt9S}`IvAdG@QbTT%`baMw)ibhEswJL2QjHxitaXHVW%hSyT*x ztF7t~0uKQpUdVJfku$u0$2xm;N5{wBaPfFqGJ$It4NKtKsaiX{mRMaptRYGt2Tw|y z16q?C$`8%DH7N4L6)}ne)D-ZHTt}cDfGO7iS4_FPi%s9Az>HSqh=&d|bhF&1VD>Izr}-wh=NMfu$S z`_hsnrRCf}%7vGY4;o;YpL+;@pwUC20frIoA?Y6Ck0RsPs`H`0`$ waybar::modules::Battery::getInfos if (!adapter_.empty() && status == "Discharging") { bool online; std::ifstream(adapter_ / "online") >> online; - if (online) { + if (online) { status = "Plugged"; } } From 336cc9f3368a2badc78131df3fbf0d270d8c25be Mon Sep 17 00:00:00 2001 From: ocisra Date: Mon, 18 Jan 2021 12:39:41 +0100 Subject: [PATCH 167/355] . --- .../index/ALabel.cpp.09E9F4748A3CBF6C.idx | Bin 3224 -> 0 bytes .../index/ALabel.hpp.81F9065828AA88EC.idx | Bin 1438 -> 0 bytes .../index/AModule.cpp.8C79E6793B0ABDDC.idx | Bin 3206 -> 0 bytes .../index/AModule.hpp.D8753B04060BBA88.idx | Bin 1730 -> 0 bytes .../index/IModule.hpp.E1245342A901572D.idx | Bin 482 -> 0 bytes .../index/backlight.cpp.8F986B9BECE3CA9B.idx | Bin 5394 -> 0 bytes .../index/backlight.hpp.0EF1448C3968172E.idx | Bin 2104 -> 0 bytes .../clangd/index/bar.cpp.499C72A404C3B6E0.idx | Bin 11056 -> 0 bytes .../clangd/index/bar.hpp.548C657FFF81C379.idx | Bin 3490 -> 0 bytes .../index/battery.cpp.C1194A004F38A6C5.idx | Bin 5698 -> 0 bytes .../index/battery.hpp.A5CF2192CCD687A2.idx | Bin 1704 -> 0 bytes .../clangd/index/clara.hpp.37039B002C851AB7.idx | Bin 30604 -> 0 bytes .../index/client.cpp.142786E5739C6086.idx | Bin 3324 -> 0 bytes .../index/client.cpp.90DC0642EC0F3846.idx | Bin 7640 -> 0 bytes .../index/client.hpp.B4D0F538B28EFA9A.idx | Bin 1852 -> 0 bytes .../index/client.hpp.F7B62724EF944420.idx | Bin 2630 -> 0 bytes .../clangd/index/clock.cpp.622BF041106573C2.idx | Bin 4824 -> 0 bytes .../clangd/index/clock.hpp.6C252B8E1A974E1B.idx | Bin 1528 -> 0 bytes .../index/command.hpp.11D8330C13D77545.idx | Bin 2266 -> 0 bytes .../index/common.cpp.8896DC31B9E7EE81.idx | Bin 2080 -> 0 bytes .../index/common.cpp.FA1CA1F6B4D16C67.idx | Bin 1866 -> 0 bytes .../clangd/index/cpu.hpp.A6F11840DCF8A513.idx | Bin 1026 -> 0 bytes .../index/custom.cpp.EA9CE9AF81C1E5D4.idx | Bin 4732 -> 0 bytes .../index/custom.hpp.36F2F4DF290D9AA1.idx | Bin 1720 -> 0 bytes .../clangd/index/disk.cpp.1F7580C201D672A2.idx | Bin 1998 -> 0 bytes .../clangd/index/disk.hpp.E57994872D8447F8.idx | Bin 728 -> 0 bytes .../index/factory.cpp.CEDE1C1627112064.idx | Bin 2394 -> 0 bytes .../index/factory.hpp.2AEC37A00908E370.idx | Bin 904 -> 0 bytes .../index/format.hpp.A472BFB350A64B30.idx | Bin 964 -> 0 bytes .../clangd/index/host.cpp.0C1CF26FC798A71A.idx | Bin 4080 -> 0 bytes .../clangd/index/host.hpp.D6E6FF9FFAF571DF.idx | Bin 1978 -> 0 bytes .../idle_inhibitor.cpp.3D718BD05B870FA9.idx | Bin 2398 -> 0 bytes .../idle_inhibitor.hpp.A4AFAA5C5DDDE471.idx | Bin 898 -> 0 bytes .../clangd/index/ipc.hpp.804BDBBDF260032D.idx | Bin 1498 -> 0 bytes .../clangd/index/item.cpp.BDF1AC58410539C1.idx | Bin 7280 -> 0 bytes .../clangd/index/item.hpp.CF2C10DA19A462FB.idx | Bin 3008 -> 0 bytes .../clangd/index/json.hpp.6C08A0DAD19BC4D8.idx | Bin 750 -> 0 bytes .../index/language.cpp.7CFC0E2AB711785B.idx | Bin 2412 -> 0 bytes .../index/language.hpp.045E99AD59170347.idx | Bin 954 -> 0 bytes .../clangd/index/linux.cpp.AA11E43948BF7636.idx | Bin 1320 -> 0 bytes .../clangd/index/linux.cpp.EBDA54C079A9D2C4.idx | Bin 1528 -> 0 bytes .../clangd/index/main.cpp.9D6EE073CE3F67E9.idx | Bin 2136 -> 0 bytes .../index/memory.hpp.220BFCF008454788.idx | Bin 740 -> 0 bytes .../clangd/index/mode.cpp.DEC43BA6A32D0056.idx | Bin 2090 -> 0 bytes .../clangd/index/mode.hpp.6A926FBEE534F2A9.idx | Bin 888 -> 0 bytes .../clangd/index/mpd.cpp.7FCBEF52ABE61287.idx | Bin 6492 -> 0 bytes .../clangd/index/mpd.hpp.F92558038735ED47.idx | Bin 2124 -> 0 bytes .../index/network.cpp.109ECEBB28F3CA1E.idx | Bin 12826 -> 0 bytes .../index/network.hpp.959179E628BFA829.idx | Bin 3296 -> 0 bytes .../index/pulseaudio.cpp.33560C8DDD3A5AD3.idx | Bin 5832 -> 0 bytes .../index/pulseaudio.hpp.C6D74738A7A6B198.idx | Bin 2202 -> 0 bytes .../sleeper_thread.hpp.B273FAC75439EB17.idx | Bin 1672 -> 0 bytes .../clangd/index/sndio.cpp.1174277772D16F52.idx | Bin 3834 -> 0 bytes .../clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx | Bin 1304 -> 0 bytes .../clangd/index/state.cpp.E5F8B9AFD9E7ED3F.idx | Bin 7084 -> 0 bytes .../clangd/index/state.hpp.210A97315D520642.idx | Bin 7032 -> 0 bytes .../index/state.inl.hpp.07C5BE693644AFA7.idx | Bin 1336 -> 0 bytes .../clangd/index/tags.cpp.901229A9EA5F0AD7.idx | Bin 3004 -> 0 bytes .../clangd/index/tags.hpp.38EBC6B49867D962.idx | Bin 1076 -> 0 bytes .../index/taskbar.cpp.3B871EDA6D279756.idx | Bin 12886 -> 0 bytes .../index/taskbar.hpp.3F1105A3E0CB852D.idx | Bin 5366 -> 0 bytes .../index/temperature.cpp.BB5C0ED5BD80EEFE.idx | Bin 2538 -> 0 bytes .../index/temperature.hpp.58F6012FF8EB97C4.idx | Bin 818 -> 0 bytes .../clangd/index/tray.cpp.02A8D890AD31BCCD.idx | Bin 2114 -> 0 bytes .../clangd/index/tray.hpp.469C1AF36DEA64C2.idx | Bin 988 -> 0 bytes .../index/watcher.cpp.793479CFFB135BF1.idx | Bin 4334 -> 0 bytes .../index/watcher.hpp.F4849F54352399E5.idx | Bin 2232 -> 0 bytes .../index/window.cpp.8AB8664D31F55915.idx | Bin 3582 -> 0 bytes .../index/window.hpp.E69A5ADAD0A0E8F9.idx | Bin 1456 -> 0 bytes .../index/workspaces.cpp.EC0CB7DF82BEDBA3.idx | Bin 7454 -> 0 bytes .../index/workspaces.hpp.0FDE443B68162423.idx | Bin 2044 -> 0 bytes 71 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .cache/clangd/index/ALabel.cpp.09E9F4748A3CBF6C.idx delete mode 100644 .cache/clangd/index/ALabel.hpp.81F9065828AA88EC.idx delete mode 100644 .cache/clangd/index/AModule.cpp.8C79E6793B0ABDDC.idx delete mode 100644 .cache/clangd/index/AModule.hpp.D8753B04060BBA88.idx delete mode 100644 .cache/clangd/index/IModule.hpp.E1245342A901572D.idx delete mode 100644 .cache/clangd/index/backlight.cpp.8F986B9BECE3CA9B.idx delete mode 100644 .cache/clangd/index/backlight.hpp.0EF1448C3968172E.idx delete mode 100644 .cache/clangd/index/bar.cpp.499C72A404C3B6E0.idx delete mode 100644 .cache/clangd/index/bar.hpp.548C657FFF81C379.idx delete mode 100644 .cache/clangd/index/battery.cpp.C1194A004F38A6C5.idx delete mode 100644 .cache/clangd/index/battery.hpp.A5CF2192CCD687A2.idx delete mode 100644 .cache/clangd/index/clara.hpp.37039B002C851AB7.idx delete mode 100644 .cache/clangd/index/client.cpp.142786E5739C6086.idx delete mode 100644 .cache/clangd/index/client.cpp.90DC0642EC0F3846.idx delete mode 100644 .cache/clangd/index/client.hpp.B4D0F538B28EFA9A.idx delete mode 100644 .cache/clangd/index/client.hpp.F7B62724EF944420.idx delete mode 100644 .cache/clangd/index/clock.cpp.622BF041106573C2.idx delete mode 100644 .cache/clangd/index/clock.hpp.6C252B8E1A974E1B.idx delete mode 100644 .cache/clangd/index/command.hpp.11D8330C13D77545.idx delete mode 100644 .cache/clangd/index/common.cpp.8896DC31B9E7EE81.idx delete mode 100644 .cache/clangd/index/common.cpp.FA1CA1F6B4D16C67.idx delete mode 100644 .cache/clangd/index/cpu.hpp.A6F11840DCF8A513.idx delete mode 100644 .cache/clangd/index/custom.cpp.EA9CE9AF81C1E5D4.idx delete mode 100644 .cache/clangd/index/custom.hpp.36F2F4DF290D9AA1.idx delete mode 100644 .cache/clangd/index/disk.cpp.1F7580C201D672A2.idx delete mode 100644 .cache/clangd/index/disk.hpp.E57994872D8447F8.idx delete mode 100644 .cache/clangd/index/factory.cpp.CEDE1C1627112064.idx delete mode 100644 .cache/clangd/index/factory.hpp.2AEC37A00908E370.idx delete mode 100644 .cache/clangd/index/format.hpp.A472BFB350A64B30.idx delete mode 100644 .cache/clangd/index/host.cpp.0C1CF26FC798A71A.idx delete mode 100644 .cache/clangd/index/host.hpp.D6E6FF9FFAF571DF.idx delete mode 100644 .cache/clangd/index/idle_inhibitor.cpp.3D718BD05B870FA9.idx delete mode 100644 .cache/clangd/index/idle_inhibitor.hpp.A4AFAA5C5DDDE471.idx delete mode 100644 .cache/clangd/index/ipc.hpp.804BDBBDF260032D.idx delete mode 100644 .cache/clangd/index/item.cpp.BDF1AC58410539C1.idx delete mode 100644 .cache/clangd/index/item.hpp.CF2C10DA19A462FB.idx delete mode 100644 .cache/clangd/index/json.hpp.6C08A0DAD19BC4D8.idx delete mode 100644 .cache/clangd/index/language.cpp.7CFC0E2AB711785B.idx delete mode 100644 .cache/clangd/index/language.hpp.045E99AD59170347.idx delete mode 100644 .cache/clangd/index/linux.cpp.AA11E43948BF7636.idx delete mode 100644 .cache/clangd/index/linux.cpp.EBDA54C079A9D2C4.idx delete mode 100644 .cache/clangd/index/main.cpp.9D6EE073CE3F67E9.idx delete mode 100644 .cache/clangd/index/memory.hpp.220BFCF008454788.idx delete mode 100644 .cache/clangd/index/mode.cpp.DEC43BA6A32D0056.idx delete mode 100644 .cache/clangd/index/mode.hpp.6A926FBEE534F2A9.idx delete mode 100644 .cache/clangd/index/mpd.cpp.7FCBEF52ABE61287.idx delete mode 100644 .cache/clangd/index/mpd.hpp.F92558038735ED47.idx delete mode 100644 .cache/clangd/index/network.cpp.109ECEBB28F3CA1E.idx delete mode 100644 .cache/clangd/index/network.hpp.959179E628BFA829.idx delete mode 100644 .cache/clangd/index/pulseaudio.cpp.33560C8DDD3A5AD3.idx delete mode 100644 .cache/clangd/index/pulseaudio.hpp.C6D74738A7A6B198.idx delete mode 100644 .cache/clangd/index/sleeper_thread.hpp.B273FAC75439EB17.idx delete mode 100644 .cache/clangd/index/sndio.cpp.1174277772D16F52.idx delete mode 100644 .cache/clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx delete mode 100644 .cache/clangd/index/state.cpp.E5F8B9AFD9E7ED3F.idx delete mode 100644 .cache/clangd/index/state.hpp.210A97315D520642.idx delete mode 100644 .cache/clangd/index/state.inl.hpp.07C5BE693644AFA7.idx delete mode 100644 .cache/clangd/index/tags.cpp.901229A9EA5F0AD7.idx delete mode 100644 .cache/clangd/index/tags.hpp.38EBC6B49867D962.idx delete mode 100644 .cache/clangd/index/taskbar.cpp.3B871EDA6D279756.idx delete mode 100644 .cache/clangd/index/taskbar.hpp.3F1105A3E0CB852D.idx delete mode 100644 .cache/clangd/index/temperature.cpp.BB5C0ED5BD80EEFE.idx delete mode 100644 .cache/clangd/index/temperature.hpp.58F6012FF8EB97C4.idx delete mode 100644 .cache/clangd/index/tray.cpp.02A8D890AD31BCCD.idx delete mode 100644 .cache/clangd/index/tray.hpp.469C1AF36DEA64C2.idx delete mode 100644 .cache/clangd/index/watcher.cpp.793479CFFB135BF1.idx delete mode 100644 .cache/clangd/index/watcher.hpp.F4849F54352399E5.idx delete mode 100644 .cache/clangd/index/window.cpp.8AB8664D31F55915.idx delete mode 100644 .cache/clangd/index/window.hpp.E69A5ADAD0A0E8F9.idx delete mode 100644 .cache/clangd/index/workspaces.cpp.EC0CB7DF82BEDBA3.idx delete mode 100644 .cache/clangd/index/workspaces.hpp.0FDE443B68162423.idx diff --git a/.cache/clangd/index/ALabel.cpp.09E9F4748A3CBF6C.idx b/.cache/clangd/index/ALabel.cpp.09E9F4748A3CBF6C.idx deleted file mode 100644 index ce9ae3c77ff53668450d36c7f728fc9387c484cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3224 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 Cca^#T diff --git a/.cache/clangd/index/AModule.cpp.8C79E6793B0ABDDC.idx b/.cache/clangd/index/AModule.cpp.8C79E6793B0ABDDC.idx deleted file mode 100644 index c782cda4988b99322fe60e0a6a72ab6213ae373f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3206 zcmYM030M=?7RQH>3|VGE5(6Yb2#G-U4I)ceLI7E05l~1Nl*b}f%p$V*;sSm8tou^; zwSu^7MSUtoTu`jFRX;73D%Pcpc^yS8KT5=Lr*-@ZW;1%g zKX}>H=yA%@YtPph4X0WQ=2qP(nEJf7FJ`L58a4ln$Bmk(uCJVLmWIE)XX53rd?oBU zx>57>?#Eq))w8GdrXH}gZmH$W+uYMHd4A=8!ebSV%YPO9l~;Tx`WKVWoV}&bSKnwq z`Jm}u`5$k8T3}ta-;1MGUTa&n^Zm^3mgb+YMl>Fp#=T(_M?DMfW#hu&(^Gm3o8I2O zSULN7(3}iaz&%;Xm*4m0bX@px>0jEV?~n9;=kBGb*>Z2jy$jZt8wV(uN5HWR2Q9O0 z+{|>c{HJ$!6J||H{dV3cdtLPCJtd!qF`h_IRy9_(G;X8e|U-g)L~7 z2sYHuAa7j|X6k-Ae%E)8_q4TF>~G*4Ue)S_J?UK1RMoz2?$vrla>+`)M)RO0r)%o* zfHL>j=URFf)gDT6Oun5z`q_^C=I)?l9Synb@#*hNG%>?+cU^3`#F|m^^uT7`@HeE@ zMHNf0>C^T%WlFZs8G5U(?ga7T+jEB2s=Z79yr)xLpO%{D|E|yf&D!*VwHqXUKXshz z-E`p5=8>CUT%Bm_P@CGn#_sH$)s*%4q?f9mwUsxfys2@;+B*yA*8|W4_uG-(Zeg#Q zR{hR@w&DrafR61LX&?8)Sk|_}A*M;U=dVK2&-QmYcXYPTdSs8E{{7QvG84~O*(8CwdUbh zrL7@H+vC5L^TB*+K-Ri_^6lpMcHD=u;xmV|qgWnM>g|=(B-g$W2xrfq zu->rw{-#vodeBJT>7>!cfeSkD{VL!3Rl^5n36?N_pV*n~96`=`dAwz9!PyUwhyma8 z*26oIs%iET#0^2%|LysHTB30)k7O=I2q(?Swy-_fJ_yzI;laCk^Tk#YG(CN3m@nIvwvS~ zFJ7Eih-pCXh{L136?4&?$H7-49kV_BHNral;5chtFr|&!4$(6rFa* z2$RSZgb{`OLO+Zs3n&X@Y{_blNwLz0Vg%Kn3NAWI$AMD11|t|K18jzl5rGjHih<2S zSuQGBp%@`TMPQ2+;t-6GqEfJBxQvSta$F8n;0mA;R{~YI3aG}_Kn<<|YH=-4hwFgJ z^kgR*Un2kp)tiFPF--P-KY`PF5{f zLv~u37Q(QGTcP;&c>BoFv=JxlWvr#3RWuxp0cN3j7$NbH;JL4Q){9?kp8_tU+6W5F z5@ZQ6qJUrEZ$7mqQvF&!0per}+46j3jPt3TaR!F5v{>HY?Et0Vq;o9vj~7JALh8P< zb-ar(C(1L5H{p9KU7way1(iua69gEMMo)vvWUw>fqp;8|{^cV-NYU&kmtj7~lOvwu zD9NY4_p-o{>B*E5=m#K^Wa37nZPV&7BGjI1I)woeBg|5GmyXuU;$nLEW`_eW!y4| z(~4WcwsY-~=5b z92wJ};tT42KG6kLVn#CKAk9#YVYWBvQTJC3Y4Fe>H$-4Wxo^2_&XZWtg0$*pNVaBZ zjd~nSh%GY!=RPF_fhz6Czv$wm3u_N+zVZ6l@t+=0zstTscs|RREP-B~Zmx0o7bJ zP{Y*#wOlPw$JGIo*~uI-k>Z;&luTHItr9X}3$ekPc8wikaD+I(u3^=%f$AE~YM*)D zraEpNh+o2#aMw{}yBwF6y?{iLwaJl#J;aUvv4QN%3tJqsq5rL`2!@)t!43jmSNk~Z zv1X@T-*gAG8mo$hI_C&-;Ft(L;rC76p7Z|Z&1`rv2~EOJRu_Nx#(&`e42?7+zfC>5 zKBQ++9K=9Hsf@wKL!y7|Iv6ntpTxg#u^_+w&Flfts#q+R!yO{l18rg(&>?onuOx05 zEp4Gpgf;mnAG_J0yuG*~>mUqcXfeE7B_)CEJAu9MdLo(#QXj=01tQO8X9LI5$NCR; zGswl&%5Jj*C%-sTeH>nAhp-d7^KbA5Zfiflg^wbr2N2pRXeO1J1)53VjKm0U#2cP_ z)4kakA*2W~xV0$3Km%fc=LW6;uKIFHIXtPRR0Exe)1!MJgK;RbeG%;9O8fysC~F+3 zu7{!1$LaT^>R9t$r=;7JGEK~ZlxcdPjb;NnXb#R`hjpnphgnGf*ks?7U4C}{?QR7u zk|;`)4t81S9j+GJ-x2Zb%KK?Gux7L(S_L1VARYQ(9zW03iTGCE$}(HA>%WVt%F-$g z{B)$0E0gc{+>P|<= TG_Gfs4~NChEKVPtk&XNfhRExb diff --git a/.cache/clangd/index/AModule.hpp.D8753B04060BBA88.idx b/.cache/clangd/index/AModule.hpp.D8753B04060BBA88.idx deleted file mode 100644 index 89805e901843f756a5e62f3548a9bbe530f5a76b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1730 zcmYL}drVVT9LH}Dl+xa3TYB5l7t$6GVlc6ok*G`%6kl_lk8Mmhz+#wo3oUF`w?C%U zB@>9q#$+gtiLyXcHVrbye3T7e_`n(Gbi5LnhKvrK#5Nk-IakkZlYVp0`JCVRo!)-# zb>`>gb;S@w&c^($ZdZ9>G(iwF{Cdkhr78(QaDX7T9;n*4@HPKzZrA;me=arL`ab!C zyxU(zpKsSyuPEKr?9NQgSXcY%kCmE=+Z%SYq=g*QPYUb}g`H=rg4+DR{yN`a z)1EH!1l2cHJOA^i3vPVee>K0xH_$$zfA*vIs%MqFV?*q~mhWXx5DLED;SkAIIy2i14OW9rKrL zRxm&gxlv;@3L$dk&asQWMOlY+AlCF^M@GpiwIVm`YmQ}B+vE(OV7*$c)(9c;v|;zD zAjefQKnJ;1ZPf}P@+NcLvJeq|XDC$E+H;!&dR(uk^^xB{^42|F zcyRV}8ITwVhKwO;Aqe>kKO~G~B)oz=nHku_04?lb&=}%{5Ia0x5R|qJRRRw1xPyhY zL^_1d+PBYWt6HuFX3SXyON#ZO{#Pb%PWviYLWb@@JZ}_2f&s z$XfEHr*McQ#ac=vf{t-vwsF_t?!P4zW0ILzEG1lwjKmJYArf%zhnq60Tys{!#TKI_ z6&r{eLH*v4=leVY%$q#DgNnxQ?W~H&3s1SOIO_azP zWFQs~Qe++W48X-uGK$dw9kqi8<0A*ZT?XJVUY9~K3C4uf+NANGdjC)BU>9|)T2&h3J0Xr4Au417S<*h<(7*@z{CLnI$|4jl{%cY1B>W%Ig5CEURVY;uaR1G^l1 z2TPD|STk6H92p0{=Cn2sQ(q6Ke5vOF`Gzfyyhemei7Fk84Ze8u&=#=0s88OmE>I(^he!>xYq6 z`R2}capH2Dr=U#s^96C@R!+~m^OiCpabhC;z%%(Uu%7UGioJ``3q$qdt$~vH^3Ud} ZgsCf(lvAqIETN1bb>xzbTyl}i{{aqF*CPM` diff --git a/.cache/clangd/index/IModule.hpp.E1245342A901572D.idx b/.cache/clangd/index/IModule.hpp.E1245342A901572D.idx deleted file mode 100644 index 0cd620b4b98f7703747b40bbd019c8d09ed25964..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 482 zcmWIYbaT7K$iU#7;#rZKT9U}Zz`(!@#Kk2=nax1@01#KqN&fKVtiR@2&s2`{KA!%% zfdR=Lr_Xq9y>$Kh`4i`Tub%fmr=#a}h2MXTkC)D+^Jl!zY5ICzZGUy~w1!55w!W_0 ziRIH%ol@m^pH)F<5aV9Pf z24)T}4sI|3m;ap;z3b_mp4041jO+}|Y;0`2U;<`7BQs-BYFcq1&}f)T89Bi&gjvkU z2(}Pr4Anu~sx%xC0b=2GNRhuOl!1vZ_BnS+}{h@mJoCs7b+GEA1?VdQOz hpZ5&@GZYsk7mI_u1N9|{$^86&meSXmN7@)!7ywNGiB|vs diff --git a/.cache/clangd/index/backlight.cpp.8F986B9BECE3CA9B.idx b/.cache/clangd/index/backlight.cpp.8F986B9BECE3CA9B.idx deleted file mode 100644 index 99750d6c12bb86b1c93034b38e3bd765f6f71bb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5394 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�sGWL1y9XvRP())8M5it?s8&pBSuTmIRdtTf5G~gWBl%; z9Gn({dm+pi@51opR14M~d0%Dam`MThb0+3YYXAKE0S&)QA$3=p{#e{+O`kOz8-Qtn zGq1^f9XsQnqallVP2CTR^p67um<2fCGVNKWxJ(pihS#edjN=ed2#(u8rwz=<-Egfj zD>9RHx*d(CauGqE0s0w`8E^cMTn|e1pe6TT_jg^dtmB{Gp4>*`jsoK-5I4U1*Qh!K z_#vSl9P7cQL)yXc8ZCYa+PhS7DLNs~GtZlu8 zWMVMxVP@SJuN#cKAWTlSrq*ETR1+T(K3GyGky-!e-2Y6Lm*An zZuK9nI`WH5N_s|SR%+TpT8e~AOZz#DPfJJ*#cA-IIWSdqf|`$$_askaHxqYjZBq|3 z`^kE?`XW0=1EYzW8oDm(I#V3Hw4BWiU9Bu_EL3I+e5d;bPE(dvq|37v2$qbL9Frld S#F-`Jb9n*z{y{Tl)BX>(deA!n diff --git a/.cache/clangd/index/backlight.hpp.0EF1448C3968172E.idx b/.cache/clangd/index/backlight.hpp.0EF1448C3968172E.idx deleted file mode 100644 index 70c3018bca32f25fb5a88850f9d31a0ed8d7205c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2104 zcmYk52~ZPP9L6^5}dcFr>- z^(1ea=k+jSYFBHBJ#X;axTVhhyAQqBtC(0ac<)))nS}Z;ax$YUPfoZoC(gUSB`M>X zzVUHv=8L{Pkx!mC$8)EnAJ==2oCrH?G{oknl=Y3>FYfxp5>z~5yZCuA;eCWXIICo^ zsIq3C?8^}S+QV0-Sm?x;hNj%MQf5;1_1cgFb%wgC$}_9)4EVYoXqdVFsL!F>b4oVv ztx4w!b7GsT62CEh7uYlHWS_NeV3kvEg*oY2=uV&LGRb$77kTU zD9b4|XU3n)+A~;lHJ&Rf@6{<|3X2<8j@`aCt?Z}c%+#MrGA?I!*vPPA!A@n1_U@6A z;{6TP&pS2@9m-A3nmn`Q;OmwrrX3B#YyPYry*xH^t7`B;YVEbJ)&(zWlRf=mWn`w}1WK&GRxECDAv-j{8Lbe?hWZO4t}tard(2*Y zTs94SkRM@)m@J6sf6!$5H?U_Ql?ERE1T--wjUb|*Y=5%}JZ;jcfS+ajOfZlRl z&slP(QF5Llbf^P*R&NpnbpS{RnH+VXdgHd0O((1)4DiJ(_>=xnT%mU0iGSGMUJCN1FujqQGIEC|5$7GRNz_4R4Vr%nZ*^3?(-)FF2#cSaD0-`#eu^HIVq z8W>Oq!j0jR1rhzD+kEo5?~`g6puzilupUOyKUO8Zbj(GSOam=i-<$DP3nKbwt`9}` z!Pg%$z=-R0tjVvgu&pg{F@gWXRM(I1K~o7zT9uXQ23#y=kcDUwpX z!@!IG=(NAbqF%WWCj5qyR4U(j<7L8v_@>}p3L1E$JtDP{K7xpQHW={%+zz}x|hLhoN`C^s- zxwq*(-)0A*>^l8u{6x0XkZAfS6(ebRV zRt_bBv7t|9r|tTijrqxWiiXXW0GXBtbKoBa&(A_a)978w95UQd-e)UWF RKl@0=P32C}t_0;U{|91B|BL_t diff --git a/.cache/clangd/index/bar.cpp.499C72A404C3B6E0.idx b/.cache/clangd/index/bar.cpp.499C72A404C3B6E0.idx deleted file mode 100644 index f9ba27979fa4b04752df346b68851a4f43c103f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11056 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 diff --git a/.cache/clangd/index/bar.hpp.548C657FFF81C379.idx b/.cache/clangd/index/bar.hpp.548C657FFF81C379.idx deleted file mode 100644 index 7a342570df838745336e39c6c675faebf767d826..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3490 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 diff --git a/.cache/clangd/index/battery.cpp.C1194A004F38A6C5.idx b/.cache/clangd/index/battery.cpp.C1194A004F38A6C5.idx deleted file mode 100644 index 72b2fed76eb57fa05079941546c3c5f580a3af54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5698 zcmYLN2Ut|s65csnma=zQb{BSGcWJu|3(|{N=m;oa2jv2yKtK=$6;QAXq6VTM9jSul zMI@RRja_0OFB*-S7&~@jMU5?rHE)i2=J9>ZoO92dHZ$j+nVlFJ5iwlGN zPhogGo)G`@@^fcI=<#?#hCE(j^O8wPvo{Vm{c~LWpXq;edimUcJXz@^(yo)a78#D( zxzGJ*@@mf0!tyuYC40Yn-{>-n+k<#b7`JvaIjm>^y? zxGfjY^rZQZ_*v_9VB!m}+$!6so68>kRJb8^vsa0d*`+E@D1Lbg8NqAU)n+z$Y@WKZ{^8^mlhXtDK9MgvP#!quUq?Fc#y(rKCt^{=TQj4L#ACd{{?M=9PTsXRbWJLko@icsuw-29QNHKr z_Hy2IUe1FhPQMC%x9`*Y(qwN(?VzNezOo&4#i97jL9t~~L)p_APeyMYY>>74(TuZ_ zirT&3TaDk7?CKSB=#(NN%R78x(wB=g+Xf})EC?Ch`fGx1-n{WMw+PcMRGnLP`Aiae zEQki>v7<+Q=Eb+9oIEgVQvJBofs%8Z4?a&_X?dz**^jbWdmY!UnGq5?(Kg| zOzXZ2V))SS@FM8*(_j6Rw;(&!5O};?u2Di7_OqrWC7H*$*tpoosXf%bJVW~I@UQYx z%YtauW4DY<#&Jf$*u^P`!swszZ;GYwx~?1OOi2QcKLD2p5EN(cVL##@i9`ES8(GJ& z3#McWN|eH=QWzhn_0SIeN1`X|g^9VhiB3*ZQ9_|mDC3kwsrS$LwM4kHb^VS_rX&f+ zBW)txpf1!gU^QmkvY*CCHXSGhUEn2 z0<~3DYFNSkrCxe0r<5!4v{CXXq-7v41C_O9B6&T`8^ zw;Wtpt^}+~K#lqUSv4qaOp1n;8vcC4faMHDhIj;_NQhJ_k|NEp%s_?Yi}JBuC@!>S zxrL&ID!cu;nGcuyuhM5YLt{fB!wHRrNTtS7r1{4ANEaF}6x!XNa%N|8*l0ZJb`Wg` zQ-=E$gujA``s-~64m8JRqK10Gu@~IzJr1=^R&R~N1z&*R1+WZPOr*ucj6q`wY6$l0 zh@g)01|n!6tizw{TQ*$G2{L53B*P>D!>tGYdN5+RCg3+w-U9p<%G-e7MtM8%+bQn? zei!9efw>9>j+xVqVp-D_s5gy5gATV$w9MRT<@S!eRm&IZG2AMmT16Zgu7bE$kf97$ zNgOMQn{(Xygbkamrcmn`cnZ)u27XAx4Z;PUwKqrUwcX36P9qv4^*o%t+u~}*Ykle? z>X%?odB95uX1NVSw}A{|xpty!r@VvcI>;d3Kg(YX&Yy1d(aYF#Aolz0$l5&j`_FKF zwOFl0>Z0~#IUS?JS2NafEP7LlMG6`-)gl$?40eW$<>vF}n^JSjmIL0Y1o$O@{VGsZ zfrDRW&4cy&D|g}!J)rCXJO7iv^xNq<{$$K@jF_=Nib%(D3b6v)3Z(*9b&F8ffuSJHA`y4;4A*O4HeC(d|+qFIqo$>K=j+_T#t!p+SX@R@|aq>A>J*O^PO+u?l z6va!YTH;BsGrXRJPGEzdyir}&rxuD8Crw=3ofCAX*BQHBDlhvOqwqu7>89m~`HU;$ z&2m$OQ&4lI;8049RtZLx6sj9Q&;VlUO@cnkAAsNi<&VMgG2jvY0;9jEToDlz5&T|6 z?23qv=ho~KOY!l9nxlySIR zf+7JSEFm-j9XL^ui0#DS#4vONWfG1iTPCA}r?{qgvRs-r%@N^mbjEmmRH_;HjAkol zqx>9;IjU(Z(q7GXel!gY-vN>iFiS4^^F?7*`5iPsCrCO0vGy{UUIz1&3rnxeJG{mf zC96SP4d$uhWvX|QPAfd1K3|`mF44EB&mY~5-SlzkTvlFKx_;W-71&MDr08ba`@D~o zKC#AbKUnmGYUUcd+%Q$QZ#Gr1X)XvIMc%PB2bDb0v5s_@G{l6S1A>k?4gt zH=d2{JV74HG=jVl(3P7()(kka738h7zX7Z_fbHxEVdVKB(+E7VdWhO@4k`TLAlNhk zk5x>x#l#-fK!#P5;S|>0YKS|7b{o=4hR!VvJf%8z`aSBYm55u3*{9qLH7X}^L*tL> zS?(g^kjiI|FdT5D#G;f?G$OvG#4m4QjD@UmJK(mZ#GsUz=DVo%A55ysLbs0hjmKx7 z@aThpJ_uV=IbS(rLWU5RnI@TLxz?fR(#3Q8D(E5}Lx$rb9>K#arM)+5JJj@A zzG`2L{z2*>hfldM7=H{8)!fm(>foRrT*ph|rL1mU>fy{m~2HM?UCajKc~@@@FJynX1NoGoX^aPe;O=nL6)*=mN%anJE!xB^iD zI&qM>eq8{4EB(E2&7{n>zb1-*sOr|wY_V}()Q(4wQ^yTzh)&z|I@_tKtens^RnFhW%jm&V?eEvG!LAHy}3)=CY-MOjB7Ed%Q^&@|h` z4Og%8rXf&iphV1yGKfN21_osyZXRAf;D2wZ86J+J7)L6it9v zXa-#~c+>Pr(L%>t!LgN&w}GOKj&A_>4KRYHQ;K%LHM_v33v@J{vbqZP+xk~5h`-T{ znLqlUpcG8I{HL0mHGJue>J$fw5opsR(xbnc?7JqQao`O~bwgw~jN6g>uaN1lFW<%w zYL#03@0_5CFTa`dfld;O)i_C(uKQGM=^6j8(qi%1I24m%G;{LqAQ8Kkx!g1+cBB4{J#pNd6d zjLM^xBFnu2mp9<^om)(s*X=KY^_c$!ZHg4Ztps!bRx+xUj5(aYW}zZ*_(XEywX0qBfuKFoZ>Zk2M6{O3 zPcBXx;jt*}3VxU`o-aEcm}myuf&;OeZ+gffz;04 zb13@(_#eRRQxT6bK}KYl+R!xhc6KxhSJEA4Lp^#*W!7(%AK?BmjL-Bm=eiYOm$ zjQ(QI+B>fh(5xA2oNv#!$0DN`42!|y(ZO9=6Pv7Jp7S>JLZY!+??N^nnD9v35ZKTHqh7``K@j|@UiwK0-VJ1 zSv;gzBgWj*+T0q`SX)C|1oR+X(2zHoW6X#8A9#tgbt0YFr=Ljh<^BEp2#eX1@EutF z^>$~;$+oc@DU@rKLlDZfQAo=`TLwdTx#_b~@Mj`kUhZdk8rq1XcYJa*dXm@yN0{{@e} B+xY+h diff --git a/.cache/clangd/index/battery.hpp.A5CF2192CCD687A2.idx b/.cache/clangd/index/battery.hpp.A5CF2192CCD687A2.idx deleted file mode 100644 index b182c02d446b2968a4420d5a0d44d8587f8498a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1704 zcmYL~4@?tR7{KpdOM5NXYXu8O0b6KGue7CQGP9{6E))hLZv0t-%9tQbWk3SO@y84u zRB$t(U_c=X!pIV2aYG$rAO^w6m;ss0gntg1LnJPd5jJ6)WA6^%@sfV|zWnZc_r1H{ zrEyUa5tl?57M2!Okd>a7BE&FE27ivc+`|lxVRHb(3NBPsw`ccj6lH~VR|1BfT7C&U zl3_}>A9Tbeo~7|qIa5rANEaPie9SQ1b^6E-XG)4DW%$JYPbB1>o+Rh%RnBPV z^mo65kV8!^``rj<$oKDgowCd&9W9@d2Z$aWOe`X%c9q7st;{Qnu2(e7sU`~R%n`*s z*E=j#?c4X>esfhZe_Zo?Z~Tq+{?Yck@?)VP15bKyRff{{uZWVXI_-U1x5hQJNQYYL z?x+@B#fvk3tv)%krGkv5FwN6^5=zcRtt2H* zmp-(2Zrf* z?4M`ljr7>P>=#y9vJiI^W~Da6XSMCXK!w9PzeoYWCX8Ub7%dktf_<=XZ66+a<|kkV z#Q^uk2wFtTxPVF4I8NZ9WpAsS798(Wz!UCZp)Fc2@H^NeA2vCEE2&lj5#(yMn&AS^ zBmJc360T)*P(TT}fi~#4!1J9&&p-XRO$fOcN`gWfgIPcP4@=R`!bd&pi#e{&2Is35n|wjeI>e7U|q>RZFRI0ZZ) zH_;}B3p{`M@?P>cgEucLfIGUs)}~#bZ}p#R&f&)0Ur;~@`^~i3#09=TH~mA09-8X9 zFyz&o>KTrc1S4jozSXJr{I25HU}+Yc$>5q_BL$65vjileR;f3^YvhbONf<>&DN-Dl za%v-^1yasrl3?E^Nq7sqrATFXCF?OV7nZEHNK{y|mLe}<$x0b73Gc~DS5&&d4V5Zy zlF-VuZ~z^n3nB@I5*dj|CF`0i#>XgAbt%Oxc5;npHV=xh{L?R0%oWSrP9%>pM z#Fdf3g8-utnT$&a)?g$q9Dud9eEIf#LhK7CfVX~28wqdiu2Ug-VGDcAvkgZ#f8N`B z0zNcVpvu~oxP=;Rz8`=K3AITb-uA4taL>$zN=S7wof{Gx_Oe1Fk73FBi?qdYg4GpS z3Ws48{jn`~UyitY0B%Kl(!R)1*vq+Y*st7?d%%&;CPcqSOmfUlW>n%TS4c@2C6-_k7OX82B^V}OPZjH_>v~G9 Rr_%M5{r7pb#3;eA{{b`Xq>}&u diff --git a/.cache/clangd/index/clara.hpp.37039B002C851AB7.idx b/.cache/clangd/index/clara.hpp.37039B002C851AB7.idx deleted file mode 100644 index 01026915693de5844b933966ad2224897c16e282..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30604 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 P^$u<~I0-FwRLT7xaofoO diff --git a/.cache/clangd/index/client.cpp.142786E5739C6086.idx b/.cache/clangd/index/client.cpp.142786E5739C6086.idx deleted file mode 100644 index 37c6e6aab07f00cb8525460edeb8bcda4f102967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3324 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 Di_2`y7(k7z-P_QEjP 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 F{{iVbf5-p; diff --git a/.cache/clangd/index/clock.cpp.622BF041106573C2.idx b/.cache/clangd/index/clock.cpp.622BF041106573C2.idx deleted file mode 100644 index f3d91abde97b6acdf0c9b6eff3dc3fde49e659cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4824 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 Z_O1^;T4g8_TS&|a@#`tkYt!Pj`9ELwhj9P^ diff --git a/.cache/clangd/index/common.cpp.8896DC31B9E7EE81.idx b/.cache/clangd/index/common.cpp.8896DC31B9E7EE81.idx deleted file mode 100644 index 979dd505d75ef2854733a6c0de076c76256455c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2080 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 DsOkkm diff --git a/.cache/clangd/index/custom.cpp.EA9CE9AF81C1E5D4.idx b/.cache/clangd/index/custom.cpp.EA9CE9AF81C1E5D4.idx deleted file mode 100644 index 17765069753c33553cfbe832fa938bd6e49f04f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4732 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 Dixt6V diff --git a/.cache/clangd/index/custom.hpp.36F2F4DF290D9AA1.idx b/.cache/clangd/index/custom.hpp.36F2F4DF290D9AA1.idx deleted file mode 100644 index 577765f0cbcc915e74477c2a1cb397e5c0942530..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1720 zcmYk74^R|U9LM+G9lQhf_7?6B+&}KPs_Pdy{hcWdhCGAggO-ZpkFZrszboeBjcWo^3=QP!HuAz!* z?N~6iJ8pSs&jJW{*T=Mc2k(knFfs;4MFTZ*Ljy_DbHr@3>Zd z_KB2}e{UT&)!UlyE^dyPNdNK0@xsTg(@k&IOw}Eoh(CMmfvfG{Ya8!n)lK-76kT>v z&J9IxjKawTSvpS0zF0QSBBc=y4H^!_foe+19V0Z2W%^9^w)=eyQX463)mhDa2wcm| zT6TRX-@qa{86Sj$0t6nGELm>&<~cWuG=%$Of5yYtrc_{iWetn`3D;t+Lg10HrM?B# zqliHa+~2G-2lL_K&Ckpk7}8#6kPf&_Z8Pv8@aXr7zDxJ5En!dqaJ^1%;zQsu<^S~L z6<5w-kRG^EXSDDk@Mqs?IONW68e&i&@DN={7#{*pq;RO?^VoC-A>hHfU?U#_FQn!c zT&=yE%^(HvP+h2*4-dan{iOb2cpr-lWdAH?WdeWe{I1Hc?4LHWNJ6*@s{#dH(bnA? z(>gnlMJ(YOtnr-RuED{$;U?_IA}_*~Sm}8_O^2SJ{7~dvgpnwi!n8L{^FjGMdj29T zYUyK7eA$~<%b+0GfkkIA@*%9?ob7G%pSR5S8Kebn&>2j82>g6|H|j6w#Vk^h6{xXV zCGdfSG~ETw`?-P0M7SKu#R4Cc?_5>i!){`b80I(WOd)&-{EGX=*w{5kof?VAc#uUZ zaECq5Y5bq*A|KvxBDTnv7n*nsl=Ih`aNwiN4OixgXl#{Q1Bk^yIeWuqq=k}`l{gAh zae_w9Cp`Yw}~Z*`re7Mp~uTOmqXvxkl`Ql2dD`&%E{`J6nTk z%qSTx%>g-<_EzB^`>QJze-tk@g=h!;|s= diff --git a/.cache/clangd/index/disk.cpp.1F7580C201D672A2.idx b/.cache/clangd/index/disk.cpp.1F7580C201D672A2.idx deleted file mode 100644 index b5c499e9b9b886a69e4abecc68594fe3720035ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1998 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 A=>Px# diff --git a/.cache/clangd/index/factory.hpp.2AEC37A00908E370.idx b/.cache/clangd/index/factory.hpp.2AEC37A00908E370.idx deleted file mode 100644 index 330bbbae66fa651d2529daf66b2f3090d4257bb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmWIYbaQK9W?*nm@vO*AElFfyU|`?{;^LB`%-DbFCz$;nu^Ai+m~xwca@g7{S1q_FIR5|Gt9x@#3oExM@5{B^uN1paH*Tu?H{At1?AzI+wy$E(cHKLl`%RhYl-W|5 zL6%vX{)_zjY7Wf2zEa5#D0I4kc-?S){5O zyJ51+HnD)|!B#S64pGu;DmdlZvlEs-*%|NbuC3baTw17otcNvA`_+=_if_T+{!d?1Fq7hnF;{Kw3$$IlqQN!+{4P+Xatvbd(lOcx9c2l7hsZ> z1#*Fa)tcK{lz{^jP(Wa>yX=avet0B16Qc|Rs|A|{FPLE9gvc|pGG@xp@4q-pY!)9A zvn&Ivy{Nqmn1Gv5Y5eQ=Q>CdF_?Vc0@^+$jl3)TZzrg97kLbQxpTw9LVJ@&@vf_lx z7p0~Z&jh&y>QY8dunS=hW8wlkh=&!VDVWoBZ*HnUA0rQ|wW75;%xR2VU?-Kb_rGz< zz0Su3R4ia6%)@HOVaE+~9#9R)ZIkC!8+RQz&UD1r$}?@%BNV=yqVBbWjR brVxV3g<$d^n1TqV6oSc#V6q{Y{0Jrh89dNC diff --git a/.cache/clangd/index/format.hpp.A472BFB350A64B30.idx b/.cache/clangd/index/format.hpp.A472BFB350A64B30.idx deleted file mode 100644 index c466d85fd1d2e778f6ae4d6593714c58bc24e7dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmYL{Z%9*77{>4Jx!rlsj(2}_bC_B=7s_gD2DZ_3St%~(GOeVjNY@liEw&X_WFNAE zL_d@bOwGVF38BC;DowF36;c!!)dwreD59i7L;7RyPTqClJoj>*m*?E~{hcCLZtfsr zn00$xbv3?VDaSBOG^{|-U)c=r30QUQ1x?wwVFk$v#3~n`9U{BDA>*?=G#e;u6aGkm_2dEfD8WDZB4$UCpEeWSKGas~=B9`Fah@nUQLaZCN( zjW}?qrfjW@VRk;>@$x(GO%d5>1%t2(YpF0%;opa+%2nChG1GNSWC_n8jY6ZO67f&= z{4DEwUDPMCO7LTFjFL*kZ>oGd9Wy*`SFr;4x;R||m56`l;=NymPJf!nig3Ol3K}XA zKXmlNcDAJ9osPxe^BgZy`R{j(>5e=RHj69^zCuu_s6_m+z|8U%^Wg(3Ru1QzqD?VW zBL1r{osAH)_68ygMKpRX_ zQ&&~;aMPnKmLR9y=_DxIp6#@b)C}k+DrPx?^0oPTg4|j+Xo0o>)T8z2i-nw_8lS2e z3U~vbMi3UTk|2lDp@rg9w^;%N1#-1qhbbO{?1}bd$T1Y8N`w%mWC)5U@hXBcHJQ4- zb=5EYv*lN1P;aoONvv2*84+Y8MzsV;hA9|{2ZG~xImVO*K^CJWttIY4MZG2HVL9Zs zy3;|k+|F}xr*zr%vGuU&&^Z!d)8JkzL4(XNvCupt9x{{UMobA2WY(J(5oAlWr9h|a z-T5#OtH(BMF78a9Y+NJbXulFahzi4#aB-Mof}ue^L29iUqD=9o6p0q}7)AvaDC754 emxgb1!0!#jg+I`ZMsL!m?u>L9$IRdK@b+JBxZpPc diff --git a/.cache/clangd/index/host.cpp.0C1CF26FC798A71A.idx b/.cache/clangd/index/host.cpp.0C1CF26FC798A71A.idx deleted file mode 100644 index f29f9b635674a94d8aff6d76ac7ae5b91a940abe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4080 zcmZ`5cUV*RHusW*jGIA#43e-Rgb_9b1OkXCC_zThTtGlT5J5CSMI%TRP$IPjwM#%n zaXl4V>Z%L}6!lfDR;`N)Esun2^ySy9CW z*+m&d0)fDQzqUxTu)v5wsG|@F#dRgB)WQdHvrDmpSJ?|x0$$*h8`dw_Gjew^sL?xS z^*dTztsnnWx7o&sbexm+rcT#_)x9yW-{AAFe(byAytS-S~jx z=67B%+S1?cGOByw)o}964=uyIH4g3Lk0PVq_l}hs|FwL{FzGjs!ESnY=@>)z@bH9xpb#b5cw;_HGJPmAAPEbR3d*)kBd7JVh>0wgX{u9?7Sz)h7BIYDJmVf5=`%#Cy`kT$o{c@-Lzy@#iu4C2P zW`19|di42g@%Gkz?ypc;*CE91@t!r`r#*Nzzb4w&zha>c-q>@5?&BAHn2E3=H9T_yS7IrxNt6{t-FN1Um^d`?o7wATlJ>ghJ@6t zX)U=QYfGXNn}3{5F-omj@K;hwi0K)rbBo*DAHE#;)+N>SvwgBH6<+j1|7yGbh-4l= zYb9+8c%G-Ps$IS+>x}+?=fd8=Na%EOcH=kI zk0)r49P;JmZ}?uCaeNk!c5FxQx)Uo@D?AHjM^iF;cZRJjTr|2b+F5_8kG|S())&v5 ztpi#d7{7I>_w+{;x-px?^ny!GiPJ;dc1MN&WYiAHKV8 zPvfK6aj3aN>a?~8z1||rfj$prYu^#774y)?J3b$c-fq2omY`i(Fn>NmAP`5&ziZ_# zw&bAmvk7$F3=QQ}*KQQ4Tr}=y~)!ftt_ci$2jqn$Dkz{(8nS zHaZ9B>k#@nM5Go;MDkA@k)Az*c0c`f4w?oWh4ez9TEG-oexlBwnp4yyg{tsQ>BaI&%91-!*1wiMJImT)h$};*SzkX0~DF8|hshCqqHD4jXk%#v0y4a1^vZ#D z8wA5KFDzg(@F<3RTY5XuCSp%Qq7LFHeGZX`i%=1ph>KA%zyLG=U?3XEHr_Vfli7ck zV}#+>cGgl1m)J|3G2GwY-4hhKo2NOAMEir5p@*L*1Ad?#1&0 zyqqTo7{Cbts#30upp;$l>eSci!7z88yNvSUvHIlf+!bJ$G1nM)C|rsq?cm6zpzl6B z0iH~1rU^YX;n&vHmtVorMrh-}+P&D=Bx{SS!8J?Fak6GWLfVY9B-%vTn0AR*J?q0v zfrqM~PBVM`q~(zQ4;Jt++!#I>ZtrUEE&9A^!!d2a4nT%U!-6q9QJNTR8I?9PVszWm zAk8l=6vNZy>EV{iMJt8^^wlU4r^=}AM4awScX22qEWH_@rv*+kmYER4`7FNBDe#Q? zly#;xM9kR7SPt&^Pyp%?ksh&@E=~U0$Fd{LppYD94hqSM=F*D8joQkxRR|HsVz4Cl zenDe-ZSE;hRZ1_#h_kT>OYl}1a4BC^l4x##$SIpYzf9V4_EkuP}C73>Pf!c8zd3X1}$!c+j0 zv1F6LobG7fn|<|gE6*n{0L1$hP6_VtysT=ivVl-(!ZcGShk+4>XJJ`l49}oTPG7qHkMSKZ{3y1<1R1s>!2)jXy7{OZFK$uJ@6Nlefk*zaZ)ei+D zLuK5_F#`J2qtkKP#3YGqt$3b4v|u~%khx@0Wc#LXf`|69K!Tm4opZE$&u^@K*Em4c zk#w|J_ixU*mcL#MM>|(L@A$2A)CHf<`vvlvhNf|dcsiQSNuW+^E68SVBEuE74q~Gd z>kQ#j>Jl-$#H5602%_ye#0kU85#w@%k#OqbxW^CuiG~O`Yh07Y-#sfjQ1zuDj1J+h z5Jrb6fGP(Sz+{JHSM}O!giAW86qtXSlMrG=tGhvbLH)?bl$o-}v{9Rr?0$E2jL zWxUY`n}eYS{*(syzAqiI6cA#qv{pgYsU#^F?qu)e0#&E-Pf6*TQ(d3?@*o&miI`L( z{CW1bV{3lDvj%Ev3OWU*jE1Ly6l=USPz=kkWiVwb5kVzlWq3*}5qCo?U{wg<^$1aq zK=p4#u#E_3a$ti~${3}ZHZim3V?)86=V}Ciq>`yn5r)>A9NmDl54Q*R4bwYUna*gN zvncof&dA)mmufT7-wpH3;Hjo&P4%s2D=r+hEG=)<Z6H#(DevU*QRkkOg~@;!PD}!761daL8V zf>cBnD%Yy4y^7ukn*1I0bsgm|hU>WY5cR3Vsca07CPo8HA|?S$A*Qg)eN0RPRjsSQ zoD5cmtYUv`+NEnt4#07>*=oLiMoC$9lFl%hst{@wLZ94S2s*L2K3B*(jMS;8AYLKd z5J*lOKhEk4#VU8rpLdoTfh$xk4WN@&O2mtJMf{rAM(O8luKWnThKa)@L_ATPDB0Yg z^VXj}T>(1DZe*`5yoQ`o_aY_eq()JrxAN9=!%EFc;YvBeEJwJ8C%+uA`>G@KhRZaW z9&{Vp3Az;8>D$OH7Hj@39{{8RRY1+eqw$o#Iq_RdX_e-X7Di_JFM(S{+#((kWYeK050$@-5sdX82Mg$AI^0l- zluj+hx7uzMPcH!rV$c|?mgB;kJOA)*g<~i$)a$rH{U286vtL1#VNqifiyD?HENX0G zQ6C?;xwxnJm#2Rx{zT-~;=`f+w;%~wmRWX0Jl`VUhKMg!ER8(TRph6xb9x2ZHI^D^ z;Y!515^*@G-_fA7c()YLOfr*UXd<~DQJiXOS=;*r-vuuGGqu`226+v6e)j^5Q%aSx z4q3u>ug4ohL3afbRDn!A%?xb0=h2h}^a{kd0-<&8P79hZP*s5x7MaB$;%qXT-DSHv z=WVWV3urVT4Us28fPQJQ@H}_p;s~G(To_)26>+a{bK_g;6T1{XZJ`-}#9PGx=r#5}%VMYWQA@(62 zP_2$}UUvuQlspStd=GfADcH>WFCK3#sBLV4qf9Kb>0^FY(|vw?8;G=Zw4L^_tF~{o zq@xrh80r_+H`MQA57MYHi?93Kc_Uq_708)Fox&VS-goc*R|=&u zB#tAtfRu3p0Zyk(2mh3q(hQ1NkY)o#EJz2K;hPaWd{Iv8^TlgHLW!V6{BjmzcO$gt z795wEF5|!KJ;-s`sDfg`wK8qMyRfFG)*F@iaHRTDL&mCJZh9`e6AR(iGPEp!u3Fh& z{SDEsJ!gLcJE5OId#OvQ=lGM*&7{j0U&6%%G{N!Xk+IRyt}o+YIavEz!+eqWN#F~? z-_Jjkpvlh9FnpnFHJMs>!%MOOO#Bc$?=heAtgg+EHvj+t diff --git a/.cache/clangd/index/host.hpp.D6E6FF9FFAF571DF.idx b/.cache/clangd/index/host.hpp.D6E6FF9FFAF571DF.idx deleted file mode 100644 index 3d38ae58573fb8663b45953337bb66f04bcd3460..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1978 zcmYL~3s4hR6oxl9Kv=T7#0_~Y2}yV)5iJ55d;kV0N(BXxM{PtI5kWeF%3}noL#>5& zph{t+I<1(hMaPa-9jh`7Dle(jQmGHLRUczqo0? z@0>Vg(~eV>#kW$^??nw)Y`mmd5ofF__b_H|nHd+J-Du4+ow?h(%|F`d{FT+V<=2wV zD;rAM+he7FmnTXOHzcp#F+!!*70+k3kLTanR`W{K$=uacyi_q1Kopkdt!alY zI*pcpb56NI$0D^CG#Cb{WRz;cm2Wu=*VL;M#|~~*GRVb?Abl;qk&Ym6S#8n8wz2jz zERx}THKW!FJf!hX_3?r?5fUWQ5~S2c>gEUp`SyGfDY72wYKz;m=&TGOe1g`johzIW zRS`Gveb@LB25F!IAB#_fBM3YuxSzW)yXppurr>;z;dBCDkuh$|8`{24hTJjNm^D^` zr)lZ+^zkRHG9<@b&d5Clp6+*hY3;2)K4uUL_v>NiJ^otYcUv53R@Dn>P# zzlIu_f3c&MV~`W%>n-~Ejv(Y`rX@W(Vtjf@hCFb-f>BK7SM~cR4G)iMRY-@qJ8~Bb z`TK^slYLF=hLuQ!IgMx+f!kZU{F@iG6w8npbCzK_fgf5QbosBMIXf8S4E1?iydxb! z;6IeVjOShrH8My6++Z<8I)cEPs`lFxJpajOkOa8VVhnQxfp_|BUH39aQ^z1BaFfLp z<_H4s{?RkIqxbSCgH*uH7PHk61U`~>r0>t&5eW?P1ny_?3wH#87i47@dW$EOEFv8W zmh62mm>Ftk#T3b!*mo#WZk7j7q{6HSz?v4hIkfCLHfU=~%qe!FNIINeK#>f~cv7T^ zHYq65Oq&&0<8U&s?Wv({wq`@7!5Q|ipwnT05M!Z8olfTiS<_8{kTu;Lh?OsXt9aN9 zZ-pY=#qN^Ob(i8oZVv226sZnWLoOH0&Bi`}TX_9r*+Y@M=CR6w^6HK`SMfM^B>P)< zI+~@`6zMJTrYX`#;zK8s3(x0e$*SQl4XXj9(QAwl<1~pBskLh10rj+APLT%MAWunP z&G&1=okdW;L`P$*ktH-ygY>>Jm2FdQ#ZQ| z4p+`phEk-;q6&u^=BOi}hIw2RwuneX^48cHF{4FnTh$EhRdPxL?ANG#cGq37x^;S6+n4QU=zTScL3HrEP28A{?uH(JIKR{FW6TJ`cWBG!Gl50&n51vFL;?P zrEMTHBLhe$*Li`=45n!yGlO{=wg()=d*k1eubw~etXam(elGhiyoh=7Xm|zl6wyRM zR&ECWn_gIuS(waE-1zWzxZ(*xP?J;AOZxD;pv>zHF0K^KNZkl#lJWn?{|_mi5X66^ CzWHhZ diff --git a/.cache/clangd/index/idle_inhibitor.cpp.3D718BD05B870FA9.idx b/.cache/clangd/index/idle_inhibitor.cpp.3D718BD05B870FA9.idx deleted file mode 100644 index 37ee31cc035a559a9c6e96c383fc26aa27433d0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2398 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 CN$E-e diff --git a/.cache/clangd/index/ipc.hpp.804BDBBDF260032D.idx b/.cache/clangd/index/ipc.hpp.804BDBBDF260032D.idx deleted file mode 100644 index b15922d2a14892ab203b9d98ea7b3b522bc87507..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1498 zcmYk6e@xV69LGQRcz4_#cRY8;_uzozqy;H0H)1qutmtMUV2*_F7s)TZzzkh?SiqJ* z<-VIT6gi9YlmKABkGt5lH(3F&odA?HJJUB;4@XFgX)|3nPS?E~pLVDI z;L)r?-T4PEJpNOCTaIV`TKVOkr`9dlBStReP1jUaEq$`2k9pJY!+jZw<=VvO@4}Ax z!ER;R2G0)`uTG`&?OHolS!-W9xQTvMsVS6JB5k+46`J6zMD5y@D+!)!t>1XEh9j@; z`8CF5*rnK9+U%;zZHcCPlWgzb%e{YPq-=B~s<6A@-0BYo6XGJxyW1K=YxTZ~tAj^k z&gK2`+Rs_{w8ys;jMUtZIDMw~UqzHYBX%ZwrnBJ4d&_6H_c3lc_Rq&#G21fEzkcJt4vXDFzVuoA18hwO|; zzW>-!1$R3s1R`M|1``k28Bqm|O(D-dIz%A|2@TOu9x~#I1CIHADIu8x{yeLV*aCUT zo)Y)4V!oj{=WPnBkO(7THXbs)plEA3I!b!!6ewi zLq=qTec`>CnQ)#0MZ%x>Qy!f7|JJvv=}^k5u}u{GkDQJ-h zC81^>vZplm1)W%3lQ2gi0Es{nXyn0(FuqIciuY`G_{Mq)CL|;xQ64g)cV9D1F87sE zFe0HPS`!c1_vqgi??|@$KTQE&TWbgjG4haoj~j*C{=RrUGM2J8*-8mD@{pY|(y>46 zR@3h$6@((8R4FYyIDs!eS~xM+LDF3Rcqo{W&=Fk#57`;B7hBUGbdDdVAR*yL{3ISS z!sUF`y#xP4g!2j=cU=gMmDw$9#>!L{>SATy3Qw^zNrjYHnUTUktV}9;a0@FF zONfM(StP8%%9Ig`U}b&?AFwhR#Q0d*@?vSMY-TYlR<^0w5Gxx{42G4hH4xrj@Z!nm zrmzwXF^jRVvZcf_SlKLM2CQrYapzdsg@eoadLHftZr5%%dW$=}QLb$1S$ud1;6E}e BgHr$i diff --git a/.cache/clangd/index/item.cpp.BDF1AC58410539C1.idx b/.cache/clangd/index/item.cpp.BDF1AC58410539C1.idx deleted file mode 100644 index cc3ededd68a1ae68fd692b777a7332dfadf756e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7280 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 Xm&2A9D^5`n351hV0)l?}ne~4FBYGur diff --git a/.cache/clangd/index/item.hpp.CF2C10DA19A462FB.idx b/.cache/clangd/index/item.hpp.CF2C10DA19A462FB.idx deleted file mode 100644 index 561786e2714d5bd34cb93de1f1ea5eadb1321955..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3008 zcmYL~2~<;88pmHQ;0uzxyu<{^LLOO20>?|wHoH~0K9 zEpx(zFMS9ieL?2ZMY$zTPl6!C@N$(Dzw?8DAX4Ftr5o#~PhN95kiOkLbeF#Wv?1rx zt5o*xuXetFFmhF6-$Q46g8Es{PyK@Pr|+MeVf1NJ_KOCFmnF~%j~gpr=z8#gYHZ`YqQpGIS_U8YZ4o+AdHKnKh+?BS>Z6CdvOg|OwPwhW7 z@LOB>-9wF{48N`gy0f>Y{L!;n`EO);n%QNBlTkSGfOq_LR-5 zde+D<+%1{^^yb@h*M)ZM3tw{nKy!&F`Rs9{>cQ=SO<$yaFu8rbGq)+esq|ccs^ICx z{H)cLe=AnD3}q(Vl}O4eX7}9JH}u79&mXr(Q$@9OR#cpO_txFZc^6jx}KM zPPb}5iT6#;>NOWxm!=xt*r+=7%{DJZso%Z;MSz!T>Na_wE$ofP2ff~{^0g~_j(`5k zSjTT0{}6pV|I_xxBh|}i&HT_he%HV$XO8QgjKTkDYkzL7j&{}T&Pcg1oYlKEPUsr z1z)vMDAG!Z({<^QT)279+(oXClSMT0!TmOk&E2nmA)2y$_H{XhNa$D7YJV>He)BZn zHl;_zLJExqo~lbVbHQ^{$^!p-=h8B zuA|T>=ugw7g>k|29KY+w-}U_UpA_-{9>fGibHVex&!1>^Y|eT>BNblXp>ddbzOY*# zUDkDPFO3YCCu@?8JTIt~Fk@G^S}0_M^(~CWzy;3>2el2Q*&_%1P%Lm6l6i2!^P>Da zW6oK1y)tCN>nCZF#`3&)UFE8adl_E}c|pINlKXPO^QwmFJ3m{tY9Eb4aeoXMBjfpp zpPccC|6MvnAvN^t7@dU+p0C$BW!XMnJ1C?9u4nWiT=2ZbxAS>@-=QlAp{SR4UMyCN zwfF`R`;QL^*IJ(RQ79bx8HO=(!S^4&{14;pEwBBBLSeuI=m1|Xc>d+Md&1qz5>qH7 z1Rl%;Te#qP$I3My1YJ;dP{;z@$QUEJ;CW}lmA8s}E9cQD7=QmbGLGT-nT$&t$H!2G zGz!7oN?N5n?O;trJg#zI7{b)ZW7d-Eo*j&)x+%T6y zqk*evm68jdpZDtA!>C_;Pa!?wp+{zVRjVxT{e3AAv*_dmYYA`7aUQAeR5;0j8i7pTKfT~Yp3e*@6Eq2t*tLSuoMW|rsuh-E zm5NOYl+`E}CzPx;u_rxW`cWii9U~IUJY=LuoD`ZAi8TrHSw~_kLdhx-OAt!dfN_O? zjjhkMz6Kj}SR8S->dM2J^BkWcI1r;X0uCfPE(v=PT39J&mYnX67}_-oT0+PWA8bXS ztP)@Me&zV0Tza(xHYSt$Lz<*;q;gU&7Ks(40#Z$?AvL51GJp(#WJm^5N9rJrq!BWR z41zR~CP*`BhP03tNPDc^Ha*3*EY0;HrGKZQArHg!f=@E$;@kt zxW3jTn&$yO1QTNtiQ_f#2FT?2SFn#^=d6seexYRDn|mo@Y}3f&*|2P?DwVOlH-B zWdbE@66_8rS#c1>x%p1^Kf+a<<66!RXf|FxQam6Ck$X7CJ(RhJ3ipt54<+uQ+&vVp a%)Q!|y)|doXb~l$rLr+{g)iaj=KlxF3+n3t diff --git a/.cache/clangd/index/json.hpp.6C08A0DAD19BC4D8.idx b/.cache/clangd/index/json.hpp.6C08A0DAD19BC4D8.idx deleted file mode 100644 index 6e8fac2aacf1fb7814ad2670445d32155d035b25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 750 zcmWIYbaQ*g#K7R3;#rZKT9U}Zz`(!@#Kk2=nfX9^5fE3*iS0Yc=U^b<^1b^_t^L81 zX9K%LwXd2*_wM*nrqyKOmv--rgXG@TJ#JwclW)x1+UTewtkhSR_GPY%X~gWcrd^M$ zW>+2C(sA@d`ZC7_kS3Y)SV`5}uU}j@y69f|soDg|NW=7}V z?G_VsFLH`8F#=6sXJY386L1syCe-@mR+_#QXW{_Li!zBag9*6&SrN`}duJt05MW{j z%5#cvN`eWvd{JszaWf;(DQng?1imlOX5?WOuorNKIh=`yna`NdnhWe~dA>%=PL4AV zfocRL1=V1VXXXMs8sab>W>IEQUfYU@=mgQ{CmC6oxdgaGV4h&)0z2OQ-L0Uz;a9SO z=5X_J3wc~wEtUJ@ax_q}popM&FsJL@+*E-+pw*nJoZ39h{G9y!l^Nw>`;$7h0@d*8 z@EO5;&Bz4y?c{mY#$5*vw1TwoaSHP=b8&I;PZe($bF34o18U*d;n$y5rL7kt_$UEr zDVH>t+U(pdM<1|nI11$Q+30_s50K)@6hc0gx?0`B?)#x-1O z7v2E12#5>FJT+kb!p<+=4Kjg~PxxhofyArJB6=XM6ral1+?!F!o2SfXVqxat3I z7UCA-|JC`a@15Q)f1r~DLk!ECJfTkFbFaUCG!fXHl diff --git a/.cache/clangd/index/language.cpp.7CFC0E2AB711785B.idx b/.cache/clangd/index/language.cpp.7CFC0E2AB711785B.idx deleted file mode 100644 index 6d439f1fe050c8b1c0e51815fc17816cbaffeec3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2412 zcmX|B2{@Gd8Xsf6S-;sC%ot;a!I%w`7-MW@Y?DecUn$9w(jrUuNLQ#-Ze^*?J(1+N zm8g_+RVZaCI&KaU&81FGt|KWOJ(i^9{-@`u?|J5Z=6&D)_j{M$@Bf7bX*6*J6lzIa zQ2O@xw2c@P3PlFL)U=c>HpVEF6&{63FU<_^-7)B7(p9O=9KX<+{PR$?|BD<(pN2#T zEX)}A90=%B z&NfAVz63ozwA<6S<@PaNf_JU=x(a;9@&|K~dLFhQ%88OJFKcKU&C>5VrF~ZP_UGt< z7W7@Fc5Lrak7UdGD1F|TEMrF-q2xgCyDO~^_Gnge?j7lSLAsmM*1X{beYUN)Ct!c% zv3skYP{K2asVbQ0l@zjdIvK?OQ6V6>e)%f|* zQ`rc+e{HTw2YyR^dpR&q|3tAjb*+Dx_JPF}47X}_q z8&%!t2~6_s#wQfp-8sw5)2C!mE*ubV!BCgU8Y}$<>QB8J8}|BiY2u!_&``UH zkS2Eb{WC_=ce~!UZg?@%8VLRR*jRiwbi1>UlOiI3nkYb_2&lSx?a~gNa~9$ z_PdOp7wk;#flri>61f@no`)JwjPkZ#HZ^;g)3bWuL;G#LMn3C1)!{hQ>NYF6SU53K z&{P}e)p>Dm1-H-alFXs%RDYRYACI>%a>09Y_U5Q_Z*smezt2_~dMl};_A~lSO!;9{ z>hA3^+2GEoyN?Gx4O>@1L$8ZMA#PMRQympYC8O|$O9h^|k47C~EZ_gp&}%`SMP-@j zm^dcDsZbg1@oQ5g-o{A%>2OCKJEsb53$5PdNSgI}IHP@*=8;rDNb2l<)bJ z_)V!82!%4<)Lr*pT1`j8h!Ufuz=$`-n?inS5kJEFCCC_qSkf%%7=&xeWnmD$6`x1d zo^ALq=S>I}MsR2xuy`~cSOS^=ED=ov7DmIsQm_;vJxg`;w-O(fF^tgcXpS%l$wdpu_84~=_WfGf5TTUl8YT~X%S z5&#Yp&BVZn4aNqPaK<=eZKidyH=FkN`f;nWVs*xepf9 zh(L;?;JCqvrGupeMz~V0vqB6zK=_boP+Gti2w_BSB^NE8$)9#j+hk~!Mximm$gq$O zMuru1^#hbIV}Aa$5eAVkCG2ksFd}}X-|u|;?x6-=Fc_IaqObxc2g9D}9&ZJ%JM2ym z88rRZ<%1Djz*SO}Ol=SCd63`o!@yMuRH9V`|EBHnw0z(~R*-E((%FQO`BqoZm^ss& z4Sy}S{+d3{d25&+0-Q1}O#r9nTnoUdkZ*@Uq*N&lgUAFjn`j5py`_>vVc{~}wF{fV+YihndW=Yn$3Vn_ueY$BTqxTA2GCwI;+ z_z$Eu81^rf$ch_T`Mg5aIOvl|C2~vJa?f--4R?a9*jj8`%F}rW3Ki=?R!k5x&k@$# zxMB6r9so-5f_#V?_!nXn~VxZA$U>6QdwN;PO+}ZKGI@<#Stl2cjf&fFt4qRfLO?SZ0Z^J8FDC!hxWsFnGj~1N@5B@(41oqxR7up*8PjuT)Ce3E)l%wNA#ohFQKOo zw*F9z18YP!5!=zVu8*@kO){e$c;RZq;zh+KNDqu6`F%PA`wa? zLr13N8M_*?4IJ6C6yUr_4DAOd1&1llCZxU((g09#z$~ zVy;nY!kzLfn{S>~+;U-SzU$PBZ;G^Y{|4}=`-DdYuz&Txlk{pn}o20IGAAI0C^DzY|l^fxDyn! zNPvl75F*0H&(6;amk-OIpZ@sgAyYmkKA?UvVKFH%0hdqt!+1PM%<+i;6Aw(kFuO1h zTt0K_?2XUQ_LqqyAU5-eoKmgQOK;&?R-pJK>eb^q7q;NE`RKF#lLlHcWCo5aRcSWg~cVo1YG{A zvtY%oL*+BsnHU8a*tpra`M?ANCnS6r*%*sb(~6CdLXwdS9D=fwl3dDn)fqAJu!*ya z^QhXc?vAc}>K|ytDby0L7`|jf) z7fNu;!NQ7}3mis36M!z^VdG=wR diff --git a/.cache/clangd/index/linux.cpp.AA11E43948BF7636.idx b/.cache/clangd/index/linux.cpp.AA11E43948BF7636.idx deleted file mode 100644 index 0d5bb13a714a3438af20f06f58ac7e2065252eda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1320 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 KZuIlo1pNacCRURG diff --git a/.cache/clangd/index/main.cpp.9D6EE073CE3F67E9.idx b/.cache/clangd/index/main.cpp.9D6EE073CE3F67E9.idx deleted file mode 100644 index 986d6c37ddc99c10c7655b0e407765630e8d5417..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2136 zcmYL~2Uru?7RQH>NJ1v0fguSgfK(AefMDnd2}y)V5r-OSL5eI0ieh<+C>B%@WcR6v zyQ~DkMMaQ~f)#iDD0V~zL1cxMeTc9U72k#TJ(=&D^PS)P?>TesoO|yCO2uM-EChMQ zNw=jaH%Fr(2qJ(xV{>|;XlS&`Cy>lY<$;I2C*wKem`vh8UumvY)_cK@xe<<^uvV_*8#J`s2Aaz*L* zr%lAEHpS(T?Z+SH84qOUC|c{z+_f%op5jJa57uwamp{Ywj@8Zno;=w8&y#!hlY8Gi z%Mfes_r~|*CyEkz>l;gB9e0%U^ts4O&el-Xv48Iq6NmqEqUo3_+r9Q>+Gb32BuBiyu|m#O2)3Xl);_=)7;@Z62vurYDbpm4Sv{Y2&TH^Dai;|Rk-ID zVUL~Ho;U2IcdnP~(gMtf#)ZcpxZdmTfXN+Kqgpy|kI_fAD75Fi)2*s91Z&1+$W^lb zAF+oH{DhWDJ+qGo7gJD3H?6Ljy^7E z6F%vESvS_`Zl^M734Ks_Y3d{UAJ6hHQQf7nPU<)E{NRDgH}upc?;V{~l7E+LpdR<= zC8<(H&!}a~w3PKhe9Y!$=;LpTa$W;R|Yn|8fj~KHAj~}(yY$z3pr^KPA}VCB$Jwa zGre@)#4Uk(fnTxnvwFkCN8w#<0WEP_;~SH#+}B(3(BIFp9|`QtnM^nwg{1QB6!9dXbHUrl|`syEE zndyNYw;t#?GEQ&7Eb84BS0(1f9WbN-x(F@8E|~9n{@1|H+>E$Z7>WV9HO6}Bg88lw zG*li)dU#nxfTDno#bc=p=DVJ*jL*mhyBu}K?lHPAsz?Jy7$k-s>Y~4I();5309kC7 zv34-g&GPhe96&i$&cqA%eaL1$T7iNQB8rHI5k88KC-ny%XcU~v*Mt!tBOg;3k(x=D z!-&6y{|fSM=ObOGJe)yzI3t`*acb>$Jwj{;7(fhQ(gd@V7g@J60dn=ZET$KaNlB9| z0Z7rNkeTW$EqS5tTLDJWBDt)>81Jpk|KbD0VzAomf`ZoHBdmxTXoMwXIUC00M?_VH zbb}gnEp_=YA`}VzV8p}Q!`CeN0x8zTCJqEjND|ue_wg#*PwxoKpG^mr&$dG&93jUkr724%_+Vx*$YVe?prxv+ zUWZ~M)&X=yx#IUS?5YfWYBT2h$nfEUK60ccppS5VIw&0ijM$=V3DtgXOu?3o1t3I5kWm|I%Slgv z+{pvzhIL!oI-;H|D!Tm^AP$4WbzFfgj{d|s3yLRFi3}K_O6vUqkNSKl1e2Fy;z)=!AB{!iXo@6FX?+Yvz56xe8RJuvPGfT+*`H{nWeQ z6^>X(+S|#d!R;xT)&SY2>=omk*Ihn%H;Vu=DNNez%hrmin&?E3kboj+!w3(>(^en) zaBRZ*`5F`&k>Os580{nN=V>7^60BImk7#-*T ztXHqs3JDF1hzwr`h0g2$yF&i&Kv3AC8@}j9EV_}4?z%-cHYIK&0&s0`u!awv!4x}- zcwUws%RTM6R;yO5v^5c!8ag_eSs1ff%iIi%T!r2o7i)8OJHCUB{+gvy+3G-v9)^m- b6LerLtfux7G)|Z3Pot2?@>t&>zX0gJ#?bcP diff --git a/.cache/clangd/index/memory.hpp.220BFCF008454788.idx b/.cache/clangd/index/memory.hpp.220BFCF008454788.idx deleted file mode 100644 index a16e087593e14b38a14b55d1c49be96500af30d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmWIYbaT7I#K7R3;#rZKT9U}Zz`(!@#Kk2=nOlH#Eh7U%#hl&=8~F|^@VNY(xz6J4 ziEHQ1-Z3m{67&$5z!)0&>#eKjl2uvl9&tJQH`l0FaZMCYoTJXlV8+&DvGWWEe~ep7 z!RIHd)ppz~RMF4%a(^LE`gMxpn(zIqvI^xkse2u9-srPp{}R*s8!tr&`I7rvdWtJ^lO6%xZt-fO`RlJnGXqFC*AsB*4TC)6d5aR0`8ycVzyyzD52A#h4gj@;ppD z9B}yyp$Yyuyqo0sn7DxEi;9WLf(f|%<>IjQaz-!Z*qIo47?`=(xOl(>11H3NjLeMp zp8LzkNeb`aW8wgsAZ#dX2`1ns6s4vW9|QUX=2J#aun%D#V`Kt*D45fAZ*HnU9}^EV zj|h(x53{h8uma3;KrJ9orCiX~xfrv9myw5AltWY$<~5)!$V-#wRU3C5IM51|<Ms0C;O4>K<_FDJ}DK$RfRJZ{fk*%`Q& z8EB3$yRb-6YEB|3UW$v7i`_vCXgq~({U%t<8 diff --git a/.cache/clangd/index/mode.cpp.DEC43BA6A32D0056.idx b/.cache/clangd/index/mode.cpp.DEC43BA6A32D0056.idx deleted file mode 100644 index e7e0326f79eb056af44246c53a79b5ba56c0a454..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2090 zcmX|B2~<;88V(^Zc?mBYgsd+K2_S?=K*C}GK}1AZB%%#@vWWs|1<@j?fC3c<*%X0s zBVy|U3aDtUbzzKRL90wbs-n0c3d2N&GFng>6zz@Y*n7_V&;9QA-~ayWTM`x;Du)S# zc`0Ez8L8PTNCX0b4!*4Hb*sddU<0_Ex_oWI+Cep^OCxxbxZrS?l&AZZK zi*h{==OmKuYZu{CRUoyk=TdH6AksqZFTSf5x@VT-q zx!v(`(V|;R|1re5^>JKE2@t2RU&UImb-(|+lK0H#@7ktho07afy&gUlSuG#f{Qp*a zZP(rVR~7|G(zR;I&ZS=MJFmKmH-FMUCB2Z%nCE#Ts4#wfdfGC#x?-D3j1JcYFHBp! z8=dI)_rF7_e-extp#bdCqg8|Ny{pTV$L=RZU8sq9)mMKffOqClL(QhB+UAyJ2JhV` z(;E24nT{hHso!UIo_glpUsQ8N-__~E>q^Uf$1RHJ;e6-|?lN8&$ zSLb>Q+g~*v{OVF;hM)+Y*wNw>30q|h+~3xyy?4o&Fcf>JcCylzu3j_Lg1t?MG8#YG zeeJZrC2YvWhn^=4*)BJoKfl+hp}4NU zAm51OK1&w$xAtD2e!Xw^YGaC{reLb{ef^n_DP0w151x-_yW#no^xBBzv&;We#U9?n zD1EcVtu%9>h_^|uhEgy89xbyvZE9XqN;tcx)8e9KOz)w_n^;w`S{)?)_GUzX>xo(A z>}jv)6E!&c8*-t~q z_`7^hakf+(N!;fhzu43_YY4iVP*>KyF(!T{GdM16Wbc?2EXC3*o;>)mKDb3w zICi}ndgz&7Y^bR*`2KNek#6(L@)-3A5^kMKpZN9J3&rVam~t*jjaVLaEmM8N+g2nlfIP>RPYd+$OgA$BpF$* zJ&=DedeYZ|g!9Gx8TJ!8x6EBZYrz$m1B)DI8h?n9H|dBZT*weINjS*#vW`C$D3b)*uWDRMP}vt_)&*9x#TzSD1}HN1LH&(NE(p_ zBtk}Lo*3c`!4XN|T~vZ9eBM+}cxUU)t}+-58;}#ko*mq9J@?T?X*ke9tPt*kv4>0g zb$8PNbVi)n5f5#ToY)rA1)zedu!-zp4TJ@2N&&>=m|`h)zA+<}RS6)(h0ui4eJLL4 zOZrG4Y9^mW!Ub%BHHeWXa5+~lZ8-f+ z_3a~>iRM}h`RJFf26Z&|Ph*qIA9;tZt3a($7u17 z_o!mRJ#YQR?*QaDay%YCTcfgh9(WDJLSxgc`}+naS2nlb1FS3T%6%%2bPDMZ1p^jk zp`79QDeUNElMp}{h3#JCzf?2&OOFC&t|J#4ol9K)_7R>6ppvc>zfFFuUTCL@0G%m> zg>+Cp7zI*FmRf;MBRd0$Vc1Nd47&Zx diff --git a/.cache/clangd/index/mode.hpp.6A926FBEE534F2A9.idx b/.cache/clangd/index/mode.hpp.6A926FBEE534F2A9.idx deleted file mode 100644 index cf2c74c8b009180a3859096d38aff9992ed720cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 888 zcmWIYbaN|UW?*nm@vO*AElFfyU|`?{;^LB`%vC^o4-G;Bo!yTJinZ z0XF00r)uk@rcD2|pyc6gPi>VW4I-UKKRu57?a}6afobwarw$8tb%`k_J3pR!eS)($ zd|TGR$1~kGwp$*PD?MGk^pw=crQvUz)`b~8YYjIE{F|KL`b8?+P%Pi_hraV!`J+#` z{1h$o3@)5tyYX#%M7Iqa$G?*N1p=0-p3GNP?Bvk-ExE{C;-Z_|m(}}gSNqQYeLXI% zd0tv^Wp0uZ(6!Reg11&i8~d{}G4eC8akFuAfe8jqkk=R(7}*##mQ`x;AJC5wVB!-1 zi!reAv-9&Za6nWr=-jz|#FVZ53?CDx00W!2u(&vwfXlZ}G<}*TfABsZ6E9F+R9I9B zOu*%r?_Vz)%4)?U#>5CSpO=Z34K9D~?iL-(FTS_MnFN9Q`Iz{a!313XW$h~qzPlaE z_?WnX@?yebl3)TZ|1J5Bg@=N_Hy;xhP+mk>L;_5}<^P(WF8vkvUq*n52WGzzyAU5- zz9==VSR5&&m?0s=!v=CC4;vpdAG_?NB$x7Cbw-RlY+~$UJgT;LiXLq zK?aI&OTogFkqI1@x4XaSSC#H;0Lls}3hBZ^6lfhNIAH+@Z*YAehiJ1QK8~kTt(^Uu$O>8wV3J3oAPV6G9mPPzTnx diff --git a/.cache/clangd/index/mpd.cpp.7FCBEF52ABE61287.idx b/.cache/clangd/index/mpd.cpp.7FCBEF52ABE61287.idx deleted file mode 100644 index 7d6d83705a258ce42ef152a027165062f9050ef8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6492 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 diff --git a/.cache/clangd/index/network.cpp.109ECEBB28F3CA1E.idx b/.cache/clangd/index/network.cpp.109ECEBB28F3CA1E.idx deleted file mode 100644 index 5f659f91839340819147bc27ba2dcb52d4f6e1b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12826 zcmbt)d036x7jS#Od%tz2&N-br&GW3eNHU~r$ef~F(k zwkU+Csi{fef8nA9zw5!v7@?Zl(xfdx0rMVt$!h$^W-hwZGsq_O{@q#Imugt$+?EI| zQf9xfcF#g0)r>g@omS@8|E(Alr+u|}$eO7o^D0d)ugG&+A2DU?=#)&WoYGVI$G3$x z-wSQ|(|suCll1uzTH?Ct+;3hPZFd_(4ZNgvUAMd_GCTCJOfc{BpW3PSz2@%@pLESmx_0@?txo^6kYTb9E`cYW) zv!~%cy24GfKR>*t{G;EEgQXWgEFxo5|Cy;BI@tSVO#au$3kCkY?H*mX7qwJevtJeN zlelrS?)tS^{s-OX%-&X`f2wstp2rxC#4Y!S%o}-9r*7_=4-1AkehAw>%C%zHh2TGZ z&fk8bA5SmDu9&*M%gT$<15)npi;E1*u4=i_qg=W9_^71=Jnd#&-ZbTQu#riJE zvTYak9Lj$xIg1zj&#w-?eRe?hsBPy1+78~$url#J)CcJpYce(aNx*2ndMr6d;QXe zt?6Mgu#0G#a$M_f*AM!G%a*qbslfk2li?gl%0@rJWtc0t{^hVRn)(OJlL&sM{ z1V_cD?Ya5qyXQWBkzabPI6FJYx#*tX?`;zs4_w+;mpQHU>fuSh@1JBmw&3k@ox4wi zs-C<%VtcEbe(==IlG)F+4qW_nGWgS~>o=xVFI+Zf%0*61OAtA*zQ zMh-Q}p>`oA5)<8@7#3T0F5q(Jnac2QfN`Ig-Y51UuG+39KQVl!U-P-(_-4BdPXvr+ zV%khxL!7mpt$$+l)mvFUx$?zh;=%A(@ zFb{ied*h!NfhB+JJKh@DRjl@xnwm;!p>+QCP*eN9)`>%2E#G!wzNQTS0TgabjM@;gFONgVkGhlu7n#x_%bnyzn2sH>b3{hew_p?7ybX|S2nXZ=%{|WtJ#3YP3hFEJ`|F^Hn z(epnT6@0oZ!;1lcBVgRr2Mfkb!cpIy$nwRjA&#Uja)-4v@QNy>tVM( z-rgpM_R8==z^J9BwbVYuR@?T!ea-yCJm6tv|E&_WVBomiQ10~Y@ss13k>3x-`{R-bJ3>9wQ9zVa&@AXm#3Y9B;BHhb3&6VNVK;boVe2sdBxM;il zCs#LSo|e@vcU>=08v_)y47EJIJ$_PXh#o2K)8n6f8D0()Qh3u8-Z8{Y+s*vv93Bg{ zq43kEoh51ufP#*Nj{UdCPYREhWIr-}QzVw*P@r%DnO=ZZm}#3C{G`xSmOh>|F6k!2 z;{jtWZ@QLu3+bZW#pWl*f@#wicDIKEdn9vpz>7Z}II+sCkJ&F`)qY-gKW`{j9pJSO z@Ot=;d7pr<6^9T}naRx*_|A@v&nlB^kXUsBi%wuIZql9?o5eaASgdNr)~(n@tcvG* z$Mb&N^vgLPoDR#OBNy|zSSD7T#QaGtEh-rF=4V%1v2uSJ?-)jDLd4%vuR8<5!s zWG7aIBeQS@HzLVKqyu!2A`-z`Vi1l&La}NGGTFiKW05iznZQ($JRa$bRXdSnxkT-*)TF`j0YCEymPPzadu}LP*>Qnx8 z{zWZP4y@D@>%oF;#kTPD5&OtA#-CBWN*!JZYukp^w_%aM^@M(|qakDDULxE}6oUSR z-Ng%L>jGQSks=)#h*jB0k&O(5M_yL<+V!PLL#(=wrT4L}Sk;KdjaVBHIIV0B5DPeY z0SD6$BVJ*oFN1@_NB}ICc<&&;FgR=n87<5Wa4q5OcVMErjIAzX8=|_3?XO}7QOd}? z-h=)Sih(g$BNj`=syM6{hfRSoSYs!9Pr$kf7#LQFEef%{SXG2|i`e@?!XG3OvFZ>J z9U@vVb)uh6%*3jE!soO00%A}=%*CooVo(WCGEw8=ZRZGBV>l6n6Ienl5yTR0iO|g5 za`($B;6@53N#PWdiSJdHU2j&x*6Z@R>Oag55q`HhVpSA%ilRMX3#l@mTETbJDTVgb zS~_dY#ekYVFv5PU*pGoJrP#C-TPqX?g6uz!nGPeI#PX9^M=_)#KHtvw8Z2%!KUySK z%_s8(VpRQUBqu8+9sAwC7O^&5DvDAT0 z!!(7p@2BSbDM;EuDmuve4^z{_tUZBuP2jsJcGY|c`s6eQ_B4nO0zR!r8td7xamX}| z31|}HlMuAGVMQBeqQKc@b1q_49oM&x^AoEYIAH@P*LhcDuY2d3HLNy*$Rh|ydK{6* z5ksYCXhZhrPmdX+QI~Mkn~Ab*GV<2Fs#rX-zr|NzLlKn}Q4_t4oXpw-wv~YCqU8dz zd*Gra`(UiFA(Hs*zy^60=k@S9OouheIorokrDcB!^gZ47w5xQahQ+8aMbo- z%{|!I;O`}GxHJA{RIJLPf-JW3N-Cy_X9C9PI*VN9(u0?{A40YCfdgDUsjB8GGlti(A3bvM1Ol`k0>hv5v!KqCGfn0 zG_EjZ@tTm=goo2aC1F%*GQ>+-o*eWRWTFlW>ad)^F*Ipphv5k}dxGtVss$@ruqpY; zvo)OU8qS5N)^OfyxL=5BEhk;e>67ogB&yw<>29tI`OZ^Q%{4tXYFv5+BrIX=u4hl~KTLzD7Ks-@b0a5f?M1D$I0KZ_ckJKBY?M+Dz;K>qDrHRG^%a>cI(xF$u>E#bz6!0Rw4(5 zO4N4~xkb?Km3sp|^ng+G;S5c+a)#!_6 zHj@LG8Phh?wN@MYu(0IJ6WHw*tlolU|MwUR>G{!h$;rV#Ncj3m55yuaaZ6Ac1*%#d=Os&w*4`lD?H>kXUt&Sf3+KF0*cz&Fe^E=O-K4W+OM3WE;say$&gSkw&_u zkv?LGFuaVbnOKy`;883( z%HT09I>z8}EIQ6$78YeOSdOLT81(9CEIrL&1(sGYcm_+)FnAVA&oWqvrIiex!_spM zp2yPj3|_#}3k+Vw(u)jU!qQ6&R%2;3gEd%MgS9*y#CB9;=ww*wV`}`E+IdWBUb^M! zgNd*+;3OVmit_{_Cy=mf?=!+%%f@L#M=mGM<$y#xCu!#t-6GvuyK_w;AUe@l5Y60+ zPU!_d?VI$1qQ)c{1EoytmWjKwxpljMdwS}huo(P&Bx#ngK;*p@|vVm`TN89m!V?|QQyM6oJ69YNVL2*H{|X+ljs4o z<51T)G_Z$%eR$K0_Osw%Wf8M10_v!iSkw~h9y0`56}>}zncg!EGWYh>OKP;WCEw=Y z6pMPWIXIUg@1D~vm)^MOu>%gn0@(tv=1+<2DYNREsB9AjxQEL2P{Us4Ay*fTEsXj$ zRbe`U)n_ANHj?!=E!FB7lQkMTim6*M^#W5t9ZRT3?^3s#prVcDFte^2T|r&+;CpEJ zbX{VO=Y0(Y>{Fc0Db5*Wh;u0CJbnb%obY>O4gLw0tfydkc2UtTYV;$vhA%s?v;&(6 zzX#a9mg|o9-TLASbYx=POy(h8z=jvFg>S+2=Fi={nAoIo$~4Zz_Xg?zQk-23`ZF4L zi^koV>N1OADku?KCSq%*y3CTWML+d=>mFMN&VesmkWUK=>?b&pvwcQa0Wh-#X|*6l z|CRSOp@M*hqWGr&8> zNsn<#zvp)X?~l3u2Z+}vr1=R!oY8?K9SAl&8q1=YlaqrbIqWPHV%@@Gt(%liq{L z9t?`|0Ok*1$?)I$;*SS%?}6^BK)8bWkY^Bo27wKZ=bhqtui<<8okOjP_wZ!~(#T*P zxkw`y$w#P7X%F>Ze+4G?E2a7N+#_pY5{?1T|0|s0UAo&&8@xc_{o2H4Fuc(MTDMjDdkjS;*i8 zq`bi3Yh?KvbpacJlwaBVJ*;z&G57|jyurbH7|{tM@V|ijBDANeE=MkMe_I{rz z@3Z%2qHJcco#?c)_V>j1J=63#R40c;nz^)lE(LvFOO>@0@LH*|mB9|G>|k&$56MS> z+j-@722*%t3U55(~4}DO=NhVHe7&q?`o;?Nr!K0pUHhc~5;tl+?c-I%-xl1OUN&FsQ9n{3>{^M#9z1 zyr&?XfvOa1nwT79&M5doM!b~JZG9L3Pv)uG==!XQr!}cd7x7u$m44y zdd<%C8mztsLu(otn#NKA4OG-Xp*@B7O5x!E?Bl)m@qI=uQFTq2^RW)b*nqlhU~%GZ zWV;)Ak1D+Q+4V&8XfPPAmad?TJ)|D;(N}yYj>+G;5Croi6`Z7CxbvwXpTSz{R!hN9 zw^H|3W_CKLYX|jY=c&h9-Y2*tzToWA6(>Ua+_(hKgb+ z$Y>@NWm3H#`C#~9F?!9f!86s zb*L*#Kv^duw~57T4j4b(y#eUd5kVcBYCRFwvrypy5j`Nlzb{1bg}}gHiS}2bKk=WB zQ3KBR=ns_IIq!DP7xWD0`JU@NdG&{N>i&^7z@1VmDWwp}-=e}>6jbeP>Uo<6i&b~1 z^&L7O#BXRu!K%Z$z<9G^W+OvRBtEbHGq4{J+(ZPM*vJV)kU*qU0?ruOij+A?cA^M*bW%Z~)?Odjo%!eYKabkxQMc(@>u-wVm-6>>oN5yeYXP9v()S?b)7lu zZPJ3p&)>q}4G1?NIE$@F*ox%84}L7R5?Qd-{O_Lr?vHG0mh@r?sCZs0o;R7L)6XlS z(tJNObS4O9um3G{&6sYRq2UyjoT5gvx0R8_Uh_(U)_E#8PeGYhQP(QkclNw_LBe)_V+Zjpyy0;bXAKjQgTtHk3h}XO(vHS$Cc?z8G%<3`dkitRunaf$_axM${yEe6=0S)lQ zUZUJfOc%_&m7StHBLEs&u}&+tSP&}o-Tu052Q)Y+EFkVa%w`JODi5WE+_vm zSF8~U8jw7R6@v6g0}?hM(em-5DkcdEnQ@Hg2gmahLsz}@ES+?J zDu~-FF6b5a8&gg0?>JaRJLlTY!R+62j_8m|Ed5}d9SHA0#;YHUxBS?!{sJ^qAXx=6 zU*~DRVEV0RlYuYIoKZ6eR;h*S-@=Uw8{Y50!rLAJa1zGxzfKZxN( zWn$AzRvxIp))lxL3k)nTFb}GM;06{{y`|(Wg^cifO5RiLu%aflHp?CJNERGLQuj#OE9`o@_VCk|ERK7Q`R9xm@tkHnr~9Lf z1|64?#$_ZGey^p4e>l@JI^g|!=r}^uk1%cf4^jVzXhsfNxq5SO=yKSGKB7L7$RUgR zw2vxz4ZIj47$V!G8}qnr{oP;SwS-DasO6^OJ#n9>rQd;u-8|mSYi=1g!;s%*9t?!f zBJo)kr#(dChe)>7XSvIQwmb8Iu$zXPVC(toEsKZuS_gRlo2~s(*MmT;v#1ALBnFwp z8TO5ct`gJj*x^=F%hy~OvNOPl9)t_{H|DRPAr0xJA*&ySKZL(k{bGJSe>bMD&uQqt zhP19B! zlgXvlA)+8~%*@h>IRU>{lF!;9+h0H+h=Xi@C9#Or4Oja9t^GG>0833vNEoicCTm#Q zsex)WP{Y{Bm8t56Cnv+v=`>s9yV;73rtz~w`=mmt}_^2suk^RjPiKf}QTH z9q)A}H1yqruvO7J)(}P*eM(Wf^y?+##fz}*6 zMGvC=~@F%Ej$6r ze!%KWS^$n;2jV*rDDYIQm&y_X<=Cj4Wm)S8 zt|K7rk179{iqoz>f3Wn8Lp@M+b#MhCceil27OOmTJz%PR6n&Hj&D+DxDyRPiJX=Gg zYnT&ykti-gv^rE>vu$zOEBJB>nF8u`Dwzt;aBLOM%xDBA5m^7=sidZcffX;l$)IgD z0{3w>wp`7M9v_I^2jYBa@0+;(Eq7q1s*Sv0BX67j>n34|#f*c{5X~Dz^VaFB2VGj} zsXH1PB6vXrZ;b!8vVFKfP~)?6q)sV-%y~9#x&af41$k zI*i-twj5o2U!!loi3gy;UCUj0wEkGQ_R$`H!D}feE#;KQ9z<+-a^KSva$6yM2>1gt z_!&~73d4LDD;sUb{AMi8p6JuORKzpSrVaCLSeAWlZrtRoBu7bIO+$-FJF)*#(5| z7_mOatjrVQ@Pq&(KNHDk#>mZ7Z!j6;Ev(JRZLY~ z!s9M6ylOnQ8vjN>;Rn?)yh_rulJp_48s8`iwUc<-C7wbpB!&8>P`~^K9^3y~aUdUw zRfE(AX&1WqF~4OqC7W56A(@h7s&(pQ{e|-1-Wb4FX-JZW zv`;nkOM(AHEqa%sQY(9l^?EcDuSZqhXS zDv-!^h^%Azunmacz;Ynrh!01mMV~JeomGy_`oHXE@#MBe#mhdia@9seHZuLO1(7XC zT)ggG?wkQHnAh6Mxwmp&r51k_>ON{50hqTq*)4X9pp=-Ek}hS7HZM2moi60y!_~PWBEr0TQrj`H)_VdX+c)@eR=+78^3eE^*j_AzJLjU`rCPTLN}J z-8IKswfBS+hRPyNSp>98Epe$OJu4*R-%ZqT+Y6H_rjlZ6cXq7x6#ZBE9{}?S*Z&FU z&!Ut8Z@G~_F5O_^_Zv45pkeuTY*x9dqp#oXqZRN4CSt!{T%1%sv_K?+iy+xmG)YV^xo*w{KwQpf5;b)0=2D|SET z20!Kkn72OU6&HBn;*}}&*8?ix%P`J3jI+C#v0(gs^}=&728)G(lNjH^8kel2E;lDO zUSlI*oPvdy&b;YgbNxj!G#uol2RVakk=ET&%FQ9r&{-3%&V5~F^1dVv8ae}^n&@jC z*^g=`LPIN7Z^c?QXAEj`7jF9iGLeXIBCBxhMr1cr3(1HiBcsc-huuXr)e=BBjHHKI zk|GC5a~NzvhAqhW%45l-ie1|UFx$smx5pf?>IvuigzI^A?)kq%x&<&x+*$Ozdc2_i zb*KR12e?2(B0F<)BntdRyzRDr*UK3&Mj>@5r0z^*I+jteU#F?vY3g!4{L(0tx$O*) z>P+8UFIM+&@VTl4gB9c%1nH&qNU@$xJ`Qz>V{vv8k|(hwUpD8F&3Utn4LS`hchkrj zHL}!m3uoNIS>5m)o0&W7^(>%!3kz>y*^Qlv!UrR5|Ar|($6C)>B{-fljOXlbj!Iqe z@O5n)V8-!$951g`i%<-|D_Z~!oz=bCU@vvKw&NOD#6cuF$kM5Bn>mZYMx<;+=C?}2 z!zyY8t?qr>js zs{b(MaK%k%IEDFBSo{9nH;GS)?HefaPcfQeOjI)sX2KB+$2#Gx_#APMW@i6_542J-7T<8_>E{d4i*d1-D5 z|KEP~1B+p{{m&Tw0!!?SMOlqm`j{#n41RIzU-Kxipmsv-P- zQ?5z8!b&hJCJ6{ZeJKe${J1O!cr{d9L!q42d1J2m(GaDNJcKFp&RuBnjj()FC=q`< z0Fpv#Ay)lMh5xcd`xk2dg?hHk+|_+d@~IR+XeaLN#EX?4Tyt0|G@2Jg^U~J-iOao` z&-Mn9`GojStUhxX>mO$M=Spl`$#U?GoJJ!DVe3my<0XUj1lO~xM_-8O3(kB1csOIy9(L?fL_V)(DoflbNv=sEOeU~s78amIxtCE8^Cp?Xx z^GzlKj^bbzYYjh!16iy!>^KHZnS}>s;o&US>RW{euvjbL62q&;Bdc)`i?xQ;;DFZ) zE6$g!8hipMw<4`pq${wgbQ1i=*fQ!1JA?CoVQ`F=X+nqvcRmc*$MbxZ_ zUB4=(U5Y6BcZR+$XYTriaL{QC{Ivehjs*Mf`LVo%Nh68&JaP8NnuY+$_Gsj27+du*vgqBTziBULJ0B1CZZ3NM%E3d11`g7p3M`Uniq$nZAx{L_ S(viAaGWm$5!$u7cQ2RfNKn(Q& diff --git a/.cache/clangd/index/network.hpp.959179E628BFA829.idx b/.cache/clangd/index/network.hpp.959179E628BFA829.idx deleted file mode 100644 index 87fa996cefd4a53e6dc1c454aac85f53cd8b0e89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3296 zcmYM02~<;88pp#034xc#llNW%2?-EL*q1=q!WI^h#RbJytzxSPb@z}cF0ERpE(I4T zt_L{7P!~qgQ^(F&go;>ZP;^jwY8|(6FI8NMB5HAL=etkuOU}vv+%La-zqjP&cQY|J zJNq&vkz~%!UB0kn$xJ7SL?VZ`ZHaa6H3x|#7d}{Czhlza#n+;!pCS)ldK`Uk=jYPd zIce40{c;b_ipmk^YDRZ2wO(25!ynJz7-uOz5}cZP?$hVnMh(6?GNZZeXZKUPuA0Wz zHQdn-atGMzi5KbUTIsO1$l_nl{QKURMLQ}A3ld8Q`sHT&>)necENia*GHlMF2Pxwg zGar93SG)Fo-uK?J*htT3asBk*=0ktl67$)mptZrrJ!Wh_yteJp_9MMXYwq1oj@Y|> z;iC!GKPoJ#on_L1qTbb}pk4DXH=dlk@wTemr{})0yWq6-adC0^3`13d?}6(_xxov2 zip{pQ&bOQf$G)EV-xpJ_=A=y5CAf7Jv=$64QvPq3uA{BDJH>_%Ll%`-u}Bw>49G*UvH=Dl(rpEpl12#nZHAD5bBjBqU zEOBfmCCk5&IqTc=Y(Yu$t%nN7g75dYv_+i!+jp&3TT|TF2i&By>t_N&iw?!0_>@{YS| z`(~ZQwqoHdQ;!WN{h+MUKihp9+iuE2Sfb`eM zHC`fDAGmldRJ#6}2htO+m1~tE*KOHtb^QBc9|pM+9>qmzMXuL={3a=V&j61Q;VPxd zSL7il%Ove9@=IwH2IrSWXDNgbd2FSzKi;u#CXHf&TWAX>gvjH(j_PustQw|~JMct4 zQ7weX(@K9#>kb?Il0h!y_z_%$UgQ?frMl+Z`!X36O1ObD_=`N}VtcG}#ljT~iXuFi z3)YBy>(h3a{L4M>81aJX? zA}`?#H#}cI?O~8V;bB~u{SKEDmAs$5bs_hj1YVk@siStxRb6R|<`S;QBJ@OkN0)Kbcc^Y|N6P-)N)-oOK6sr%>M?;$Q$rNh{HN-&18d4}W z2j#d@@*qpyO`J) zt`u8$c5i6d57S%Za3}Lz@_35Pcgg38fng3dFA*-3ShU2i&=AX&=oBc{D6uC{tWF|J zD6uIwymKQ=#!lS$>YooLO?bJ^kz!TuDh0)=-PMqz(P$a5B+SHiBvN#6V6hCh{rQua z%8rip@bK^MV2D?s#6Ed2r#60aLu(^6)c9!vDOT&F z)f2bC31hJkl|YF-Vl7!P6aOc)S&MB|c;JoW?TaG=i9}-`df105`%q~gD(pi~`_Rii fSS18rqo?a@A2PgSI^xQJo diff --git a/.cache/clangd/index/pulseaudio.cpp.33560C8DDD3A5AD3.idx b/.cache/clangd/index/pulseaudio.cpp.33560C8DDD3A5AD3.idx deleted file mode 100644 index a0d951ab1d34d5ca8ce517492c946b6e919fd9bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5832 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 U(BNx_3%EMEVN*jQL&vK87hG7Kh5!Hn diff --git a/.cache/clangd/index/pulseaudio.hpp.C6D74738A7A6B198.idx b/.cache/clangd/index/pulseaudio.hpp.C6D74738A7A6B198.idx deleted file mode 100644 index 40bf5907d709a90dfc20cedeb8f98395162dbfd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2202 zcmYM04Nw$i7{~YCQ+7G_Ue4vXPwu!oj&Be26eWceNc>0>WXz95M-&;+69iJkPfSw* z5h2A93e8Hb{9uf+2m{nc63Hl2kRg+hAuU2CKm)O77vJS(_|HE3+vnL`xZg7@m>nHm z$WT<&>e-o&#Eg}rD2kH9PkKh$+Q|}%szMZ%S$eQAJVk0|-+w+K{?Nof9FEho&MEz) zX0}U;; zt{yDz{yo(kdw>g0DBQhvRr#aR{`P{RiT>#2o;dojKG+dkx8k>xQ7!+P!y>0H_&%ZS zq5aQ>`oi;Pwk@r`d#!9yL*!06rFv)e9kVZT|Xu zB~e}XXe6;xjEj?tLI}!vc)o;@*ts&#FpHxaBX^i!!4{1W;)Kw*j6)qw)<%pxfCu0J ztq>v)-!`CbL`hW`8G+ld%~J@GNA2A|*mI(}Pk~&$hu?|ODRrJApRczxD*aL{7>$Ph zU>s}_LgXfc_9T`2VB`ec z2m81QA@YQ|ZN)nk;cjZ=L*`?Ir6Nz95+C!#SP+VlC-ev6Ko22AzP)Z5AD?U5YPkbWgrYD9i4CNdzScFqor#z4P^#=|Ux$iHf~=g#QOzl4z& za5FZ$3nB7KsZUN>(hsk3NKNLeuu3QLD-TK=j!%u9${`)$?$~{V*Cd5hCHLo^#7GMB zjT)m#2(ka_zWZy-v(7A2AO-2yDzzq&-%fjyAGT=AbNHh`zc=>Q2_f=dKF)XU+Up;L zksEMd?5h$&R{jqqiP`?r)TBq3am6~dq55YIbSY{cn=rzzQ;MwxZ+4uZ~45EV|gXv&7*%fd{eo>Is042W{ z$R?0T7=8l~@qzNz6VIXKB_~?LQT`!o|F;#7`)BIf;(Y%WFvNgOaz7$OaelrV+P*@=o3SBJG`x z^tU(QMlL!R6EO=e=CvXsLCIV6tL1d}vGymQz{T!C?qNhD7{%*DtbvmMIuS{rmp3FW zas5hu*QckgN{{0Yn6Pto6+3NbQ=ME`xwDL>Wc=CTj|({%{?Fo7#g3eH9yz2(4*v%d Cs1;-Y diff --git a/.cache/clangd/index/sleeper_thread.hpp.B273FAC75439EB17.idx b/.cache/clangd/index/sleeper_thread.hpp.B273FAC75439EB17.idx deleted file mode 100644 index ee3351c34d12016680e3261376da49be2729a29e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1672 zcmYL~3s4hR6oxl9H}9Ke6G%1*C~*@c5=ukEK%hh!jEN{uEme!v8c>UG30AR;#aCyn zW$L3^YjLdN6SXtgQAAs7u``H{qjoH`q7l^k>S(PU#bR4~cI}3p$)CIX-#z!-bH6h? zF3<0;lT*~lio7Lrr&mwI6h&#_7pktRyaNB1B^0%!p?>|jS*LTzs3-1U-m2XE;kKESld7a0<`y}wUG`)G-m{85!AVL(C zaW1;9Y~eo_jYwjoFpcOaK`13(3b+CX5A1uoJtvk%2>b#|0VhbrAN%{i`5J4glYHFtyF6=JZ%^(84QD-y@ z67e^bY`023DtkyHE%?Qj;vs@W{EZXObZ^WV0Xw9@=M)?xNW|Z>Y*Nd{OGPCtV!`(z zpHz^D-*oiZt0wkl{mTjyM4~V+5x@OR!pe~iX)QF;!25-kLaQJV|FQM!`;C8{TtFi! z_(hhYA%YC}q0?thevo&VK@9lmigb-25&ub}q3MzG@z z$K*j9g1*Jam%Sz>*cI!t66}fffEFqWNqp+&mg1D$AjI@qyoubSrlb0&yH>%iJ;olF zOqN{eQHHljFlGs>6;YI^1q8F@w?fY;dl9T{j`tsY)x*0tQ^sfK_YQ7wLlsXP78_vtpPr(UluY(GT7om>nUDZaxX3hAfCqZ(>DAjVxO&ba zj9r{70b>v6Noa_lkj1TYzYSTrG%f=itHxsxVTa6l()T?Yy<^JC{a0WP8_mK_^A-78 z5qJpBgMMh~?n-}o#sUbgXY@LZEySWdv}tOI*4NPs5BYKd05q#>{%lx@x9#j&*q5L2 zo5aR|v$mORg8=|j5~ypaD;bg*>Pc1$jnduT(|+ej;}HmDGuT*+lMG30&ji`^y0&s3 zgmT6>2a7!fC1P}piC~k~1VmXm>o6!(u00Q?jdhMAI7^-dCE}ax@&9dw)IvKEJPMCe xR!yHXjqjmQRe31D53ub<*AMFxA7YtIu28Bd_?C#5LL5+(a$u+$7|I5Q{{f$nonQa} diff --git a/.cache/clangd/index/sndio.cpp.1174277772D16F52.idx b/.cache/clangd/index/sndio.cpp.1174277772D16F52.idx deleted file mode 100644 index dcbcf66a93e0bc7fd46a9b8fac102640380ab6aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3834 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 W(Pt0 diff --git a/.cache/clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx b/.cache/clangd/index/sndio.hpp.2C5698C31C5CA7B4.idx deleted file mode 100644 index a6d18d34376287f1e1ad737d131bb841036f3a23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1304 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

tu4dSZ;#O4U-L&~5c0|64 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 B9!mfK diff --git a/.cache/clangd/index/taskbar.cpp.3B871EDA6D279756.idx b/.cache/clangd/index/taskbar.cpp.3B871EDA6D279756.idx deleted file mode 100644 index da30b7b2c157c04d7033cd7cef0ad65e3ca015fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12886 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 anU}Dhg`JIwg@Fwu1_A6a1_J{Vf(Zbi#?Pbx diff --git a/.cache/clangd/index/tray.cpp.02A8D890AD31BCCD.idx b/.cache/clangd/index/tray.cpp.02A8D890AD31BCCD.idx deleted file mode 100644 index d907a6a2994853609beddb733ee264a4e73b4236..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2114 zcmX|B4LDTk9v{cdIdjgO`8a0GFf+^yGa8K~bSFeo2qhn7hNQ&oh`2J^lyY^^E|%33 zd)NB7MITnN2$fbB)vX@Vx?8foLaUbAv3*dfbl>qjb)IMb&-~us|NWoe|Np+f6XNIN z<4Prw*2VgzC2CTm$s`hq4t~1Sl-&|z5(xraTKVCveMw~woXOBLS5reZ!>5L7C6hNaU#3mNFYPlnW>`IpY9sRg9r_Gnf!vT`4JS1YJx z{$BQuJ(9W$3h%oyyqp#O8E(w#BY7ol1GKEZ`*m-xy@!t)H(cF3V|zQ}(0sXnWNg{y z2QKyTOMm)L^K4wzmXpbjxg%uvG{4pJ3oSX;D*B41p|uC6V_F~ngLy0O8)bIwnD~jA zS7cUg?9RB+=~79@EH{2?nOWTUYSs1E0alaSeC#`MC)?(+lYT#?|JQq+zwMXb1ch&J zk|r+Qe&0VNVkW@#8QV^iy}c`;i6Tq)D=SH|&)YhocP6t>*bd~ke%<26|6xZuS^HzF z=lIN)n$D+TACYTW{|srW>enRytWvfO2KBCN&e$QaQ|*2^e=t{(^XGM4g!5QK!O+zK zrOWJ`zM?$R`EWb7{7nVCEPwXIljRG8P9eGZEx(vgcnXF6?CM_kn-sIi3Da#_rSi#= z)7j<283)=UUi92_ZPT4Ad^fXV*>4B@0xUngvV6T(^P%$xE&JELvs2}b)0O>J?7F^% zvBP<%!};PZNLxqUJMQ^`=w7P)LO~uDoM~}X9k4T z_G{XYan4=LJyjAH>tht1lFDDLiXZp9)9PMVYhx`-O8$Gz#ho&znuWXkK!w^A?>Cvb zbKZ`AiEzoWiYd9Cytjz<>(RZtgo9_!XV&H(t2q>NV^xdzUPl&+lLQNt=tIG}y2`tjB?+f;|Z`#|_c-}fOeD7Fz*cHES z#|4P?ri4k-9Z1}j2^|sF> zfalZrER_jjf`8`kY)ZUX@%*a^E))iM3QWONbchar=I7mQ9%r{f<}4@@@KTzTP%#lE z{WG7U`9e1Y9Bcf=-R3vTY6&A;&4idZ?PO4^`-TJz!qse;O~=(7Q;v|XmPI}FnUsSZ z2Et$xjk?T9be+8sS&hI5X1@P%b7#WkM}Xy^9FC>=u{xJRDQb+Xc@U3`tA&sdLCKm>%ZelTQ2 zbuR%x7RF-weQXIxkKSJlAeBQE1nhUz3Z_Ps01_y{4;VD9K7Taq4uCeO4Lua~Zco&( z3IU{WDZ()8EBk-Hl@bb|7!lJyT_d0kv%qB7;!WChTm7%+dgD=$gNP8P_@NV7-NS*Q z2K_h+=EjA%w0+38&%6>JFbrko6h+RS{1^2hfztq@FiI}MjK(-#neLR= z(UD_F_MogQPM&+`-LJb0k=1NEn?Y7{gdB_FzVOzIXU}Osj*KSb70;c)M{o2N0Vqf1 zM8%YO!|-M86qt{p{;9tX1}nN=-3BZS!}NOM%xsynJ_bMqO+nOmz4~sbRN?_3;)VoY z@+nEH_k1z{_QG6Pc)6v#s`%2vF2GV@Dx3*2a9|zUktRFi>x2xhoory@p8}?VM#3c(Udi%l6K#71WFe9tQCSndLMYAW`@Ga4$#OSOIf5Hu6 z@i9`5w_7`H`YqQKQiYRLpO#6an8esU2DoMGRwG|?zQD)L+hN^OPsLhiv7OhlRV!qF zvymuWm)KfcT1Y*FR_-qAMXT-QYn&WcE;rlE_45x1*i_@% diff --git a/.cache/clangd/index/tray.hpp.469C1AF36DEA64C2.idx b/.cache/clangd/index/tray.hpp.469C1AF36DEA64C2.idx deleted file mode 100644 index 3a9e9b296bf8acb6781cba51d2593c36d1bd5568..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 988 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 IbXX+g|A~rsG5`Po diff --git a/.cache/clangd/index/watcher.hpp.F4849F54352399E5.idx b/.cache/clangd/index/watcher.hpp.F4849F54352399E5.idx deleted file mode 100644 index 8ee37cc490750e62eca5bf907dd91e1d632a4f71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2232 zcmYjS2~ZPf7~O1E$Zj^tW^+I|5{^Iu2?hv=RV)aIq5`7`ii!*%bp)vzP^lJd9T{&& zDa8YHP^s1f#8#_LovJw01C^o{(6NdZv?3lO;#sxduKr7RCNI15{`dXg|7G9H#Dw_x z1__46&P*sS$SukuFbtEyr?AK|d#nh<7T_3GTwOM?Iq6I=^L)>|<+1tX{0nt4C0)@Y z!*<@C`PmEq^sbK6GgA5+kN$l)v1Ux!)wRD5|8;-*&)qR|W;MMVt3H@qcxdrWb?@{G zYhH_|rAk;eYsL!)Kd0+(Au~f?SUAv?*57SLG$(m7oR`s$Q;|! zyfVJ;@^HrmUHx}+*)bFGhY|}Bb=}iBvFfDTj#U4=&bq6u(VeG#4C^u?rslk=uWLQ> zsB7WkMKhzEs#A5=6+el)_50SpDaot3xqCq!o@UsUUh}8#%ix~;jzjTN3p#aqG*Q}( zzbkhvs|-(2EX%q}zF{(JoBpUR&Uo##I?l8=OZ2bv?&G3@f^VvGuVwlzoO-2$DY_ln z5X(N$_Nvc+k#CD|4$BY|nM+x_bV@(vy{K*GnE|AEUZ`J~{4bz^E`;n1%;T!i^p-r+d%#*4lSR%W)O(p|VgF4+5{x zJzjIGs^_pAmjE9k3(@f)@W!0-*a=1EFeyd=?=j3{6b}M#Znh7N8#K}`$K1Uz%E%a9 zc@TKpTX$uDd%wRFcLlvdqEPZ6@X;;wxhEsKF0wdd_}DRJVJ#j4pYY+xxFuPODxC2_ zdW@1dNn|`=aIQZ;j|d(FzS5%K61HxMfx+ESeVemw zU_wWi_OzR{0X{6QLA;f<>IHqHdw5FJq1ChHm=5|kFa|Xb0)IB7?snBd-()E!hW-5r zKPe9ae>o+*?Q$BC#NrB6KZp$)m~Z>zh`e_ZlPg$U26{%t=y?$Iw<~*^PSsCa#o$gz zZ(>aY`tD23MBkUigIHXNcr$ArnBTq4RsWQqEZZ!{oS}ao#>bThq5l1)^~L4Rv;AFg zZ={#uGO@tFy7ww>h;~D-9Mgi{m+^JyLEzt}vW|-Q{lCaD58%BRFBcvJ-jVx7VfFu< zCZc$U5vkX91ZT5DahfudW+hDpkO4{}_s;1F_Hipj1f}#*`Xlp!gma#A)#woU{YF+q zQ>H*uFm>SRrO2)C@4;gT9zw}PgVP>L`V&FxDs@$=d$p#*$v2L{qncDJ)O~X@hOM|2 z2aA=A(iPbjDs!II7rG}JzfN?6#TuDLj!Y}2c(c-!fiNg&%HnA;Bfo->Gwa|XN`2X? z`SnoNYOoGQZpA6yr8LEm3_EPr*|FhmceYV9?0`DtDUF7&QKXR*jveya+ETbmeEZLRWqPfR@RY z8Pi(H`FEDPO@SZF=4pe)VR)Ey`gYr$4gU0W*wi$^GzH}dbjamLfy3~2r&E45H&TU$ zMJWPv<07QsQ)uAir{1{T=l#&`cBTH}2{8;oA84ehP&`yZQ+C`gK_LQiE`8sGwC{ioaj2^ShDCb$M5BTy>9VlEB#KWThm$b2g0-o{|_ zC^&m?z$laqu!c(n6a-L#O9AA2cu6?ZL(gO&1LGns%sHnqk8R^0N#P(0ox&I9OsZ5c zVYNn&(g135DS*rmH96-auLH|@yz_kp;W!gA5@x8CYH8$jU^#~)V}q7+HS)1YL~;H_ zwgr~+EOIG4au)s2@aFmRrVSIg-!9S=@5r5##r=B}I&una+zrXW$4iQCFpT;zhdHyY O{`49#DWx%bfcOukpfkAu diff --git a/.cache/clangd/index/window.cpp.8AB8664D31F55915.idx b/.cache/clangd/index/window.cpp.8AB8664D31F55915.idx deleted file mode 100644 index d84db141d9d657d794a181c0dee61d88f723af36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3582 zcmYLLd0bP+77p=dx#R}2k%TO4A%P^2gapXKzKbYAG-d*bvMGX~f<{mTt76sSZWk#o zb*qYCYu(UN_o}?Q?@OyxE7tmIwLqyBeJ8%BFMoW$nR8~&ocqmp&cvFYn%d7Kk&=qj zYbr{n7hoh338tj#=~a`44Iz;x(n+M6mN~Xdl|Nfp=f2$a^73q(x8Ts>YXQ&W(@Qst zImsJC{*qS}azmP=W;}H8<+?4!Nypl-#gAINU)9t-MfB`*e+}QfZqwuyKix%V>P4|p zmr4&UioP-KpGwlJ0(PdP;nK~NF8$N+s^DUy@M>e_eb4sFs3VrRtlb}7el@WE(!(1E z8VW}g@A=!=DXTr!+jqn^C!A`_*7fSf4Q$WUp#s1tFkSOBbj{-4dXT3 zY%4V(v`1KI-5C8~`;CqWLrn6L(8$ZVS0j!ema^h5EJl;fF*NS+efoKQeuB+Gi64hw zDZ8M&^0ztTf!=6qizqtfU(}f~?{v$HYSY%-HP3Gx%=`Q$Ib_jc11s+f>kE4kd-s^D zzttV_!gO&o5az0juPmtFk>=;NR7^vEp0OzJrX;Hm6$qm~?W+v(ST->UHA> z)_*+j7Zc4k(3r6^-;(}`qh_;{XkF0Le7~ekcv>#Fx-)HA$4T9?eY@1VA_TjZf4yV- z^QK9gn8SNhezm`B-s8FdhwWLvKEHMgDb?Srl+~$o2FmQ+5>1?X?7!sN$c(KAYEwBA z@YL(J)Ze@KqpS9A{$qMSky*4h+p255b!b@5^fi3jz8Mn3f)rRh8 zBe2(=H%1E zOfq z_qUWwR~07DJXEiTEh2A`kB|4tHuJJT9Hu^)57qaD+d1yE)<~Q{6cU9B2)9Hax}I(# z5U#@`3B;%H83Ynign)sRKtQL_8AG5tN*yD>wr;W@|p%g(%0ESQmvH)hHJPb_~ zObn3q+BMVG#7`kZOdeefF*&%mT-Ui_Ou!Di8-{F5n}@QoeN*+qxw9aMLa&IykbbCs zB!&!O1`~#&CDAgqeQnOhty4N`0e8{q!R7*;gdf{QCo$KJZJvm8PQ(->xbo$t@F7z@0@_dp8Ugw8Ch{$RU*B{$ z_G~kgKvV@QE^o979T(5>OSaQej9fR|jE8Bh!FI8>|J3PObxsK3X3O zG{_AwHp-0PHOWl!#DulRDSwxxz&$8f3OG^8QUa>HR3I8PM=gWgSQ@Zsy|iG_adcqO zEAd(oetk&ZUpjVc=A)fZTx-m(+L~kuCiEJe7I+plb`nc zZR?NrtK}GhDL%t5vhJlPj$8ymEPj@t;g2Y-osFHVfqpqn z&VeN1N(mHB4QFQ_DEZ~%@TY2UNdhGy1R5p21S$alkbb68cB_`yve_+DfZ`b5XN}V z@hl9LGs`_NG?h6Ouo|y+ulS@)Xu0F_2s9hc3FlVtcv|<{mu@cV=rlTadPo4}iEULG z1wJiFl0hJwj}6GrO~_3rP+n|aDrhsT&^&{-{Apsv4G&z0E5LGl5?f$MkLZQ2Q<43)z z2NOxnzrY%P0ACIz>nD`GYmu(t7J7pF+b+3!{cOXMqemNEY$sCE2$U#KQ~}SdY%jpL z>|{txY=v8x$(jk48hQ&t zFiJ#8kU7@@_8fK&?8+78!mixNTqB0^BzaQ6usl763OoutF;o~_sDuJ!OoW(|jFX`5 zD=n2#YX`Z<$H^QBSXIasVIXz65>O-802<{+K$F}Q*6h~RJY=~a6Yj#1>KN91qH)~? z-Tf}0PUI&FZ1J^Q0#+Etf>(r#xEnJ4Rz7R3FLy1DbtG@W9sBqDd~y*q$r7^s3FOQ7 z1x+^a8+^BZRl4%>=4ts5CtsW|-M&Nh?^&BTD?m0Do<#sT2NnjmUa0bGpZn1;9I4Mr|wlR@SG0g)n;Rqx|P&E#j18zCTKPPDS411&dS7lFN zJB>zT9ZdbWraivrCWw&gMFoneGAh(QjZF&yd1pzi9YZTd?=BMj3hN8J3Pgt<#P67M zV)=fUT5t>Z$d!Ae#M>!SNVt?=Dmdz4`R1-}YcV7v#iay+D)CC<-IM4tMo5#~-@c0P z-a#jnTTkR(xZIw!8fPSLV0_tP+XD*R=r*c z(|UHj^v*}U+F3I?=0a}#AU-54lncY|c30}Tk7G{(GfXy<^W)8X1BE+JT!$@D)F|Hl zk(5*R(tEWq70E^FZjTREo<1}9IUTyRUI|iEg{z{VONXgptkG+r$!Np1@XG1JbRcG< z-UxP+-em3$-TNl~+pIx|gVS*KFDb?B?4lkK2!<}9`(X$d;XaRuxqUL{&jnlzG6M&$ zqWK^O*I$^|J>bN+uV${@+zs6;;bz1G@|U`*XY-klc`j;Zs@l^}c$t-9aj>I5Kjx*>Zw8D}6^kEs+ hpvJjfWQ=S!DT4u2HisWKM-|T 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 diff --git a/.cache/clangd/index/workspaces.hpp.0FDE443B68162423.idx b/.cache/clangd/index/workspaces.hpp.0FDE443B68162423.idx deleted file mode 100644 index e4f37356d26c43375d9da06060c2ecfbdd3eb81a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2044 zcmYL~3s4hB7=SO!BfwoQmvF|AkS9$-F6bdaUVTs933lDo91F4ntoG zQ^ZoJqs0f-TDA4jQKSk=(F&p{Fde0(!$=jh)@pU46&2gP)4kjb|LmXdcK6@S_mhm& z9jD4GYG;Xj_s?R5>U1 zZ`E$BO1)o852WPn*(*JBx$*B~1`=yH;raF*B^5E)sM^&Oo+FEGuV|3;9yqxpfqjvA zAbi`xZ9Od$cH=qk+`i+_=T_Ls;&&_3f9rV1b&oN0)fC@TTr9bsKQs5zSY4B}8d&om zyx)1*JUG7SsB2~Yk-6d(_jR+64u6=x)Bl3^iKX7f&7sSKeu&$fWs`iCal7uz=FRuC zKTY0u`y8{nr|%RotjzYFy0v#x^`SO(PrK|ui^F!Xdi~5s=Mh!n*TxR|So?tb;_*($ zcYogM8NV_!>b|0LJnu=)ADUZ{)Y1Ob?1TlT%gfsyK6`*aE_;xAS~R%O@)UpSc@G0wd%W)-sC^0*}ke+#pH6`V9#TkegX^3?Bp@pWhR`=e=k9 zNZ<*1FdJ;=gTRv#Vya#XDBDhfKvchxHkt&UmUJ~dFMeG)1!%+#w871@M>YDE+LJ{j zP{Z}DtTloU!u(|pI?BH0>I4O3Xnr6a=)Rxjl67)bzw2k~MEwNr6@MW7GBD2^G zU$clUlI(&RuHBTS29_iZl}01sVZog3$ZuE@=QYw9rkuveUYK&$mNJgCn>{HkTuMJn zpHe2?d^f>)jRdfMRt9S}`IvAdG@QbTT%`baMw)ibhEswJL2QjHxitaXHVW%hSyT*x ztF7t~0uKQpUdVJfku$u0$2xm;N5{wBaPfFqGJ$It4NKtKsaiX{mRMaptRYGt2Tw|y z16q?C$`8%DH7N4L6)}ne)D-ZHTt}cDfGO7iS4_FPi%s9Az>HSqh=&d|bhF&1VD>Izr}-wh=NMfu$S z`_hsnrRCf}%7vGY4;o;YpL+;@pwUC20frIoA?Y6Ck0RsPs`H`0`$ Date: Wed, 20 Jan 2021 17:48:35 -0800 Subject: [PATCH 168/355] fix(client): attach styles only once Gdk >= 3.10 has only one GdkScreen. No need to reattach styles on every output change. --- src/client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 24984a47..9fdf8703 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -129,9 +129,6 @@ void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_ wl_display_roundtrip(client->wl_display); for (const auto &config : configs) { client->bars.emplace_back(std::make_unique(&output, config)); - Glib::RefPtr screen = client->bars.back()->window.get_screen(); - client->style_context_->add_provider_for_screen( - screen, client->css_provider_, GTK_STYLE_PROVIDER_PRIORITY_USER); } } } catch (const std::exception &e) { @@ -232,6 +229,9 @@ auto waybar::Client::setupCss(const std::string &css_file) -> void { if (!css_provider_->load_from_path(css_file)) { throw std::runtime_error("Can't open style file"); } + // there's always only one screen + style_context_->add_provider_for_screen( + Gdk::Screen::get_default(), css_provider_, GTK_STYLE_PROVIDER_PRIORITY_USER); } void waybar::Client::bindInterfaces() { From 7fa1c118335cad40fdb92db49f4e35c8f8dc0bac Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 20 Jan 2021 19:36:16 -0800 Subject: [PATCH 169/355] fix(client): unsubscribe after receiving xdg_output.done event Ignore any further xdg_output events. Name and description are constant for the lifetime of wl_output in xdg-output-unstable-v1 version 2 and we don't need other properties. Fixes #990. --- src/client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 9fdf8703..0ad4e6bb 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -123,14 +123,14 @@ void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_ spdlog::debug("Output detection done: {} ({})", output.name, output.identifier); auto configs = client->getOutputConfigs(output); - if (configs.empty()) { - output.xdg_output.reset(); - } else { + if (!configs.empty()) { wl_display_roundtrip(client->wl_display); for (const auto &config : configs) { client->bars.emplace_back(std::make_unique(&output, config)); } } + // unsubscribe + output.xdg_output.reset(); } catch (const std::exception &e) { std::cerr << e.what() << std::endl; } From 3bcf3904849bc3cb91799d992336d1b7fe59dd1e Mon Sep 17 00:00:00 2001 From: Martin Pittermann Date: Sun, 24 Jan 2021 21:39:14 +0100 Subject: [PATCH 170/355] add power to battery formatter --- include/modules/battery.hpp | 10 +++++----- src/modules/battery.cpp | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp index 08dd79db..41bc0ad3 100644 --- a/include/modules/battery.hpp +++ b/include/modules/battery.hpp @@ -31,11 +31,11 @@ class Battery : public ALabel { private: static inline const fs::path data_dir_ = "/sys/class/power_supply/"; - void refreshBatteries(); - void worker(); - const std::string getAdapterStatus(uint8_t capacity) const; - const std::tuple getInfos(); - const std::string formatTimeRemaining(float hoursRemaining); + void refreshBatteries(); + void worker(); + const std::string getAdapterStatus(uint8_t capacity) const; + const std::tuple getInfos(); + const std::string formatTimeRemaining(float hoursRemaining); int global_watch; std::map batteries_; diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 86f24b2e..85774697 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -135,7 +135,7 @@ void waybar::modules::Battery::refreshBatteries() { } } -const std::tuple waybar::modules::Battery::getInfos() { +const std::tuple waybar::modules::Battery::getInfos() { std::lock_guard guard(battery_list_mutex_); try { @@ -210,10 +210,10 @@ const std::tuple waybar::modules::Battery::getInfos status = "Full"; } - return {cap, time_remaining, status}; + return {cap, time_remaining, status, total_power / 1e6}; } catch (const std::exception& e) { spdlog::error("Battery: {}", e.what()); - return {0, 0, "Unknown"}; + return {0, 0, "Unknown", 0}; } } @@ -248,7 +248,7 @@ const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemai } auto waybar::modules::Battery::update() -> void { - auto [capacity, time_remaining, status] = getInfos(); + auto [capacity, time_remaining, status, power] = getInfos(); if (status == "Unknown") { status = getAdapterStatus(capacity); } @@ -302,6 +302,7 @@ auto waybar::modules::Battery::update() -> void { auto icons = std::vector{status + "-" + state, status, state}; label_.set_markup(fmt::format(format, fmt::arg("capacity", capacity), + fmt::arg("power", power), fmt::arg("icon", getIcon(capacity, icons)), fmt::arg("time", time_remaining_formatted))); } From cd97bdb30f1d6d5b6ebc9553bb9ff1e13ccefa28 Mon Sep 17 00:00:00 2001 From: Martin Pittermann Date: Sun, 24 Jan 2021 21:49:00 +0100 Subject: [PATCH 171/355] document power formatter in battery module --- man/waybar-battery.5.scd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd index 869df32c..a4650cd6 100644 --- a/man/waybar-battery.5.scd +++ b/man/waybar-battery.5.scd @@ -96,6 +96,8 @@ The *battery* module displays the current capacity and state (eg. charging) of y *{capacity}*: Capacity in percentage +*{power}*: Power in watts + *{icon}*: Icon, as defined in *format-icons*. *{time}*: Estimate of time until full or empty. Note that this is based on the power draw at the last refresh time, not an average. From e19aa1d43af943d83eae532833b2ada0baaed31f Mon Sep 17 00:00:00 2001 From: Thomas Sarboni Date: Sat, 30 Jan 2021 01:41:45 +0100 Subject: [PATCH 172/355] [sway/window] Add app_id to usable fields in title --- src/modules/sway/window.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index e9203451..d8f113f7 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -56,7 +56,8 @@ auto Window::update() -> void { bar_.window.get_style_context()->remove_class("solo"); bar_.window.get_style_context()->remove_class("empty"); } - label_.set_markup(fmt::format(format_, window_)); + label_.set_markup(fmt::format(format_, fmt::arg("title", window_), + fmt::arg("app_id", app_id_))); if (tooltipEnabled()) { label_.set_tooltip_text(window_); } From 6cc32126052c58b8fd87cd400f4270151ffcafda Mon Sep 17 00:00:00 2001 From: nullobsi Date: Sat, 30 Jan 2021 18:04:59 -0800 Subject: [PATCH 173/355] add length limits for MPD module tags --- man/waybar-mpd.5.scd | 16 ++++++++++++++++ src/modules/mpd/mpd.cpp | 34 +++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd index 8c33c624..3f1ef9be 100644 --- a/man/waybar-mpd.5.scd +++ b/man/waybar-mpd.5.scd @@ -73,6 +73,22 @@ Addressed by *mpd* default: "MPD (disconnected)" ++ Tooltip information displayed when the MPD server can't be reached. +*artist-len*: ++ + typeof: integer ++ + Maximum length of the Artist tag. + +*album-len*: ++ + typeof: integer ++ + Maximum length of the Album tag. + +*album-artist-len*: ++ + typeof: integer ++ + Maximum length of the Album Artist tag. + +*title-len*: ++ + typeof: integer ++ + Maximum length of the Title tag. + *rotate*: ++ typeof: integer ++ Positive value to rotate the text label. diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index 98332dc0..ab822249 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -2,7 +2,7 @@ #include #include - +#include #include "modules/mpd/state.hpp" #if defined(MPD_NOINLINE) namespace waybar::modules { @@ -98,8 +98,8 @@ void waybar::modules::MPD::setLabel() { } auto format = format_; - - std::string artist, album_artist, album, title, date; + Glib::ustring artist, album_artist, album, title; + std::string date; int song_pos = 0, queue_length = 0; std::chrono::seconds elapsedTime, totalTime; @@ -144,13 +144,25 @@ void waybar::modules::MPD::setLabel() { bool singleActivated = mpd_status_get_single(status_.get()); std::string singleIcon = getOptionIcon("single", singleActivated); + auto artistLen = config_["artist-len"].isInt() ? + config_["artist-len"].asInt() : artist.size(); + + auto albumArtistLen = config_["album-artist-len"].isInt() ? + config_["album-artist-len"].asInt() : album_artist.size(); + + auto albumLen = config_["album-len"].isInt() ? + config_["album-len"].asInt() : album.size(); + + auto titleLen = config_["title-len"].isInt() ? + config_["title-len"].asInt() : title.size(); + try { label_.set_markup( fmt::format(format, - fmt::arg("artist", Glib::Markup::escape_text(artist).raw()), - fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist).raw()), - fmt::arg("album", Glib::Markup::escape_text(album).raw()), - fmt::arg("title", Glib::Markup::escape_text(title).raw()), + fmt::arg("artist", Glib::Markup::escape_text(artist.substr(0, artistLen)).raw()), + fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist.substr(0, albumArtistLen)).raw()), + fmt::arg("album", Glib::Markup::escape_text(album.substr(0, albumLen)).raw()), + fmt::arg("title", Glib::Markup::escape_text(title.substr(0, titleLen)).raw()), fmt::arg("date", Glib::Markup::escape_text(date).raw()), fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), @@ -171,10 +183,10 @@ void waybar::modules::MPD::setLabel() { : "MPD (connected)"; try { auto tooltip_text = fmt::format(tooltip_format, - fmt::arg("artist", artist), - fmt::arg("albumArtist", album_artist), - fmt::arg("album", album), - fmt::arg("title", title), + fmt::arg("artist", artist.substr(0, artistLen).raw()), + fmt::arg("albumArtist", album_artist.substr(0, albumArtistLen).raw()), + fmt::arg("album", album.substr(0, albumLen).raw()), + fmt::arg("title", title.substr(0, titleLen).raw()), fmt::arg("date", date), fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), From 149c1c2f1b8b4c23f3bc7ea70d9cd503f29d9f31 Mon Sep 17 00:00:00 2001 From: Joshua Chapman Date: Sun, 31 Jan 2021 11:33:17 +0100 Subject: [PATCH 174/355] Update waybar-bluetooth.5.scd Remove the `status` from the `tooltip-format` example since it will throw error. Related to #685 --- man/waybar-bluetooth.5.scd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar-bluetooth.5.scd b/man/waybar-bluetooth.5.scd index 8151ec01..5d7d7dd5 100644 --- a/man/waybar-bluetooth.5.scd +++ b/man/waybar-bluetooth.5.scd @@ -85,7 +85,7 @@ Addressed by *bluetooth* "enabled": "", "disabled": "" }, - "tooltip-format": "{status}" + "tooltip-format": "{}" } ``` From 3881af4bbe6412248ac5dc72e55865ae755ee833 Mon Sep 17 00:00:00 2001 From: jgmdev Date: Sun, 31 Jan 2021 15:37:26 -0400 Subject: [PATCH 175/355] Improved wlr/taskbar icon search. --- src/modules/wlr/taskbar.cpp | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 4cbb8ce6..83ce3662 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -26,19 +26,19 @@ const std::string WHITESPACE = " \n\r\t\f\v"; static std::string ltrim(const std::string& s) { - size_t start = s.find_first_not_of(WHITESPACE); - return (start == std::string::npos) ? "" : s.substr(start); + size_t start = s.find_first_not_of(WHITESPACE); + return (start == std::string::npos) ? "" : s.substr(start); } static std::string rtrim(const std::string& s) { - size_t end = s.find_last_not_of(WHITESPACE); - return (end == std::string::npos) ? "" : s.substr(0, end + 1); + size_t end = s.find_last_not_of(WHITESPACE); + return (end == std::string::npos) ? "" : s.substr(0, end + 1); } static std::string trim(const std::string& s) { - return rtrim(ltrim(s)); + return rtrim(ltrim(s)); } @@ -103,8 +103,8 @@ static std::string get_from_desktop_app_info(const std::string &app_id) /* Method 2 - use the app_id and check whether there is an icon with this name in the icon theme */ static std::string get_from_icon_theme(const Glib::RefPtr& icon_theme, - const std::string &app_id) { - + const std::string &app_id) +{ if (icon_theme->lookup_icon(app_id, 24)) return app_id; @@ -122,6 +122,10 @@ static bool image_load_icon(Gtk::Image& image, const Glib::RefPtr> app_id) { + size_t start = 0, end = app_id.size(); + start = app_id.rfind(".", end); + std::string app_name = app_id.substr(start+1, app_id.size()); + auto lower_app_id = app_id; std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(), [](char c){ return std::tolower(c); }); @@ -130,10 +134,14 @@ static bool image_load_icon(Gtk::Image& image, const Glib::RefPtr Date: Sun, 31 Jan 2021 11:53:53 -0800 Subject: [PATCH 176/355] Use g_unichar_iswide to properly align calendar on CJK locales --- include/util/ustring_clen.hpp | 5 +++++ meson.build | 1 + src/modules/clock.cpp | 15 ++++++++++----- src/util/ustring_clen.cpp | 9 +++++++++ 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 include/util/ustring_clen.hpp create mode 100644 src/util/ustring_clen.cpp diff --git a/include/util/ustring_clen.hpp b/include/util/ustring_clen.hpp new file mode 100644 index 00000000..cddd2e1a --- /dev/null +++ b/include/util/ustring_clen.hpp @@ -0,0 +1,5 @@ +#pragma once +#include + +// calculate column width of ustring +int ustring_clen(const Glib::ustring &str); \ No newline at end of file diff --git a/meson.build b/meson.build index 49e71f26..373ec86b 100644 --- a/meson.build +++ b/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 diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index 5b2c3f43..0aade690 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -5,6 +5,7 @@ #include #include +#include "util/ustring_clen.hpp" #ifdef HAVE_LANGINFO_1STDAY #include #include @@ -154,12 +155,16 @@ 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 wd_len = wd_ustring.length(); - if (wd_len > 2) { - wd_ustring = wd_ustring.substr(0, 2); - wd_len = 2; + auto clen = ustring_clen(wd_ustring); + auto wd_len = wd_ustring.length(); + fmt::print("{} {}\n", clen, wd_len); + 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, ' '); + fmt::print("{} {}", clen, wd_len); + const std::string pad(2 - clen, ' '); os << pad << wd_ustring; } while (++wd != first_dow); os << "\n"; diff --git a/src/util/ustring_clen.cpp b/src/util/ustring_clen.cpp new file mode 100644 index 00000000..cd7d9cf5 --- /dev/null +++ b/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; +} \ No newline at end of file From ecba117dc05b6677c951c4b1c3f1dd2442494aab Mon Sep 17 00:00:00 2001 From: nullobsi Date: Sun, 31 Jan 2021 11:56:25 -0800 Subject: [PATCH 177/355] remove unnessecary logging --- src/modules/clock.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index 0aade690..22bedc78 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -157,13 +157,11 @@ auto waybar::modules::Clock::weekdays_header(const date::weekday& first_dow, std Glib::ustring wd_ustring(date::format(locale_, "%a", wd)); auto clen = ustring_clen(wd_ustring); auto wd_len = wd_ustring.length(); - fmt::print("{} {}\n", clen, wd_len); while (clen > 2) { wd_ustring = wd_ustring.substr(0, wd_len-1); wd_len--; clen = ustring_clen(wd_ustring); } - fmt::print("{} {}", clen, wd_len); const std::string pad(2 - clen, ' '); os << pad << wd_ustring; } while (++wd != first_dow); From 8c70513a248fb9c22ff37d14e9a06b983099ab71 Mon Sep 17 00:00:00 2001 From: nullobsi Date: Sun, 31 Jan 2021 13:58:41 -0800 Subject: [PATCH 178/355] add common `align` config property to set text alignment add fixed-length property to set the fixed width of the label --- src/ALabel.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/ALabel.cpp b/src/ALabel.cpp index 9371a0e7..4d15cc17 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -28,6 +28,15 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st label_.set_single_line_mode(true); } + if (config_["fixed-length"].isUInt()) { + label_.set_width_chars(config_["fixed-length"].asUInt()); + } + + if (config_["align"].isDouble()) { + auto align = config_["align"].asFloat(); + label_.set_xalign(align); + } + if (config_["rotate"].isUInt()) { label_.set_angle(config["rotate"].asUInt()); } From c8d7b6fa92ea006d35b4c425fb38fb8fe83f7d98 Mon Sep 17 00:00:00 2001 From: nullobsi Date: Sun, 31 Jan 2021 14:03:49 -0800 Subject: [PATCH 179/355] rename fixed-length to min-length --- src/ALabel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ALabel.cpp b/src/ALabel.cpp index 4d15cc17..ed5740a2 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -20,7 +20,7 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st } event_box_.add(label_); if (config_["max-length"].isUInt()) { - label_.set_max_width_chars(config_["max-length"].asUInt()); + label_.set_max_width_chars(config_["max-length"].asInt()); label_.set_ellipsize(Pango::EllipsizeMode::ELLIPSIZE_END); label_.set_single_line_mode(true); } else if (ellipsize && label_.get_max_width_chars() == -1) { @@ -28,8 +28,8 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st label_.set_single_line_mode(true); } - if (config_["fixed-length"].isUInt()) { - label_.set_width_chars(config_["fixed-length"].asUInt()); + if (config_["min-length"].isUInt()) { + label_.set_width_chars(config_["min-length"].asUInt()); } if (config_["align"].isDouble()) { From 72cd753c0259f695adc4bf372048256bc403a47d Mon Sep 17 00:00:00 2001 From: nullobsi Date: Mon, 1 Feb 2021 01:44:51 -0800 Subject: [PATCH 180/355] align should use rotate property --- src/ALabel.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/ALabel.cpp b/src/ALabel.cpp index ed5740a2..8d9c9b41 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -32,14 +32,24 @@ ALabel::ALabel(const Json::Value& config, const std::string& name, const std::st label_.set_width_chars(config_["min-length"].asUInt()); } - if (config_["align"].isDouble()) { - auto align = config_["align"].asFloat(); - label_.set_xalign(align); - } + uint rotate = 0; if (config_["rotate"].isUInt()) { - label_.set_angle(config["rotate"].asUInt()); + rotate = config["rotate"].asUInt(); + label_.set_angle(rotate); } + + if (config_["align"].isDouble()) { + auto align = config_["align"].asFloat(); + if (rotate == 90 || rotate == 270) { + label_.set_yalign(align); + } else { + label_.set_xalign(align); + } + + } + + } auto ALabel::update() -> void { From 97f7050d7defb4dc3e23a1709ce063dbfaa38d9f Mon Sep 17 00:00:00 2001 From: nullobsi Date: Mon, 1 Feb 2021 08:34:51 -0800 Subject: [PATCH 181/355] Update man pages --- man/waybar-backlight.5.scd | 8 ++++++++ man/waybar-battery.5.scd | 8 ++++++++ man/waybar-bluetooth.5.scd | 8 ++++++++ man/waybar-clock.5.scd | 8 ++++++++ man/waybar-cpu.5.scd | 8 ++++++++ man/waybar-custom.5.scd | 8 ++++++++ man/waybar-disk.5.scd | 8 ++++++++ man/waybar-idle-inhibitor.5.scd | 8 ++++++++ man/waybar-memory.5.scd | 8 ++++++++ man/waybar-mpd.5.scd | 8 ++++++++ man/waybar-network.5.scd | 8 ++++++++ man/waybar-pulseaudio.5.scd | 8 ++++++++ man/waybar-sndio.5.scd | 8 ++++++++ man/waybar-sway-language.5.scd | 8 ++++++++ man/waybar-sway-mode.5.scd | 8 ++++++++ man/waybar-sway-window.5.scd | 8 ++++++++ man/waybar-temperature.5.scd | 8 ++++++++ 17 files changed, 136 insertions(+) diff --git a/man/waybar-backlight.5.scd b/man/waybar-backlight.5.scd index e6116e3e..d14e4f24 100644 --- a/man/waybar-backlight.5.scd +++ b/man/waybar-backlight.5.scd @@ -24,6 +24,14 @@ The *backlight* module displays the current backlight level. typeof: integer ++ The maximum length in characters the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *rotate*: ++ typeof: integer ++ Positive value to rotate the text label. diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd index a4650cd6..48c2ee19 100644 --- a/man/waybar-battery.5.scd +++ b/man/waybar-battery.5.scd @@ -55,6 +55,14 @@ The *battery* module displays the current capacity and state (eg. charging) of y typeof: integer++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *rotate*: ++ typeof: integer++ Positive value to rotate the text label. diff --git a/man/waybar-bluetooth.5.scd b/man/waybar-bluetooth.5.scd index 5d7d7dd5..0cd9386a 100644 --- a/man/waybar-bluetooth.5.scd +++ b/man/waybar-bluetooth.5.scd @@ -35,6 +35,14 @@ Addressed by *bluetooth* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-clock.5.scd b/man/waybar-clock.5.scd index 9f36c435..28688ee9 100644 --- a/man/waybar-clock.5.scd +++ b/man/waybar-clock.5.scd @@ -45,6 +45,14 @@ The *clock* module displays the current date and time. typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *rotate*: ++ typeof: integer ++ Positive value to rotate the text label. diff --git a/man/waybar-cpu.5.scd b/man/waybar-cpu.5.scd index cb83134f..c8b12e26 100644 --- a/man/waybar-cpu.5.scd +++ b/man/waybar-cpu.5.scd @@ -24,6 +24,14 @@ The *cpu* module displays the current cpu utilization. typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *rotate*: ++ typeof: integer ++ Positive value to rotate the text label. diff --git a/man/waybar-custom.5.scd b/man/waybar-custom.5.scd index 3e820c63..8f9dcfaf 100644 --- a/man/waybar-custom.5.scd +++ b/man/waybar-custom.5.scd @@ -67,6 +67,14 @@ Addressed by *custom/* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-disk.5.scd b/man/waybar-disk.5.scd index 431d7c8f..58797141 100644 --- a/man/waybar-disk.5.scd +++ b/man/waybar-disk.5.scd @@ -39,6 +39,14 @@ Addressed by *disk* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-idle-inhibitor.5.scd b/man/waybar-idle-inhibitor.5.scd index 9d231d86..0b0bdd03 100644 --- a/man/waybar-idle-inhibitor.5.scd +++ b/man/waybar-idle-inhibitor.5.scd @@ -27,6 +27,14 @@ screensaving, also known as "presentation mode". typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. A click also toggles the state diff --git a/man/waybar-memory.5.scd b/man/waybar-memory.5.scd index 81c62165..3ff4c35b 100644 --- a/man/waybar-memory.5.scd +++ b/man/waybar-memory.5.scd @@ -34,6 +34,14 @@ Addressed by *memory* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd index 8c33c624..5bbc00a7 100644 --- a/man/waybar-mpd.5.scd +++ b/man/waybar-mpd.5.scd @@ -81,6 +81,14 @@ Addressed by *mpd* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-network.5.scd b/man/waybar-network.5.scd index ab459ae0..f274881e 100644 --- a/man/waybar-network.5.scd +++ b/man/waybar-network.5.scd @@ -64,6 +64,14 @@ Addressed by *network* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-pulseaudio.5.scd b/man/waybar-pulseaudio.5.scd index c3f50e0b..d894290f 100644 --- a/man/waybar-pulseaudio.5.scd +++ b/man/waybar-pulseaudio.5.scd @@ -50,6 +50,14 @@ Additionally you can control the volume by scrolling *up* or *down* while the cu typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *scroll-step*: ++ typeof: float ++ default: 1.0 ++ diff --git a/man/waybar-sndio.5.scd b/man/waybar-sndio.5.scd index a61c3325..90a73f48 100644 --- a/man/waybar-sndio.5.scd +++ b/man/waybar-sndio.5.scd @@ -26,6 +26,14 @@ cursor is over the module, and clicking on the module toggles mute. typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *scroll-step*: ++ typeof: int ++ default: 5 ++ diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd index a288cca9..769924f0 100644 --- a/man/waybar-sway-language.5.scd +++ b/man/waybar-sway-language.5.scd @@ -25,6 +25,14 @@ Addressed by *sway/language* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-sway-mode.5.scd b/man/waybar-sway-mode.5.scd index 958a1edb..b8b59cd3 100644 --- a/man/waybar-sway-mode.5.scd +++ b/man/waybar-sway-mode.5.scd @@ -25,6 +25,14 @@ Addressed by *sway/mode* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-sway-window.5.scd b/man/waybar-sway-window.5.scd index 4863a76c..40250e6f 100644 --- a/man/waybar-sway-window.5.scd +++ b/man/waybar-sway-window.5.scd @@ -25,6 +25,14 @@ Addressed by *sway/window* typeof: integer ++ The maximum length in character the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when clicked on the module. diff --git a/man/waybar-temperature.5.scd b/man/waybar-temperature.5.scd index 7810a59b..8d11e517 100644 --- a/man/waybar-temperature.5.scd +++ b/man/waybar-temperature.5.scd @@ -63,6 +63,14 @@ Addressed by *temperature* typeof: integer ++ The maximum length in characters the module should display. +*min-length*: ++ + typeof: integer ++ + The minimum length in characters the module should take up. + +*align*: ++ + typeof: float ++ + The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. + *on-click*: ++ typeof: string ++ Command to execute when you clicked on the module. From ac6667b1c979aa9493c4ae033d121a712743e484 Mon Sep 17 00:00:00 2001 From: jgmdev Date: Tue, 2 Feb 2021 01:03:28 -0400 Subject: [PATCH 182/355] [wlr/taskbar] More icon search improvements. * Added ~/.local/share prefix to search in user defined apps. * Add support for apps that don't properly set an id like pamac. --- src/modules/wlr/taskbar.cpp | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 83ce3662..15b927a8 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -15,6 +15,7 @@ #include #include +#include #include @@ -64,6 +65,9 @@ static std::vector search_prefix() } while(end != std::string::npos); } + std::string home_dir = std::getenv("HOME"); + prefixes.push_back(home_dir + "/.local/share/"); + for (auto& p : prefixes) spdlog::debug("Using 'desktop' search path prefix: {}", p); @@ -111,6 +115,26 @@ static std::string get_from_icon_theme(const Glib::RefPtr& icon_ return ""; } +/* Method 3 - as last resort perform a search for most appropriate desktop info file */ +static std::string get_from_desktop_app_info_search(const std::string &app_id) +{ + std::string desktop_file = ""; + + gchar*** desktop_list = g_desktop_app_info_search(app_id.c_str()); + if (desktop_list != nullptr && desktop_list[0] != nullptr) { + for (size_t i=0; desktop_list[0][i]; i++) { + if(desktop_file == "") { + desktop_file = desktop_list[0][i]; + } + break; + } + g_strfreev(desktop_list[0]); + } + g_free(desktop_list); + + return get_from_desktop_app_info(desktop_file); +} + static bool image_load_icon(Gtk::Image& image, const Glib::RefPtr& icon_theme, const std::string &app_id_list, int size) { @@ -142,9 +166,11 @@ static bool image_load_icon(Gtk::Image& image, const Glib::RefPtrload_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); if (pixbuf) { From 7eb2a6b7090c371656dd2df7fd44af6d430b43cb Mon Sep 17 00:00:00 2001 From: Genesis Date: Tue, 2 Feb 2021 21:58:26 +0100 Subject: [PATCH 183/355] Add a configuration entry to disable auto_back_and_forth on Sway workspaces --- include/modules/sway/workspaces.hpp | 2 +- man/waybar-sway-workspaces.5.scd | 12 ++++++++---- src/modules/sway/workspaces.cpp | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/include/modules/sway/workspaces.hpp b/include/modules/sway/workspaces.hpp index 92ec0516..c6443836 100644 --- a/include/modules/sway/workspaces.hpp +++ b/include/modules/sway/workspaces.hpp @@ -20,7 +20,7 @@ class Workspaces : public AModule, public sigc::trackable { auto update() -> void; private: - static inline const std::string workspace_switch_cmd_ = "workspace --no-auto-back-and-forth \"{}\""; + static inline const std::string workspace_switch_cmd_ = "workspace {} \"{}\""; static int convertWorkspaceNameToNum(std::string name); diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd index 5e516892..f2808b90 100644 --- a/man/waybar-sway-workspaces.5.scd +++ b/man/waybar-sway-workspaces.5.scd @@ -66,12 +66,16 @@ Addressed by *sway/workspaces* Lists workspaces that should always be shown, even when non existent *on-update*: ++ - typeof: string ++ - Command to execute when the module is updated. + typeof: string ++ + Command to execute when the module is updated. *numeric-first*: ++ - typeof: bool ++ - Whether to put workspaces starting with numbers before workspaces that do not start with a number. + typeof: bool ++ + Whether to put workspaces starting with numbers before workspaces that do not start with a number. + +*disable-auto-back-and-forth*: ++ + typeof: bool ++ + Whether to disable *workspace_auto_back_and_forth* when clicking on workspaces. If this is set to *true*, clicking on a workspace you are already on won't do anything, even if *workspace_auto_back_and_forth* is enabled in the Sway configuration. # FORMAT REPLACEMENTS diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index d0c24632..43dcf33c 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -257,11 +257,19 @@ Gtk::Button &Workspaces::addButton(const Json::Value &node) { ipc_.sendCmd( IPC_COMMAND, fmt::format(workspace_switch_cmd_ + "; move workspace to output \"{}\"; " + workspace_switch_cmd_, + "--no-auto-back-and-forth", node["name"].asString(), node["target_output"].asString(), + "--no-auto-back-and-forth", node["name"].asString())); } else { - ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, node["name"].asString())); + ipc_.sendCmd( + IPC_COMMAND, + fmt::format("workspace {} \"{}\"", + config_["disable-auto-back-and-forth"].asBool() + ? "--no-auto-back-and-forth" + : "", + node["name"].asString())); } } catch (const std::exception &e) { spdlog::error("Workspaces: {}", e.what()); @@ -322,7 +330,9 @@ bool Workspaces::handleScroll(GdkEventScroll *e) { } } try { - ipc_.sendCmd(IPC_COMMAND, fmt::format(workspace_switch_cmd_, name)); + ipc_.sendCmd( + IPC_COMMAND, + fmt::format(workspace_switch_cmd_, "--no-auto-back-and-forth", name)); } catch (const std::exception &e) { spdlog::error("Workspaces: {}", e.what()); } From 22ed153004e904ed58fe3d4817576552ff1fa57b Mon Sep 17 00:00:00 2001 From: jgmdev Date: Wed, 3 Feb 2021 21:04:10 -0400 Subject: [PATCH 184/355] [wlr/taskbar] Fix unhandled exception crash when icon name is a path. --- src/modules/wlr/taskbar.cpp | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 15b927a8..93c6a77f 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -1,5 +1,7 @@ #include "modules/wlr/taskbar.hpp" +#include "glibmm/error.h" +#include "glibmm/fileutils.h" #include "glibmm/refptr.h" #include "util/format.hpp" @@ -74,6 +76,18 @@ static std::vector search_prefix() return prefixes; } +Glib::RefPtr load_icon_from_file(std::string icon_path, int size) +{ + try { + auto pb = Gdk::Pixbuf::create_from_file(icon_path, size, size); + return pb; + } catch(Glib::Error&) { + return {}; + } catch(...) { + return {}; + } +} + /* Method 1 - get the correct icon name from the desktop file */ static std::string get_from_desktop_app_info(const std::string &app_id) { @@ -172,7 +186,17 @@ static bool image_load_icon(Gtk::Image& image, const Glib::RefPtrload_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + Glib::RefPtr pixbuf; + + try { + pixbuf = icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + } catch(...) { + if (Glib::file_test(icon_name, Glib::FILE_TEST_EXISTS)) + pixbuf = load_icon_from_file(icon_name, size); + else + pixbuf = {}; + } + if (pixbuf) { image.set(pixbuf); found = true; From 8a284e7c74e25c07a603612393a9a07bf31baee7 Mon Sep 17 00:00:00 2001 From: jgmdev Date: Wed, 3 Feb 2021 21:14:04 -0400 Subject: [PATCH 185/355] [wlr/taskbar] Declared load_icon_from_file() static. --- src/modules/wlr/taskbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 93c6a77f..1135a8e5 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -76,7 +76,7 @@ static std::vector search_prefix() return prefixes; } -Glib::RefPtr load_icon_from_file(std::string icon_path, int size) +static Glib::RefPtr load_icon_from_file(std::string icon_path, int size) { try { auto pb = Gdk::Pixbuf::create_from_file(icon_path, size, size); From e293b89f6ba08ca92c834bad4473d708530521de Mon Sep 17 00:00:00 2001 From: jgmdev Date: Thu, 4 Feb 2021 04:57:08 -0400 Subject: [PATCH 186/355] [wlr/taskbar] Removed unnecessary catch statement. --- src/modules/wlr/taskbar.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 1135a8e5..c2acbd9a 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -81,8 +81,6 @@ static Glib::RefPtr load_icon_from_file(std::string icon_path, int try { auto pb = Gdk::Pixbuf::create_from_file(icon_path, size, size); return pb; - } catch(Glib::Error&) { - return {}; } catch(...) { return {}; } From fffb52dd936b7e633996e1a506577c7409cef1fc Mon Sep 17 00:00:00 2001 From: jgmdev Date: Sun, 7 Feb 2021 00:50:52 -0400 Subject: [PATCH 187/355] [wlr/taskbar] Check StartupWMClass on list returned by g_desktop_app_info_searchi() --- src/modules/wlr/taskbar.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index c2acbd9a..e91b19a7 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -137,8 +137,13 @@ static std::string get_from_desktop_app_info_search(const std::string &app_id) for (size_t i=0; desktop_list[0][i]; i++) { if(desktop_file == "") { desktop_file = desktop_list[0][i]; + } else { + auto tmp_info = Gio::DesktopAppInfo::create(desktop_list[0][i]); + auto startup_class = tmp_info->get_startup_wm_class(); + + if (startup_class == app_id) + desktop_file = desktop_list[0][i]; } - break; } g_strfreev(desktop_list[0]); } From f14a73584f4eeb1c2c761ba293ad616cb7020975 Mon Sep 17 00:00:00 2001 From: jgmdev Date: Sun, 7 Feb 2021 01:01:57 -0400 Subject: [PATCH 188/355] [wlr/taskbar] Added break when matching StartupWMClass is found. --- src/modules/wlr/taskbar.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index e91b19a7..08e8bf34 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -141,8 +141,10 @@ static std::string get_from_desktop_app_info_search(const std::string &app_id) auto tmp_info = Gio::DesktopAppInfo::create(desktop_list[0][i]); auto startup_class = tmp_info->get_startup_wm_class(); - if (startup_class == app_id) + if (startup_class == app_id) { desktop_file = desktop_list[0][i]; + break; + } } } g_strfreev(desktop_list[0]); From e4a65c72dd8d48a787f065ce330230c45b2e74cb Mon Sep 17 00:00:00 2001 From: jgmdev Date: Sun, 7 Feb 2021 04:27:16 -0400 Subject: [PATCH 189/355] Added missing 'if' space. --- src/modules/wlr/taskbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 08e8bf34..ef46f36a 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -135,7 +135,7 @@ static std::string get_from_desktop_app_info_search(const std::string &app_id) gchar*** desktop_list = g_desktop_app_info_search(app_id.c_str()); if (desktop_list != nullptr && desktop_list[0] != nullptr) { for (size_t i=0; desktop_list[0][i]; i++) { - if(desktop_file == "") { + if (desktop_file == "") { desktop_file = desktop_list[0][i]; } else { auto tmp_info = Gio::DesktopAppInfo::create(desktop_list[0][i]); From 65853812306414b525ea6beb25dc915249dc922e Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Mon, 8 Feb 2021 22:30:01 -0800 Subject: [PATCH 190/355] fix(client): remove unnecessary wl_output_roundtrip At this point we're not awaiting any protocol events and flushing wayland queue makes little sense. As #1019 shows, it may be even harmful as an extra roundtrip could process wl_output disappearance and delete output object right from under our code. --- src/client.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index 0ad4e6bb..9983bb56 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -124,7 +124,6 @@ void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_ auto configs = client->getOutputConfigs(output); if (!configs.empty()) { - wl_display_roundtrip(client->wl_display); for (const auto &config : configs) { client->bars.emplace_back(std::make_unique(&output, config)); } From 89b5e819a34388e39829bd3cbe52d5fb28a08297 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Mon, 8 Feb 2021 23:05:31 -0800 Subject: [PATCH 191/355] fix(client): improve guard from repeated xdg_output.done events Multiple .done events may arrive in batch. In this case libwayland would queue xdg_output.destroy and dispatch all pending events, triggering this callback several times for the same output. Delete xdg_output pointer immediately on the first event and use the value as a guard for reentering. --- src/client.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 9983bb56..fcfcd98c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -120,16 +120,26 @@ void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_ auto client = waybar::Client::inst(); try { auto &output = client->getOutput(data); - spdlog::debug("Output detection done: {} ({})", output.name, output.identifier); + /** + * Multiple .done events may arrive in batch. In this case libwayland would queue + * xdg_output.destroy and dispatch all pending events, triggering this callback several times + * for the same output. .done events can also arrive after that for a scale or position changes. + * We wouldn't want to draw a duplicate bar for each such event either. + * + * All the properties we care about are immutable so it's safe to delete the xdg_output object + * on the first event and use the ptr value to check that the callback was already invoked. + */ + if (output.xdg_output) { + output.xdg_output.reset(); + spdlog::debug("Output detection done: {} ({})", output.name, output.identifier); - auto configs = client->getOutputConfigs(output); - if (!configs.empty()) { - for (const auto &config : configs) { - client->bars.emplace_back(std::make_unique(&output, config)); + auto configs = client->getOutputConfigs(output); + if (!configs.empty()) { + for (const auto &config : configs) { + client->bars.emplace_back(std::make_unique(&output, config)); + } } } - // unsubscribe - output.xdg_output.reset(); } catch (const std::exception &e) { std::cerr << e.what() << std::endl; } From 95a6689077b5a42833ba3a228f0e56e7a4b71d66 Mon Sep 17 00:00:00 2001 From: Andy Russell Date: Mon, 8 Feb 2021 23:52:29 -0500 Subject: [PATCH 192/355] disable Idle Inhibitor module if unsupported --- src/modules/idle_inhibitor.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/idle_inhibitor.cpp b/src/modules/idle_inhibitor.cpp index 9978bbac..26889c23 100644 --- a/src/modules/idle_inhibitor.cpp +++ b/src/modules/idle_inhibitor.cpp @@ -12,6 +12,10 @@ waybar::modules::IdleInhibitor::IdleInhibitor(const std::string& id, const Bar& bar_(bar), idle_inhibitor_(nullptr), pid_(-1) { + if (waybar::Client::inst()->idle_inhibit_manager == nullptr) { + throw std::runtime_error("idle-inhibit not available"); + } + event_box_.add_events(Gdk::BUTTON_PRESS_MASK); event_box_.signal_button_press_event().connect( sigc::mem_fun(*this, &IdleInhibitor::handleToggle)); From 40f4dc9ecf26a8d9cd8d33b9bc88ff4dd6b3e508 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Mon, 1 Feb 2021 18:50:45 -0800 Subject: [PATCH 193/355] fix(rfkill): accept events larger than v1 event size Kernel 5.11 added one more field to the `struct rfkill_event` and broke unnecessarily strict check in `rfkill.cpp`. According to `linux/rfkill.h`, we must accept events at least as large as v1 event size and should be prepared to get additional fields at the end of a v1 event structure. --- src/util/rfkill.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/rfkill.cpp b/src/util/rfkill.cpp index 82d29e91..e968ca18 100644 --- a/src/util/rfkill.cpp +++ b/src/util/rfkill.cpp @@ -61,7 +61,7 @@ void waybar::util::Rfkill::waitForEvent() { break; } - if (len != RFKILL_EVENT_SIZE_V1) { + if (len < RFKILL_EVENT_SIZE_V1) { throw std::runtime_error("Wrong size of RFKILL event"); continue; } From 38c29fc2426557b43af91e7557c40f7880aaa0b8 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 2 Feb 2021 19:17:06 -0800 Subject: [PATCH 194/355] refactor(rfkill): poll rfkill events from Glib main loop Open rfkill device only once per module. Remove rfkill threads and use `Glib::signal_io` as a more efficient way to poll the rfkill device. Handle runtime errors from rfkill and stop polling of the device instead of crashing waybar. --- include/modules/bluetooth.hpp | 16 ++++---- include/modules/network.hpp | 2 - include/util/rfkill.hpp | 15 +++++-- src/modules/bluetooth.cpp | 8 +--- src/modules/network.cpp | 17 ++++---- src/util/rfkill.cpp | 73 ++++++++++++++++++----------------- 6 files changed, 64 insertions(+), 67 deletions(-) diff --git a/include/modules/bluetooth.hpp b/include/modules/bluetooth.hpp index 04c213da..716df0eb 100644 --- a/include/modules/bluetooth.hpp +++ b/include/modules/bluetooth.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include "ALabel.hpp" - #include -#include "util/sleeper_thread.hpp" +#include + +#include "ALabel.hpp" #include "util/rfkill.hpp" +#include "util/sleeper_thread.hpp" namespace waybar::modules { @@ -16,11 +16,9 @@ class Bluetooth : public ALabel { auto update() -> void; private: - std::string status_; - util::SleeperThread thread_; - util::SleeperThread intervall_thread_; - - util::Rfkill rfkill_; + std::string status_; + util::SleeperThread thread_; + util::Rfkill rfkill_; }; } // namespace waybar::modules diff --git a/include/modules/network.hpp b/include/modules/network.hpp index c02d3c5e..539f4583 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -75,8 +75,6 @@ class Network : public ALabel { util::SleeperThread thread_; util::SleeperThread thread_timer_; #ifdef WANT_RFKILL - util::SleeperThread thread_rfkill_; - util::Rfkill rfkill_; #endif }; diff --git a/include/util/rfkill.hpp b/include/util/rfkill.hpp index ac3d406b..5d519cae 100644 --- a/include/util/rfkill.hpp +++ b/include/util/rfkill.hpp @@ -1,19 +1,26 @@ #pragma once +#include #include +#include +#include namespace waybar::util { -class Rfkill { +class Rfkill : public sigc::trackable { public: Rfkill(enum rfkill_type rfkill_type); - ~Rfkill() = default; - void waitForEvent(); + ~Rfkill(); bool getState() const; + sigc::signal on_update; + private: enum rfkill_type rfkill_type_; - int state_ = 0; + bool state_ = false; + int fd_ = -1; + + bool on_event(Glib::IOCondition cond); }; } // namespace waybar::util diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp index b390976a..9939cc19 100644 --- a/src/modules/bluetooth.cpp +++ b/src/modules/bluetooth.cpp @@ -1,17 +1,11 @@ #include "modules/bluetooth.hpp" -#include "util/rfkill.hpp" -#include -#include waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value& config) : ALabel(config, "bluetooth", id, "{icon}", 10), status_("disabled"), rfkill_{RFKILL_TYPE_BLUETOOTH} { + rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Bluetooth::update))); thread_ = [this] { - dp.emit(); - rfkill_.waitForEvent(); - }; - intervall_thread_ = [this] { auto now = std::chrono::system_clock::now(); auto timeout = std::chrono::floor(now + interval_); auto diff = std::chrono::seconds(timeout.time_since_epoch().count() % interval_.count()); diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 7d9da8b5..41bc9d51 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -212,18 +212,15 @@ void waybar::modules::Network::worker() { thread_timer_.sleep_for(interval_); }; #ifdef WANT_RFKILL - thread_rfkill_ = [this] { - rfkill_.waitForEvent(); - { - std::lock_guard lock(mutex_); - if (ifid_ > 0) { - getInfo(); - dp.emit(); - } + rfkill_.on_update.connect([this](auto &) { + std::lock_guard lock(mutex_); + if (ifid_ > 0) { + getInfo(); + dp.emit(); } - }; + }); #else - spdlog::warn("Waybar has been built without rfkill support."); + spdlog::warn("Waybar has been built without rfkill support."); #endif thread_ = [this] { std::array events{}; diff --git a/src/util/rfkill.cpp b/src/util/rfkill.cpp index e968ca18..d3eb516a 100644 --- a/src/util/rfkill.cpp +++ b/src/util/rfkill.cpp @@ -19,60 +19,63 @@ #include "util/rfkill.hpp" #include +#include #include -#include -#include +#include #include #include -#include -#include -waybar::util::Rfkill::Rfkill(const enum rfkill_type rfkill_type) : rfkill_type_(rfkill_type) {} - -void waybar::util::Rfkill::waitForEvent() { - struct rfkill_event event; - struct pollfd p; - ssize_t len; - int fd, n; - - fd = open("/dev/rfkill", O_RDONLY); - if (fd < 0) { - throw std::runtime_error("Can't open RFKILL control device"); +waybar::util::Rfkill::Rfkill(const enum rfkill_type rfkill_type) : rfkill_type_(rfkill_type) { + fd_ = open("/dev/rfkill", O_RDONLY); + if (fd_ < 0) { + spdlog::error("Can't open RFKILL control device"); return; } + int rc = fcntl(fd_, F_SETFL, O_NONBLOCK); + if (rc < 0) { + spdlog::error("Can't set RFKILL control device to non-blocking: {}", errno); + close(fd_); + fd_ = -1; + return; + } + Glib::signal_io().connect( + sigc::mem_fun(*this, &Rfkill::on_event), fd_, Glib::IO_IN | Glib::IO_ERR | Glib::IO_HUP); +} - memset(&p, 0, sizeof(p)); - p.fd = fd; - p.events = POLLIN | POLLHUP; +waybar::util::Rfkill::~Rfkill() { + if (fd_ >= 0) { + close(fd_); + } +} - while (1) { - n = poll(&p, 1, -1); - if (n < 0) { - throw std::runtime_error("Failed to poll RFKILL control device"); - break; - } +bool waybar::util::Rfkill::on_event(Glib::IOCondition cond) { + if (cond & Glib::IO_IN) { + struct rfkill_event event; + ssize_t len; - if (n == 0) continue; - - len = read(fd, &event, sizeof(event)); + len = read(fd_, &event, sizeof(event)); if (len < 0) { - throw std::runtime_error("Reading of RFKILL events failed"); - break; + spdlog::error("Reading of RFKILL events failed: {}", errno); + return false; } if (len < RFKILL_EVENT_SIZE_V1) { - throw std::runtime_error("Wrong size of RFKILL event"); - continue; + if (errno != EAGAIN) { + spdlog::error("Wrong size of RFKILL event: {}", len); + } + return true; } - if (event.type == rfkill_type_ && event.op == RFKILL_OP_CHANGE) { + if (event.type == rfkill_type_ && (event.op == RFKILL_OP_ADD || event.op == RFKILL_OP_CHANGE)) { state_ = event.soft || event.hard; - break; + on_update.emit(event); } + return true; + } else { + spdlog::error("Failed to poll RFKILL control device"); + return false; } - - close(fd); } bool waybar::util::Rfkill::getState() const { return state_; } From ecc32ddd185b112b101891200d127dc319a58ca5 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 2 Feb 2021 20:01:01 -0800 Subject: [PATCH 195/355] refactor(bluetooth): remove Bluetooth::status_ The string was always overwritten in `update()`; don't need to store temporary value in the class. --- include/modules/bluetooth.hpp | 4 ---- src/modules/bluetooth.cpp | 21 +++++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/include/modules/bluetooth.hpp b/include/modules/bluetooth.hpp index 716df0eb..4d7b7c84 100644 --- a/include/modules/bluetooth.hpp +++ b/include/modules/bluetooth.hpp @@ -1,8 +1,5 @@ #pragma once -#include -#include - #include "ALabel.hpp" #include "util/rfkill.hpp" #include "util/sleeper_thread.hpp" @@ -16,7 +13,6 @@ class Bluetooth : public ALabel { auto update() -> void; private: - std::string status_; util::SleeperThread thread_; util::Rfkill rfkill_; }; diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp index 9939cc19..0df404d3 100644 --- a/src/modules/bluetooth.cpp +++ b/src/modules/bluetooth.cpp @@ -1,9 +1,9 @@ #include "modules/bluetooth.hpp" +#include + waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value& config) - : ALabel(config, "bluetooth", id, "{icon}", 10), - status_("disabled"), - rfkill_{RFKILL_TYPE_BLUETOOTH} { + : ALabel(config, "bluetooth", id, "{icon}", 10), rfkill_{RFKILL_TYPE_BLUETOOTH} { rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Bluetooth::update))); thread_ = [this] { auto now = std::chrono::system_clock::now(); @@ -15,25 +15,18 @@ waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value& } auto waybar::modules::Bluetooth::update() -> void { - if (rfkill_.getState()) { - status_ = "disabled"; - } else { - status_ = "enabled"; - } + std::string status = rfkill_.getState() ? "disabled" : "enabled"; label_.set_markup( - fmt::format( - format_, - fmt::arg("status", status_), - fmt::arg("icon", getIcon(0, status_)))); + fmt::format(format_, fmt::arg("status", status), fmt::arg("icon", getIcon(0, status)))); if (tooltipEnabled()) { if (config_["tooltip-format"].isString()) { auto tooltip_format = config_["tooltip-format"].asString(); - auto tooltip_text = fmt::format(tooltip_format, status_); + auto tooltip_text = fmt::format(tooltip_format, status); label_.set_tooltip_text(tooltip_text); } else { - label_.set_tooltip_text(status_); + label_.set_tooltip_text(status); } } } From 52dd3d2446a99ff822ae4fd913bdab3dc2c06d1c Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 2 Feb 2021 20:10:27 -0800 Subject: [PATCH 196/355] refactor(bluetooth): remove `interval` and timer thread The timer thread was always reading the same value from Rfkill state. --- include/modules/bluetooth.hpp | 4 +--- man/waybar-bluetooth.5.scd | 6 ------ src/modules/bluetooth.cpp | 7 ------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/include/modules/bluetooth.hpp b/include/modules/bluetooth.hpp index 4d7b7c84..87845c95 100644 --- a/include/modules/bluetooth.hpp +++ b/include/modules/bluetooth.hpp @@ -2,7 +2,6 @@ #include "ALabel.hpp" #include "util/rfkill.hpp" -#include "util/sleeper_thread.hpp" namespace waybar::modules { @@ -13,8 +12,7 @@ class Bluetooth : public ALabel { auto update() -> void; private: - util::SleeperThread thread_; - util::Rfkill rfkill_; + util::Rfkill rfkill_; }; } // namespace waybar::modules diff --git a/man/waybar-bluetooth.5.scd b/man/waybar-bluetooth.5.scd index 0cd9386a..d4ecb1d1 100644 --- a/man/waybar-bluetooth.5.scd +++ b/man/waybar-bluetooth.5.scd @@ -12,11 +12,6 @@ The *bluetooth* module displays information about the status of the device's blu Addressed by *bluetooth* -*interval*: ++ - typeof: integer ++ - default: 60 ++ - The interval in which the bluetooth state gets updated. - *format*: ++ typeof: string ++ default: *{icon}* ++ @@ -88,7 +83,6 @@ Addressed by *bluetooth* "bluetooth": { "format": "{icon}", "format-alt": "bluetooth: {status}", - "interval": 30, "format-icons": { "enabled": "", "disabled": "" diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp index 0df404d3..88526845 100644 --- a/src/modules/bluetooth.cpp +++ b/src/modules/bluetooth.cpp @@ -5,13 +5,6 @@ waybar::modules::Bluetooth::Bluetooth(const std::string& id, const Json::Value& config) : ALabel(config, "bluetooth", id, "{icon}", 10), rfkill_{RFKILL_TYPE_BLUETOOTH} { rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Bluetooth::update))); - thread_ = [this] { - auto now = std::chrono::system_clock::now(); - auto timeout = std::chrono::floor(now + interval_); - auto diff = std::chrono::seconds(timeout.time_since_epoch().count() % interval_.count()); - thread_.sleep_until(timeout - diff); - dp.emit(); - }; } auto waybar::modules::Bluetooth::update() -> void { From 6d5afdaa5fee87304fceb4b9d978b992bad32126 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 2 Feb 2021 20:56:00 -0800 Subject: [PATCH 197/355] fix(network): don't block the main thread on rfkill update Moving rfkill to the main event loop had unexpected side-effects. Notably, the network module mutex can block all the main thread events for several seconds while the network worker thread is sleeping. Instead of waiting for the mutex let's hope that the worker thread succeeds and schedule timer thread wakeup just in case. --- src/modules/network.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 41bc9d51..a8aaffaf 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -213,11 +213,11 @@ void waybar::modules::Network::worker() { }; #ifdef WANT_RFKILL rfkill_.on_update.connect([this](auto &) { - std::lock_guard lock(mutex_); - if (ifid_ > 0) { - getInfo(); - dp.emit(); - } + /* If we are here, it's likely that the network thread already holds the mutex and will be + * holding it for a next few seconds. + * Let's delegate the update to the timer thread instead of blocking the main thread. + */ + thread_timer_.wake_up(); }); #else spdlog::warn("Waybar has been built without rfkill support."); From e786ea601ed0aba54338bb7ea1563f2f3ebd5ae0 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 10 Feb 2021 08:22:22 -0800 Subject: [PATCH 198/355] fix(rfkill): handle EAGAIN correctly --- src/util/rfkill.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/rfkill.cpp b/src/util/rfkill.cpp index d3eb516a..7400135e 100644 --- a/src/util/rfkill.cpp +++ b/src/util/rfkill.cpp @@ -56,14 +56,15 @@ bool waybar::util::Rfkill::on_event(Glib::IOCondition cond) { len = read(fd_, &event, sizeof(event)); if (len < 0) { + if (errno == EAGAIN) { + return true; + } spdlog::error("Reading of RFKILL events failed: {}", errno); return false; } if (len < RFKILL_EVENT_SIZE_V1) { - if (errno != EAGAIN) { - spdlog::error("Wrong size of RFKILL event: {}", len); - } + spdlog::error("Wrong size of RFKILL event: {} < {}", len, RFKILL_EVENT_SIZE_V1); return true; } From d8706af2ea7cb0f668cc26c449b3a9cc46516ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= Date: Fri, 12 Feb 2021 20:15:38 +0100 Subject: [PATCH 199/355] Terminate custom module scripts on exit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Fixes #358.) Subprocesses created for custom module scripts were previously left running when the parent Waybar process exited. This patch sets the parent-death signal of child processes (PR_SET_PDEATHSIG on Linux, PROC_PDEATHSIG_CTL on FreeBSD) to SIGTERM. Caveats: * This uses Linux-specific or FreeBSD-specific calls. I don’t know if this project targets other systems? * There is a possibility that Waybar exits after calling `fork()`, but before calling `prctl` to set the parent-death signal. In this case, the child will not receive the SIGTERM signal and will continue to run. I did not handle this case as I consider it quite unlikely, since module scripts are usually launched only when Waybar starts. Please let me know if you think it needs to be handled. Testing: * With `htop` open, run Waybar v0.9.5 with a custom module that has an `exec` script. Terminate the Waybar process and notice that the script’s subprocess stays alive and is now a child of the init process. * Run Waybar with this patch and follow the same steps as above. Notice that this time the script’s subprocess terminates when the parent exits. --- include/util/command.hpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/util/command.hpp b/include/util/command.hpp index 52655581..3a38da36 100644 --- a/include/util/command.hpp +++ b/include/util/command.hpp @@ -5,6 +5,13 @@ #include #include +#ifdef __linux__ +#include +#endif +#ifdef __FreeBSD__ +#include +#endif + #include extern std::mutex reap_mtx; @@ -77,6 +84,18 @@ inline FILE* open(const std::string& cmd, int& pid) { // Reset sigmask err = pthread_sigmask(SIG_UNBLOCK, &mask, nullptr); if (err != 0) spdlog::error("pthread_sigmask in open failed: {}", strerror(err)); + // Kill child if Waybar exits + int deathsig = SIGTERM; +#ifdef __linux__ + if (prctl(PR_SET_PDEATHSIG, deathsig) != 0) { + spdlog::error("prctl(PR_SET_PDEATHSIG) in open failed: {}", strerror(errno)); + } +#endif +#ifdef __FreeBSD__ + if (procctl(P_PID, 0, PROC_PDEATHSIG_CTL, reinterpret_cast(&deathsig)) == -1) { + spdlog::error("procctl(PROC_PDEATHSIG_CTL) in open failed: {}", strerror(errno)); + } +#endif ::close(fd[0]); dup2(fd[1], 1); setpgid(child_pid, child_pid); From 2019028688cb5c03062281854855f05eeb9e606f Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Fri, 19 Feb 2021 14:33:38 +0100 Subject: [PATCH 200/355] Configure systemd.service file to allow reloading This allows `systemctl --user reload waybar` to reload waybar's config as expected. --- resources/waybar.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/waybar.service.in b/resources/waybar.service.in index af5832d5..ef0d07e8 100644 --- a/resources/waybar.service.in +++ b/resources/waybar.service.in @@ -6,6 +6,7 @@ After=graphical-session.target [Service] ExecStart=@prefix@/bin/waybar +ExecReload=kill -SIGUSR2 $MAINPID Restart=on-failure [Install] From 943ba3a2da2730d536a2f6409dfe61a8523239a6 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 9 Feb 2021 19:24:46 -0800 Subject: [PATCH 201/355] fix: schedule output destruction on idle callback Defer destruction of bars for the output to the next iteration of the event loop to avoid deleting objects referenced by currently executed code. --- include/client.hpp | 1 + src/client.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/include/client.hpp b/include/client.hpp index 5965f7cd..ec3866ad 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -51,6 +51,7 @@ class Client { static void handleOutputDescription(void *, struct zxdg_output_v1 *, const char *); void handleMonitorAdded(Glib::RefPtr monitor); void handleMonitorRemoved(Glib::RefPtr monitor); + void handleDeferredMonitorRemoval(Glib::RefPtr monitor); Json::Value config_; Glib::RefPtr style_context_; diff --git a/src/client.cpp b/src/client.cpp index fcfcd98c..1c48c813 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -179,6 +179,16 @@ void waybar::Client::handleMonitorAdded(Glib::RefPtr monitor) { void waybar::Client::handleMonitorRemoved(Glib::RefPtr monitor) { spdlog::debug("Output removed: {} {}", monitor->get_manufacturer(), monitor->get_model()); + /* This event can be triggered from wl_display_roundtrip called by GTK or our code. + * Defer destruction of bars for the output to the next iteration of the event loop to avoid + * deleting objects referenced by currently executed code. + */ + Glib::signal_idle().connect_once( + sigc::bind(sigc::mem_fun(*this, &Client::handleDeferredMonitorRemoval), monitor), + Glib::PRIORITY_HIGH_IDLE); +} + +void waybar::Client::handleDeferredMonitorRemoval(Glib::RefPtr monitor) { for (auto it = bars.begin(); it != bars.end();) { if ((*it)->output->monitor == monitor) { auto output_name = (*it)->output->name; From 08ea5ebe1f7f2a3cdeba8f8bbeebcd8539fee359 Mon Sep 17 00:00:00 2001 From: Genesis Date: Tue, 2 Feb 2021 23:33:33 +0100 Subject: [PATCH 202/355] Add cpu frequency --- include/modules/cpu.hpp | 2 ++ man/waybar-cpu.5.scd | 6 ++++++ src/modules/cpu/bsd.cpp | 4 ++++ src/modules/cpu/common.cpp | 21 ++++++++++++++++++++- src/modules/cpu/linux.cpp | 21 +++++++++++++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp index 7a703364..6a9b5864 100644 --- a/include/modules/cpu.hpp +++ b/include/modules/cpu.hpp @@ -22,7 +22,9 @@ class Cpu : public ALabel { private: uint16_t getCpuLoad(); std::tuple getCpuUsage(); + std::tuple getCpuFrequency(); std::vector> parseCpuinfo(); + std::vector parseCpuFrequencies(); std::vector> prev_times_; diff --git a/man/waybar-cpu.5.scd b/man/waybar-cpu.5.scd index c8b12e26..fbf6206f 100644 --- a/man/waybar-cpu.5.scd +++ b/man/waybar-cpu.5.scd @@ -79,6 +79,12 @@ The *cpu* module displays the current cpu utilization. *{usage}*: Current cpu usage. +*{avg_frequency}*: Current cpu average frequency (based on all cores) in GHz. + +*{max_frequency}*: Current cpu max frequency (based on the core with the highest frequency) in GHz. + +*{min_frequency}*: Current cpu min frequency (based on the core with the lowest frequency) in GHz. + # EXAMPLE ``` diff --git a/src/modules/cpu/bsd.cpp b/src/modules/cpu/bsd.cpp index 73ab1e8a..10f18385 100644 --- a/src/modules/cpu/bsd.cpp +++ b/src/modules/cpu/bsd.cpp @@ -95,3 +95,7 @@ std::vector> waybar::modules::Cpu::parseCpuinfo() { free(cp_time); return cpuinfo; } + +std::vector waybar::modules::Cpu::parseCpuFrequencies() { + throw std::runtime_error("Cpu frequency is not implemented on BSD."); +} diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index e86d10a0..74f1e404 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -12,6 +12,7 @@ auto waybar::modules::Cpu::update() -> void { // TODO: as creating dynamic fmt::arg arrays is buggy we have to calc both auto cpu_load = getCpuLoad(); auto [cpu_usage, tooltip] = getCpuUsage(); + auto [max_frequency, min_frequency, avg_frequency] = getCpuFrequency(); if (tooltipEnabled()) { label_.set_tooltip_text(tooltip); } @@ -25,7 +26,12 @@ auto waybar::modules::Cpu::update() -> void { event_box_.hide(); } else { event_box_.show(); - label_.set_markup(fmt::format(format, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage))); + label_.set_markup(fmt::format(format, + fmt::arg("load", cpu_load), + fmt::arg("usage", cpu_usage), + fmt::arg("max_frequency", max_frequency), + fmt::arg("min_frequency", min_frequency), + fmt::arg("avg_frequency", avg_frequency))); } // Call parent update @@ -64,3 +70,16 @@ std::tuple waybar::modules::Cpu::getCpuUsage() { prev_times_ = curr_times; return {usage, tooltip}; } + +std::tuple waybar::modules::Cpu::getCpuFrequency() { + std::vector frequencies = parseCpuFrequencies(); + auto [min, max] = std::minmax_element(std::begin(frequencies), std::end(frequencies)); + float avg_frequency = std::accumulate(std::begin(frequencies), std::end(frequencies), 0.0) / frequencies.size(); + + // Round frequencies with double decimal precision to get GHz + float max_frequency = std::ceil(*max / 10.0) / 100.0; + float min_frequency = std::ceil(*min / 10.0) / 100.0; + avg_frequency = std::ceil(avg_frequency / 10.0) / 100.0; + + return { max_frequency, min_frequency, avg_frequency }; +} diff --git a/src/modules/cpu/linux.cpp b/src/modules/cpu/linux.cpp index 9f1734fb..b69f71a7 100644 --- a/src/modules/cpu/linux.cpp +++ b/src/modules/cpu/linux.cpp @@ -27,3 +27,24 @@ std::vector> waybar::modules::Cpu::parseCpuinfo() { } return cpuinfo; } + +std::vector waybar::modules::Cpu::parseCpuFrequencies() { + const std::string file_path_ = "/proc/cpuinfo"; + std::ifstream info(file_path_); + if (!info.is_open()) { + throw std::runtime_error("Can't open " + file_path_); + } + std::vector frequencies; + std::string line; + while (getline(info, line)) { + if (line.substr(0, 7).compare("cpu MHz") != 0) { + continue; + } + + std::string frequency_str = line.substr(line.find(":") + 2); + float frequency = std::strtol(frequency_str.c_str(), nullptr, 10); + frequencies.push_back(frequency); + } + info.close(); + return frequencies; +} From 99643ba2e615daf27ae3d8662fc0cd3b122cc664 Mon Sep 17 00:00:00 2001 From: Genesis Date: Sun, 21 Feb 2021 21:57:55 +0100 Subject: [PATCH 203/355] Stub parseCpuFrequencies on *BSD platforms --- src/modules/cpu/bsd.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/cpu/bsd.cpp b/src/modules/cpu/bsd.cpp index 10f18385..a92252f1 100644 --- a/src/modules/cpu/bsd.cpp +++ b/src/modules/cpu/bsd.cpp @@ -2,8 +2,10 @@ #include #include +#include #include // malloc #include // sysconf +#include // NAN #if defined(__NetBSD__) || defined(__OpenBSD__) # include @@ -97,5 +99,10 @@ std::vector> waybar::modules::Cpu::parseCpuinfo() { } std::vector waybar::modules::Cpu::parseCpuFrequencies() { - throw std::runtime_error("Cpu frequency is not implemented on BSD."); + static std::vector frequencies; + if (frequencies.empty()) { + spdlog::warn("cpu/bsd: parseCpuFrequencies is not implemented, expect garbage in {*_frequency}"); + frequencies.push_back(NAN); + } + return frequencies; } From 1573e1eb971877f54738f4b5c51dd1c613c1eb80 Mon Sep 17 00:00:00 2001 From: nullobsi Date: Fri, 26 Feb 2021 13:29:58 -0800 Subject: [PATCH 204/355] change variable instead of substr(len) --- src/modules/mpd/mpd.cpp | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index ab822249..6a828c3f 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -143,26 +143,18 @@ void waybar::modules::MPD::setLabel() { std::string repeatIcon = getOptionIcon("repeat", repeatActivated); bool singleActivated = mpd_status_get_single(status_.get()); std::string singleIcon = getOptionIcon("single", singleActivated); - - auto artistLen = config_["artist-len"].isInt() ? - config_["artist-len"].asInt() : artist.size(); - - auto albumArtistLen = config_["album-artist-len"].isInt() ? - config_["album-artist-len"].asInt() : album_artist.size(); - - auto albumLen = config_["album-len"].isInt() ? - config_["album-len"].asInt() : album.size(); - - auto titleLen = config_["title-len"].isInt() ? - config_["title-len"].asInt() : title.size(); + if (config_["artist-len"].isInt()) artist = artist.substr(0, config_["artist-len"].asInt()); + if (config_["album-artist-len"].isInt()) album_artist = album_artist.substr(0, config_["album-artist-len"].asInt()); + if (config_["album-len"].isInt()) album = album.substr(0, config_["album-len"].asInt()); + if (config_["title-len"].isInt()) title = title.substr(0,config_["title-len"].asInt()); try { label_.set_markup( fmt::format(format, - fmt::arg("artist", Glib::Markup::escape_text(artist.substr(0, artistLen)).raw()), - fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist.substr(0, albumArtistLen)).raw()), - fmt::arg("album", Glib::Markup::escape_text(album.substr(0, albumLen)).raw()), - fmt::arg("title", Glib::Markup::escape_text(title.substr(0, titleLen)).raw()), + fmt::arg("artist", Glib::Markup::escape_text(artist).raw()), + fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist).raw()), + fmt::arg("album", Glib::Markup::escape_text(album).raw()), + fmt::arg("title", Glib::Markup::escape_text(title).raw()), fmt::arg("date", Glib::Markup::escape_text(date).raw()), fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), @@ -183,10 +175,10 @@ void waybar::modules::MPD::setLabel() { : "MPD (connected)"; try { auto tooltip_text = fmt::format(tooltip_format, - fmt::arg("artist", artist.substr(0, artistLen).raw()), - fmt::arg("albumArtist", album_artist.substr(0, albumArtistLen).raw()), - fmt::arg("album", album.substr(0, albumLen).raw()), - fmt::arg("title", title.substr(0, titleLen).raw()), + fmt::arg("artist", artist.raw()), + fmt::arg("albumArtist", album_artist.raw()), + fmt::arg("album", album.raw()), + fmt::arg("title", title.raw()), fmt::arg("date", date), fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), From a49b12b66b4ff2d8de12ead98caf822d9eb35308 Mon Sep 17 00:00:00 2001 From: Antonin Reitz Date: Fri, 12 Mar 2021 20:58:51 +0100 Subject: [PATCH 205/355] Fix CPU load values --- include/modules/cpu.hpp | 3 +-- src/modules/cpu/common.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp index 7a703364..d5b79e05 100644 --- a/include/modules/cpu.hpp +++ b/include/modules/cpu.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #include #include #include @@ -20,7 +19,7 @@ class Cpu : public ALabel { auto update() -> void; private: - uint16_t getCpuLoad(); + double getCpuLoad(); std::tuple getCpuUsage(); std::vector> parseCpuinfo(); diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index e86d10a0..03befe42 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -32,10 +32,10 @@ auto waybar::modules::Cpu::update() -> void { ALabel::update(); } -uint16_t waybar::modules::Cpu::getCpuLoad() { +double waybar::modules::Cpu::getCpuLoad() { double load[1]; if (getloadavg(load, 1) != -1) { - return load[0] * 100 / sysconf(_SC_NPROCESSORS_ONLN); + return load[0]; } throw std::runtime_error("Can't get Cpu load"); } From 354de5f13f407ca17e09bdc2aa98dde0821bb758 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sat, 13 Mar 2021 15:17:11 +0000 Subject: [PATCH 206/355] style: add styling to disk module --- resources/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/style.css b/resources/style.css index 920bb527..952f368f 100644 --- a/resources/style.css +++ b/resources/style.css @@ -69,6 +69,7 @@ window#waybar.chromium { #battery, #cpu, #memory, +#disk, #temperature, #backlight, #network, @@ -142,6 +143,10 @@ label:focus { background-color: #9b59b6; } +#disk { + background-color: #964B00; +} + #backlight { background-color: #90b1b1; } From b4ee994515e17ffff22e5575316e5b8e57b8cdf1 Mon Sep 17 00:00:00 2001 From: Martin Pittermann Date: Tue, 23 Mar 2021 00:26:45 +0100 Subject: [PATCH 207/355] Add style for battery state "plugged" --- resources/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/style.css b/resources/style.css index 920bb527..e1243065 100644 --- a/resources/style.css +++ b/resources/style.css @@ -107,7 +107,7 @@ window#waybar.chromium { color: #000000; } -#battery.charging { +#battery.charging, #battery.plugged { color: #ffffff; background-color: #26A65B; } From f4ad5d36ec0d64f55a541ef4e04500462e2c25ec Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Wed, 17 Mar 2021 17:07:06 +0300 Subject: [PATCH 208/355] meson.build: add missing waybar-sway-language manpage --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 373ec86b..23af767c 100644 --- a/meson.build +++ b/meson.build @@ -315,6 +315,7 @@ if scdoc.found() 'waybar-network.5.scd', 'waybar-pulseaudio.5.scd', 'waybar-river-tags.5.scd', + 'waybar-sway-language.5.scd', 'waybar-sway-mode.5.scd', 'waybar-sway-window.5.scd', 'waybar-sway-workspaces.5.scd', From c85021228832cbea002ef38a468b84bbaf36f41c Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sun, 28 Mar 2021 20:07:35 +0300 Subject: [PATCH 209/355] Use the correct battery status when multiple batteries are present --- src/modules/battery.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 85774697..49e23dec 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -135,6 +135,16 @@ void waybar::modules::Battery::refreshBatteries() { } } +// Unknown > Full > Not charging > Discharging > Charging +static bool status_gt(const std::string& a, const std::string& b) { + if (a == b) return false; + else if (a == "Unknown") return true; + else if (a == "Full" && b != "Unknown") return true; + else if (a == "Not charging" && b != "Unknown" && b != "Full") return true; + else if (a == "Discharging" && b != "Unknown" && b != "Full" && b != "Not charging") return true; + return false; +} + const std::tuple waybar::modules::Battery::getInfos() { std::lock_guard guard(battery_list_mutex_); @@ -160,7 +170,9 @@ const std::tuple waybar::modules::Battery::g std::ifstream(bat / full_path) >> energy_full; auto full_design_path = fs::exists(bat / "charge_full_design") ? "charge_full_design" : "energy_full_design"; std::ifstream(bat / full_design_path) >> energy_full_design; - if (_status != "Unknown") { + + // Show the "smallest" status among all batteries + if (status_gt(status, _status)) { status = _status; } total_power += power_now; From 729a4fe37e899143cf9ae2e3bf88c5d574714489 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 15 Apr 2021 16:09:45 +0200 Subject: [PATCH 210/355] chore: v0.9.6 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 23af767c..39706ba6 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'waybar', 'cpp', 'c', - version: '0.9.5', + version: '0.9.6', license: 'MIT', meson_version: '>= 0.49.0', default_options : [ From f8f1e791a30a5b44a43a2d4bf673d837724c5396 Mon Sep 17 00:00:00 2001 From: jgmdev Date: Thu, 15 Apr 2021 14:30:29 -0400 Subject: [PATCH 211/355] [Module CPU] fix crash due to empty frequencies. On some systems (eg: ARM) the supported frequencies of the CPU are not properly reported by /proc/cpuinfo so if that fails try to retrieve them from /sys/devices/system/cpu/cpufreq/policy[0-9]/cpuinfo_[max|min]_freq. --- src/modules/cpu/linux.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/modules/cpu/linux.cpp b/src/modules/cpu/linux.cpp index b69f71a7..6d638a9f 100644 --- a/src/modules/cpu/linux.cpp +++ b/src/modules/cpu/linux.cpp @@ -1,3 +1,4 @@ +#include #include "modules/cpu.hpp" std::vector> waybar::modules::Cpu::parseCpuinfo() { @@ -46,5 +47,31 @@ std::vector waybar::modules::Cpu::parseCpuFrequencies() { frequencies.push_back(frequency); } info.close(); + + if (frequencies.size() <= 0) { + std::string cpufreq_dir = "/sys/devices/system/cpu/cpufreq"; + if (std::filesystem::exists(cpufreq_dir)) { + std::vector frequency_files = { + "/cpuinfo_min_freq", + "/cpuinfo_max_freq" + }; + for (auto& p: std::filesystem::directory_iterator(cpufreq_dir)) { + for (auto freq_file: frequency_files) { + std::string freq_file_path = p.path().string() + freq_file; + if (std::filesystem::exists(freq_file_path)) { + std::string freq_value; + std::ifstream freq(freq_file_path); + if (freq.is_open()) { + getline(freq, freq_value); + float frequency = std::strtol(freq_value.c_str(), nullptr, 10); + frequencies.push_back(frequency / 1000); + freq.close(); + } + } + } + } + } + } + return frequencies; } From 5300461c79de4c38ec652a5e26eb05ab2bbff335 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 15 Apr 2021 21:17:48 +0200 Subject: [PATCH 212/355] chore: v0.9.7 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 39706ba6..2bb4e49e 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'waybar', 'cpp', 'c', - version: '0.9.6', + version: '0.9.7', license: 'MIT', meson_version: '>= 0.49.0', default_options : [ From ba278985e86315731871611996382f31d0e526c2 Mon Sep 17 00:00:00 2001 From: dmitry Date: Sun, 18 Apr 2021 21:34:29 +0300 Subject: [PATCH 213/355] Add ignore-list param to wlr/taskbar --- include/modules/wlr/taskbar.hpp | 7 +++++++ man/waybar-wlr-taskbar.5.scd | 9 ++++++++- src/modules/wlr/taskbar.cpp | 31 ++++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index 7085d79d..bb65066a 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -61,6 +62,7 @@ class Task Gtk::Label text_before_; Gtk::Label text_after_; bool button_visible_; + bool ignored_; bool with_icon_; std::string format_before_; @@ -132,10 +134,14 @@ class Taskbar : public waybar::AModule std::vector tasks_; std::vector> icon_themes_; + std::unordered_set ignore_list_; struct zwlr_foreign_toplevel_manager_v1 *manager_; struct wl_seat *seat_; + protected: + + public: /* Callbacks for global registration */ void register_manager(struct wl_registry*, uint32_t name, uint32_t version); @@ -155,6 +161,7 @@ class Taskbar : public waybar::AModule bool all_outputs() const; std::vector> icon_themes() const; + const std::unordered_set& ignore_list() const; }; } /* namespace waybar::modules::wlr */ diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd index a2bff265..0e86238a 100644 --- a/man/waybar-wlr-taskbar.5.scd +++ b/man/waybar-wlr-taskbar.5.scd @@ -68,6 +68,10 @@ Addressed by *wlr/taskbar* typeof: string ++ Command to execute when the module is updated. +*ignore-list*: ++ + typeof: array ++ + List of app_id to be invisible. + # FORMAT REPLACEMENTS *{icon}*: The icon of the application. @@ -98,7 +102,10 @@ Addressed by *wlr/taskbar* "icon-theme": "Numix-Circle", "tooltip-format": "{title}", "on-click": "activate", - "on-click-middle": "close" + "on-click-middle": "close", + "ignore-list": [ + "Alacritty" + ] } ``` diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index ef46f36a..932a95e6 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -277,7 +277,7 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, bar_{bar}, config_{config}, tbar_{tbar}, handle_{tl_handle}, seat_{seat}, id_{global_id++}, content_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0}, - button_visible_{false} + button_visible_{false}, ignored_{false} { zwlr_foreign_toplevel_handle_v1_add_listener(handle_, &toplevel_handle_impl, this); @@ -383,6 +383,21 @@ void Task::handle_app_id(const char *app_id) { app_id_ = app_id; + if (tbar_->ignore_list().count(app_id)) { + ignored_ = true; + if (button_visible_) { + auto output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); + handle_output_leave(output); + } + } else { + bool is_was_ignored = ignored_; + ignored_ = false; + if (is_was_ignored) { + auto output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); + handle_output_enter(output); + } + } + if (!with_icon_) return; @@ -405,6 +420,11 @@ void Task::handle_output_enter(struct wl_output *output) { spdlog::debug("{} entered output {}", repr(), (void*)output); + if (ignored_) { + spdlog::debug("{} is ignored", repr()); + return; + } + if (!button_visible_ && (tbar_->all_outputs() || tbar_->show_output(output))) { /* The task entered the output of the current bar make the button visible */ tbar_->add_button(button_); @@ -694,6 +714,14 @@ Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Valu icon_themes_.push_back(it); } + + // Load ignore-list + if (config_["ignore-list"].isArray()) { + for (auto& app_name : config_["ignore-list"]) { + ignore_list_.emplace(app_name.asString()); + } + } + icon_themes_.push_back(Gtk::IconTheme::get_default()); } @@ -829,5 +857,6 @@ std::vector> Taskbar::icon_themes() const { return icon_themes_; } +const std::unordered_set &Taskbar::ignore_list() const { return ignore_list_; } } /* namespace waybar::modules::wlr */ From 5ad3b6018a85be29a88131bfe1e8270589140f5b Mon Sep 17 00:00:00 2001 From: dmitry Date: Sun, 18 Apr 2021 21:37:58 +0300 Subject: [PATCH 214/355] Remove exceed protected --- include/modules/wlr/taskbar.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index bb65066a..891ad55b 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -139,9 +139,6 @@ class Taskbar : public waybar::AModule struct zwlr_foreign_toplevel_manager_v1 *manager_; struct wl_seat *seat_; - protected: - - public: /* Callbacks for global registration */ void register_manager(struct wl_registry*, uint32_t name, uint32_t version); From fc89b01ba68b13321e2254158247b7022dc370f5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 20 Apr 2021 08:25:48 +0200 Subject: [PATCH 215/355] feat: implement mpd volume format template Allow the user to show the current volume from MPD status via the `format` and/or `tooltip-format` configuration options. The values are provided by libmpdclient and are integers, generally between 0-100 (without %). Values above 100 are also possible, as mpd output plugins like `pulse` support volumes above 100%. Signed-off-by: Sefa Eyeoglu --- man/waybar-mpd.5.scd | 2 ++ resources/config | 2 +- src/modules/mpd/mpd.cpp | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd index b8e96648..044af98e 100644 --- a/man/waybar-mpd.5.scd +++ b/man/waybar-mpd.5.scd @@ -172,6 +172,8 @@ Addressed by *mpd* *{date}*: The date of the current song +*{volume}*: The current volume in percent + *{elapsedTime}*: The current position of the current song. To format as a date/time (see example configuration) *{totalTime}*: The length of the current song. To format as a date/time (see example configuration) diff --git a/resources/config b/resources/config index f3c0a778..13dc94c1 100644 --- a/resources/config +++ b/resources/config @@ -27,7 +27,7 @@ "format": "{}" }, "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ ", + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", "format-disconnected": "Disconnected ", "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", "unknown-tag": "N/A", diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index 6a828c3f..0a7c9706 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -100,7 +100,7 @@ void waybar::modules::MPD::setLabel() { auto format = format_; Glib::ustring artist, album_artist, album, title; std::string date; - int song_pos = 0, queue_length = 0; + int song_pos = 0, queue_length = 0, volume = 0; std::chrono::seconds elapsedTime, totalTime; std::string stateIcon = ""; @@ -130,6 +130,7 @@ void waybar::modules::MPD::setLabel() { title = getTag(MPD_TAG_TITLE); date = getTag(MPD_TAG_DATE); song_pos = mpd_status_get_song_pos(status_.get()); + volume = mpd_status_get_volume(status_.get()); queue_length = mpd_status_get_queue_length(status_.get()); elapsedTime = std::chrono::seconds(mpd_status_get_elapsed_time(status_.get())); totalTime = std::chrono::seconds(mpd_status_get_total_time(status_.get())); @@ -156,6 +157,7 @@ void waybar::modules::MPD::setLabel() { fmt::arg("album", Glib::Markup::escape_text(album).raw()), fmt::arg("title", Glib::Markup::escape_text(title).raw()), fmt::arg("date", Glib::Markup::escape_text(date).raw()), + fmt::arg("volume", volume), fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), fmt::arg("songPosition", song_pos), @@ -180,6 +182,7 @@ void waybar::modules::MPD::setLabel() { fmt::arg("album", album.raw()), fmt::arg("title", title.raw()), fmt::arg("date", date), + fmt::arg("volume", volume), fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), fmt::arg("songPosition", song_pos), From b16c8972c70d536df0e579beee8c9054f0990d6b Mon Sep 17 00:00:00 2001 From: Matthias Richter Date: Sun, 21 Mar 2021 11:42:25 +0100 Subject: [PATCH 216/355] Add option to rewrite sway/window title MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rewrites window title according to config option "rewrite". "rewrite" is an object where keys are regular expressions and values are rewrite rules if the expression matches. Rules may contain references to captures of the expression. Regex and replacement follow ECMA-script rules. If no regex matches, the title is left unchanged. example: "sway/window": { "rewrite": { "(.*) - Mozilla Firefox": " $1", "(.*) - zsh": " $1", } } --- include/modules/sway/window.hpp | 1 + src/modules/sway/window.cpp | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/modules/sway/window.hpp b/include/modules/sway/window.hpp index 40aaa1a0..0f7ae317 100644 --- a/include/modules/sway/window.hpp +++ b/include/modules/sway/window.hpp @@ -22,6 +22,7 @@ class Window : public ALabel, public sigc::trackable { std::tuple getFocusedNode(const Json::Value& nodes, std::string& output); void getTree(); + std::string rewriteTitle(const std::string& title); const Bar& bar_; std::string window_; diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index d8f113f7..3b424c2f 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -1,5 +1,6 @@ #include "modules/sway/window.hpp" #include +#include namespace waybar::modules::sway { @@ -56,7 +57,7 @@ auto Window::update() -> void { bar_.window.get_style_context()->remove_class("solo"); bar_.window.get_style_context()->remove_class("empty"); } - label_.set_markup(fmt::format(format_, fmt::arg("title", window_), + label_.set_markup(fmt::format(format_, fmt::arg("title", rewriteTitle(window_)), fmt::arg("app_id", app_id_))); if (tooltipEnabled()) { label_.set_tooltip_text(window_); @@ -131,4 +132,23 @@ void Window::getTree() { } } +std::string Window::rewriteTitle(const std::string& title) +{ + const auto& rules = config_["rewrite"]; + if (!rules.isObject()) { + return title; + } + + for (auto it = rules.begin(); it != rules.end(); ++it) { + if (it.key().isString() && it->isString()) { + const std::regex rule{it.key().asString()}; + if (std::regex_match(title, rule)) { + return std::regex_replace(title, rule, it->asString()); + } + } + } + + return title; +} + } // namespace waybar::modules::sway From af3c868a5b63b1e77b56801ca558f76afcc21ed6 Mon Sep 17 00:00:00 2001 From: Matthias Richter Date: Wed, 21 Apr 2021 12:15:25 +0200 Subject: [PATCH 217/355] Catch exception on erroneous rules std::regex and std::regex_replace may throw an std::regex_error if the expression or replacement contain errors. Log this error and carry on with the next rule, so that the title is shown even if the config contains errors. --- src/modules/sway/window.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index 3b424c2f..04910394 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -141,9 +141,15 @@ std::string Window::rewriteTitle(const std::string& title) for (auto it = rules.begin(); it != rules.end(); ++it) { if (it.key().isString() && it->isString()) { - const std::regex rule{it.key().asString()}; - if (std::regex_match(title, rule)) { - return std::regex_replace(title, rule, it->asString()); + try { + // malformated regexes will cause an exception. + // in this case, log error and try the next rule. + const std::regex rule{it.key().asString()}; + if (std::regex_match(title, rule)) { + return std::regex_replace(title, rule, it->asString()); + } + } catch (const std::regex_error& e) { + spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what()); } } } From 7cdf178f8d7c3caec57b57bd2f539e4982d83a9a Mon Sep 17 00:00:00 2001 From: Matthias Richter Date: Wed, 21 Apr 2021 12:18:33 +0200 Subject: [PATCH 218/355] Document changes in manpage Add section on rewrite rules and extend example --- man/waybar-sway-window.5.scd | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/man/waybar-sway-window.5.scd b/man/waybar-sway-window.5.scd index 40250e6f..ea060696 100644 --- a/man/waybar-sway-window.5.scd +++ b/man/waybar-sway-window.5.scd @@ -66,12 +66,32 @@ Addressed by *sway/window* default: true ++ Option to disable tooltip on hover. +*rewrite*: ++ + typeof: object ++ + Rules to rewrite window title. See *rewrite rules*. + +# REWRITE RULES + +*rewrite* is an object where keys are regular expressions and values are +rewrite rules if the expression matches. Rules may contain references to +captures of the expression. + +Regular expression and replacement follow ECMA-script rules. + +If no expression matches, the title is left unchanged. + +Invalid expressions (e.g., mismatched parentheses) are skipped. + # EXAMPLES ``` "sway/window": { "format": "{}", - "max-length": 50 + "max-length": 50, + "rewrite": { + "(.*) - Mozilla Firefox": "🌎 $1", + "(.*) - zsh": "> [$1]" + } } ``` From 2213380dc0c89b104b92183249c48c27a2b16f72 Mon Sep 17 00:00:00 2001 From: David96 Date: Sun, 25 Apr 2021 11:19:35 +0200 Subject: [PATCH 219/355] [modules/pulseaudio] fix bluetooth class for PipeWire apparently, pipewire-pulse slightly changed the naming of the sink. --- src/modules/pulseaudio.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index 7f4f3b65..3fbe9569 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -210,7 +210,8 @@ auto waybar::modules::Pulseaudio::update() -> void { std::string tooltip_format; if (!alt_) { std::string format_name = "format"; - if (monitor_.find("a2dp_sink") != std::string::npos) { + if (monitor_.find("a2dp_sink") != std::string::npos || // PulseAudio + monitor_.find("a2dp-sink") != std::string::npos) { // PipeWire format_name = format_name + "-bluetooth"; label_.get_style_context()->add_class("bluetooth"); } else { From 7e13e26c29f2e7090d3d92a7016a0cf2b2af6746 Mon Sep 17 00:00:00 2001 From: Gabe Gorelick Date: Sun, 25 Apr 2021 22:00:24 -0400 Subject: [PATCH 220/355] [modules/battery] allow format-discharging-full `format-discharging-full` has been impossible since #923 made it impossible to be full and discharging at the same time. This should fix that by only making `format-charging-full` impossible. Whether or not that should be allowed is a good question, but beyond the scope of this change. Fixes #1031 --- src/modules/battery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 49e23dec..e598858b 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -216,7 +216,7 @@ const std::tuple waybar::modules::Battery::g capacity = 100.f; } uint8_t cap = round(capacity); - if (cap == 100) { + if (cap == 100 && status == "Charging") { // If we've reached 100% just mark as full as some batteries can stay // stuck reporting they're still charging but not yet done status = "Full"; From a03283d65f0dff17b5e69258c5cc206bdfd5f8c6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 26 Apr 2021 20:26:43 +0200 Subject: [PATCH 221/355] rewriteTitle: allow multiple sequential rewrites --- src/modules/sway/window.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index 04910394..b6779585 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -132,13 +132,14 @@ void Window::getTree() { } } -std::string Window::rewriteTitle(const std::string& title) -{ +std::string Window::rewriteTitle(const std::string& title) { const auto& rules = config_["rewrite"]; if (!rules.isObject()) { return title; } + std::string res = title; + for (auto it = rules.begin(); it != rules.end(); ++it) { if (it.key().isString() && it->isString()) { try { @@ -146,7 +147,7 @@ std::string Window::rewriteTitle(const std::string& title) // in this case, log error and try the next rule. const std::regex rule{it.key().asString()}; if (std::regex_match(title, rule)) { - return std::regex_replace(title, rule, it->asString()); + res = std::regex_replace(res, rule, it->asString()); } } catch (const std::regex_error& e) { spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what()); @@ -154,7 +155,7 @@ std::string Window::rewriteTitle(const std::string& title) } } - return title; + return res; } } // namespace waybar::modules::sway From 71d7596b6f5537a5572a2588320d85e37fa5f670 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 30 Apr 2021 14:23:49 +0200 Subject: [PATCH 222/355] fix: bluetooth status tooltip --- src/modules/bluetooth.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/bluetooth.cpp b/src/modules/bluetooth.cpp index 88526845..1540c053 100644 --- a/src/modules/bluetooth.cpp +++ b/src/modules/bluetooth.cpp @@ -16,7 +16,7 @@ auto waybar::modules::Bluetooth::update() -> void { if (tooltipEnabled()) { if (config_["tooltip-format"].isString()) { auto tooltip_format = config_["tooltip-format"].asString(); - auto tooltip_text = fmt::format(tooltip_format, status); + auto tooltip_text = fmt::format(tooltip_format, status, fmt::arg("status", status)); label_.set_tooltip_text(tooltip_text); } else { label_.set_tooltip_text(status); From b25b7d29fcd8c80b49bba5a02a69825811719699 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 30 Apr 2021 14:25:26 +0200 Subject: [PATCH 223/355] Update spdlog.wrap --- subprojects/spdlog.wrap | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap index c30450e2..daddfd61 100644 --- a/subprojects/spdlog.wrap +++ b/subprojects/spdlog.wrap @@ -1,13 +1,11 @@ [wrap-file] -directory = spdlog-1.8.1 - -source_url = https://github.com/gabime/spdlog/archive/v1.8.1.tar.gz -source_filename = v1.8.1.tar.gz -source_hash = 5197b3147cfcfaa67dd564db7b878e4a4b3d9f3443801722b3915cdeced656cb - -patch_url = https://github.com/mesonbuild/spdlog/releases/download/1.8.1-1/spdlog.zip -patch_filename = spdlog-1.8.1-1-wrap.zip -patch_hash = 76844292a8e912aec78450618271a311841b33b17000988f215ddd6c64dd71b3 +directory = spdlog-1.8.5 +source_url = https://github.com/gabime/spdlog/archive/v1.8.5.tar.gz +source_filename = v1.8.5.tar.gz +source_hash = 944d0bd7c763ac721398dca2bb0f3b5ed16f67cef36810ede5061f35a543b4b8 +patch_url = https://wrapdb.mesonbuild.com/v1/projects/spdlog/1.8.5/1/get_zip +patch_filename = spdlog-1.8.5-1-wrap.zip +patch_hash = 3c38f275d5792b1286391102594329e98b17737924b344f98312ab09929b74be [provide] spdlog = spdlog_dep From cdce3e03ea9c22ef8825d53001b84520e3e32c98 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 30 Apr 2021 14:25:48 +0200 Subject: [PATCH 224/355] Update meson.build --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2bb4e49e..e80448e0 100644 --- a/meson.build +++ b/meson.build @@ -80,7 +80,7 @@ is_openbsd = host_machine.system() == 'openbsd' thread_dep = dependency('threads') fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep']) -spdlog = dependency('spdlog', version : ['>=1.8.0'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=true']) +spdlog = dependency('spdlog', version : ['>=1.8.5'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=true']) wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') wayland_protos = dependency('wayland-protocols') From f3a6e2d49481ac761b3e4886cfad4c2d721ded1b Mon Sep 17 00:00:00 2001 From: Max1Truc Date: Mon, 10 May 2021 21:00:14 +0200 Subject: [PATCH 225/355] fix: incorrect battery percentage on Pinebook Pro --- src/modules/battery.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index e598858b..67223c49 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -164,13 +164,25 @@ const std::tuple waybar::modules::Battery::g std::ifstream(bat / "status") >> _status; auto rate_path = fs::exists(bat / "current_now") ? "current_now" : "power_now"; std::ifstream(bat / rate_path) >> power_now; - auto now_path = fs::exists(bat / "charge_now") ? "charge_now" : "energy_now"; + + std::string now_path; + if (fs::exists(bat / "charge_now")) { + now_path = "charge_now"; + } else if (fs::exists(bat / "energy_now")) { + now_path = "energy_now"; + } else { + now_path = "capacity"; + } std::ifstream(bat / now_path) >> energy_now; auto full_path = fs::exists(bat / "charge_full") ? "charge_full" : "energy_full"; std::ifstream(bat / full_path) >> energy_full; auto full_design_path = fs::exists(bat / "charge_full_design") ? "charge_full_design" : "energy_full_design"; std::ifstream(bat / full_design_path) >> energy_full_design; + if (now_path == "capacity") { + energy_now = energy_now * energy_full / 100; + } + // Show the "smallest" status among all batteries if (status_gt(status, _status)) { status = _status; @@ -245,7 +257,7 @@ const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) c } const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemaining) { - hoursRemaining = std::fabs(hoursRemaining); + hoursRemaining = std::fabs(hoursRemaining); uint16_t full_hours = static_cast(hoursRemaining); uint16_t minutes = static_cast(60 * (hoursRemaining - full_hours)); auto format = std::string("{H} h {M} min"); From 4d067619a8f72aebd64042db9d686c6ef15a0a3e Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Sat, 15 May 2021 15:46:23 +0100 Subject: [PATCH 226/355] =?UTF-8?q?Fix=20power=20calculation=20when=20batt?= =?UTF-8?q?ery=20units=20are=20in=20=CE=BCA=20instead=20of=20=CE=BCW?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/battery.cpp | 45 +++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp index 67223c49..26567690 100644 --- a/src/modules/battery.cpp +++ b/src/modules/battery.cpp @@ -162,25 +162,36 @@ const std::tuple waybar::modules::Battery::g uint32_t energy_full_design; std::string _status; std::ifstream(bat / "status") >> _status; - auto rate_path = fs::exists(bat / "current_now") ? "current_now" : "power_now"; - std::ifstream(bat / rate_path) >> power_now; - std::string now_path; - if (fs::exists(bat / "charge_now")) { - now_path = "charge_now"; - } else if (fs::exists(bat / "energy_now")) { - now_path = "energy_now"; + // Some battery will report current and charge in μA/μAh. + // Scale these by the voltage to get μW/μWh. + if (fs::exists(bat / "current_now")) { + uint32_t voltage_now; + uint32_t current_now; + uint32_t charge_now; + uint32_t charge_full; + uint32_t charge_full_design; + std::ifstream(bat / "voltage_now") >> voltage_now; + std::ifstream(bat / "current_now") >> current_now; + std::ifstream(bat / "charge_full") >> charge_full; + std::ifstream(bat / "charge_full_design") >> charge_full_design; + if (fs::exists(bat / "charge_now")) + std::ifstream(bat / "charge_now") >> charge_now; + else { + // charge_now is missing on some systems, estimate using capacity. + uint32_t capacity; + std::ifstream(bat / "capacity") >> capacity; + charge_now = (capacity * charge_full) / 100; + } + power_now = ((uint64_t)current_now * (uint64_t)voltage_now) / 1000000; + energy_now = ((uint64_t)charge_now * (uint64_t)voltage_now) / 1000000; + energy_full = ((uint64_t)charge_full * (uint64_t)voltage_now) / 1000000; + energy_full_design = ((uint64_t)charge_full_design * (uint64_t)voltage_now) / 1000000; } else { - now_path = "capacity"; - } - std::ifstream(bat / now_path) >> energy_now; - auto full_path = fs::exists(bat / "charge_full") ? "charge_full" : "energy_full"; - std::ifstream(bat / full_path) >> energy_full; - auto full_design_path = fs::exists(bat / "charge_full_design") ? "charge_full_design" : "energy_full_design"; - std::ifstream(bat / full_design_path) >> energy_full_design; - - if (now_path == "capacity") { - energy_now = energy_now * energy_full / 100; + std::ifstream(bat / "power_now") >> power_now; + std::ifstream(bat / "energy_now") >> energy_now; + std::ifstream(bat / "energy_full") >> energy_full; + std::ifstream(bat / "energy_full_design") >> energy_full_design; } // Show the "smallest" status among all batteries From dbc06abf1826a3c5752a39f1843144a0cc2a87a1 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 15 May 2021 16:38:00 +0100 Subject: [PATCH 227/355] network: Initialise cidr_ like clearIface() does --- src/modules/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index a8aaffaf..8dcfb572 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -86,7 +86,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET), efd_(-1), ev_fd_(-1), - cidr_(-1), + cidr_(0), signal_strength_dbm_(0), signal_strength_(0), #ifdef WANT_RFKILL From 9357a6cb8802b3d57a6c140a3d9a9a2068403089 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 15 May 2021 16:38:00 +0100 Subject: [PATCH 228/355] network: Start the module with some text in the label_ Fix modules starting with no text, but not hidding. Start with some "text" in the module's label_, update() will then update it. Since the text should be different, update() will be able to show or hide the event_box_. This is to work around the case where the module start with no text, but the the event_box_ is shown. --- src/modules/network.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 8dcfb572..e52ed027 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -93,6 +93,13 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf rfkill_{RFKILL_TYPE_WLAN}, #endif frequency_(0) { + + // Start with some "text" in the module's label_, update() will then + // update it. Since the text should be different, update() will be able + // to show or hide the event_box_. This is to work around the case where + // the module start with no text, but the the event_box_ is shown. + label_.set_markup(""); + auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY); auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY); if (down_octets) { From 63fdf66ad66914354d4ac510f08d51dd25389c36 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 15 May 2021 16:38:00 +0100 Subject: [PATCH 229/355] network: Read all available messages on ev_sock_ When more than one message is available to read on the ev_sock_ socket, only the first one is read. Make some changes to be able to read all the messages available by setting the socket to non-blocking. This way we can detect when there's nothing left to read and loop back to wait with epoll. --- src/modules/network.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index e52ed027..bd84c1a6 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -160,6 +160,9 @@ void waybar::modules::Network::createEventSocket() { if (nl_connect(ev_sock_, NETLINK_ROUTE) != 0) { throw std::runtime_error("Can't connect network socket"); } + if (nl_socket_set_nonblocking(ev_sock_)) { + throw std::runtime_error("Can't set non-blocking on network socket"); + } nl_socket_add_membership(ev_sock_, RTNLGRP_LINK); if (family_ == AF_INET) { nl_socket_add_membership(ev_sock_, RTNLGRP_IPV4_IFADDR); @@ -235,7 +238,23 @@ void waybar::modules::Network::worker() { int ec = epoll_wait(efd_, events.data(), EPOLL_MAX, -1); if (ec > 0) { for (auto i = 0; i < ec; i++) { - if (events[i].data.fd != nl_socket_get_fd(ev_sock_) || nl_recvmsgs_default(ev_sock_) < 0) { + if (events[i].data.fd == nl_socket_get_fd(ev_sock_)) { + int rc = 0; + // Read as many message as possible, until the socket blocks + while (true) { + errno = 0; + rc = nl_recvmsgs_default(ev_sock_); + if (rc == -NLE_AGAIN || errno == EAGAIN) { + rc = 0; + break; + } + } + if (rc < 0) { + spdlog::error("nl_recvmsgs_default error: {}", nl_geterror(-rc)); + thread_.stop(); + break; + } + } else { thread_.stop(); break; } From c9bbaa7241bb40f06bed523c54faa9a8643f7ec2 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 15 May 2021 16:38:00 +0100 Subject: [PATCH 230/355] network: Rework initial interface search by using a dump Instead of using an alternative way to list all links in order to choose one when an "interface" is in the configuration, we can ask for a dump of all interface an reuse the handleEvents() function. This patch also start to rework the handleEvents() function to grab more information out of each event, like the interface name. --- include/modules/network.hpp | 6 ++ src/modules/network.cpp | 130 ++++++++++++++++++++++++------------ 2 files changed, 95 insertions(+), 41 deletions(-) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 539f4583..2d3a1ff1 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -28,8 +28,11 @@ class Network : public ALabel { static const uint8_t EPOLL_MAX = 200; static int handleEvents(struct nl_msg*, void*); + static int handleEventsDone(struct nl_msg*, void*); static int handleScan(struct nl_msg*, void*); + void askForStateDump(void); + void worker(); void createInfoSocket(); void createEventSocket(); @@ -59,6 +62,9 @@ class Network : public ALabel { int nl80211_id_; std::mutex mutex_; + bool want_link_dump_; + bool dump_in_progress_; + unsigned long long bandwidth_down_total_; unsigned long long bandwidth_up_total_; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index bd84c1a6..65d82b62 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -86,6 +86,8 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET), efd_(-1), ev_fd_(-1), + want_link_dump_(false), + dump_in_progress_(false), cidr_(0), signal_strength_dbm_(0), signal_strength_(0), @@ -114,6 +116,11 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf bandwidth_up_total_ = 0; } + if (config_["interface"].isString()) { + // Look for an interface that match "interface" + want_link_dump_ = true; + } + createEventSocket(); createInfoSocket(); auto default_iface = getPreferredIface(-1, false); @@ -125,6 +132,10 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf getInterfaceAddress(); } dp.emit(); + // Ask for a dump of interfaces and then addresses to populate our + // information. First the interface dump, and once done, the callback + // will be called again which will ask for addresses dump. + askForStateDump(); worker(); } @@ -155,6 +166,7 @@ void waybar::modules::Network::createEventSocket() { ev_sock_ = nl_socket_alloc(); nl_socket_disable_seq_check(ev_sock_); nl_socket_modify_cb(ev_sock_, NL_CB_VALID, NL_CB_CUSTOM, handleEvents, this); + nl_socket_modify_cb(ev_sock_, NL_CB_FINISH, NL_CB_CUSTOM, handleEventsDone, this); auto groups = RTMGRP_LINK | (family_ == AF_INET ? RTMGRP_IPV4_IFADDR : RTMGRP_IPV6_IFADDR); nl_join_groups(ev_sock_, groups); // Deprecated if (nl_connect(ev_sock_, NETLINK_ROUTE) != 0) { @@ -590,28 +602,8 @@ bool waybar::modules::Network::checkInterface(struct ifinfomsg *rtif, std::strin int waybar::modules::Network::getPreferredIface(int skip_idx, bool wait) const { int ifid = -1; if (config_["interface"].isString()) { - ifid = if_nametoindex(config_["interface"].asCString()); - if (ifid > 0) { - return ifid; - } else { - // Try with wildcard - struct ifaddrs *ifaddr, *ifa; - int success = getifaddrs(&ifaddr); - if (success != 0) { - return -1; - } - ifa = ifaddr; - ifid = -1; - while (ifa != nullptr) { - if (wildcardMatch(config_["interface"].asString(), ifa->ifa_name)) { - ifid = if_nametoindex(ifa->ifa_name); - break; - } - ifa = ifa->ifa_next; - } - freeifaddrs(ifaddr); - return ifid; - } + // Using link dump instead + return -1; } // getExternalInterface may need some delay to detect external interface for (uint8_t tries = 0; tries < MAX_RETRY; tries += 1) { @@ -656,6 +648,55 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { std::lock_guard lock(net->mutex_); auto nh = nlmsg_hdr(msg); auto ifi = static_cast(NLMSG_DATA(nh)); + bool is_del_event = false; + + switch (nh->nlmsg_type) { + case RTM_DELLINK: + is_del_event = true; + case RTM_NEWLINK: { + struct ifinfomsg *ifi = static_cast(NLMSG_DATA(nh)); + ssize_t attrlen = IFLA_PAYLOAD(nh); + struct rtattr *ifla = IFLA_RTA(ifi); + const char *ifname = NULL; + size_t ifname_len = 0; + + if (net->ifid_ != -1 && ifi->ifi_index != net->ifid_) { + return NL_OK; + } + + for (; RTA_OK(ifla, attrlen); ifla = RTA_NEXT(ifla, attrlen)) { + switch (ifla->rta_type) { + case IFLA_IFNAME: + ifname = static_cast(RTA_DATA(ifla)); + ifname_len = RTA_PAYLOAD(ifla) - 1; // minus \0 + break; + } + } + + if (!is_del_event && net->ifid_ == -1) { + // Checking if it's an interface we care about. + std::string new_ifname (ifname, ifname_len); + if (net->checkInterface(ifi, new_ifname)) { + spdlog::debug("network: selecting new interface {}/{}", new_ifname, ifi->ifi_index); + + net->ifname_ = new_ifname; + net->ifid_ = ifi->ifi_index; + net->getInterfaceAddress(); + net->thread_timer_.wake_up(); + } + } else if (is_del_event && net->ifid_ >= 0) { + // Our interface has been deleted, start looking/waiting for one we care. + spdlog::debug("network: interface {}/{} deleted", net->ifname_, net->ifid_); + + net->clearIface(); + // Check for a new interface and get info + net->checkNewInterface(ifi); + net->dp.emit(); + } + return NL_OK; + } + } + if (nh->nlmsg_type == RTM_DELADDR) { // Check for valid interface if (ifi->ifi_index == net->ifid_) { @@ -671,25 +712,6 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { } return NL_OK; } - } else if (nh->nlmsg_type == RTM_NEWLINK || nh->nlmsg_type == RTM_DELLINK) { - char ifname[IF_NAMESIZE]; - if_indextoname(ifi->ifi_index, ifname); - // Check for valid interface - if (ifi->ifi_index != net->ifid_ && net->checkInterface(ifi, ifname)) { - net->ifname_ = ifname; - net->ifid_ = ifi->ifi_index; - // Get Iface and WIFI info - net->getInterfaceAddress(); - net->thread_timer_.wake_up(); - return NL_OK; - } else if (ifi->ifi_index == net->ifid_ && - (!(ifi->ifi_flags & IFF_RUNNING) || !(ifi->ifi_flags & IFF_UP) || - !net->checkInterface(ifi, ifname))) { - net->clearIface(); - // Check for a new interface and get info - net->checkNewInterface(ifi); - return NL_OK; - } } else { char ifname[IF_NAMESIZE]; if_indextoname(ifi->ifi_index, ifname); @@ -713,6 +735,32 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { return NL_SKIP; } +void waybar::modules::Network::askForStateDump(void) { + /* We need to wait until the current dump is done before sending new + * messages. handleEventsDone() is called when a dump is done. */ + if (dump_in_progress_) + return; + + struct rtgenmsg rt_hdr = { + .rtgen_family = AF_UNSPEC, + }; + + if (want_link_dump_) { + nl_send_simple(ev_sock_, RTM_GETLINK, NLM_F_DUMP, + &rt_hdr, sizeof (rt_hdr)); + want_link_dump_ = false; + dump_in_progress_ = true; + + } +} + +int waybar::modules::Network::handleEventsDone(struct nl_msg *msg, void *data) { + auto net = static_cast(data); + net->dump_in_progress_ = false; + net->askForStateDump(); + return NL_OK; +} + int waybar::modules::Network::handleScan(struct nl_msg *msg, void *data) { auto net = static_cast(data); auto gnlh = static_cast(nlmsg_data(nlmsg_hdr(msg))); From 0fc7ef6685321e1b7d966c21c508e94e6fbf3692 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 15 May 2021 16:38:00 +0100 Subject: [PATCH 231/355] network: Rework address lookup to use only events In order to get the IP address of an interface, we can get the information out of NEWADDR events without needed to call getifaddrs(). And when now events are expected, we can requests a dump of all addresses and handle addresses changes the same way via handleEvents() only. --- include/modules/network.hpp | 3 +- src/modules/network.cpp | 176 ++++++++++++++++++------------------ 2 files changed, 87 insertions(+), 92 deletions(-) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 2d3a1ff1..cc8b3f59 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -37,7 +36,6 @@ class Network : public ALabel { void createInfoSocket(); void createEventSocket(); int getExternalInterface(int skip_idx = -1) const; - void getInterfaceAddress(); int netlinkRequest(void*, uint32_t, uint32_t groups = 0) const; int netlinkResponse(void*, uint32_t, uint32_t groups = 0) const; void parseEssid(struct nlattr**); @@ -63,6 +61,7 @@ class Network : public ALabel { std::mutex mutex_; bool want_link_dump_; + bool want_addr_dump_; bool dump_in_progress_; unsigned long long bandwidth_down_total_; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 65d82b62..f4cee78b 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -87,6 +87,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf efd_(-1), ev_fd_(-1), want_link_dump_(false), + want_addr_dump_(false), dump_in_progress_(false), cidr_(0), signal_strength_dbm_(0), @@ -118,7 +119,9 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf if (config_["interface"].isString()) { // Look for an interface that match "interface" + // and then find the address associated with it. want_link_dump_ = true; + want_addr_dump_ = true; } createEventSocket(); @@ -129,7 +132,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf char ifname[IF_NAMESIZE]; if_indextoname(default_iface, ifname); ifname_ = ifname; - getInterfaceAddress(); + want_addr_dump_ = true; } dp.emit(); // Ask for a dump of interfaces and then addresses to populate our @@ -502,55 +505,6 @@ out: return ifidx; } -void waybar::modules::Network::getInterfaceAddress() { - struct ifaddrs *ifaddr, *ifa; - cidr_ = 0; - int success = getifaddrs(&ifaddr); - if (success != 0) { - return; - } - ifa = ifaddr; - while (ifa != nullptr) { - if (ifa->ifa_addr != nullptr && ifa->ifa_addr->sa_family == family_ && - ifa->ifa_name == ifname_) { - char ipaddr[INET6_ADDRSTRLEN]; - char netmask[INET6_ADDRSTRLEN]; - unsigned int cidr = 0; - if (family_ == AF_INET) { - ipaddr_ = inet_ntop(AF_INET, - &reinterpret_cast(ifa->ifa_addr)->sin_addr, - ipaddr, - INET_ADDRSTRLEN); - auto net_addr = reinterpret_cast(ifa->ifa_netmask); - netmask_ = inet_ntop(AF_INET, &net_addr->sin_addr, netmask, INET_ADDRSTRLEN); - unsigned int cidrRaw = net_addr->sin_addr.s_addr; - while (cidrRaw) { - cidr += cidrRaw & 1; - cidrRaw >>= 1; - } - } else { - ipaddr_ = inet_ntop(AF_INET6, - &reinterpret_cast(ifa->ifa_addr)->sin6_addr, - ipaddr, - INET6_ADDRSTRLEN); - auto net_addr = reinterpret_cast(ifa->ifa_netmask); - netmask_ = inet_ntop(AF_INET6, &net_addr->sin6_addr, netmask, INET6_ADDRSTRLEN); - for (size_t i = 0; i < sizeof(net_addr->sin6_addr.s6_addr); ++i) { - unsigned char cidrRaw = net_addr->sin6_addr.s6_addr[i]; - while (cidrRaw) { - cidr += cidrRaw & 1; - cidrRaw >>= 1; - } - } - } - cidr_ = cidr; - break; - } - ifa = ifa->ifa_next; - } - freeifaddrs(ifaddr); -} - int waybar::modules::Network::netlinkRequest(void *req, uint32_t reqlen, uint32_t groups) const { struct sockaddr_nl sa = {}; sa.nl_family = AF_NETLINK; @@ -635,7 +589,8 @@ void waybar::modules::Network::checkNewInterface(struct ifinfomsg *rtif) { char ifname[IF_NAMESIZE]; if_indextoname(new_iface, ifname); ifname_ = ifname; - getInterfaceAddress(); + want_addr_dump_ = true; + askForStateDump(); thread_timer_.wake_up(); } else { ifid_ = -1; @@ -647,7 +602,6 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { auto net = static_cast(data); std::lock_guard lock(net->mutex_); auto nh = nlmsg_hdr(msg); - auto ifi = static_cast(NLMSG_DATA(nh)); bool is_del_event = false; switch (nh->nlmsg_type) { @@ -681,8 +635,12 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->ifname_ = new_ifname; net->ifid_ = ifi->ifi_index; - net->getInterfaceAddress(); net->thread_timer_.wake_up(); + /* An address for this new interface should be received via an + * RTM_NEWADDR event either because we ask for a dump of both links + * and addrs, or because this interface has just been created and + * the addr will be sent after the RTM_NEWLINK event. + * So we don't need to do anything. */ } } else if (is_del_event && net->ifid_ >= 0) { // Our interface has been deleted, start looking/waiting for one we care. @@ -693,46 +651,78 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->checkNewInterface(ifi); net->dp.emit(); } - return NL_OK; + break; + } + + case RTM_DELADDR: + is_del_event = true; + case RTM_NEWADDR: { + struct ifaddrmsg *ifa = static_cast(NLMSG_DATA(nh)); + ssize_t attrlen = IFA_PAYLOAD(nh); + struct rtattr *ifa_rta = IFA_RTA(ifa); + + if ((int)ifa->ifa_index != net->ifid_) { + return NL_OK; + } + + if (ifa->ifa_family != net->family_) { + return NL_OK; + } + + // We ignore address mark as scope for the link or host, + // which should leave scope global addresses. + if (ifa->ifa_scope >= RT_SCOPE_LINK) { + return NL_OK; + } + + for (; RTA_OK(ifa_rta, attrlen); ifa_rta = RTA_NEXT(ifa_rta, attrlen)) { + switch (ifa_rta->rta_type) { + case IFA_ADDRESS: { + char ipaddr[INET6_ADDRSTRLEN]; + if (!is_del_event) { + net->ipaddr_ = inet_ntop(ifa->ifa_family, RTA_DATA(ifa_rta), + ipaddr, sizeof (ipaddr)); + net->cidr_ = ifa->ifa_prefixlen; + switch (ifa->ifa_family) { + case AF_INET: { + struct in_addr netmask; + netmask.s_addr = htonl(~0 << (32 - ifa->ifa_prefixlen)); + net->netmask_ = inet_ntop(ifa->ifa_family, &netmask, + ipaddr, sizeof (ipaddr)); + } + case AF_INET6: { + struct in6_addr netmask; + for (int i = 0; i < 16; i++) { + int v = (i + 1) * 8 - ifa->ifa_prefixlen; + if (v < 0) v = 0; + if (v > 8) v = 8; + netmask.s6_addr[i] = ~0 << v; + } + net->netmask_ = inet_ntop(ifa->ifa_family, &netmask, + ipaddr, sizeof (ipaddr)); + } + } + spdlog::debug("network: {}, new addr {}/{}", net->ifname_, net->ipaddr_, net->cidr_); + } else { + net->ipaddr_.clear(); + net->cidr_ = 0; + net->netmask_.clear(); + spdlog::debug("network: {} addr deleted {}/{}", + net->ifname_, + inet_ntop(ifa->ifa_family, RTA_DATA(ifa_rta), + ipaddr, sizeof (ipaddr)), + ifa->ifa_prefixlen); + } + net->dp.emit(); + break; + } + } + } + break; } } - if (nh->nlmsg_type == RTM_DELADDR) { - // Check for valid interface - if (ifi->ifi_index == net->ifid_) { - net->ipaddr_.clear(); - net->netmask_.clear(); - net->cidr_ = 0; - if (!(ifi->ifi_flags & IFF_RUNNING)) { - net->clearIface(); - // Check for a new interface and get info - net->checkNewInterface(ifi); - } else { - net->dp.emit(); - } - return NL_OK; - } - } else { - char ifname[IF_NAMESIZE]; - if_indextoname(ifi->ifi_index, ifname); - // Auto detected network can also be assigned here - if (ifi->ifi_index != net->ifid_ && net->checkInterface(ifi, ifname)) { - // If iface is different, clear data - if (ifi->ifi_index != net->ifid_) { - net->clearIface(); - } - net->ifname_ = ifname; - net->ifid_ = ifi->ifi_index; - } - // Check for valid interface - if (ifi->ifi_index == net->ifid_) { - // Get Iface and WIFI info - net->getInterfaceAddress(); - net->thread_timer_.wake_up(); - return NL_OK; - } - } - return NL_SKIP; + return NL_OK; } void waybar::modules::Network::askForStateDump(void) { @@ -751,6 +741,12 @@ void waybar::modules::Network::askForStateDump(void) { want_link_dump_ = false; dump_in_progress_ = true; + } else if (want_addr_dump_) { + rt_hdr.rtgen_family = family_; + nl_send_simple(ev_sock_, RTM_GETADDR, NLM_F_DUMP, + &rt_hdr, sizeof (rt_hdr)); + want_addr_dump_ = false; + dump_in_progress_ = true; } } From 0bb436f9493424d63e66a39e2dc2f5e6e2ada9a3 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 15 May 2021 16:38:00 +0100 Subject: [PATCH 232/355] network: Rework interface auto detection, handle route change events Last part of the rework of handleEvents(), this time we take the getExternalInterface() function and add it to the handleEvents() function. That way, waybar can react immediately when a new "external interface" is available and doesn't need to probe. Also that avoid to have two different functions consuming from the same socket and we don't need to recode some of the functions that are already available via libnl (to send and receive messages). --- include/modules/network.hpp | 9 +- src/modules/network.cpp | 356 +++++++++++++++--------------------- 2 files changed, 146 insertions(+), 219 deletions(-) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index cc8b3f59..964597ab 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -35,17 +34,12 @@ class Network : public ALabel { void worker(); void createInfoSocket(); void createEventSocket(); - int getExternalInterface(int skip_idx = -1) const; - int netlinkRequest(void*, uint32_t, uint32_t groups = 0) const; - int netlinkResponse(void*, uint32_t, uint32_t groups = 0) const; void parseEssid(struct nlattr**); void parseSignal(struct nlattr**); void parseFreq(struct nlattr**); bool associatedOrJoined(struct nlattr**); - bool checkInterface(struct ifinfomsg* rtif, std::string name); - int getPreferredIface(int skip_idx = -1, bool wait = true) const; + bool checkInterface(std::string name); auto getInfo() -> void; - void checkNewInterface(struct ifinfomsg* rtif); const std::string getNetworkState() const; void clearIface(); bool wildcardMatch(const std::string& pattern, const std::string& text) const; @@ -60,6 +54,7 @@ class Network : public ALabel { int nl80211_id_; std::mutex mutex_; + bool want_route_dump_; bool want_link_dump_; bool want_addr_dump_; bool dump_in_progress_; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index f4cee78b..508af910 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -86,6 +86,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET), efd_(-1), ev_fd_(-1), + want_route_dump_(false), want_link_dump_(false), want_addr_dump_(false), dump_in_progress_(false), @@ -117,7 +118,11 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf bandwidth_up_total_ = 0; } - if (config_["interface"].isString()) { + if (!config_["interface"].isString()) { + // "interface" isn't configure, then try to guess the external + // interface currently used for internet. + want_route_dump_ = true; + } else { // Look for an interface that match "interface" // and then find the address associated with it. want_link_dump_ = true; @@ -126,14 +131,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf createEventSocket(); createInfoSocket(); - auto default_iface = getPreferredIface(-1, false); - if (default_iface != -1) { - ifid_ = default_iface; - char ifname[IF_NAMESIZE]; - if_indextoname(default_iface, ifname); - ifname_ = ifname; - want_addr_dump_ = true; - } + dp.emit(); // Ask for a dump of interfaces and then addresses to populate our // information. First the interface dump, and once done, the callback @@ -184,6 +182,14 @@ void waybar::modules::Network::createEventSocket() { } else { nl_socket_add_membership(ev_sock_, RTNLGRP_IPV6_IFADDR); } + if (!config_["interface"].isString()) { + if (family_ == AF_INET) { + nl_socket_add_membership(ev_sock_, RTNLGRP_IPV4_ROUTE); + } else { + 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"); @@ -383,196 +389,16 @@ auto waybar::modules::Network::update() -> void { ALabel::update(); } -// Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698 -int waybar::modules::Network::getExternalInterface(int skip_idx) const { - static const uint32_t route_buffer_size = 8192; - struct nlmsghdr * hdr = nullptr; - struct rtmsg * rt = nullptr; - char resp[route_buffer_size] = {0}; - int ifidx = -1; - - /* Prepare request. */ - constexpr uint32_t reqlen = NLMSG_SPACE(sizeof(*rt)); - char req[reqlen] = {0}; - - /* Build the RTM_GETROUTE request. */ - hdr = reinterpret_cast(req); - hdr->nlmsg_len = NLMSG_LENGTH(sizeof(*rt)); - hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; - hdr->nlmsg_type = RTM_GETROUTE; - rt = static_cast(NLMSG_DATA(hdr)); - rt->rtm_family = family_; - rt->rtm_table = RT_TABLE_MAIN; - - /* Issue the query. */ - if (netlinkRequest(req, reqlen) < 0) { - goto out; - } - - /* Read the response(s). - * - * WARNING: All the packets generated by the request must be consumed (as in, - * consume responses till NLMSG_DONE/NLMSG_ERROR is encountered). - */ - do { - auto len = netlinkResponse(resp, route_buffer_size); - if (len < 0) { - goto out; - } - - /* Parse the response payload into netlink messages. */ - for (hdr = reinterpret_cast(resp); NLMSG_OK(hdr, len); - hdr = NLMSG_NEXT(hdr, len)) { - if (hdr->nlmsg_type == NLMSG_DONE) { - goto out; - } - if (hdr->nlmsg_type == NLMSG_ERROR) { - /* Even if we found the interface index, something is broken with the - * netlink socket, so return an error. - */ - ifidx = -1; - goto out; - } - - /* If we found the correct answer, skip parsing the attributes. */ - if (ifidx != -1) { - continue; - } - - /* Find the message(s) concerting the main routing table, each message - * corresponds to a single routing table entry. - */ - rt = static_cast(NLMSG_DATA(hdr)); - if (rt->rtm_table != RT_TABLE_MAIN) { - continue; - } - - /* Parse all the attributes for a single routing table entry. */ - struct rtattr *attr = RTM_RTA(rt); - uint64_t attrlen = RTM_PAYLOAD(hdr); - bool has_gateway = false; - bool has_destination = false; - int temp_idx = -1; - for (; RTA_OK(attr, attrlen); attr = RTA_NEXT(attr, attrlen)) { - /* Determine if this routing table entry corresponds to the default - * route by seeing if it has a gateway, and if a destination addr is - * set, that it is all 0s. - */ - switch (attr->rta_type) { - case RTA_GATEWAY: - /* The gateway of the route. - * - * If someone every needs to figure out the gateway address as well, - * it's here as the attribute payload. - */ - has_gateway = true; - break; - case RTA_DST: { - /* The destination address. - * Should be either missing, or maybe all 0s. Accept both. - */ - const uint32_t nr_zeroes = (family_ == AF_INET) ? 4 : 16; - unsigned char c = 0; - size_t dstlen = RTA_PAYLOAD(attr); - if (dstlen != nr_zeroes) { - break; - } - for (uint32_t i = 0; i < dstlen; i += 1) { - c |= *((unsigned char *)RTA_DATA(attr) + i); - } - has_destination = (c == 0); - break; - } - case RTA_OIF: - /* The output interface index. */ - temp_idx = *static_cast(RTA_DATA(attr)); - break; - default: - break; - } - } - /* If this is the default route, and we know the interface index, - * we can stop parsing this message. - */ - if (has_gateway && !has_destination && temp_idx != -1 && temp_idx != skip_idx) { - ifidx = temp_idx; - break; - } - } - } while (true); - -out: - return ifidx; -} - -int waybar::modules::Network::netlinkRequest(void *req, uint32_t reqlen, uint32_t groups) const { - struct sockaddr_nl sa = {}; - sa.nl_family = AF_NETLINK; - sa.nl_groups = groups; - struct iovec iov = {req, reqlen}; - struct msghdr msg = { - .msg_name = &sa, - .msg_namelen = sizeof(sa), - .msg_iov = &iov, - .msg_iovlen = 1, - }; - return sendmsg(nl_socket_get_fd(ev_sock_), &msg, 0); -} - -int waybar::modules::Network::netlinkResponse(void *resp, uint32_t resplen, uint32_t groups) const { - struct sockaddr_nl sa = {}; - sa.nl_family = AF_NETLINK; - sa.nl_groups = groups; - struct iovec iov = {resp, resplen}; - struct msghdr msg = { - .msg_name = &sa, - .msg_namelen = sizeof(sa), - .msg_iov = &iov, - .msg_iovlen = 1, - }; - auto ret = recvmsg(nl_socket_get_fd(ev_sock_), &msg, 0); - if (msg.msg_flags & MSG_TRUNC) { - return -1; - } - return ret; -} - -bool waybar::modules::Network::checkInterface(struct ifinfomsg *rtif, std::string name) { +bool waybar::modules::Network::checkInterface(std::string name) { if (config_["interface"].isString()) { return config_["interface"].asString() == name || wildcardMatch(config_["interface"].asString(), name); } - // getExternalInterface may need some delay to detect external interface - for (uint8_t tries = 0; tries < MAX_RETRY; tries += 1) { - auto external_iface = getExternalInterface(); - if (external_iface > 0) { - return external_iface == rtif->ifi_index; - } - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - } return false; } -int waybar::modules::Network::getPreferredIface(int skip_idx, bool wait) const { - int ifid = -1; - if (config_["interface"].isString()) { - // Using link dump instead - return -1; - } - // getExternalInterface may need some delay to detect external interface - for (uint8_t tries = 0; tries < MAX_RETRY; tries += 1) { - ifid = getExternalInterface(skip_idx); - if (ifid > 0) { - return ifid; - } - if (wait) { - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - } - } - return -1; -} - void waybar::modules::Network::clearIface() { + ifid_ = -1; essid_.clear(); ipaddr_.clear(); netmask_.clear(); @@ -582,22 +408,6 @@ void waybar::modules::Network::clearIface() { frequency_ = 0; } -void waybar::modules::Network::checkNewInterface(struct ifinfomsg *rtif) { - auto new_iface = getPreferredIface(rtif->ifi_index); - if (new_iface != -1) { - ifid_ = new_iface; - char ifname[IF_NAMESIZE]; - if_indextoname(new_iface, ifname); - ifname_ = ifname; - want_addr_dump_ = true; - askForStateDump(); - thread_timer_.wake_up(); - } else { - ifid_ = -1; - dp.emit(); - } -} - int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { auto net = static_cast(data); std::lock_guard lock(net->mutex_); @@ -627,10 +437,16 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { } } - if (!is_del_event && net->ifid_ == -1) { + if (!is_del_event && ifi->ifi_index == net->ifid_) { + // Update inferface information + if (net->ifname_.empty()) { + std::string new_ifname (ifname, ifname_len); + net->ifname_ = new_ifname; + } + } else if (!is_del_event && net->ifid_ == -1) { // Checking if it's an interface we care about. std::string new_ifname (ifname, ifname_len); - if (net->checkInterface(ifi, new_ifname)) { + if (net->checkInterface(new_ifname)) { spdlog::debug("network: selecting new interface {}/{}", new_ifname, ifi->ifi_index); net->ifname_ = new_ifname; @@ -647,8 +463,6 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { spdlog::debug("network: interface {}/{} deleted", net->ifname_, net->ifid_); net->clearIface(); - // Check for a new interface and get info - net->checkNewInterface(ifi); net->dp.emit(); } break; @@ -720,6 +534,117 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { } break; } + + case RTM_DELROUTE: + is_del_event = true; + case RTM_NEWROUTE: { + // Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698 + // to find the interface used to reach the outside world + + struct rtmsg *rtm = static_cast(NLMSG_DATA(nh)); + ssize_t attrlen = RTM_PAYLOAD(nh); + struct rtattr *attr = RTM_RTA(rtm); + bool has_gateway = false; + bool has_destination = false; + int temp_idx = -1; + + /* If we found the correct answer, skip parsing the attributes. */ + if (!is_del_event && net->ifid_ != -1) { + return NL_OK; + } + + /* Find the message(s) concerting the main routing table, each message + * corresponds to a single routing table entry. + */ + if (rtm->rtm_table != RT_TABLE_MAIN) { + return NL_OK; + } + + /* Parse all the attributes for a single routing table entry. */ + for (; RTA_OK(attr, attrlen); attr = RTA_NEXT(attr, attrlen)) { + /* Determine if this routing table entry corresponds to the default + * route by seeing if it has a gateway, and if a destination addr is + * set, that it is all 0s. + */ + switch(attr->rta_type) { + case RTA_GATEWAY: + /* The gateway of the route. + * + * If someone every needs to figure out the gateway address as well, + * it's here as the attribute payload. + */ + has_gateway = true; + break; + case RTA_DST: { + /* The destination address. + * Should be either missing, or maybe all 0s. Accept both. + */ + const uint32_t nr_zeroes = (net->family_ == AF_INET) ? 4 : 16; + unsigned char c = 0; + size_t dstlen = RTA_PAYLOAD(attr); + if (dstlen != nr_zeroes) { + break; + } + for (uint32_t i = 0; i < dstlen; i += 1) { + c |= *((unsigned char *)RTA_DATA(attr) + i); + } + has_destination = (c == 0); + break; + } + case RTA_OIF: + /* The output interface index. */ + temp_idx = *static_cast(RTA_DATA(attr)); + break; + default: + break; + } + + /* If this is the default route, and we know the interface index, + * we can stop parsing this message. + */ + if (has_gateway && !has_destination && temp_idx != -1) { + if (!is_del_event) { + net->ifid_ = temp_idx; + + spdlog::debug("network: new default route via if{}", temp_idx); + + /* Ask ifname associated with temp_idx as well as carrier status */ + struct ifinfomsg ifinfo_hdr = { + .ifi_family = AF_UNSPEC, + .ifi_index = temp_idx, + }; + int err; + err = nl_send_simple(net->ev_sock_, RTM_GETLINK, NLM_F_REQUEST, + &ifinfo_hdr, sizeof (ifinfo_hdr)); + if (err < 0) { + spdlog::error("network: failed to ask link info: {}", err); + /* Ask for a dump of all links instead */ + net->want_link_dump_ = true; + } + + /* Also ask for the address. Asking for a addresses of a specific + * interface doesn't seems to work so ask for a dump of all + * addresses. */ + net->want_addr_dump_ = true; + net->askForStateDump(); + net->thread_timer_.wake_up(); + } else if (is_del_event && temp_idx == net->ifid_) { + spdlog::debug("network: default route deleted {}/if{}", + net->ifname_, temp_idx); + + net->ifname_.clear(); + net->clearIface(); + net->dp.emit(); + /* Ask for a dump of all routes in case another one is already + * setup. If there's none, there'll be an event with new one + * later. */ + net->want_route_dump_ = true; + net->askForStateDump(); + } + } + } + break; + } } return NL_OK; @@ -735,7 +660,14 @@ void waybar::modules::Network::askForStateDump(void) { .rtgen_family = AF_UNSPEC, }; - if (want_link_dump_) { + if (want_route_dump_) { + rt_hdr.rtgen_family = family_; + nl_send_simple(ev_sock_, RTM_GETROUTE, NLM_F_DUMP, + &rt_hdr, sizeof (rt_hdr)); + want_route_dump_ = false; + dump_in_progress_ = true; + + } else if (want_link_dump_) { nl_send_simple(ev_sock_, RTM_GETLINK, NLM_F_DUMP, &rt_hdr, sizeof (rt_hdr)); want_link_dump_ = false; From c1427ff8072aa9573a09941fbaa1c45af5005d89 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 15 May 2021 16:38:00 +0100 Subject: [PATCH 233/355] network: Handle carrier information IFLA_CARRIER allows to know when a cable is plugged to the Ethernet card or when the WiFi is connected. If there's no carrier, the interface will be considered disconnected. --- include/modules/network.hpp | 1 + src/modules/network.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 964597ab..2523dc22 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -64,6 +64,7 @@ class Network : public ALabel { std::string state_; std::string essid_; + bool carrier_; std::string ifname_; std::string ipaddr_; std::string netmask_; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 508af910..6102a43c 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -292,6 +292,7 @@ const std::string waybar::modules::Network::getNetworkState() const { #endif return "disconnected"; } + if (!carrier_) return "disconnected"; if (ipaddr_.empty()) return "linked"; if (essid_.empty()) return "ethernet"; return "wifi"; @@ -402,6 +403,7 @@ void waybar::modules::Network::clearIface() { essid_.clear(); ipaddr_.clear(); netmask_.clear(); + carrier_ = false; cidr_ = 0; signal_strength_dbm_ = 0; signal_strength_ = 0; @@ -423,6 +425,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { struct rtattr *ifla = IFLA_RTA(ifi); const char *ifname = NULL; size_t ifname_len = 0; + bool carrier = false; if (net->ifid_ != -1 && ifi->ifi_index != net->ifid_) { return NL_OK; @@ -434,6 +437,10 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { ifname = static_cast(RTA_DATA(ifla)); ifname_len = RTA_PAYLOAD(ifla) - 1; // minus \0 break; + case IFLA_CARRIER: { + carrier = *(char*)RTA_DATA(ifla) == 1; + break; + } } } @@ -443,6 +450,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { std::string new_ifname (ifname, ifname_len); net->ifname_ = new_ifname; } + net->carrier_ = carrier; } else if (!is_del_event && net->ifid_ == -1) { // Checking if it's an interface we care about. std::string new_ifname (ifname, ifname_len); @@ -451,6 +459,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->ifname_ = new_ifname; net->ifid_ = ifi->ifi_index; + net->carrier_ = carrier; net->thread_timer_.wake_up(); /* An address for this new interface should be received via an * RTM_NEWADDR event either because we ask for a dump of both links From c65ec9e14fa3509c2da67551e14add961f9850ce Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Fri, 21 May 2021 15:54:48 +0300 Subject: [PATCH 234/355] Add options to use a .json extension for the config filename --- src/client.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client.cpp b/src/client.cpp index 1c48c813..f6330c32 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -207,9 +207,13 @@ std::tuple waybar::Client::getConfigs( const std::string &config, const std::string &style) const { auto config_file = config.empty() ? getValidPath({ "$XDG_CONFIG_HOME/waybar/config", + "$XDG_CONFIG_HOME/waybar/config.json", "$HOME/.config/waybar/config", + "$HOME/.config/waybar/config.json", "$HOME/waybar/config", + "$HOME/waybar/config.json", "/etc/xdg/waybar/config", + "/etc/xdg/waybar/config.json", SYSCONFDIR "/xdg/waybar/config", "./resources/config", }) From 99918205ede41e80fc5e55e0b2582ae3fc613e21 Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Fri, 21 May 2021 17:53:43 +0300 Subject: [PATCH 235/355] Correct .json to .jsonc --- src/client.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index f6330c32..ced9e492 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -207,13 +207,13 @@ std::tuple waybar::Client::getConfigs( const std::string &config, const std::string &style) const { auto config_file = config.empty() ? getValidPath({ "$XDG_CONFIG_HOME/waybar/config", - "$XDG_CONFIG_HOME/waybar/config.json", + "$XDG_CONFIG_HOME/waybar/config.jsonc", "$HOME/.config/waybar/config", - "$HOME/.config/waybar/config.json", + "$HOME/.config/waybar/config.jsonc", "$HOME/waybar/config", - "$HOME/waybar/config.json", + "$HOME/waybar/config.jsonc", "/etc/xdg/waybar/config", - "/etc/xdg/waybar/config.json", + "/etc/xdg/waybar/config.jsonc", SYSCONFDIR "/xdg/waybar/config", "./resources/config", }) From 729553d3bc8eeb3c7a5370692174d9962d242e9b Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sun, 17 Jan 2021 01:05:18 -0800 Subject: [PATCH 236/355] feat(bar): add config flag for pointer event passthrough --- include/bar.hpp | 1 + src/bar.cpp | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/include/bar.hpp b/include/bar.hpp index d6cd895f..6bf8c526 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -44,6 +44,7 @@ class BarSurface { virtual void setExclusiveZone(bool enable) = 0; virtual void setLayer(bar_layer layer) = 0; virtual void setMargins(const struct bar_margins &margins) = 0; + virtual void setPassThrough(bool enable) = 0; virtual void setPosition(const std::string_view &position) = 0; virtual void setSize(uint32_t width, uint32_t height) = 0; virtual void commit(){}; diff --git a/src/bar.cpp b/src/bar.cpp index 1dbd69a0..3361ebf1 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -33,6 +33,7 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { gtk_layer_set_monitor(window_.gobj(), output.monitor->gobj()); gtk_layer_set_namespace(window_.gobj(), "waybar"); + window.signal_map_event().connect_notify(sigc::mem_fun(*this, &GLSSurfaceImpl::onMap)); window.signal_configure_event().connect_notify( sigc::mem_fun(*this, &GLSSurfaceImpl::onConfigure)); } @@ -62,6 +63,18 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { gtk_layer_set_layer(window_.gobj(), layer); } + void setPassThrough(bool enable) override { + passthrough_ = enable; + auto gdk_window = window_.get_window(); + if (gdk_window) { + Cairo::RefPtr region; + if (enable) { + region = Cairo::Region::create(); + } + gdk_window->input_shape_combine_region(region, 0, 0); + } + } + void setPosition(const std::string_view& position) override { auto unanchored = GTK_LAYER_SHELL_EDGE_BOTTOM; vertical_ = false; @@ -93,8 +106,11 @@ struct GLSSurfaceImpl : public BarSurface, public sigc::trackable { std::string output_name_; uint32_t width_; uint32_t height_; + bool passthrough_ = false; bool vertical_ = false; + void onMap(GdkEventAny* ev) { setPassThrough(passthrough_); } + void onConfigure(GdkEventConfigure* ev) { /* * GTK wants new size for the window. @@ -182,6 +198,20 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { } } + void setPassThrough(bool enable) override { + passthrough_ = enable; + /* GTK overwrites any region changes applied directly to the wl_surface, + * thus the same GTK region API as in the GLS impl has to be used. */ + auto gdk_window = window_.get_window(); + if (gdk_window) { + Cairo::RefPtr region; + if (enable) { + region = Cairo::Region::create(); + } + gdk_window->input_shape_combine_region(region, 0, 0); + } + } + void setPosition(const std::string_view& position) override { anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; if (position == "bottom") { @@ -230,6 +260,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { uint32_t height_ = 0; uint8_t anchor_ = HORIZONTAL_ANCHOR | ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP; bool exclusive_zone_ = true; + bool passthrough_ = false; struct bar_margins margins_; zwlr_layer_shell_v1_layer layer_ = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM; @@ -262,6 +293,7 @@ struct RawSurfaceImpl : public BarSurface, public sigc::trackable { setSurfaceSize(width_, height_); setExclusiveZone(exclusive_zone_); + setPassThrough(passthrough_); commit(); wl_display_roundtrip(client->wl_display); @@ -377,6 +409,14 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) layer_ = bar_layer::OVERLAY; } + bool passthrough = false; + if (config["passthrough"].isBool()) { + passthrough = config["passthrough"].asBool(); + } else if (layer_ == bar_layer::OVERLAY) { + // swaybar defaults: overlay mode does not accept pointer events. + passthrough = true; + } + auto position = config["position"].asString(); if (position == "right" || position == "left") { @@ -386,7 +426,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) box_ = Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0); vertical = true; } - + left_.get_style_context()->add_class("modules-left"); center_.get_style_context()->add_class("modules-center"); right_.get_style_context()->add_class("modules-right"); @@ -454,6 +494,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) surface_impl_->setLayer(layer_); surface_impl_->setExclusiveZone(true); surface_impl_->setMargins(margins_); + surface_impl_->setPassThrough(passthrough); surface_impl_->setPosition(position); surface_impl_->setSize(width, height); From 7aaa3df701cdf660c915efec5ee3145180dac9c7 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sun, 17 Jan 2021 01:40:25 -0800 Subject: [PATCH 237/355] feat(bar): add config flag to disable exclusive zone --- include/bar.hpp | 1 + src/bar.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index 6bf8c526..6f3dfcf9 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -65,6 +65,7 @@ class Bar { struct waybar_output *output; Json::Value config; struct wl_surface * surface; + bool exclusive = true; bool visible = true; bool vertical = false; Gtk::Window window; diff --git a/src/bar.cpp b/src/bar.cpp index 3361ebf1..7d763599 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -409,6 +409,13 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) layer_ = bar_layer::OVERLAY; } + if (config["exclusive"].isBool()) { + exclusive = config["exclusive"].asBool(); + } else if (layer_ == bar_layer::OVERLAY) { + // swaybar defaults: overlay mode does not reserve an exclusive zone + exclusive = false; + } + bool passthrough = false; if (config["passthrough"].isBool()) { passthrough = config["passthrough"].asBool(); @@ -492,7 +499,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) } surface_impl_->setLayer(layer_); - surface_impl_->setExclusiveZone(true); + surface_impl_->setExclusiveZone(exclusive); surface_impl_->setMargins(margins_); surface_impl_->setPassThrough(passthrough); surface_impl_->setPosition(position); @@ -533,7 +540,7 @@ void waybar::Bar::setVisible(bool value) { window.set_opacity(1); surface_impl_->setLayer(layer_); } - surface_impl_->setExclusiveZone(visible); + surface_impl_->setExclusiveZone(exclusive && visible); surface_impl_->commit(); } From da2d603b53d42f68c41055731bd3a4a50dc11f9b Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 21 May 2021 22:38:48 -0700 Subject: [PATCH 238/355] doc: add man for exclusive and passthrough flags --- man/waybar.5.scd.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index 430b9fcd..fe11c4a7 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -68,6 +68,17 @@ Also a minimal example configuration can be found on the at the bottom of this m typeof: string ++ Optional name added as a CSS class, for styling multiple waybars. +*exclusive* ++ + typeof: bool ++ + default: *true* unless the layer is set to *overlay* ++ + Option to request an exclusive zone from the compositor. Disable this to allow drawing application windows underneath or on top of the bar. + +*passthrough* ++ + typeof: bool ++ + default: *false* unless the layer is set to *overlay* ++ + Option to pass any pointer events to the window under the bar. + Intended to be used with either *top* or *overlay* layers and without exclusive zone. + *gtk-layer-shell* ++ typeof: bool ++ default: true ++ From 28dfb0ba41f2d0f97b2f84de77e878c6c24fc29d Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Wed, 26 May 2021 18:28:49 +0100 Subject: [PATCH 239/355] network: Fix use of carrier information Some RTM_NEWLINK messages may not have the IFLA_CARRIER information. This is the case when a WiFi interface report scan result are available. `carrier` is used regardless of if it is present in the message or not. This would result in the interface appearing "disconnected" in waybar when it isn't. This patch now check that `carrier` is available before using it. The same thing could potentially happen to `ifname` so check if it's set before recording it. Fixes: c1427ff (network: Handle carrier information) Fixes #388 --- src/modules/network.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 6102a43c..9e0ed395 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -425,7 +425,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { struct rtattr *ifla = IFLA_RTA(ifi); const char *ifname = NULL; size_t ifname_len = 0; - bool carrier = false; + std::optional carrier; if (net->ifid_ != -1 && ifi->ifi_index != net->ifid_) { return NL_OK; @@ -446,11 +446,13 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { if (!is_del_event && ifi->ifi_index == net->ifid_) { // Update inferface information - if (net->ifname_.empty()) { + if (net->ifname_.empty() && ifname != NULL) { std::string new_ifname (ifname, ifname_len); net->ifname_ = new_ifname; } - net->carrier_ = carrier; + if (carrier.has_value()) { + net->carrier_ = carrier.value(); + } } else if (!is_del_event && net->ifid_ == -1) { // Checking if it's an interface we care about. std::string new_ifname (ifname, ifname_len); @@ -459,7 +461,9 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->ifname_ = new_ifname; net->ifid_ = ifi->ifi_index; - net->carrier_ = carrier; + if (carrier.has_value()) { + net->carrier_ = carrier.value(); + } net->thread_timer_.wake_up(); /* An address for this new interface should be received via an * RTM_NEWADDR event either because we ask for a dump of both links From f49a7a1acbe8489f37a88f5c8f7941a44bb90ac7 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Wed, 26 May 2021 18:51:02 +0100 Subject: [PATCH 240/355] network: Update WiFi information when available The module doesn't update the `essid_` as soon as a WiFi interface is connected, but that happens at some point later, depending on "interval" configuration. Fix that by rerunning the get WiFi information thread when the `carrier` state changes. Also, we will clear the state related to WiFi when the connection is drop to avoid stale information. --- src/modules/network.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 9e0ed395..583daaea 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -451,6 +451,18 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->ifname_ = new_ifname; } if (carrier.has_value()) { + if (net->carrier_ != *carrier) { + if (*carrier) { + // Ask for WiFi information + net->thread_timer_.wake_up(); + } else { + // clear state related to WiFi connection + net->essid_.clear(); + net->signal_strength_dbm_ = 0; + net->signal_strength_ = 0; + net->frequency_ = 0; + } + } net->carrier_ = carrier.value(); } } else if (!is_del_event && net->ifid_ == -1) { From 999c1b6b81c5fe29c32e1e4450d49d67d0e6570c Mon Sep 17 00:00:00 2001 From: Maxim Baz Date: Sat, 5 Jun 2021 14:50:25 +0200 Subject: [PATCH 241/355] sway-language: ignore events with empty layout --- src/modules/sway/language.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index a3186477..4d27fb88 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -45,7 +45,9 @@ void Language::onEvent(const struct Ipc::ipc_response& res) { auto payload = parser_.parse(res.payload)["input"]; if (payload["type"].asString() == "keyboard") { auto layout_name = payload["xkb_active_layout_name"].asString().substr(0,2); - lang_ = Glib::Markup::escape_text(layout_name); + if (!layout_name.empty()) { + lang_ = Glib::Markup::escape_text(layout_name); + } } dp.emit(); } catch (const std::exception& e) { From 23b9923eeba13bdba51b601f2c5c7e4f20b8710a Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sun, 30 May 2021 15:56:56 +0100 Subject: [PATCH 242/355] network: Parse whole RTM_NEWROUTE msg before interpreting it The check to figure out if we have the default route should be after the for loop that parses the route attributes, to avoid acting on incomplete information. We are going to use more fields from the message. --- src/modules/network.cpp | 76 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 583daaea..3edc4dcc 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -623,49 +623,47 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { default: break; } + } - /* If this is the default route, and we know the interface index, - * we can stop parsing this message. - */ - if (has_gateway && !has_destination && temp_idx != -1) { - if (!is_del_event) { - net->ifid_ = temp_idx; + // Check if we have a default route. + if (has_gateway && !has_destination && temp_idx != -1) { + if (!is_del_event) { + net->ifid_ = temp_idx; - spdlog::debug("network: new default route via if{}", temp_idx); + spdlog::debug("network: new default route via if{}", temp_idx); - /* Ask ifname associated with temp_idx as well as carrier status */ - struct ifinfomsg ifinfo_hdr = { - .ifi_family = AF_UNSPEC, - .ifi_index = temp_idx, - }; - int err; - err = nl_send_simple(net->ev_sock_, RTM_GETLINK, NLM_F_REQUEST, - &ifinfo_hdr, sizeof (ifinfo_hdr)); - if (err < 0) { - spdlog::error("network: failed to ask link info: {}", err); - /* Ask for a dump of all links instead */ - net->want_link_dump_ = true; - } - - /* Also ask for the address. Asking for a addresses of a specific - * interface doesn't seems to work so ask for a dump of all - * addresses. */ - net->want_addr_dump_ = true; - net->askForStateDump(); - net->thread_timer_.wake_up(); - } else if (is_del_event && temp_idx == net->ifid_) { - spdlog::debug("network: default route deleted {}/if{}", - net->ifname_, temp_idx); - - net->ifname_.clear(); - net->clearIface(); - net->dp.emit(); - /* Ask for a dump of all routes in case another one is already - * setup. If there's none, there'll be an event with new one - * later. */ - net->want_route_dump_ = true; - net->askForStateDump(); + /* Ask ifname associated with temp_idx as well as carrier status */ + struct ifinfomsg ifinfo_hdr = { + .ifi_family = AF_UNSPEC, + .ifi_index = temp_idx, + }; + int err; + err = nl_send_simple(net->ev_sock_, RTM_GETLINK, NLM_F_REQUEST, + &ifinfo_hdr, sizeof (ifinfo_hdr)); + if (err < 0) { + spdlog::error("network: failed to ask link info: {}", err); + /* Ask for a dump of all links instead */ + net->want_link_dump_ = true; } + + /* Also ask for the address. Asking for a addresses of a specific + * interface doesn't seems to work so ask for a dump of all + * addresses. */ + net->want_addr_dump_ = true; + net->askForStateDump(); + net->thread_timer_.wake_up(); + } else if (is_del_event && temp_idx == net->ifid_) { + spdlog::debug("network: default route deleted {}/if{}", + net->ifname_, temp_idx); + + net->ifname_.clear(); + net->clearIface(); + net->dp.emit(); + /* Ask for a dump of all routes in case another one is already + * setup. If there's none, there'll be an event with new one + * later. */ + net->want_route_dump_ = true; + net->askForStateDump(); } } break; From ce97df34e69689d97adbf481ef65997beb4f3f98 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Sat, 5 Jun 2021 15:44:32 +0100 Subject: [PATCH 243/355] network: Also clear ifname in clearIface() Since we reset `ifid_`, clear `ifname_` as well. --- src/modules/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 3edc4dcc..e895569a 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -400,6 +400,7 @@ bool waybar::modules::Network::checkInterface(std::string name) { void waybar::modules::Network::clearIface() { ifid_ = -1; + ifname_.clear(); essid_.clear(); ipaddr_.clear(); netmask_.clear(); @@ -656,7 +657,6 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { spdlog::debug("network: default route deleted {}/if{}", net->ifname_, temp_idx); - net->ifname_.clear(); net->clearIface(); net->dp.emit(); /* Ask for a dump of all routes in case another one is already From efaac20d8200b2249668773fa96ef40ea66fe4fe Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Wed, 2 Jun 2021 22:15:34 +0100 Subject: [PATCH 244/355] network: Handle ip route priority When there's a new default route with higher priority, switch to it. --- include/modules/network.hpp | 1 + src/modules/network.cpp | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 2523dc22..009ae5a3 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -72,6 +72,7 @@ class Network : public ALabel { int32_t signal_strength_dbm_; uint8_t signal_strength_; uint32_t frequency_; + uint32_t route_priority; util::SleeperThread thread_; util::SleeperThread thread_timer_; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index e895569a..de023ef4 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -573,11 +573,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { bool has_gateway = false; bool has_destination = false; int temp_idx = -1; - - /* If we found the correct answer, skip parsing the attributes. */ - if (!is_del_event && net->ifid_ != -1) { - return NL_OK; - } + uint32_t priority = 0; /* Find the message(s) concerting the main routing table, each message * corresponds to a single routing table entry. @@ -621,6 +617,9 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { /* The output interface index. */ temp_idx = *static_cast(RTA_DATA(attr)); break; + case RTA_PRIORITY: + priority = *(uint32_t*)RTA_DATA(attr); + break; default: break; } @@ -628,10 +627,16 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { // Check if we have a default route. if (has_gateway && !has_destination && temp_idx != -1) { - if (!is_del_event) { + // Check if this is the first default route we see, or if this new + // route have a higher priority. + if (!is_del_event && ((net->ifid_ == -1) || (priority < net->route_priority))) { + // Clear if's state for the case were there is a higher priority + // route on a different interface. + net->clearIface(); net->ifid_ = temp_idx; + net->route_priority = priority; - spdlog::debug("network: new default route via if{}", temp_idx); + spdlog::debug("network: new default route via if{} metric {}", temp_idx, priority); /* Ask ifname associated with temp_idx as well as carrier status */ struct ifinfomsg ifinfo_hdr = { @@ -653,9 +658,10 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->want_addr_dump_ = true; net->askForStateDump(); net->thread_timer_.wake_up(); - } else if (is_del_event && temp_idx == net->ifid_) { - spdlog::debug("network: default route deleted {}/if{}", - net->ifname_, temp_idx); + } else if (is_del_event && temp_idx == net->ifid_ + && net->route_priority == priority) { + spdlog::debug("network: default route deleted {}/if{} metric {}", + net->ifname_, temp_idx, priority); net->clearIface(); net->dp.emit(); From 33617b67f0c342f15a72da413c4e6b0b46f9e196 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Wed, 2 Jun 2021 22:16:28 +0100 Subject: [PATCH 245/355] network: Fix one case where default route is deleted without notification When an interface's state is change to "down", all the route associated with it are deleted without an RTM_DELROUTE event. So when this happen, reset the module to start looking for a new external interface / default route. Fixes #1117 --- src/modules/network.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index de023ef4..ec221a2f 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -1,6 +1,7 @@ #include "modules/network.hpp" #include #include +#include #include #include #include @@ -432,6 +433,20 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { return NL_OK; } + // Check if the interface goes "down" and if we want to detect the + // external interface. + if (net->ifid_ != -1 && !(ifi->ifi_flags & IFF_UP) + && !net->config_["interface"].isString()) { + // The current interface is now down, all the routes associated with + // it have been deleted, so start looking for a new default route. + spdlog::debug("network: if{} down", net->ifid_); + net->clearIface(); + net->dp.emit(); + net->want_route_dump_ = true; + net->askForStateDump(); + return NL_OK; + } + for (; RTA_OK(ifla, attrlen); ifla = RTA_NEXT(ifla, attrlen)) { switch (ifla->rta_type) { case IFLA_IFNAME: From 194f4c2f18799633a1877fb79ea82c47f4aa30c7 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Mon, 7 Jun 2021 19:24:38 +0100 Subject: [PATCH 246/355] network: Fix mix use of default and state specific format Whenever the network module is configured with both "format" and "format-$state" and when the module use "format-$state" once, it override the value that was saved from "format". For example, if both "format" and "format-disconnect" are configured, and only those, as soon as the module show information about a disconnected interface, it will keep showing the format for disconnected, even if the interface is connected again later. Fix that by always setting a value to default_format_ in update() and thus use the intended default format when needed. Fixes #1129 --- src/modules/network.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index ec221a2f..7d0f6382 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -19,6 +19,7 @@ constexpr const char *NETSTAT_FILE = constexpr std::string_view BANDWIDTH_CATEGORY = "IpExt"; constexpr std::string_view BANDWIDTH_DOWN_TOTAL_KEY = "InOctets"; constexpr std::string_view BANDWIDTH_UP_TOTAL_KEY = "OutOctets"; +constexpr const char *DEFAULT_FORMAT = "{ifname}"; std::ifstream netstat(NETSTAT_FILE); std::optional read_netstat(std::string_view category, std::string_view key) { @@ -82,7 +83,7 @@ std::optional read_netstat(std::string_view category, std::s } // namespace waybar::modules::Network::Network(const std::string &id, const Json::Value &config) - : ALabel(config, "network", id, "{ifname}", 60), + : ALabel(config, "network", id, DEFAULT_FORMAT, 60), ifid_(-1), family_(config["family"] == "ipv6" ? AF_INET6 : AF_INET), efd_(-1), @@ -323,6 +324,10 @@ auto waybar::modules::Network::update() -> void { } if (config_["format-" + state].isString()) { default_format_ = config_["format-" + state].asString(); + } else if (config_["format"].isString()) { + default_format_ = config_["format"].asString(); + } else { + default_format_ = DEFAULT_FORMAT; } if (config_["tooltip-format-" + state].isString()) { tooltip_format = config_["tooltip-format-" + state].asString(); From 5da268077cb0e53a5ff46fe9ca2dee8bf8e1c041 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 4 Jun 2021 20:22:16 -0700 Subject: [PATCH 247/355] fix(util): protect std::condition_variable methods from pthread_cancel The changes in GCC 11.x made `std::condition_variable` implementation internals `noexcept`. `noexcept` is known to interact particularly bad with `pthread_cancel`, i.e. `__cxxabiv1::__force_unwind` passing through the `noexcept` call stack frame causes a `std::terminate` call and immediate termination of the program Digging through the GCC ML archives[1] lead me to the idea of patching this with a few pthread_setcancelstate's. As bad as the solution is, it seems to be the best we can do within C++17 limits and without major rework. [1]: https://gcc.gnu.org/legacy-ml/gcc/2017-08/msg00156.html --- include/util/sleeper_thread.hpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/util/sleeper_thread.hpp b/include/util/sleeper_thread.hpp index 9adbe8f7..d1c6ba0d 100644 --- a/include/util/sleeper_thread.hpp +++ b/include/util/sleeper_thread.hpp @@ -8,6 +8,20 @@ namespace waybar::util { +/** + * Defer pthread_cancel until the end of a current scope. + * + * Required to protect a scope where it's unsafe to raise `__forced_unwind` exception. + * An example of these is a call of a method marked as `noexcept`; an attempt to cancel within such + * a method may result in a `std::terminate` call. + */ +class CancellationGuard { + int oldstate; +public: + CancellationGuard() { pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); } + ~CancellationGuard() { pthread_setcancelstate(oldstate, &oldstate); } +}; + class SleeperThread { public: SleeperThread() = default; @@ -33,14 +47,16 @@ class SleeperThread { bool isRunning() const { return do_run_; } auto sleep_for(std::chrono::system_clock::duration dur) { - std::unique_lock lk(mutex_); + std::unique_lock lk(mutex_); + CancellationGuard cancel_lock; return condvar_.wait_for(lk, dur, [this] { return signal_ || !do_run_; }); } auto sleep_until( std::chrono::time_point time_point) { - std::unique_lock lk(mutex_); + std::unique_lock lk(mutex_); + CancellationGuard cancel_lock; return condvar_.wait_until(lk, time_point, [this] { return signal_ || !do_run_; }); } From 14f626d422a77b51bca4bbbe5282ee6e995169e0 Mon Sep 17 00:00:00 2001 From: Oskar Carl Date: Sun, 24 Jan 2021 17:36:30 +0100 Subject: [PATCH 248/355] Add recursive config includes --- include/client.hpp | 1 + src/client.cpp | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/client.hpp b/include/client.hpp index ec3866ad..af6eeef7 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -39,6 +39,7 @@ class Client { void handleOutput(struct waybar_output &output); bool isValidOutput(const Json::Value &config, struct waybar_output &output); auto setupConfig(const std::string &config_file) -> void; + auto mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void; auto setupCss(const std::string &css_file) -> void; struct waybar_output & getOutput(void *); std::vector getOutputConfigs(struct waybar_output &output); diff --git a/src/client.cpp b/src/client.cpp index ced9e492..752574df 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -241,7 +241,24 @@ auto waybar::Client::setupConfig(const std::string &config_file) -> void { } std::string str((std::istreambuf_iterator(file)), std::istreambuf_iterator()); util::JsonParser parser; - config_ = parser.parse(str); + Json::Value tmp_config_ = parser.parse(str); + if (tmp_config_["include"].isArray()) { + for (const auto& include : tmp_config_["include"]) { + spdlog::info("Including resource file: {}", include.asString()); + setupConfig(getValidPath({include.asString()})); + } + } + mergeConfig(config_, tmp_config_); +} + +auto waybar::Client::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void { + for (const auto& key : b_config_.getMemberNames()) { + if (a_config_[key].type() == Json::objectValue && b_config_[key].type() == Json::objectValue) { + mergeConfig(a_config_[key], b_config_[key]); + } else { + a_config_[key] = b_config_[key]; + } + } } auto waybar::Client::setupCss(const std::string &css_file) -> void { From e8278431d281e6bfa2cae15c6874963711a1396b Mon Sep 17 00:00:00 2001 From: Oskar Carl Date: Sun, 24 Jan 2021 18:32:05 +0100 Subject: [PATCH 249/355] Proper formatting --- src/client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 752574df..7f3229cf 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -241,9 +241,9 @@ auto waybar::Client::setupConfig(const std::string &config_file) -> void { } std::string str((std::istreambuf_iterator(file)), std::istreambuf_iterator()); util::JsonParser parser; - Json::Value tmp_config_ = parser.parse(str); + Json::Value tmp_config_ = parser.parse(str); if (tmp_config_["include"].isArray()) { - for (const auto& include : tmp_config_["include"]) { + for (const auto &include : tmp_config_["include"]) { spdlog::info("Including resource file: {}", include.asString()); setupConfig(getValidPath({include.asString()})); } @@ -252,7 +252,7 @@ auto waybar::Client::setupConfig(const std::string &config_file) -> void { } auto waybar::Client::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void { - for (const auto& key : b_config_.getMemberNames()) { + for (const auto &key : b_config_.getMemberNames()) { if (a_config_[key].type() == Json::objectValue && b_config_[key].type() == Json::objectValue) { mergeConfig(a_config_[key], b_config_[key]); } else { From e62b634f72a9b91a6f2e94ba04a7ac60bcee23cb Mon Sep 17 00:00:00 2001 From: Oskar Carl Date: Mon, 21 Jun 2021 19:29:09 +0200 Subject: [PATCH 250/355] Workaround for circular imports --- include/client.hpp | 2 +- src/client.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index af6eeef7..a54bf4b4 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -38,7 +38,7 @@ class Client { const std::string getValidPath(const std::vector &paths) const; void handleOutput(struct waybar_output &output); bool isValidOutput(const Json::Value &config, struct waybar_output &output); - auto setupConfig(const std::string &config_file) -> void; + auto setupConfig(const std::string &config_file, int depth) -> void; auto mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void; auto setupCss(const std::string &css_file) -> void; struct waybar_output & getOutput(void *); diff --git a/src/client.cpp b/src/client.cpp index 7f3229cf..07c0b23d 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -234,7 +234,10 @@ std::tuple waybar::Client::getConfigs( return {config_file, css_file}; } -auto waybar::Client::setupConfig(const std::string &config_file) -> void { +auto waybar::Client::setupConfig(const std::string &config_file, int depth) -> void { + if (depth > 100) { + throw std::runtime_error("Aborting due to likely recursive include in config files"); + } std::ifstream file(config_file); if (!file.is_open()) { throw std::runtime_error("Can't open config file"); @@ -245,7 +248,7 @@ auto waybar::Client::setupConfig(const std::string &config_file) -> void { if (tmp_config_["include"].isArray()) { for (const auto &include : tmp_config_["include"]) { spdlog::info("Including resource file: {}", include.asString()); - setupConfig(getValidPath({include.asString()})); + setupConfig(getValidPath({include.asString()}), ++depth); } } mergeConfig(config_, tmp_config_); @@ -337,7 +340,7 @@ int waybar::Client::main(int argc, char *argv[]) { } wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj()); auto [config_file, css_file] = getConfigs(config, style); - setupConfig(config_file); + setupConfig(config_file, 0); setupCss(css_file); bindInterfaces(); gtk_app->hold(); From 982d571b2ea0577b70582e2830ab878eb8070ff3 Mon Sep 17 00:00:00 2001 From: Oskar Carl Date: Wed, 23 Jun 2021 23:08:47 +0200 Subject: [PATCH 251/355] Add include man section --- man/waybar.5.scd.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index fe11c4a7..6e6dd13a 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -85,6 +85,10 @@ Also a minimal example configuration can be found on the at the bottom of this m Option to disable the use of gtk-layer-shell for popups. Only functional if compiled with gtk-layer-shell support. +*include* ++ + typeof: array ++ + Paths to additional configuration files. In case of duplicate options, the including file's value takes precedence. Make sure to avoid circular imports. + # MODULE FORMAT You can use PangoMarkupFormat (See https://developer.gnome.org/pango/stable/PangoMarkupFormat.html#PangoMarkupFormat). From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001 From: John Helmert III Date: Tue, 29 Jun 2021 21:29:12 -0500 Subject: [PATCH 252/355] libfmt >=8.0.0 compatibility --- include/util/format.hpp | 4 ++++ src/modules/clock.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/util/format.hpp b/include/util/format.hpp index 288d8f0c..543a100f 100644 --- a/include/util/format.hpp +++ b/include/util/format.hpp @@ -35,7 +35,11 @@ namespace fmt { // The rationale for ignoring it is that the only reason to specify // an alignment and a with is to get a fixed width bar, and ">" is // sufficient in this implementation. +#if FMT_VERSION < 80000 width = parse_nonnegative_int(it, end, ctx); +#else + width = detail::parse_nonnegative_int(it, end, -1); +#endif } return it; } diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index 22bedc78..82c57010 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -196,6 +196,9 @@ template <> struct fmt::formatter : fmt::formatter { template auto format(const waybar_time& t, FormatContext& ctx) { +#if FMT_VERSION >= 80000 + auto& tm_format = specs; +#endif return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime)); } }; From d3c59c42ef9c3878e0086b0e95100a2f832aa088 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 30 Jun 2021 23:28:01 -0700 Subject: [PATCH 253/355] feat(ci): add GitHub CI jobs on Linux --- .github/workflows/linux.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/linux.yml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 00000000..e550e20b --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,25 @@ +name: linux + +on: [push, pull_request] + +jobs: + build: + strategy: + matrix: + distro: + - alpine + - archlinux + - debian + - fedora + - opensuse + + runs-on: ubuntu-latest + container: + image: alexays/waybar:${{ matrix.distro }} + + steps: + - uses: actions/checkout@v2 + - name: configure + run: meson -Dman-pages=enabled build + - name: build + run: ninja -C build From 2a52efa99a7a9604f9d28b0c1bec8e74643c19cf Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 30 Jun 2021 23:50:37 -0700 Subject: [PATCH 254/355] chore: update fedora dockerfile --- Dockerfiles/fedora | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfiles/fedora b/Dockerfiles/fedora index d75083c8..77c77cb8 100644 --- a/Dockerfiles/fedora +++ b/Dockerfiles/fedora @@ -1,7 +1,12 @@ # vim: ft=Dockerfile -FROM fedora:32 +FROM fedora:latest -RUN dnf install sway meson git libinput-devel wayland-devel wayland-protocols-devel pugixml-devel egl-wayland-devel mesa-libEGL-devel mesa-libGLES-devel mesa-libgbm-devel libxkbcommon-devel libudev-devel pixman-devel gtkmm30-devel jsoncpp-devel scdoc -y && \ - dnf group install "C Development Tools and Libraries" -y && \ +RUN dnf install -y @c-development git-core meson scdoc 'pkgconfig(date)' \ + 'pkgconfig(dbusmenu-gtk3-0.4)' 'pkgconfig(fmt)' 'pkgconfig(gdk-pixbuf-2.0)' \ + 'pkgconfig(gio-unix-2.0)' 'pkgconfig(gtk-layer-shell-0)' 'pkgconfig(gtkmm-3.0)' \ + 'pkgconfig(jsoncpp)' 'pkgconfig(libinput)' 'pkgconfig(libmpdclient)' \ + 'pkgconfig(libnl-3.0)' 'pkgconfig(libnl-genl-3.0)' 'pkgconfig(libpulse)' \ + 'pkgconfig(libudev)' 'pkgconfig(pugixml)' 'pkgconfig(sigc++-2.0)' 'pkgconfig(spdlog)' \ + 'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' && \ dnf clean all -y From 5420a9104652ece306faefcfe41a6f2191f02295 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 1 Jul 2021 00:13:05 -0700 Subject: [PATCH 255/355] chore: update FreeBSD action to address ntp sync issue --- .github/workflows/freebsd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 7072c493..74422eec 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Test in FreeBSD VM - uses: vmactions/freebsd-vm@v0.0.9 # aka FreeBSD 12.2 + uses: vmactions/freebsd-vm@v0.1.3 # aka FreeBSD 12.2 with: usesh: true prepare: | From 8e1f85e1c30b7431097e7441cfb80db5fccc029b Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 3 Jul 2021 00:27:57 +0200 Subject: [PATCH 256/355] Update archlinux --- Dockerfiles/archlinux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux index 0b618ffe..e5a53ef5 100644 --- a/Dockerfiles/archlinux +++ b/Dockerfiles/archlinux @@ -1,6 +1,6 @@ # vim: ft=Dockerfile -FROM archlinux/base:latest +FROM archlinux:base-devel RUN pacman -Syu --noconfirm && \ pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection --noconfirm From a8edc0886d6524e3df46e58f98bc86184fa05bb1 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 3 Jul 2021 00:28:43 +0200 Subject: [PATCH 257/355] Delete .travis.yml --- .travis.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index abc739cd..00000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -language: cpp - -services: - - docker - -git: - submodules: false - -env: - - distro: debian - - distro: archlinux - - distro: fedora - - distro: alpine - - distro: opensuse - -before_install: - - docker pull alexays/waybar:${distro} - - find . -type f \( -name '*.cpp' -o -name '*.h' \) -print0 | xargs -r0 clang-format -i - -script: - - echo FROM alexays/waybar:${distro} > Dockerfile - - echo ADD . /root >> Dockerfile - - docker build -t waybar . - - docker run waybar /bin/sh -c "cd /root && meson build -Dman-pages=enabled && ninja -C build" - -jobs: - include: - - os: freebsd - compiler: clang - env: - before_install: - - export CPPFLAGS+=-isystem/usr/local/include LDFLAGS+=-L/usr/local/lib # sndio - - sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf - - sudo pkg install -y gtk-layer-shell gtkmm30 jsoncpp libdbusmenu sndio - libfmt libmpdclient libudev-devd meson pulseaudio scdoc spdlog - script: - - meson build -Dman-pages=enabled - - ninja -C build From 569517c53164a8df6bfa2697bd4b7a97f44d0eb6 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 3 Jul 2021 00:55:59 +0200 Subject: [PATCH 258/355] chore: update freebsd-vm to 0.1.4 --- .github/workflows/freebsd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 74422eec..2fde6107 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Test in FreeBSD VM - uses: vmactions/freebsd-vm@v0.1.3 # aka FreeBSD 12.2 + uses: vmactions/freebsd-vm@v0.1.4 # aka FreeBSD 12.2 with: usesh: true prepare: | From 78aaa5c1b448dc3d744cd6e8cc1a5ee466774107 Mon Sep 17 00:00:00 2001 From: tiosgz Date: Sat, 10 Jul 2021 20:22:37 +0000 Subject: [PATCH 259/355] Do not fail to parse a multi-bar config --- include/client.hpp | 1 + man/waybar.5.scd.in | 3 ++- src/client.cpp | 48 +++++++++++++++++++++++++++++++++++---------- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index a54bf4b4..e7fa1db0 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -39,6 +39,7 @@ class Client { void handleOutput(struct waybar_output &output); bool isValidOutput(const Json::Value &config, struct waybar_output &output); auto setupConfig(const std::string &config_file, int depth) -> void; + auto resolveConfigIncludes(Json::Value &config, int depth) -> void; auto mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void; auto setupCss(const std::string &css_file) -> void; struct waybar_output & getOutput(void *); diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index 6e6dd13a..0168de38 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -86,8 +86,9 @@ Also a minimal example configuration can be found on the at the bottom of this m Only functional if compiled with gtk-layer-shell support. *include* ++ - typeof: array ++ + typeof: string|array ++ Paths to additional configuration files. In case of duplicate options, the including file's value takes precedence. Make sure to avoid circular imports. + For a multi-bar config, specify at least an empty object for each bar also in every file being included. # MODULE FORMAT diff --git a/src/client.cpp b/src/client.cpp index 07c0b23d..ff6e7bf2 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -245,22 +245,50 @@ auto waybar::Client::setupConfig(const std::string &config_file, int depth) -> v std::string str((std::istreambuf_iterator(file)), std::istreambuf_iterator()); util::JsonParser parser; Json::Value tmp_config_ = parser.parse(str); - if (tmp_config_["include"].isArray()) { - for (const auto &include : tmp_config_["include"]) { - spdlog::info("Including resource file: {}", include.asString()); - setupConfig(getValidPath({include.asString()}), ++depth); + if (tmp_config_.isArray()) { + for (auto &config_part : tmp_config_) { + resolveConfigIncludes(config_part, depth); } + } else { + resolveConfigIncludes(tmp_config_, depth); } mergeConfig(config_, tmp_config_); } -auto waybar::Client::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void { - for (const auto &key : b_config_.getMemberNames()) { - if (a_config_[key].type() == Json::objectValue && b_config_[key].type() == Json::objectValue) { - mergeConfig(a_config_[key], b_config_[key]); - } else { - a_config_[key] = b_config_[key]; +auto waybar::Client::resolveConfigIncludes(Json::Value &config, int depth) -> void { + Json::Value includes = config["include"]; + if (includes.isArray()) { + for (const auto &include : includes) { + spdlog::info("Including resource file: {}", include.asString()); + setupConfig(getValidPath({include.asString()}), ++depth); } + } else if (includes.isString()) { + spdlog::info("Including resource file: {}", includes.asString()); + setupConfig(getValidPath({includes.asString()}), ++depth); + } +} + +auto waybar::Client::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void { + if (!a_config_) { + // For the first config + a_config_ = b_config_; + } else if (a_config_.isObject() && b_config_.isObject()) { + for (const auto &key : b_config_.getMemberNames()) { + if (a_config_[key].isObject() && b_config_[key].isObject()) { + mergeConfig(a_config_[key], b_config_[key]); + } else { + a_config_[key] = b_config_[key]; + } + } + } else if (a_config_.isArray() && b_config_.isArray()) { + // This can happen only on the top-level array of a multi-bar config + for (Json::Value::ArrayIndex i = 0; i < b_config_.size(); i++) { + if (a_config_[i].isObject() && b_config_[i].isObject()) { + mergeConfig(a_config_[i], b_config_[i]); + } + } + } else { + spdlog::error("Cannot merge config, conflicting or invalid JSON types"); } } From 8310700bbb52af17477cedc61ea9f660c7965053 Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 13 Jul 2021 04:33:12 +0300 Subject: [PATCH 260/355] Improve sway/language --- include/modules/sway/ipc/ipc.hpp | 4 + include/modules/sway/language.hpp | 40 +++++++- include/util/string.hpp | 15 +++ man/waybar-sway-language.5.scd | 59 +++--------- meson.build | 4 +- src/modules/sway/language.cpp | 148 +++++++++++++++++++++++++----- 6 files changed, 197 insertions(+), 73 deletions(-) create mode 100644 include/util/string.hpp diff --git a/include/modules/sway/ipc/ipc.hpp b/include/modules/sway/ipc/ipc.hpp index 2c5a7a6e..5f23d172 100644 --- a/include/modules/sway/ipc/ipc.hpp +++ b/include/modules/sway/ipc/ipc.hpp @@ -29,4 +29,8 @@ enum ipc_command_type { IPC_EVENT_BINDING = ((1 << 31) | 5), IPC_EVENT_SHUTDOWN = ((1 << 31) | 6), IPC_EVENT_TICK = ((1 << 31) | 7), + + // sway-specific event types + IPC_EVENT_BAR_STATE_UPDATE = ((1<<31) | 20), + IPC_EVENT_INPUT = ((1<<31) | 21), }; diff --git a/include/modules/sway/language.hpp b/include/modules/sway/language.hpp index 7cd6bf62..fb4438bb 100644 --- a/include/modules/sway/language.hpp +++ b/include/modules/sway/language.hpp @@ -1,6 +1,11 @@ #pragma once #include +#include + +#include +#include + #include "ALabel.hpp" #include "bar.hpp" #include "client.hpp" @@ -16,13 +21,40 @@ class Language : public ALabel, public sigc::trackable { auto update() -> void; private: + struct Layout { + std::string full_name; + std::string short_name; + std::string variant; + }; + + class XKBContext { + public: + XKBContext(); + ~XKBContext(); + auto next_layout() -> Layout*; + private: + rxkb_context* context_ = nullptr; + rxkb_layout* xkb_layout_ = nullptr; + Layout* layout_ = nullptr; + }; + void onEvent(const struct Ipc::ipc_response&); void onCmd(const struct Ipc::ipc_response&); + + auto set_current_layout(std::string current_layout) -> void; + auto init_layouts_map(const std::vector& used_layouts) -> void; + + const static std::string XKB_LAYOUT_NAMES_KEY; + const static std::string XKB_ACTIVE_LAYOUT_NAME_KEY; - std::string lang_; - util::JsonParser parser_; - std::mutex mutex_; - Ipc ipc_; + Layout layout_; + std::map layouts_map_; + XKBContext xkb_context_; + bool is_variant_displayed; + + util::JsonParser parser_; + std::mutex mutex_; + Ipc ipc_; }; } // namespace waybar::modules::sway diff --git a/include/util/string.hpp b/include/util/string.hpp new file mode 100644 index 00000000..d644b4c4 --- /dev/null +++ b/include/util/string.hpp @@ -0,0 +1,15 @@ +#include + +const std::string WHITESPACE = " \n\r\t\f\v"; + +std::string ltrim(const std::string s) { + size_t begin = s.find_first_not_of(WHITESPACE); + return (begin == std::string::npos) ? "" : s.substr(begin); +} + +std::string rtrim(const std::string s) { + size_t end = s.find_last_not_of(WHITESPACE); + return (end == std::string::npos) ? "" : s.substr(0, end + 1); +} + +std::string trim(const std::string& s) { return rtrim(ltrim(s)); } diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd index 769924f0..f7f88304 100644 --- a/man/waybar-sway-language.5.scd +++ b/man/waybar-sway-language.5.scd @@ -15,63 +15,30 @@ Addressed by *sway/language* *format*: ++ typeof: string ++ default: {} ++ - The format, how information should be displayed. On {} data gets inserted. - -*rotate*: ++ - typeof: integer ++ - Positive value to rotate the text label. - -*max-length*: ++ - typeof: integer ++ - The maximum length in character the module should display. - -*min-length*: ++ - typeof: integer ++ - The minimum length in characters the module should take up. - -*align*: ++ - typeof: float ++ - The alignment of the text, where 0 is left-aligned and 1 is right-aligned. If the module is rotated, it will follow the flow of the text. - -*on-click*: ++ - typeof: string ++ - Command to execute when clicked on the module. - -*on-click-middle*: ++ - typeof: string ++ - Command to execute when middle-clicked on the module using mousewheel. - -*on-click-right*: ++ - typeof: string ++ - Command to execute when you right clicked on the module. - -*on-update*: ++ - typeof: string ++ - Command to execute when the module is updated. - -*on-scroll-up*: ++ - typeof: string ++ - Command to execute when scrolling up on the module. - -*on-scroll-down*: ++ - typeof: string ++ - Command to execute when scrolling down on the module. - -*smooth-scrolling-threshold*: ++ - typeof: double ++ - Threshold to be used when scrolling. + The format, how layout should be displayed. *tooltip*: ++ typeof: bool ++ default: true ++ Option to disable tooltip on hover. +# FORMAT REPLACEMENTS + +*{short}*: Short name of layout (e.g. "en"). Equals to {}. + +*{long}*: Long name of layout (e.g. "English (Dvorak)"). + +*{variant}*: Variant of layout (e.g. "Dvorak"). + # EXAMPLES ``` "sway/language": { "format": "{}", - "max-length": 50 +}, + +"sway/language": { + "format": "{short} {variant}", } ``` diff --git a/meson.build b/meson.build index e80448e0..1bd1f027 100644 --- a/meson.build +++ b/meson.build @@ -95,6 +95,7 @@ libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl')) libpulse = dependency('libpulse', required: get_option('pulseaudio')) libudev = dependency('libudev', required: get_option('libudev')) libmpdclient = dependency('libmpdclient', required: get_option('mpd')) +xkbregistry = dependency('xkbregistry') libsndio = compiler.find_library('sndio', required: get_option('sndio')) if libsndio.found() @@ -272,7 +273,8 @@ executable( libmpdclient, gtk_layer_shell, libsndio, - tz_dep + tz_dep, + xkbregistry ], include_directories: [include_directories('include')], install: true, diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index 4d27fb88..86a8e1eb 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -1,10 +1,24 @@ #include "modules/sway/language.hpp" + +#include #include +#include + +#include +#include +#include + +#include "modules/sway/ipc/ipc.hpp" +#include "util/string.hpp" namespace waybar::modules::sway { +const std::string Language::XKB_LAYOUT_NAMES_KEY = "xkb_layout_names"; +const std::string Language::XKB_ACTIVE_LAYOUT_NAME_KEY = "xkb_active_layout_name"; + Language::Language(const std::string& id, const Json::Value& config) : ALabel(config, "language", id, "{}", 0, true) { + is_variant_displayed = format_.find("{variant}") != std::string::npos; ipc_.subscribe(R"(["input"])"); ipc_.signal_event.connect(sigc::mem_fun(*this, &Language::onEvent)); ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Language::onCmd)); @@ -21,18 +35,31 @@ Language::Language(const std::string& id, const Json::Value& config) } void Language::onCmd(const struct Ipc::ipc_response& res) { + if (res.type != static_cast(IPC_GET_INPUTS)) { + return; + } + try { - auto payload = parser_.parse(res.payload); - //Display current layout of a device with a maximum count of layouts, expecting that all will be OK - Json::Value::ArrayIndex maxId = 0, max = 0; - for(Json::Value::ArrayIndex i = 0; i < payload.size(); i++) { - if(payload[i]["xkb_layout_names"].size() > max) { - max = payload[i]["xkb_layout_names"].size(); - maxId = i; + std::lock_guard lock(mutex_); + auto payload = parser_.parse(res.payload); + std::vector used_layouts; + // Display current layout of a device with a maximum count of layouts, expecting that all will + // be OK + Json::ArrayIndex max_id = 0, max = 0; + for (Json::ArrayIndex i = 0; i < payload.size(); i++) { + auto size = payload[i][XKB_LAYOUT_NAMES_KEY].size(); + if (size > max) { + max = size; + max_id = i; } } - auto layout_name = payload[maxId]["xkb_active_layout_name"].asString().substr(0,2); - lang_ = Glib::Markup::escape_text(layout_name); + + for (const auto& layout : payload[max_id][XKB_LAYOUT_NAMES_KEY]) { + used_layouts.push_back(layout.asString()); + } + + init_layouts_map(used_layouts); + set_current_layout(payload[max_id][XKB_ACTIVE_LAYOUT_NAME_KEY].asString()); dp.emit(); } catch (const std::exception& e) { spdlog::error("Language: {}", e.what()); @@ -40,14 +67,15 @@ void Language::onCmd(const struct Ipc::ipc_response& res) { } void Language::onEvent(const struct Ipc::ipc_response& res) { + if (res.type != static_cast(IPC_EVENT_INPUT)) { + return; + } + try { std::lock_guard lock(mutex_); - auto payload = parser_.parse(res.payload)["input"]; + auto payload = parser_.parse(res.payload)["input"]; if (payload["type"].asString() == "keyboard") { - auto layout_name = payload["xkb_active_layout_name"].asString().substr(0,2); - if (!layout_name.empty()) { - lang_ = Glib::Markup::escape_text(layout_name); - } + set_current_layout(payload[XKB_ACTIVE_LAYOUT_NAME_KEY].asString()); } dp.emit(); } catch (const std::exception& e) { @@ -56,17 +84,93 @@ void Language::onEvent(const struct Ipc::ipc_response& res) { } auto Language::update() -> void { - if (lang_.empty()) { - event_box_.hide(); - } else { - label_.set_markup(fmt::format(format_, lang_)); - if (tooltipEnabled()) { - label_.set_tooltip_text(lang_); - } - event_box_.show(); + auto display_layout = trim(fmt::format(format_, + fmt::arg("short", layout_.short_name), + fmt::arg("long", layout_.full_name), + fmt::arg("variant", layout_.variant))); + label_.set_markup(display_layout); + if (tooltipEnabled()) { + label_.set_tooltip_markup(display_layout); } + + event_box_.show(); + // Call parent update ALabel::update(); } +auto Language::set_current_layout(std::string current_layout) -> void { + layout_ = layouts_map_[current_layout]; +} + +auto Language::init_layouts_map(const std::vector& used_layouts) -> void { + std::map> found_by_short_names; + auto layout = xkb_context_.next_layout(); + for (; layout != nullptr; layout = xkb_context_.next_layout()) { + if (std::find(used_layouts.begin(), used_layouts.end(), layout->full_name) == + used_layouts.end()) { + continue; + } + + if (!is_variant_displayed) { + auto short_name = layout->short_name; + if (found_by_short_names.count(short_name) > 0) { + found_by_short_names[short_name].push_back(layout); + } else { + found_by_short_names[short_name] = {layout}; + } + } + + layouts_map_.emplace(layout->full_name, *layout); + } + + if (is_variant_displayed || found_by_short_names.size() == 0) { + return; + } + + std::map short_name_to_number_map; + for (const auto& used_layout_name : used_layouts) { + auto used_layout = &layouts_map_.find(used_layout_name)->second; + auto layouts_with_same_name_list = found_by_short_names[used_layout->short_name]; + spdlog::info("SIZE: " + std::to_string(layouts_with_same_name_list.size())); + if (layouts_with_same_name_list.size() < 2) { + continue; + } + + if (short_name_to_number_map.count(used_layout->short_name) == 0) { + short_name_to_number_map[used_layout->short_name] = 1; + } + + used_layout->short_name = + used_layout->short_name + std::to_string(short_name_to_number_map[used_layout->short_name]++); + } +} + +Language::XKBContext::XKBContext() { + context_ = rxkb_context_new(RXKB_CONTEXT_NO_DEFAULT_INCLUDES); + rxkb_context_include_path_append_default(context_); + rxkb_context_parse_default_ruleset(context_); +} + +auto Language::XKBContext::next_layout() -> Layout* { + if (xkb_layout_ == nullptr) { + xkb_layout_ = rxkb_layout_first(context_); + } else { + xkb_layout_ = rxkb_layout_next(xkb_layout_); + } + + if (xkb_layout_ == nullptr) { + return nullptr; + } + + auto description = std::string(rxkb_layout_get_description(xkb_layout_)); + auto name = std::string(rxkb_layout_get_name(xkb_layout_)); + auto variant_ = rxkb_layout_get_variant(xkb_layout_); + std::string variant = variant_ == nullptr ? "" : std::string(variant_); + + layout_ = new Layout{description, name, variant}; + return layout_; +} + +Language::XKBContext::~XKBContext() { rxkb_context_unref(context_); } } // namespace waybar::modules::sway From 9cce5ea6b536a0dace941fd233a0c54c3462b9d8 Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 13 Jul 2021 04:49:19 +0300 Subject: [PATCH 261/355] Update dockerfiles --- Dockerfiles/alpine | 2 +- Dockerfiles/archlinux | 2 +- Dockerfiles/debian | 2 +- Dockerfiles/fedora | 2 +- Dockerfiles/opensuse | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfiles/alpine b/Dockerfiles/alpine index 21d1cbba..c0e032ff 100644 --- a/Dockerfiles/alpine +++ b/Dockerfiles/alpine @@ -2,4 +2,4 @@ FROM alpine:latest -RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev pugixml-dev libnl3-dev pulseaudio-dev libmpdclient-dev sndio-dev scdoc +RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev pugixml-dev libnl3-dev pulseaudio-dev libmpdclient-dev sndio-dev scdoc libxkbcommon diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux index e5a53ef5..40a1b2e3 100644 --- a/Dockerfiles/archlinux +++ b/Dockerfiles/archlinux @@ -3,4 +3,4 @@ FROM archlinux:base-devel RUN pacman -Syu --noconfirm && \ - pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection --noconfirm + pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection --noconfirm libxkbcommon diff --git a/Dockerfiles/debian b/Dockerfiles/debian index cee17441..f7f6e633 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -3,5 +3,5 @@ FROM debian:sid RUN apt-get update && \ - apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev && \ + apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon && \ apt-get clean diff --git a/Dockerfiles/fedora b/Dockerfiles/fedora index 77c77cb8..470ceb7d 100644 --- a/Dockerfiles/fedora +++ b/Dockerfiles/fedora @@ -8,5 +8,5 @@ RUN dnf install -y @c-development git-core meson scdoc 'pkgconfig(date)' \ 'pkgconfig(jsoncpp)' 'pkgconfig(libinput)' 'pkgconfig(libmpdclient)' \ 'pkgconfig(libnl-3.0)' 'pkgconfig(libnl-genl-3.0)' 'pkgconfig(libpulse)' \ 'pkgconfig(libudev)' 'pkgconfig(pugixml)' 'pkgconfig(sigc++-2.0)' 'pkgconfig(spdlog)' \ - 'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' && \ + 'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' 'pkgconfig(xkbcommon)' && \ dnf clean all -y diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse index 5b664fb2..eb231fdb 100644 --- a/Dockerfiles/opensuse +++ b/Dockerfiles/opensuse @@ -4,4 +4,4 @@ FROM opensuse/tumbleweed:latest RUN zypper -n up && \ zypper -n install -t pattern devel_C_C++ && \ - zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc + zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc libxkbcommon From 9c2b5efe7b5f9acd934595fcd8f27d2404ea0668 Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Thu, 15 Jul 2021 08:52:02 +0200 Subject: [PATCH 262/355] Support per-device icon in pulseaudio --- include/ALabel.hpp | 2 +- include/modules/pulseaudio.hpp | 2 +- man/waybar-pulseaudio.5.scd | 4 ++++ src/ALabel.cpp | 2 +- src/modules/pulseaudio.cpp | 12 +++++++----- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/ALabel.hpp b/include/ALabel.hpp index 5b9ac541..d8a5b504 100644 --- a/include/ALabel.hpp +++ b/include/ALabel.hpp @@ -14,7 +14,7 @@ class ALabel : public AModule { virtual ~ALabel() = default; virtual auto update() -> void; virtual std::string getIcon(uint16_t, const std::string &alt = "", uint16_t max = 0); - virtual std::string getIcon(uint16_t, std::vector &alts, uint16_t max = 0); + virtual std::string getIcon(uint16_t, const std::vector &alts, uint16_t max = 0); protected: Gtk::Label label_; diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp index 5f17620a..9b36dfee 100644 --- a/include/modules/pulseaudio.hpp +++ b/include/modules/pulseaudio.hpp @@ -24,7 +24,7 @@ class Pulseaudio : public ALabel { static void volumeModifyCb(pa_context*, int, void*); bool handleScroll(GdkEventScroll* e); - const std::string getPortIcon() const; + const std::vector getPulseIcon() const; pa_threaded_mainloop* mainloop_; pa_mainloop_api* mainloop_api_; diff --git a/man/waybar-pulseaudio.5.scd b/man/waybar-pulseaudio.5.scd index d894290f..7de10281 100644 --- a/man/waybar-pulseaudio.5.scd +++ b/man/waybar-pulseaudio.5.scd @@ -109,6 +109,9 @@ Additionally you can control the volume by scrolling *up* or *down* while the cu # ICONS: The following strings for *format-icons* are supported. + +- the device name + If they are found in the current PulseAudio port name, the corresponding icons will be selected. - *default* (Shown, when no other port is found) @@ -131,6 +134,7 @@ If they are found in the current PulseAudio port name, the corresponding icons w "format-bluetooth": "{volume}% {icon}", "format-muted": "", "format-icons": { + "alsa_output.pci-0000_00_1f.3.analog-stereo": "", "headphones": "", "handsfree": "", "headset": "", diff --git a/src/ALabel.cpp b/src/ALabel.cpp index 8d9c9b41..dd41a32c 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -76,7 +76,7 @@ std::string ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_ return ""; } -std::string ALabel::getIcon(uint16_t percentage, std::vector& alts, uint16_t max) { +std::string ALabel::getIcon(uint16_t percentage, const std::vector& alts, uint16_t max) { auto format_icons = config_["format-icons"]; if (format_icons.isObject()) { std::string _alt = "default"; diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index 3fbe9569..a7cdcec1 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -194,15 +194,17 @@ static const std::array ports = { "phone", }; -const std::string waybar::modules::Pulseaudio::getPortIcon() const { +const std::vector waybar::modules::Pulseaudio::getPulseIcon() const { + std::vector res = {default_sink_name_}; std::string nameLC = port_name_ + form_factor_; std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower); for (auto const &port : ports) { if (nameLC.find(port) != std::string::npos) { - return port; + res.push_back(port); + return res; } } - return port_name_; + return res; } auto waybar::modules::Pulseaudio::update() -> void { @@ -252,7 +254,7 @@ auto waybar::modules::Pulseaudio::update() -> void { fmt::arg("format_source", format_source), fmt::arg("source_volume", source_volume_), fmt::arg("source_desc", source_desc_), - fmt::arg("icon", getIcon(volume_, getPortIcon())))); + fmt::arg("icon", getIcon(volume_, getPulseIcon())))); getState(volume_); if (tooltipEnabled()) { @@ -267,7 +269,7 @@ auto waybar::modules::Pulseaudio::update() -> void { fmt::arg("format_source", format_source), fmt::arg("source_volume", source_volume_), fmt::arg("source_desc", source_desc_), - fmt::arg("icon", getIcon(volume_, getPortIcon())))); + fmt::arg("icon", getIcon(volume_, getPulseIcon())))); } else { label_.set_tooltip_text(desc_); } From 948eba92a540b52443b1e0b0a414b7ec6de83cab Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 13 Jul 2021 04:49:19 +0300 Subject: [PATCH 263/355] Update dockerfiles --- Dockerfiles/alpine | 2 +- Dockerfiles/archlinux | 2 +- Dockerfiles/debian | 2 +- Dockerfiles/fedora | 2 +- Dockerfiles/opensuse | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfiles/alpine b/Dockerfiles/alpine index 21d1cbba..c0e032ff 100644 --- a/Dockerfiles/alpine +++ b/Dockerfiles/alpine @@ -2,4 +2,4 @@ FROM alpine:latest -RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev pugixml-dev libnl3-dev pulseaudio-dev libmpdclient-dev sndio-dev scdoc +RUN apk add --no-cache git meson alpine-sdk libinput-dev wayland-dev wayland-protocols mesa-dev libxkbcommon-dev eudev-dev pixman-dev gtkmm3-dev jsoncpp-dev pugixml-dev libnl3-dev pulseaudio-dev libmpdclient-dev sndio-dev scdoc libxkbcommon diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux index e5a53ef5..40a1b2e3 100644 --- a/Dockerfiles/archlinux +++ b/Dockerfiles/archlinux @@ -3,4 +3,4 @@ FROM archlinux:base-devel RUN pacman -Syu --noconfirm && \ - pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection --noconfirm + pacman -S git meson base-devel libinput wayland wayland-protocols pixman libxkbcommon mesa gtkmm3 jsoncpp pugixml scdoc libpulse libdbusmenu-gtk3 libmpdclient gobject-introspection --noconfirm libxkbcommon diff --git a/Dockerfiles/debian b/Dockerfiles/debian index cee17441..f7f6e633 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -3,5 +3,5 @@ FROM debian:sid RUN apt-get update && \ - apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev && \ + apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon && \ apt-get clean diff --git a/Dockerfiles/fedora b/Dockerfiles/fedora index 77c77cb8..470ceb7d 100644 --- a/Dockerfiles/fedora +++ b/Dockerfiles/fedora @@ -8,5 +8,5 @@ RUN dnf install -y @c-development git-core meson scdoc 'pkgconfig(date)' \ 'pkgconfig(jsoncpp)' 'pkgconfig(libinput)' 'pkgconfig(libmpdclient)' \ 'pkgconfig(libnl-3.0)' 'pkgconfig(libnl-genl-3.0)' 'pkgconfig(libpulse)' \ 'pkgconfig(libudev)' 'pkgconfig(pugixml)' 'pkgconfig(sigc++-2.0)' 'pkgconfig(spdlog)' \ - 'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' && \ + 'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' 'pkgconfig(xkbcommon)' && \ dnf clean all -y diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse index 5b664fb2..eb231fdb 100644 --- a/Dockerfiles/opensuse +++ b/Dockerfiles/opensuse @@ -4,4 +4,4 @@ FROM opensuse/tumbleweed:latest RUN zypper -n up && \ zypper -n install -t pattern devel_C_C++ && \ - zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc + zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc libxkbcommon From 2506c0104a12e017721849ff9b5541b5675e4c7a Mon Sep 17 00:00:00 2001 From: Anakael Date: Fri, 16 Jul 2021 11:37:58 +0300 Subject: [PATCH 264/355] Update Dockerfiles/fedora Co-authored-by: Aleksei Bavshin --- Dockerfiles/fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/fedora b/Dockerfiles/fedora index 470ceb7d..a61dcd3e 100644 --- a/Dockerfiles/fedora +++ b/Dockerfiles/fedora @@ -8,5 +8,5 @@ RUN dnf install -y @c-development git-core meson scdoc 'pkgconfig(date)' \ 'pkgconfig(jsoncpp)' 'pkgconfig(libinput)' 'pkgconfig(libmpdclient)' \ 'pkgconfig(libnl-3.0)' 'pkgconfig(libnl-genl-3.0)' 'pkgconfig(libpulse)' \ 'pkgconfig(libudev)' 'pkgconfig(pugixml)' 'pkgconfig(sigc++-2.0)' 'pkgconfig(spdlog)' \ - 'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' 'pkgconfig(xkbcommon)' && \ + 'pkgconfig(wayland-client)' 'pkgconfig(wayland-cursor)' 'pkgconfig(wayland-protocols)' 'pkgconfig(xkbregistry)' && \ dnf clean all -y From 86a43b904214613b2470db65746367b7721bd929 Mon Sep 17 00:00:00 2001 From: Roosembert Palacios Date: Tue, 20 Jul 2021 10:11:55 +0200 Subject: [PATCH 265/355] pulseaudio: Control currently running sink In a system with multiple sinks, the default sink may not always be the once currently being used. It is more useful to control the currently active sink rather than an unused one. This patch does not make any difference if the system only uses the default sink. Signed-off-by: Roosembert Palacios --- include/modules/pulseaudio.hpp | 3 ++- src/modules/pulseaudio.cpp | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp index 5f17620a..f636c002 100644 --- a/include/modules/pulseaudio.hpp +++ b/include/modules/pulseaudio.hpp @@ -38,7 +38,8 @@ class Pulseaudio : public ALabel { std::string form_factor_; std::string desc_; std::string monitor_; - std::string default_sink_name_; + std::string current_sink_name_; + bool current_sink_running_; // SOURCE uint32_t source_idx_{0}; uint16_t source_volume_; diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index 3fbe9569..c0299fc4 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -151,8 +151,24 @@ void waybar::modules::Pulseaudio::sourceInfoCb(pa_context * /*context*/, const p */ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_sink_info *i, int /*eol*/, void *data) { + if (i == nullptr) + return; + auto pa = static_cast(data); - if (i != nullptr && pa->default_sink_name_ == i->name) { + if (pa->current_sink_name_ == i->name) { + if (i->state != PA_SINK_RUNNING) { + pa->current_sink_running_ = false; + } else { + pa->current_sink_running_ = true; + } + } + + if (!pa->current_sink_running_ && i->state == PA_SINK_RUNNING) { + pa->current_sink_name_ = i->name; + pa->current_sink_running_ = true; + } + + if (pa->current_sink_name_ == i->name) { pa->pa_volume_ = i->volume; float volume = static_cast(pa_cvolume_avg(&(pa->pa_volume_))) / float{PA_VOLUME_NORM}; pa->sink_idx_ = i->index; @@ -175,11 +191,11 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context, const pa_server_info *i, void *data) { auto pa = static_cast(data); - pa->default_sink_name_ = i->default_sink_name; + pa->current_sink_name_ = i->default_sink_name; pa->default_source_name_ = i->default_source_name; - pa_context_get_sink_info_by_name(context, i->default_sink_name, sinkInfoCb, data); - pa_context_get_source_info_by_name(context, i->default_source_name, sourceInfoCb, data); + pa_context_get_sink_info_list(context, sinkInfoCb, data); + pa_context_get_source_info_list(context, sourceInfoCb, data); } static const std::array ports = { From 6f2bfd43bf2a92ffefd880c6923af757b6565665 Mon Sep 17 00:00:00 2001 From: Lars Christensen Date: Tue, 20 Jul 2021 15:25:05 +0200 Subject: [PATCH 266/355] Fix pulseaudio icon name compilation error --- src/modules/pulseaudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp index bd90375b..cf427800 100644 --- a/src/modules/pulseaudio.cpp +++ b/src/modules/pulseaudio.cpp @@ -211,7 +211,7 @@ static const std::array ports = { }; const std::vector waybar::modules::Pulseaudio::getPulseIcon() const { - std::vector res = {default_sink_name_}; + std::vector res = {default_source_name_}; std::string nameLC = port_name_ + form_factor_; std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower); for (auto const &port : ports) { From 6dfa31fb1778da2989a28179304f9e1ccf1e3e4e Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Sun, 7 Feb 2021 15:05:11 -0500 Subject: [PATCH 267/355] Basic keyboard state module --- README.md | 2 + include/factory.hpp | 3 ++ include/modules/keyboard_state.hpp | 31 +++++++++++++ meson.build | 7 +++ meson_options.txt | 1 + src/factory.cpp | 5 ++ src/modules/keyboard_state.cpp | 73 ++++++++++++++++++++++++++++++ 7 files changed, 122 insertions(+) create mode 100644 include/modules/keyboard_state.hpp create mode 100644 src/modules/keyboard_state.cpp diff --git a/README.md b/README.md index b104adec..37c0cfc7 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ libappindicator-gtk3 [Tray module] libdbusmenu-gtk3 [Tray module] libmpdclient [MPD module] libsndio [sndio module] +libevdev [KeyboardState module] ``` **Build dependencies** @@ -86,6 +87,7 @@ sudo apt install \ clang-tidy \ gobject-introspection \ libdbusmenu-gtk3-dev \ + libevdev-dev \ libfmt-dev \ libgirepository1.0-dev \ libgtk-3-dev \ diff --git a/include/factory.hpp b/include/factory.hpp index 1cae68c9..4b9f32aa 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -38,6 +38,9 @@ #ifdef HAVE_LIBUDEV #include "modules/backlight.hpp" #endif +#ifdef HAVE_LIBEVDEV +#include "modules/keyboard_state.hpp" +#endif #ifdef HAVE_LIBPULSE #include "modules/pulseaudio.hpp" #endif diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp new file mode 100644 index 00000000..99ed602b --- /dev/null +++ b/include/modules/keyboard_state.hpp @@ -0,0 +1,31 @@ +#pragma once + +#include +#if FMT_VERSION < 60000 +#include +#else +#include +#endif +#include "ALabel.hpp" +#include "util/sleeper_thread.hpp" + +extern "C" { +#include +} + +namespace waybar::modules { + +class KeyboardState : public ALabel { + public: + KeyboardState(const std::string&, const Json::Value&); + ~KeyboardState(); + auto update() -> void; + + private: + std::string dev_path_; + int fd_; + libevdev* dev_; + util::SleeperThread thread_; +}; + +} // namespace waybar::modules diff --git a/meson.build b/meson.build index e80448e0..7ac6fd6a 100644 --- a/meson.build +++ b/meson.build @@ -94,6 +94,7 @@ libnl = dependency('libnl-3.0', required: get_option('libnl')) libnlgen = dependency('libnl-genl-3.0', required: get_option('libnl')) libpulse = dependency('libpulse', required: get_option('pulseaudio')) libudev = dependency('libudev', required: get_option('libudev')) +libevdev = dependency('libevdev', required: get_option('libevdev')) libmpdclient = dependency('libmpdclient', required: get_option('mpd')) libsndio = compiler.find_library('sndio', required: get_option('sndio')) @@ -215,6 +216,11 @@ if libudev.found() and (is_linux or libepoll.found()) src_files += 'src/modules/backlight.cpp' endif +if libevdev.found() and (is_linux or libepoll.found()) + add_project_arguments('-DHAVE_LIBEVDEV', language: 'cpp') + src_files += 'src/modules/keyboard_state.cpp' +endif + if libmpdclient.found() add_project_arguments('-DHAVE_LIBMPDCLIENT', language: 'cpp') src_files += 'src/modules/mpd/mpd.cpp' @@ -270,6 +276,7 @@ executable( libudev, libepoll, libmpdclient, + libevdev, gtk_layer_shell, libsndio, tz_dep diff --git a/meson_options.txt b/meson_options.txt index cb5581b3..fefb3dc3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,7 @@ option('libcxx', type : 'boolean', value : false, description : 'Build with Clang\'s libc++ instead of libstdc++ on Linux.') option('libnl', type: 'feature', value: 'auto', description: 'Enable libnl support for network related features') option('libudev', type: 'feature', value: 'auto', description: 'Enable libudev support for udev related features') +option('libevdev', type: 'feature', value: 'auto', description: 'Enable libevdev support for evdev related features') option('pulseaudio', type: 'feature', value: 'auto', description: 'Enable support for pulseaudio') option('systemd', type: 'feature', value: 'auto', description: 'Install systemd user service unit') option('dbusmenu-gtk', type: 'feature', value: 'auto', description: 'Enable support for tray') diff --git a/src/factory.cpp b/src/factory.cpp index 1f907894..cab23079 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -70,6 +70,11 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { return new waybar::modules::Backlight(id, config_[name]); } #endif +#ifdef HAVE_LIBEVDEV + if (ref == "keyboard_state") { + return new waybar::modules::KeyboardState(id, config_[name]); + } +#endif #ifdef HAVE_LIBPULSE if (ref == "pulseaudio") { return new waybar::modules::Pulseaudio(id, config_[name]); diff --git a/src/modules/keyboard_state.cpp b/src/modules/keyboard_state.cpp new file mode 100644 index 00000000..ea9ae577 --- /dev/null +++ b/src/modules/keyboard_state.cpp @@ -0,0 +1,73 @@ +#include "modules/keyboard_state.hpp" +#include + +extern "C" { +#include +#include +#include +} + +waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Json::Value& config) + : ALabel(config, "keyboard_state", id, "{temperatureC}", 1) { + if (config_["device-path"].isString()) { + dev_path_ = config_["device-path"].asString(); + } else { + dev_path_ = ""; + } + + fd_ = open(dev_path_.c_str(), O_NONBLOCK | O_CLOEXEC | O_RDONLY); + if (fd_ < 0) { + throw std::runtime_error("Can't open " + dev_path_); + } + int err = libevdev_new_from_fd(fd_, &dev_); + if (err < 0) { + throw std::runtime_error("Can't create libevdev device"); + } + if (!libevdev_has_event_type(dev_, EV_LED)) { + throw std::runtime_error("Device doesn't support LED events"); + } + if (!libevdev_has_event_code(dev_, EV_LED, LED_NUML) || !libevdev_has_event_code(dev_, EV_LED, LED_CAPSL)) { + throw std::runtime_error("Device doesn't support num lock or caps lock events"); + } + + thread_ = [this] { + dp.emit(); + thread_.sleep_for(interval_); + }; +} + +waybar::modules::KeyboardState::~KeyboardState() { + libevdev_free(dev_); + int err = close(fd_); + if (err < 0) { + // Not much we can do, so ignore it. + } +} + +auto waybar::modules::KeyboardState::update() -> void { + int err = LIBEVDEV_READ_STATUS_SUCCESS; + while (err == LIBEVDEV_READ_STATUS_SUCCESS) { + input_event ev; + err = libevdev_next_event(dev_, LIBEVDEV_READ_FLAG_NORMAL, &ev); + while (err == LIBEVDEV_READ_STATUS_SYNC) { + err = libevdev_next_event(dev_, LIBEVDEV_READ_FLAG_SYNC, &ev); + } + } + if (err != -EAGAIN) { + throw std::runtime_error("Failed to sync evdev device"); + } + + int numl = libevdev_get_event_value(dev_, EV_LED, LED_NUML); + //int capsl = libevdev_get_event_value(dev_, EV_LED, LED_CAPSL); + + std::string text; + if (numl) { + text = fmt::format(format_, "num lock enabled"); + label_.set_markup(text); + } else { + text = fmt::format(format_, "num lock disabled"); + label_.set_markup(text); + } + + ALabel::update(); +} From 642e28166b784244fda45cc90832b75951969372 Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Sun, 7 Feb 2021 18:46:39 -0500 Subject: [PATCH 268/355] Add more configuaration --- include/modules/keyboard_state.hpp | 22 ++++++++-- resources/config | 13 +++++- src/factory.cpp | 2 +- src/modules/keyboard_state.cpp | 70 ++++++++++++++++++++++++------ 4 files changed, 89 insertions(+), 18 deletions(-) diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp index 99ed602b..0873ad55 100644 --- a/include/modules/keyboard_state.hpp +++ b/include/modules/keyboard_state.hpp @@ -6,8 +6,10 @@ #else #include #endif -#include "ALabel.hpp" +#include "AModule.hpp" +#include "bar.hpp" #include "util/sleeper_thread.hpp" +#include extern "C" { #include @@ -15,16 +17,30 @@ extern "C" { namespace waybar::modules { -class KeyboardState : public ALabel { +class KeyboardState : public AModule { public: - KeyboardState(const std::string&, const Json::Value&); + KeyboardState(const std::string&, const waybar::Bar&, const Json::Value&); ~KeyboardState(); auto update() -> void; private: + const Bar& bar_; + Gtk::Box box_; + Gtk::Label numlock_label_; + Gtk::Label capslock_label_; + Gtk::Label scrolllock_label_; + + std::string numlock_format_; + std::string capslock_format_; + std::string scrolllock_format_; + const std::chrono::seconds interval_; + std::string icon_locked_; + std::string icon_unlocked_; + std::string dev_path_; int fd_; libevdev* dev_; + util::SleeperThread thread_; }; diff --git a/resources/config b/resources/config index 13dc94c1..e7c91c0f 100644 --- a/resources/config +++ b/resources/config @@ -6,7 +6,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], "modules-center": ["sway/window"], - "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "battery#bat2", "clock", "tray"], + "modules-right": ["keyboard_state", "mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration // "sway/workspaces": { // "disable-scroll": true, @@ -23,6 +23,16 @@ // "default": "" // } // }, + "keyboard_state": { + "numlock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + }, + "capslock": true, + "device-path": "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + }, "sway/mode": { "format": "{}" }, @@ -145,3 +155,4 @@ // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name } } + diff --git a/src/factory.cpp b/src/factory.cpp index cab23079..6a0147d9 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -72,7 +72,7 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { #endif #ifdef HAVE_LIBEVDEV if (ref == "keyboard_state") { - return new waybar::modules::KeyboardState(id, config_[name]); + return new waybar::modules::KeyboardState(id, bar_, config_[name]); } #endif #ifdef HAVE_LIBPULSE diff --git a/src/modules/keyboard_state.cpp b/src/modules/keyboard_state.cpp index ea9ae577..b51617f2 100644 --- a/src/modules/keyboard_state.cpp +++ b/src/modules/keyboard_state.cpp @@ -7,8 +7,44 @@ extern "C" { #include } -waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Json::Value& config) - : ALabel(config, "keyboard_state", id, "{temperatureC}", 1) { +waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar& bar, const Json::Value& config) + : AModule(config, "keyboard_state", id, false, !config["disable-scroll"].asBool()), + bar_(bar), + box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0), + numlock_label_(""), + capslock_label_(""), + numlock_format_(config_["format"].isString() ? config_["format"].asString() + : config_["format"]["numlock"].isString() ? config_["format"]["numlock"].asString() + : "{name} {icon}"), + capslock_format_(config_["format"].isString() ? config_["format"].asString() + : config_["format"]["capslock"].isString() ? config_["format"]["capslock"].asString() + : "{name} {icon}"), + scrolllock_format_(config_["format"].isString() ? config_["format"].asString() + : config_["format"]["scrolllock"].isString() ? config_["format"]["scrolllock"].asString() + : "{name} {icon}"), + interval_(std::chrono::seconds(config_["interval"].isUInt() ? config_["interval"].asUInt() : 1)), + icon_locked_(config_["format-icons"]["locked"].isString() + ? config_["format-icons"]["locked"].asString() + : "locked"), + icon_unlocked_(config_["format-icons"]["unlocked"].isString() + ? config_["format-icons"]["unlocked"].asString() + : "unlocked") + { + box_.set_name("keyboard_state"); + if (config_["numlock"].asBool()) { + box_.pack_end(numlock_label_, false, false, 0); + } + if (config_["capslock"].asBool()) { + box_.pack_end(capslock_label_, false, false, 0); + } + if (config_["scrolllock"].asBool()) { + box_.pack_end(scrolllock_label_, false, false, 0); + } + if (!id.empty()) { + box_.get_style_context()->add_class(id); + } + event_box_.add(box_); + if (config_["device-path"].isString()) { dev_path_ = config_["device-path"].asString(); } else { @@ -26,8 +62,10 @@ waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Json: if (!libevdev_has_event_type(dev_, EV_LED)) { throw std::runtime_error("Device doesn't support LED events"); } - if (!libevdev_has_event_code(dev_, EV_LED, LED_NUML) || !libevdev_has_event_code(dev_, EV_LED, LED_CAPSL)) { - throw std::runtime_error("Device doesn't support num lock or caps lock events"); + if (!libevdev_has_event_code(dev_, EV_LED, LED_NUML) + || !libevdev_has_event_code(dev_, EV_LED, LED_CAPSL) + || !libevdev_has_event_code(dev_, EV_LED, LED_SCROLLL)) { + throw std::runtime_error("Device doesn't support num lock, caps lock, or scroll lock events"); } thread_ = [this] { @@ -58,16 +96,22 @@ auto waybar::modules::KeyboardState::update() -> void { } int numl = libevdev_get_event_value(dev_, EV_LED, LED_NUML); - //int capsl = libevdev_get_event_value(dev_, EV_LED, LED_CAPSL); + int capsl = libevdev_get_event_value(dev_, EV_LED, LED_CAPSL); + int scrolll = libevdev_get_event_value(dev_, EV_LED, LED_SCROLLL); std::string text; - if (numl) { - text = fmt::format(format_, "num lock enabled"); - label_.set_markup(text); - } else { - text = fmt::format(format_, "num lock disabled"); - label_.set_markup(text); - } + text = fmt::format(numlock_format_, + fmt::arg("icon", numl ? icon_locked_ : icon_unlocked_), + fmt::arg("name", "Num")); + numlock_label_.set_markup(text); + text = fmt::format(capslock_format_, + fmt::arg("icon", capsl ? icon_locked_ : icon_unlocked_), + fmt::arg("name", "Caps")); + capslock_label_.set_markup(text); + text = fmt::format(scrolllock_format_, + fmt::arg("icon", scrolll ? icon_locked_ : icon_unlocked_), + fmt::arg("name", "Scroll")); + scrolllock_label_.set_markup(text); - ALabel::update(); + AModule::update(); } From 40e6360722acc32ea1b266f361666a4cc64d9608 Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Sun, 7 Feb 2021 18:57:12 -0500 Subject: [PATCH 269/355] Update css class when locked/unlocked --- src/modules/keyboard_state.cpp | 35 +++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/modules/keyboard_state.cpp b/src/modules/keyboard_state.cpp index b51617f2..516502f9 100644 --- a/src/modules/keyboard_state.cpp +++ b/src/modules/keyboard_state.cpp @@ -99,19 +99,28 @@ auto waybar::modules::KeyboardState::update() -> void { int capsl = libevdev_get_event_value(dev_, EV_LED, LED_CAPSL); int scrolll = libevdev_get_event_value(dev_, EV_LED, LED_SCROLLL); - std::string text; - text = fmt::format(numlock_format_, - fmt::arg("icon", numl ? icon_locked_ : icon_unlocked_), - fmt::arg("name", "Num")); - numlock_label_.set_markup(text); - text = fmt::format(capslock_format_, - fmt::arg("icon", capsl ? icon_locked_ : icon_unlocked_), - fmt::arg("name", "Caps")); - capslock_label_.set_markup(text); - text = fmt::format(scrolllock_format_, - fmt::arg("icon", scrolll ? icon_locked_ : icon_unlocked_), - fmt::arg("name", "Scroll")); - scrolllock_label_.set_markup(text); + struct { + bool state; + Gtk::Label& label; + const std::string& format; + const char* name; + } label_states[] = { + {(bool) numl, numlock_label_, numlock_format_, "Num"}, + {(bool) capsl, capslock_label_, capslock_format_, "Caps"}, + {(bool) scrolll, scrolllock_label_, scrolllock_format_, "Scroll"}, + }; + for (auto& label_state : label_states) { + std::string text; + text = fmt::format(label_state.format, + fmt::arg("icon", label_state.state ? icon_locked_ : icon_unlocked_), + fmt::arg("name", label_state.name)); + label_state.label.set_markup(text); + if (label_state.state) { + label_state.label.get_style_context()->add_class("locked"); + } else { + label_state.label.get_style_context()->remove_class("locked"); + } + } AModule::update(); } From 6fdbc27998e16daafa637427c6ecddc53abc31ce Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Sun, 7 Feb 2021 19:06:55 -0500 Subject: [PATCH 270/355] Add default style --- resources/config | 2 +- resources/style.css | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/resources/config b/resources/config index e7c91c0f..a83edf1c 100644 --- a/resources/config +++ b/resources/config @@ -6,7 +6,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], "modules-center": ["sway/window"], - "modules-right": ["keyboard_state", "mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "battery#bat2", "clock", "tray"], + "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard_state", "sway/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration // "sway/workspaces": { // "disable-scroll": true, diff --git a/resources/style.css b/resources/style.css index 63ea871c..c1ac5ad1 100644 --- a/resources/style.css +++ b/resources/style.css @@ -228,3 +228,19 @@ label:focus { margin: 0 5px; min-width: 16px; } + +#keyboard_state { + background: #97e1ad; + color: #000000; + padding: 0 0px; + margin: 0 5px; + min-width: 16px; +} + +#keyboard_state > label { + padding: 0 5px; +} + +#keyboard_state > label.locked { + background: rgba(0, 0, 0, 0.2); +} From 08e886ebc681849e7b241db71ad7e76a9d0dec43 Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Sun, 7 Feb 2021 21:05:34 -0500 Subject: [PATCH 271/355] Search for device automatically if none given --- include/modules/keyboard_state.hpp | 3 +- resources/config | 5 +-- src/modules/keyboard_state.cpp | 69 +++++++++++++++++++++--------- 3 files changed, 52 insertions(+), 25 deletions(-) diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp index 0873ad55..d6d98de2 100644 --- a/include/modules/keyboard_state.hpp +++ b/include/modules/keyboard_state.hpp @@ -24,6 +24,8 @@ class KeyboardState : public AModule { auto update() -> void; private: + static auto openDevice(const std::string&) -> std::pair; + const Bar& bar_; Gtk::Box box_; Gtk::Label numlock_label_; @@ -37,7 +39,6 @@ class KeyboardState : public AModule { std::string icon_locked_; std::string icon_unlocked_; - std::string dev_path_; int fd_; libevdev* dev_; diff --git a/resources/config b/resources/config index a83edf1c..465f6949 100644 --- a/resources/config +++ b/resources/config @@ -25,13 +25,12 @@ // }, "keyboard_state": { "numlock": true, + "capslock": true, "format": "{name} {icon}", "format-icons": { "locked": "", "unlocked": "" - }, - "capslock": true, - "device-path": "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + } }, "sway/mode": { "format": "{}" diff --git a/src/modules/keyboard_state.cpp b/src/modules/keyboard_state.cpp index 516502f9..9a7802f4 100644 --- a/src/modules/keyboard_state.cpp +++ b/src/modules/keyboard_state.cpp @@ -1,5 +1,6 @@ #include "modules/keyboard_state.hpp" #include +#include extern "C" { #include @@ -28,8 +29,9 @@ waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar& : "locked"), icon_unlocked_(config_["format-icons"]["unlocked"].isString() ? config_["format-icons"]["unlocked"].asString() - : "unlocked") - { + : "unlocked"), + fd_(0), + dev_(nullptr) { box_.set_name("keyboard_state"); if (config_["numlock"].asBool()) { box_.pack_end(numlock_label_, false, false, 0); @@ -46,26 +48,28 @@ waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar& event_box_.add(box_); if (config_["device-path"].isString()) { - dev_path_ = config_["device-path"].asString(); + std::string dev_path = config_["device-path"].asString(); + std::tie(fd_, dev_) = openDevice(dev_path); } else { - dev_path_ = ""; - } - - fd_ = open(dev_path_.c_str(), O_NONBLOCK | O_CLOEXEC | O_RDONLY); - if (fd_ < 0) { - throw std::runtime_error("Can't open " + dev_path_); - } - int err = libevdev_new_from_fd(fd_, &dev_); - if (err < 0) { - throw std::runtime_error("Can't create libevdev device"); - } - if (!libevdev_has_event_type(dev_, EV_LED)) { - throw std::runtime_error("Device doesn't support LED events"); - } - if (!libevdev_has_event_code(dev_, EV_LED, LED_NUML) - || !libevdev_has_event_code(dev_, EV_LED, LED_CAPSL) - || !libevdev_has_event_code(dev_, EV_LED, LED_SCROLLL)) { - throw std::runtime_error("Device doesn't support num lock, caps lock, or scroll lock events"); + DIR* dev_dir = opendir("/dev/input"); + if (dev_dir == nullptr) { + throw std::runtime_error("Failed to open /dev/input"); + } + dirent *ep; + while ((ep = readdir(dev_dir))) { + if (ep->d_type != DT_CHR) continue; + std::string dev_path = std::string("/dev/input/") + ep->d_name; + try { + std::tie(fd_, dev_) = openDevice(dev_path); + spdlog::info("Found device {} at '{}'", libevdev_get_name(dev_), dev_path); + break; + } catch (const std::runtime_error& e) { + continue; + } + } + if (dev_ == nullptr) { + throw std::runtime_error("Failed to find keyboard device"); + } } thread_ = [this] { @@ -82,6 +86,29 @@ waybar::modules::KeyboardState::~KeyboardState() { } } +auto waybar::modules::KeyboardState::openDevice(const std::string& path) -> std::pair { + int fd = open(path.c_str(), O_NONBLOCK | O_CLOEXEC | O_RDONLY); + if (fd < 0) { + throw std::runtime_error("Can't open " + path); + } + + libevdev* dev; + int err = libevdev_new_from_fd(fd, &dev); + if (err < 0) { + throw std::runtime_error("Can't create libevdev device"); + } + if (!libevdev_has_event_type(dev, EV_LED)) { + throw std::runtime_error("Device doesn't support LED events"); + } + if (!libevdev_has_event_code(dev, EV_LED, LED_NUML) + || !libevdev_has_event_code(dev, EV_LED, LED_CAPSL) + || !libevdev_has_event_code(dev, EV_LED, LED_SCROLLL)) { + throw std::runtime_error("Device doesn't support num lock, caps lock, or scroll lock events"); + } + + return std::make_pair(fd, dev); +} + auto waybar::modules::KeyboardState::update() -> void { int err = LIBEVDEV_READ_STATUS_SUCCESS; while (err == LIBEVDEV_READ_STATUS_SUCCESS) { From 99138ffdcd6e3620a9952d7ca1ceb7b0fc5edfb1 Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Thu, 15 Apr 2021 17:41:15 -0400 Subject: [PATCH 272/355] Add man page for keyboard_state module --- man/waybar-keyboard-state.5.scd | 80 +++++++++++++++++++++++++++++++++ man/waybar.5.scd.in | 1 + meson.build | 1 + 3 files changed, 82 insertions(+) create mode 100644 man/waybar-keyboard-state.5.scd diff --git a/man/waybar-keyboard-state.5.scd b/man/waybar-keyboard-state.5.scd new file mode 100644 index 00000000..8e9ca5eb --- /dev/null +++ b/man/waybar-keyboard-state.5.scd @@ -0,0 +1,80 @@ +waybar-keyboard-state(5) + +# NAME + +waybar - keyboard_state module + +# DESCRIPTION + +The *keyboard_state* module displays the state of number lock, caps lock, and scroll lock. + +# CONFIGURATION + +*interval*: ++ + typeof: integer ++ + default: 1 ++ + The interval, in seconds, to poll the keyboard state. + +*format*: ++ + typeof: string|object ++ + default: {name} {icon} ++ + The format, how information should be displayed. If a string, the same format is used for all keyboard states. If an object, the fields "numlock", "capslock", and "scrolllock" each specify the format for the corresponding state. Any unspecified states use the default format. + +*format-icons*: ++ + typeof: object ++ + default: {"locked": "locked", "unlocked": "unlocked"} ++ + Based on the keyboard state, the corresponding icon gets selected. The same set of icons is used for number, caps, and scroll lock, but the icon is selected from the set independently for each. See *icons*. + +*numlock*: ++ + typeof: bool ++ + default: false ++ + Display the number lock state. + +*capslock*: ++ + typeof: bool ++ + default: false ++ + Display the caps lock state. + +*scrolllock*: ++ + typeof: bool ++ + default: false ++ + Display the scroll lock state. + +*device-path*: ++ + typeof: string ++ + default: chooses first valid input device ++ + Which libevdev input device to show the state of. Libevdev devices can be found in /dev/input. The device should support number lock, caps lock, and scroll lock events. + +# FORMAT REPLACEMENTS + +*{name}*: Caps, Num, or Scroll. + +*{icon}*: Icon, as defined in *format-icons*. + +# ICONS + +The following *format-icons* can be set. + +- *locked*: Will be shown when the keyboard state is locked. Default "locked". +- *unlocked*: Will be shown when the keyboard state is not locked. Default "unlocked" + +# EXAMPLE: + +``` +"keyboard_state": { + "numlock": true, + "capslock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } +} +``` + +# STYLE + +- *#keyboard_state* +- *#keyboard_state label* +- *#keyboard_state label.locked* + diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index 0168de38..9dc6925f 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -208,6 +208,7 @@ Valid options for the "rotate" property are: 0, 90, 180 and 270. - *waybar-custom(5)* - *waybar-disk(5)* - *waybar-idle-inhibitor(5)* +- *waybar-keyboard-state(5)* - *waybar-memory(5)* - *waybar-mpd(5)* - *waybar-network(5)* diff --git a/meson.build b/meson.build index 7ac6fd6a..f3b50f7b 100644 --- a/meson.build +++ b/meson.build @@ -317,6 +317,7 @@ if scdoc.found() 'waybar-custom.5.scd', 'waybar-disk.5.scd', 'waybar-idle-inhibitor.5.scd', + 'waybar-keyboard-state.5.scd', 'waybar-memory.5.scd', 'waybar-mpd.5.scd', 'waybar-network.5.scd', From 9880c6929f64284aa088a8a662ac3c636176b685 Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Tue, 20 Jul 2021 21:24:43 -0400 Subject: [PATCH 273/355] Install libevdev in FreeBSD workflow --- .github/workflows/freebsd.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 2fde6107..f02c9b57 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -15,8 +15,9 @@ jobs: export CPPFLAGS=-isystem/usr/local/include LDFLAGS=-L/usr/local/lib # sndio sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf pkg install -y git # subprojects/date - pkg install -y gtk-layer-shell gtkmm30 jsoncpp libdbusmenu sndio \ - libfmt libmpdclient libudev-devd meson pkgconf pulseaudio scdoc spdlog + pkg install -y evdev-proto gtk-layer-shell gtkmm30 jsoncpp libdbusmenu \ + libevdev libfmt libmpdclient libudev-devd meson pkgconf pulseaudio \ + scdoc sndio spdlog run: | meson build -Dman-pages=enabled ninja -C build From 311c5779ea7729474343490817974a6c89d6fe0c Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Tue, 20 Jul 2021 23:01:39 -0400 Subject: [PATCH 274/355] Remove unused variable --- include/modules/keyboard_state.hpp | 1 - src/modules/keyboard_state.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp index d6d98de2..1793bfe8 100644 --- a/include/modules/keyboard_state.hpp +++ b/include/modules/keyboard_state.hpp @@ -26,7 +26,6 @@ class KeyboardState : public AModule { private: static auto openDevice(const std::string&) -> std::pair; - const Bar& bar_; Gtk::Box box_; Gtk::Label numlock_label_; Gtk::Label capslock_label_; diff --git a/src/modules/keyboard_state.cpp b/src/modules/keyboard_state.cpp index 9a7802f4..ca72144a 100644 --- a/src/modules/keyboard_state.cpp +++ b/src/modules/keyboard_state.cpp @@ -10,7 +10,6 @@ extern "C" { waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar& bar, const Json::Value& config) : AModule(config, "keyboard_state", id, false, !config["disable-scroll"].asBool()), - bar_(bar), box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0), numlock_label_(""), capslock_label_(""), From 1440ed29d45f978164f37dd86c3e0e0bcaadef85 Mon Sep 17 00:00:00 2001 From: Michael Swiger Date: Tue, 20 Jul 2021 22:29:34 -0700 Subject: [PATCH 275/355] Fix blurry tray icons for HiDPI displays --- src/modules/sni/item.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index abf95560..6fca472c 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -1,4 +1,5 @@ #include "modules/sni/item.hpp" +#include #include #include #include @@ -252,33 +253,42 @@ Glib::RefPtr Item::extractPixBuf(GVariant* variant) { } void Item::updateImage() { + auto scale_factor = image.get_scale_factor(); + auto scaled_icon_size = icon_size * scale_factor; + image.set_from_icon_name("image-missing", Gtk::ICON_SIZE_MENU); - image.set_pixel_size(icon_size); + image.set_pixel_size(scaled_icon_size); if (!icon_name.empty()) { try { // Try to find icons specified by path and filename std::ifstream temp(icon_name); if (temp.is_open()) { auto pixbuf = Gdk::Pixbuf::create_from_file(icon_name); + if (pixbuf->gobj() != nullptr) { // An icon specified by path and filename may be the wrong size for // the tray - // Keep the aspect ratio and scale to make the height equal to icon_size + // Keep the aspect ratio and scale to make the height equal to scaled_icon_size // If people have non square icons, assume they want it to grow in width not height - int width = icon_size * pixbuf->get_width() / pixbuf->get_height(); + int width = scaled_icon_size * pixbuf->get_width() / pixbuf->get_height(); - pixbuf = pixbuf->scale_simple(width, icon_size, Gdk::InterpType::INTERP_BILINEAR); - image.set(pixbuf); + pixbuf = pixbuf->scale_simple(width, scaled_icon_size, Gdk::InterpType::INTERP_BILINEAR); + + auto surface = Gdk::Cairo::create_surface_from_pixbuf(pixbuf, 0, image.get_window()); + image.set(surface); } } else { - image.set(getIconByName(icon_name, icon_size)); + auto icon_by_name = getIconByName(icon_name, scaled_icon_size); + auto surface = Gdk::Cairo::create_surface_from_pixbuf(icon_by_name, 0, image.get_window()); + image.set(surface); } } catch (Glib::Error& e) { spdlog::error("Item '{}': {}", id, static_cast(e.what())); } } else if (icon_pixmap) { // An icon extracted may be the wrong size for the tray - icon_pixmap = icon_pixmap->scale_simple(icon_size, icon_size, Gdk::InterpType::INTERP_BILINEAR); + icon_pixmap = icon_pixmap->scale_simple(icon_size, scaled_icon_size, Gdk::InterpType::INTERP_BILINEAR); + auto surface = Gdk::Cairo::create_surface_from_pixbuf(icon_pixmap, 0, image.get_window()); image.set(icon_pixmap); } } From 67d482d28b46ee6f89d69016ec3451bbe8653f11 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 09:23:52 +0200 Subject: [PATCH 276/355] Update opensuse --- Dockerfiles/opensuse | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse index eb231fdb..1015e5cc 100644 --- a/Dockerfiles/opensuse +++ b/Dockerfiles/opensuse @@ -3,5 +3,7 @@ FROM opensuse/tumbleweed:latest RUN zypper -n up && \ + zypper -n addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo && \ + zypper -n refresh && \ zypper -n install -t pattern devel_C_C++ && \ zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc libxkbcommon From 1f5c07a07f5f35dd531177ad1e86251b0a6565a4 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 09:27:54 +0200 Subject: [PATCH 277/355] Update debian --- Dockerfiles/debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/debian b/Dockerfiles/debian index f7f6e633..7c9e0b00 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -3,5 +3,5 @@ FROM debian:sid RUN apt-get update && \ - apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon && \ + apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev && \ apt-get clean From 7f5fd1ac8648d1301c2840d328567c120317b285 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 09:30:47 +0200 Subject: [PATCH 278/355] Update opensuse --- Dockerfiles/opensuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse index 1015e5cc..a88aa7db 100644 --- a/Dockerfiles/opensuse +++ b/Dockerfiles/opensuse @@ -3,7 +3,7 @@ FROM opensuse/tumbleweed:latest RUN zypper -n up && \ - zypper -n addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo && \ + zypper addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo | echo 'a' && \ zypper -n refresh && \ zypper -n install -t pattern devel_C_C++ && \ zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc libxkbcommon From 7729ca34275bbc7a2bcd382a14f5be6cc74396e9 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 10:28:56 +0200 Subject: [PATCH 279/355] Update debian --- Dockerfiles/debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/debian b/Dockerfiles/debian index 7c9e0b00..32d7a6f3 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -3,5 +3,5 @@ FROM debian:sid RUN apt-get update && \ - apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev && \ + apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev libxkbregistry0 && \ apt-get clean From 929fc16994c413923af31d8b4a3d302315943a47 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 23 Jun 2021 00:27:30 -0700 Subject: [PATCH 280/355] fix(tray): ignore unused WindowId property --- include/modules/sni/item.hpp | 1 - src/modules/sni/item.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp index 3cbd0b74..11402c19 100644 --- a/include/modules/sni/item.hpp +++ b/include/modules/sni/item.hpp @@ -30,7 +30,6 @@ class Item : public sigc::trackable { std::string status; std::string title; - int32_t window_id; std::string icon_name; Glib::RefPtr icon_pixmap; Glib::RefPtr icon_theme; diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index 6fca472c..0ccba197 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -105,8 +105,6 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { title = get_variant(value); } else if (name == "Status") { status = get_variant(value); - } else if (name == "WindowId") { - window_id = get_variant(value); } else if (name == "IconName") { icon_name = get_variant(value); } else if (name == "IconPixmap") { From 4b6253e81001e285c7e09a7196b3dad98d9aa783 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 23 Jun 2021 00:27:42 -0700 Subject: [PATCH 281/355] refactor(tray): infer changed properties from signal name Comparing two GVariants is too expensive; let's collect the set of properties updated by each signal and apply them unconditionally. --- include/modules/sni/item.hpp | 5 +++- src/modules/sni/item.cpp | 46 ++++++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp index 11402c19..fbb51630 100644 --- a/include/modules/sni/item.hpp +++ b/include/modules/sni/item.hpp @@ -11,6 +11,9 @@ #include #include +#include +#include + namespace waybar::modules::SNI { class Item : public sigc::trackable { @@ -64,7 +67,7 @@ class Item : public sigc::trackable { Glib::RefPtr proxy_; Glib::RefPtr cancellable_; - bool update_pending_; + std::set update_pending_; }; } // namespace waybar::modules::SNI diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index 0ccba197..d3eed4a8 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -1,8 +1,11 @@ #include "modules/sni/item.hpp" + #include #include #include + #include +#include template <> struct fmt::formatter : formatter { @@ -40,8 +43,7 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf object_path(op), icon_size(16), effective_icon_size(0), - icon_theme(Gtk::IconTheme::create()), - update_pending_(false) { + icon_theme(Gtk::IconTheme::create()) { if (config["icon-size"].isUInt()) { icon_size = config["icon-size"].asUInt(); } @@ -148,8 +150,6 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { } void Item::getUpdatedProperties() { - update_pending_ = false; - auto params = Glib::VariantContainerBase::create_tuple( {Glib::Variant::create(SNI_INTERFACE_NAME)}); proxy_->call("org.freedesktop.DBus.Properties.GetAll", @@ -166,10 +166,7 @@ void Item::processUpdatedProperties(Glib::RefPtr& _result) { auto properties = properties_variant.get(); for (const auto& [name, value] : properties) { - Glib::VariantBase old_value; - proxy_->get_cached_property(old_value, name); - if (!old_value || !value.equal(old_value)) { - proxy_->set_cached_property(name, value); + if (update_pending_.count(name.raw())) { setProperty(name, const_cast(value)); } } @@ -181,18 +178,37 @@ void Item::processUpdatedProperties(Glib::RefPtr& _result) { } catch (const std::exception& err) { spdlog::warn("Failed to update properties: {}", err.what()); } + update_pending_.clear(); } +/** + * Mapping from a signal name to a set of possibly changed properties. + * Commented signals are not handled by the tray module at the moment. + */ +static const std::map> signal2props = { + {"NewTitle", {"Title"}}, + {"NewIcon", {"IconName", "IconPixmap"}}, + // {"NewAttentionIcon", {"AttentionIconName", "AttentionIconPixmap", "AttentionMovieName"}}, + // {"NewOverlayIcon", {"OverlayIconName", "OverlayIconPixmap"}}, + {"NewIconThemePath", {"IconThemePath"}}, + {"NewToolTip", {"ToolTip"}}, + {"NewStatus", {"Status"}}, + // {"XAyatanaNewLabel", {"XAyatanaLabel"}}, +}; + void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name, const Glib::VariantContainerBase& arguments) { spdlog::trace("Tray item '{}' got signal {}", id, signal_name); - if (!update_pending_ && signal_name.compare(0, 3, "New") == 0) { - /* Debounce signals and schedule update of all properties. - * Based on behavior of Plasma dataengine for StatusNotifierItem. - */ - update_pending_ = true; - Glib::signal_timeout().connect_once(sigc::mem_fun(*this, &Item::getUpdatedProperties), - UPDATE_DEBOUNCE_TIME); + auto changed = signal2props.find(signal_name.raw()); + if (changed != signal2props.end()) { + if (update_pending_.empty()) { + /* Debounce signals and schedule update of all properties. + * Based on behavior of Plasma dataengine for StatusNotifierItem. + */ + Glib::signal_timeout().connect_once(sigc::mem_fun(*this, &Item::getUpdatedProperties), + UPDATE_DEBOUNCE_TIME); + } + update_pending_.insert(changed->second.begin(), changed->second.end()); } } From 84a8f79bbe18ec17036f7816d29cc6c5df20b0de Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 23 Jun 2021 23:47:35 -0700 Subject: [PATCH 282/355] feat(tray): implement tooltips (text only) for tray items --- include/modules/sni/item.hpp | 6 ++++++ src/modules/sni/item.cpp | 24 ++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp index fbb51630..fc4596e1 100644 --- a/include/modules/sni/item.hpp +++ b/include/modules/sni/item.hpp @@ -16,6 +16,11 @@ namespace waybar::modules::SNI { +struct ToolTip { + Glib::ustring icon_name; + Glib::ustring text; +}; + class Item : public sigc::trackable { public: Item(const std::string&, const std::string&, const Json::Value&); @@ -41,6 +46,7 @@ class Item : public sigc::trackable { std::string attention_movie_name; std::string icon_theme_path; std::string menu; + ToolTip tooltip; DbusmenuGtkMenu* dbus_menu = nullptr; Gtk::Menu* gtk_menu = nullptr; /** diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index d3eed4a8..f0921831 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -81,7 +82,6 @@ void Item::proxyReady(Glib::RefPtr& result) { return; } this->updateImage(); - // this->event_box.set_tooltip_text(this->title); } catch (const Glib::Error& err) { spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what()); @@ -91,10 +91,24 @@ void Item::proxyReady(Glib::RefPtr& result) { } template -T get_variant(Glib::VariantBase& value) { +T get_variant(const Glib::VariantBase& value) { return Glib::VariantBase::cast_dynamic>(value).get(); } +template <> +ToolTip get_variant(const Glib::VariantBase& value) { + ToolTip result; + // Unwrap (sa(iiay)ss) + auto container = value.cast_dynamic(value); + result.icon_name = get_variant(container.get_child(0)); + result.text = get_variant(container.get_child(2)); + auto description = get_variant(container.get_child(3)); + if (!description.empty()) { + result.text = fmt::format("{}\n{}", result.text, description); + } + return result; +} + void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { try { spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, name, value); @@ -122,7 +136,10 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { } else if (name == "AttentionMovieName") { attention_movie_name = get_variant(value); } else if (name == "ToolTip") { - // TODO: tooltip + tooltip = get_variant(value); + if (!tooltip.text.empty()) { + event_box.set_tooltip_markup(tooltip.text); + } } else if (name == "IconThemePath") { icon_theme_path = get_variant(value); if (!icon_theme_path.empty()) { @@ -172,7 +189,6 @@ void Item::processUpdatedProperties(Glib::RefPtr& _result) { } this->updateImage(); - // this->event_box.set_tooltip_text(this->title); } catch (const Glib::Error& err) { spdlog::warn("Failed to update properties: {}", err.what()); } catch (const std::exception& err) { From 1418f96e4653aad2e8f0be25453ac022632cbe32 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 30 Jun 2021 22:17:27 -0700 Subject: [PATCH 283/355] feat(tray): fallback to Title for items without ToolTip --- src/modules/sni/item.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index f0921831..d4c48729 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -119,6 +119,9 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { id = get_variant(value); } else if (name == "Title") { title = get_variant(value); + if (tooltip.text.empty()) { + event_box.set_tooltip_markup(title); + } } else if (name == "Status") { status = get_variant(value); } else if (name == "IconName") { From 245f7f4b11731c158f15703750b85dd6c87d660f Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sat, 26 Jun 2021 16:33:25 -0700 Subject: [PATCH 284/355] feat(tray): handle scroll events --- include/modules/sni/item.hpp | 6 ++++ man/waybar-tray.5.scd | 4 +++ src/modules/sni/item.cpp | 54 +++++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp index fc4596e1..e51d3c76 100644 --- a/include/modules/sni/item.hpp +++ b/include/modules/sni/item.hpp @@ -70,6 +70,12 @@ class Item : public sigc::trackable { static void onMenuDestroyed(Item* self, GObject* old_menu_pointer); void makeMenu(); bool handleClick(GdkEventButton* const& /*ev*/); + bool handleScroll(GdkEventScroll* const&); + + // smooth scrolling threshold + gdouble scroll_threshold_ = 0; + gdouble distance_scrolled_x_ = 0; + gdouble distance_scrolled_y_ = 0; Glib::RefPtr proxy_; Glib::RefPtr cancellable_; diff --git a/man/waybar-tray.5.scd b/man/waybar-tray.5.scd index cd0e93f6..5446a561 100644 --- a/man/waybar-tray.5.scd +++ b/man/waybar-tray.5.scd @@ -16,6 +16,10 @@ Addressed by *tray* typeof: integer ++ Defines the size of the tray icons. +*smooth-scrolling-threshold*: ++ + typeof: double ++ + Threshold to be used when scrolling. + *spacing*: ++ typeof: integer ++ Defines the spacing between the tray icons. diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index d4c48729..9a77d241 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -48,9 +48,13 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf if (config["icon-size"].isUInt()) { icon_size = config["icon-size"].asUInt(); } + if (config["smooth-scrolling-threshold"].isNumeric()) { + scroll_threshold_ = config["smooth-scrolling-threshold"].asDouble(); + } event_box.add(image); - event_box.add_events(Gdk::BUTTON_PRESS_MASK); + event_box.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK); event_box.signal_button_press_event().connect(sigc::mem_fun(*this, &Item::handleClick)); + event_box.signal_scroll_event().connect(sigc::mem_fun(*this, &Item::handleScroll)); cancellable_ = Gio::Cancellable::create(); @@ -403,4 +407,52 @@ bool Item::handleClick(GdkEventButton* const& ev) { return false; } +bool Item::handleScroll(GdkEventScroll* const& ev) { + int dx = 0, dy = 0; + switch (ev->direction) { + case GDK_SCROLL_UP: + dy = -1; + break; + case GDK_SCROLL_DOWN: + dy = 1; + break; + case GDK_SCROLL_LEFT: + dx = -1; + break; + case GDK_SCROLL_RIGHT: + dx = 1; + break; + case GDK_SCROLL_SMOOTH: + distance_scrolled_x_ += ev->delta_x; + distance_scrolled_y_ += ev->delta_y; + // check against the configured threshold and ensure that the absolute value >= 1 + if (distance_scrolled_x_ > scroll_threshold_) { + dx = (int)lround(std::max(distance_scrolled_x_, 1.0)); + distance_scrolled_x_ = 0; + } else if (distance_scrolled_x_ < -scroll_threshold_) { + dx = (int)lround(std::min(distance_scrolled_x_, -1.0)); + distance_scrolled_x_ = 0; + } + if (distance_scrolled_y_ > scroll_threshold_) { + dy = (int)lround(std::max(distance_scrolled_y_, 1.0)); + distance_scrolled_y_ = 0; + } else if (distance_scrolled_y_ < -scroll_threshold_) { + dy = (int)lround(std::min(distance_scrolled_y_, -1.0)); + distance_scrolled_y_ = 0; + } + break; + } + if (dx != 0) { + auto parameters = Glib::VariantContainerBase::create_tuple( + {Glib::Variant::create(dx), Glib::Variant::create("horizontal")}); + proxy_->call("Scroll", parameters); + } + if (dy != 0) { + auto parameters = Glib::VariantContainerBase::create_tuple( + {Glib::Variant::create(dy), Glib::Variant::create("vertical")}); + proxy_->call("Scroll", parameters); + } + return true; +} + } // namespace waybar::modules::SNI From a5fe6f40b8d1439b8c9794e30ba97d92fabc4715 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 2 Jul 2021 19:44:10 -0700 Subject: [PATCH 285/355] feat(tray): handle Status property On the `Passive` value of `Status` tray items would be hidden unless `show-passive-items` is set to true. On the `NeedsAttention` value of `Status` tray items will have a `.needs-attention` CSS class. --- include/modules/sni/item.hpp | 4 +++- man/waybar-tray.5.scd | 8 ++++++++ resources/style.css | 9 +++++++++ src/modules/sni/item.cpp | 24 ++++++++++++++++++++++-- 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp index e51d3c76..1f1503ee 100644 --- a/include/modules/sni/item.hpp +++ b/include/modules/sni/item.hpp @@ -35,7 +35,6 @@ class Item : public sigc::trackable { Gtk::EventBox event_box; std::string category; std::string id; - std::string status; std::string title; std::string icon_name; @@ -59,6 +58,7 @@ class Item : public sigc::trackable { private: void proxyReady(Glib::RefPtr& result); void setProperty(const Glib::ustring& name, Glib::VariantBase& value); + void setStatus(const Glib::ustring& value); void getUpdatedProperties(); void processUpdatedProperties(Glib::RefPtr& result); void onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name, @@ -76,6 +76,8 @@ class Item : public sigc::trackable { gdouble scroll_threshold_ = 0; gdouble distance_scrolled_x_ = 0; gdouble distance_scrolled_y_ = 0; + // visibility of items with Status == Passive + bool show_passive_ = false; Glib::RefPtr proxy_; Glib::RefPtr cancellable_; diff --git a/man/waybar-tray.5.scd b/man/waybar-tray.5.scd index 5446a561..c664594d 100644 --- a/man/waybar-tray.5.scd +++ b/man/waybar-tray.5.scd @@ -16,6 +16,11 @@ Addressed by *tray* typeof: integer ++ Defines the size of the tray icons. +*show-passive-items*: ++ + typeof: bool ++ + default: false ++ + Defines visibility of the tray icons with *Passive* status. + *smooth-scrolling-threshold*: ++ typeof: double ++ Threshold to be used when scrolling. @@ -41,3 +46,6 @@ Addressed by *tray* # STYLE - *#tray* +- *#tray > .passive* +- *#tray > .active* +- *#tray > .needs-attention* diff --git a/resources/style.css b/resources/style.css index 63ea871c..32dce429 100644 --- a/resources/style.css +++ b/resources/style.css @@ -195,6 +195,15 @@ label:focus { background-color: #2980b9; } +#tray > .passive { + -gtk-icon-effect: dim; +} + +#tray > .needs-attention { + -gtk-icon-effect: highlight; + background-color: #eb4d4b; +} + #idle_inhibitor { background-color: #2d3436; } diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index 9a77d241..267cf63f 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -51,10 +51,15 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf if (config["smooth-scrolling-threshold"].isNumeric()) { scroll_threshold_ = config["smooth-scrolling-threshold"].asDouble(); } + if (config["show-passive-items"].isBool()) { + show_passive_ = config["show-passive-items"].asBool(); + } event_box.add(image); event_box.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK); event_box.signal_button_press_event().connect(sigc::mem_fun(*this, &Item::handleClick)); event_box.signal_scroll_event().connect(sigc::mem_fun(*this, &Item::handleScroll)); + // initial visibility + event_box.set_visible(show_passive_); cancellable_ = Gio::Cancellable::create(); @@ -81,7 +86,7 @@ void Item::proxyReady(Glib::RefPtr& result) { this->proxy_->signal_signal().connect(sigc::mem_fun(*this, &Item::onSignal)); - if (this->id.empty() || this->category.empty() || this->status.empty()) { + if (this->id.empty() || this->category.empty()) { spdlog::error("Invalid Status Notifier Item: {}, {}", bus_name, object_path); return; } @@ -127,7 +132,7 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { event_box.set_tooltip_markup(title); } } else if (name == "Status") { - status = get_variant(value); + setStatus(get_variant(value)); } else if (name == "IconName") { icon_name = get_variant(value); } else if (name == "IconPixmap") { @@ -173,6 +178,21 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { } } +void Item::setStatus(const Glib::ustring& value) { + Glib::ustring lower = value.lowercase(); + event_box.set_visible(show_passive_ || lower.compare("passive") != 0); + + auto style = event_box.get_style_context(); + for (const auto& class_name : style->list_classes()) { + style->remove_class(class_name); + } + if (lower.compare("needsattention") == 0) { + // convert status to dash-case for CSS + lower = "needs-attention"; + } + style->add_class(lower); +} + void Item::getUpdatedProperties() { auto params = Glib::VariantContainerBase::create_tuple( {Glib::Variant::create(SNI_INTERFACE_NAME)}); From cf832798fb4ac250fb1ff0435e8f8f3c5d384b30 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 23 Jul 2021 14:46:03 +0200 Subject: [PATCH 286/355] Update debian --- Dockerfiles/debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/debian b/Dockerfiles/debian index 32d7a6f3..026d8fdb 100644 --- a/Dockerfiles/debian +++ b/Dockerfiles/debian @@ -3,5 +3,5 @@ FROM debian:sid RUN apt-get update && \ - apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev libxkbregistry0 && \ + apt-get install -y build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev libxkbregistry-dev libxkbregistry0 && \ apt-get clean From 77a2eff2ce828eb14105c076f84333531b953ec9 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 23 Jul 2021 14:49:03 +0200 Subject: [PATCH 287/355] Update opensuse --- Dockerfiles/opensuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse index a88aa7db..d7cdcf64 100644 --- a/Dockerfiles/opensuse +++ b/Dockerfiles/opensuse @@ -6,4 +6,4 @@ RUN zypper -n up && \ zypper addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo | echo 'a' && \ zypper -n refresh && \ zypper -n install -t pattern devel_C_C++ && \ - zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc libxkbcommon + zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc From 2009ceb35093fcf24c23d1d20e024fc3bfc58c35 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 23 Jul 2021 15:01:29 +0200 Subject: [PATCH 288/355] Update opensuse --- Dockerfiles/opensuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/opensuse b/Dockerfiles/opensuse index d7cdcf64..49dea272 100644 --- a/Dockerfiles/opensuse +++ b/Dockerfiles/opensuse @@ -6,4 +6,4 @@ RUN zypper -n up && \ zypper addrepo https://download.opensuse.org/repositories/X11:Wayland/openSUSE_Tumbleweed/X11:Wayland.repo | echo 'a' && \ zypper -n refresh && \ zypper -n install -t pattern devel_C_C++ && \ - zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel scdoc + zypper -n install git meson clang libinput10 libinput-devel pugixml-devel libwayland-client0 libwayland-cursor0 wayland-protocols-devel wayland-devel Mesa-libEGL-devel Mesa-libGLESv2-devel libgbm-devel libxkbcommon-devel libudev-devel libpixman-1-0-devel gtkmm3-devel jsoncpp-devel libxkbregistry-devel scdoc From 88a5f713ed2c98034dbdd547d184e56a3071c5c8 Mon Sep 17 00:00:00 2001 From: Grant Moyer Date: Fri, 23 Jul 2021 09:45:07 -0400 Subject: [PATCH 289/355] Prefer keyboard-state over keyboard_state --- man/waybar-keyboard-state.5.scd | 12 ++++++------ resources/config | 4 ++-- resources/style.css | 6 +++--- src/factory.cpp | 2 +- src/modules/keyboard_state.cpp | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/man/waybar-keyboard-state.5.scd b/man/waybar-keyboard-state.5.scd index 8e9ca5eb..1d7c3a83 100644 --- a/man/waybar-keyboard-state.5.scd +++ b/man/waybar-keyboard-state.5.scd @@ -2,11 +2,11 @@ waybar-keyboard-state(5) # NAME -waybar - keyboard_state module +waybar - keyboard-state module # DESCRIPTION -The *keyboard_state* module displays the state of number lock, caps lock, and scroll lock. +The *keyboard-state* module displays the state of number lock, caps lock, and scroll lock. # CONFIGURATION @@ -61,7 +61,7 @@ The following *format-icons* can be set. # EXAMPLE: ``` -"keyboard_state": { +"keyboard-state": { "numlock": true, "capslock": true, "format": "{name} {icon}", @@ -74,7 +74,7 @@ The following *format-icons* can be set. # STYLE -- *#keyboard_state* -- *#keyboard_state label* -- *#keyboard_state label.locked* +- *#keyboard-state* +- *#keyboard-state label* +- *#keyboard-state label.locked* diff --git a/resources/config b/resources/config index 465f6949..87f24c04 100644 --- a/resources/config +++ b/resources/config @@ -6,7 +6,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], "modules-center": ["sway/window"], - "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard_state", "sway/language", "battery", "battery#bat2", "clock", "tray"], + "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration // "sway/workspaces": { // "disable-scroll": true, @@ -23,7 +23,7 @@ // "default": "" // } // }, - "keyboard_state": { + "keyboard-state": { "numlock": true, "capslock": true, "format": "{name} {icon}", diff --git a/resources/style.css b/resources/style.css index c1ac5ad1..b585e5f1 100644 --- a/resources/style.css +++ b/resources/style.css @@ -229,7 +229,7 @@ label:focus { min-width: 16px; } -#keyboard_state { +#keyboard-state { background: #97e1ad; color: #000000; padding: 0 0px; @@ -237,10 +237,10 @@ label:focus { min-width: 16px; } -#keyboard_state > label { +#keyboard-state > label { padding: 0 5px; } -#keyboard_state > label.locked { +#keyboard-state > label.locked { background: rgba(0, 0, 0, 0.2); } diff --git a/src/factory.cpp b/src/factory.cpp index 6a0147d9..98363545 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -71,7 +71,7 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name) const { } #endif #ifdef HAVE_LIBEVDEV - if (ref == "keyboard_state") { + if (ref == "keyboard-state") { return new waybar::modules::KeyboardState(id, bar_, config_[name]); } #endif diff --git a/src/modules/keyboard_state.cpp b/src/modules/keyboard_state.cpp index ca72144a..2b6eb2d9 100644 --- a/src/modules/keyboard_state.cpp +++ b/src/modules/keyboard_state.cpp @@ -9,7 +9,7 @@ extern "C" { } waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar& bar, const Json::Value& config) - : AModule(config, "keyboard_state", id, false, !config["disable-scroll"].asBool()), + : AModule(config, "keyboard-state", id, false, !config["disable-scroll"].asBool()), box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0), numlock_label_(""), capslock_label_(""), @@ -31,7 +31,7 @@ waybar::modules::KeyboardState::KeyboardState(const std::string& id, const Bar& : "unlocked"), fd_(0), dev_(nullptr) { - box_.set_name("keyboard_state"); + box_.set_name("keyboard-state"); if (config_["numlock"].asBool()) { box_.pack_end(numlock_label_, false, false, 0); } From 68e4457f3a226c985bb48bf470f1a992e91cf688 Mon Sep 17 00:00:00 2001 From: dmitry Date: Sat, 24 Jul 2021 17:24:37 +0300 Subject: [PATCH 290/355] Add tooltip-formay --- include/modules/sway/language.hpp | 1 + man/waybar-sway-language.5.scd | 5 +++++ src/modules/sway/language.cpp | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/modules/sway/language.hpp b/include/modules/sway/language.hpp index fb4438bb..b310b7f3 100644 --- a/include/modules/sway/language.hpp +++ b/include/modules/sway/language.hpp @@ -48,6 +48,7 @@ class Language : public ALabel, public sigc::trackable { const static std::string XKB_ACTIVE_LAYOUT_NAME_KEY; Layout layout_; + std::string tooltip_format_ = ""; std::map layouts_map_; XKBContext xkb_context_; bool is_variant_displayed; diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd index f7f88304..60a18fc3 100644 --- a/man/waybar-sway-language.5.scd +++ b/man/waybar-sway-language.5.scd @@ -17,6 +17,11 @@ Addressed by *sway/language* default: {} ++ The format, how layout should be displayed. +*format-tooltip*: ++ + typeof: string ++ + default: {} ++ + The format, how layout should be displayed in tooltip. + *tooltip*: ++ typeof: bool ++ default: true ++ diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index 86a8e1eb..5f3ce065 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -1,6 +1,7 @@ #include "modules/sway/language.hpp" #include +#include #include #include @@ -19,6 +20,9 @@ const std::string Language::XKB_ACTIVE_LAYOUT_NAME_KEY = "xkb_active_layout_name Language::Language(const std::string& id, const Json::Value& config) : ALabel(config, "language", id, "{}", 0, true) { is_variant_displayed = format_.find("{variant}") != std::string::npos; + if (config.isMember("tooltip-format")) { + tooltip_format_ = config["tooltip-format"].asString(); + } ipc_.subscribe(R"(["input"])"); ipc_.signal_event.connect(sigc::mem_fun(*this, &Language::onEvent)); ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Language::onCmd)); @@ -90,7 +94,16 @@ auto Language::update() -> void { fmt::arg("variant", layout_.variant))); label_.set_markup(display_layout); if (tooltipEnabled()) { - label_.set_tooltip_markup(display_layout); + if (tooltip_format_ != "") { + auto tooltip_display_layout = trim(fmt::format(tooltip_format_, + fmt::arg("short", layout_.short_name), + fmt::arg("long", layout_.full_name), + fmt::arg("variant", layout_.variant))); + label_.set_tooltip_markup(tooltip_display_layout); + + } else { + label_.set_tooltip_markup(display_layout); + } } event_box_.show(); From af2113931a2b1fc8d331581bbaec2f747d158f04 Mon Sep 17 00:00:00 2001 From: dmitry Date: Sat, 24 Jul 2021 17:26:49 +0300 Subject: [PATCH 291/355] fix typo --- man/waybar-sway-language.5.scd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd index 60a18fc3..76bc7208 100644 --- a/man/waybar-sway-language.5.scd +++ b/man/waybar-sway-language.5.scd @@ -17,7 +17,7 @@ Addressed by *sway/language* default: {} ++ The format, how layout should be displayed. -*format-tooltip*: ++ +*tooltip-format*: ++ typeof: string ++ default: {} ++ The format, how layout should be displayed in tooltip. From 710f933fa6165bf02a25f371496de76f1cdbbca6 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Sat, 31 Jul 2021 14:55:17 +0000 Subject: [PATCH 292/355] Don't start if graphical-session is not running Currently waybar _can_ try to start even if there's no graphical session (and no sway) running. Adding `Requisite=` prevents this. From `systemd.unit(5)`: Requisite= Similar to Requires=. However, if the units listed here are not started already, they will not be started and the starting of this unit will fail immediately. Requisite= does not imply an ordering dependency, even if both units are started in the same transaction. Hence this setting should usually be combined with After=, to ensure this unit is not started before the other unit. When Requisite=b.service is used on a.service, this dependency will show as RequisiteOf=a.service in property listing of b.service. RequisiteOf= dependency cannot be specified directly. --- resources/waybar.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/waybar.service.in b/resources/waybar.service.in index ef0d07e8..81ac6779 100644 --- a/resources/waybar.service.in +++ b/resources/waybar.service.in @@ -3,6 +3,7 @@ Description=Highly customizable Wayland bar for Sway and Wlroots based composito Documentation=https://github.com/Alexays/Waybar/wiki/ PartOf=graphical-session.target After=graphical-session.target +Requisite=graphical-session.target [Service] ExecStart=@prefix@/bin/waybar From 4f6a9b1bc29cc73400e6d2b7253ff1bc1f1ba595 Mon Sep 17 00:00:00 2001 From: Michael Swiger Date: Sat, 31 Jul 2021 16:14:02 -0700 Subject: [PATCH 293/355] Fix incorrect tray icon scaling --- include/modules/sni/item.hpp | 2 ++ src/modules/sni/item.cpp | 68 +++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp index 1f1503ee..1115145d 100644 --- a/include/modules/sni/item.hpp +++ b/include/modules/sni/item.hpp @@ -66,7 +66,9 @@ class Item : public sigc::trackable { void updateImage(); Glib::RefPtr extractPixBuf(GVariant* variant); + Glib::RefPtr getIconPixbuf(); Glib::RefPtr getIconByName(const std::string& name, int size); + double getScaledIconSize(); static void onMenuDestroyed(Item* self, GObject* old_menu_pointer); void makeMenu(); bool handleClick(GdkEventButton* const& /*ev*/); diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index 267cf63f..d40f0ddf 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -310,44 +310,41 @@ Glib::RefPtr Item::extractPixBuf(GVariant* variant) { } void Item::updateImage() { - auto scale_factor = image.get_scale_factor(); - auto scaled_icon_size = icon_size * scale_factor; + auto pixbuf = getIconPixbuf(); + auto scaled_icon_size = getScaledIconSize(); + + if (!pixbuf) { + pixbuf = getIconByName("image-missing", getScaledIconSize()); + } - image.set_from_icon_name("image-missing", Gtk::ICON_SIZE_MENU); - image.set_pixel_size(scaled_icon_size); - if (!icon_name.empty()) { - try { - // Try to find icons specified by path and filename + // If the loaded icon is not square, assume that the icon height should match the + // requested icon size, but the width is allowed to be different. As such, if the + // height of the image does not match the requested icon size, resize the icon such that + // the aspect ratio is maintained, but the height matches the requested icon size. + if (pixbuf->get_height() != scaled_icon_size) { + int width = scaled_icon_size * pixbuf->get_width() / pixbuf->get_height(); + pixbuf = pixbuf->scale_simple(width, scaled_icon_size, Gdk::InterpType::INTERP_BILINEAR); + } + + auto surface = Gdk::Cairo::create_surface_from_pixbuf(pixbuf, 0, image.get_window()); + image.set(surface); +} + +Glib::RefPtr Item::getIconPixbuf() { + try { + if (!icon_name.empty()) { std::ifstream temp(icon_name); if (temp.is_open()) { - auto pixbuf = Gdk::Pixbuf::create_from_file(icon_name); - - if (pixbuf->gobj() != nullptr) { - // An icon specified by path and filename may be the wrong size for - // the tray - // Keep the aspect ratio and scale to make the height equal to scaled_icon_size - // If people have non square icons, assume they want it to grow in width not height - int width = scaled_icon_size * pixbuf->get_width() / pixbuf->get_height(); - - pixbuf = pixbuf->scale_simple(width, scaled_icon_size, Gdk::InterpType::INTERP_BILINEAR); - - auto surface = Gdk::Cairo::create_surface_from_pixbuf(pixbuf, 0, image.get_window()); - image.set(surface); - } - } else { - auto icon_by_name = getIconByName(icon_name, scaled_icon_size); - auto surface = Gdk::Cairo::create_surface_from_pixbuf(icon_by_name, 0, image.get_window()); - image.set(surface); + return Gdk::Pixbuf::create_from_file(icon_name); } - } catch (Glib::Error& e) { - spdlog::error("Item '{}': {}", id, static_cast(e.what())); + return getIconByName(icon_name, getScaledIconSize()); + } else if (icon_pixmap) { + return icon_pixmap; } - } else if (icon_pixmap) { - // An icon extracted may be the wrong size for the tray - icon_pixmap = icon_pixmap->scale_simple(icon_size, scaled_icon_size, Gdk::InterpType::INTERP_BILINEAR); - auto surface = Gdk::Cairo::create_surface_from_pixbuf(icon_pixmap, 0, image.get_window()); - image.set(icon_pixmap); - } + } catch (Glib::Error& e) { + spdlog::error("Item '{}': {}", id, static_cast(e.what())); + } + return getIconByName("image-missing", getScaledIconSize()); } Glib::RefPtr Item::getIconByName(const std::string& name, int request_size) { @@ -382,6 +379,11 @@ Glib::RefPtr Item::getIconByName(const std::string& name, int reque name.c_str(), tmp_size, Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE); } +double Item::getScaledIconSize() { + // apply the scale factor from the Gtk window to the requested icon size + return icon_size * image.get_scale_factor(); +} + void Item::onMenuDestroyed(Item* self, GObject* old_menu_pointer) { if (old_menu_pointer == reinterpret_cast(self->dbus_menu)) { self->gtk_menu = nullptr; From e5787a2617df99ed465a46b5cd3063f3c440450a Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 16 Aug 2021 15:47:34 +0200 Subject: [PATCH 294/355] chore: 0.9.8 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1c065f7f..835b70e3 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'waybar', 'cpp', 'c', - version: '0.9.7', + version: '0.9.8', license: 'MIT', meson_version: '>= 0.49.0', default_options : [ From a57e431437da8bae31cf4bde1ede57d7d21609b6 Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 17 Aug 2021 05:28:41 +0300 Subject: [PATCH 295/355] Add shortDescription --- include/modules/sway/language.hpp | 3 ++- man/waybar-sway-language.5.scd | 6 ++++-- src/modules/sway/language.cpp | 21 ++++++++++++++++----- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/include/modules/sway/language.hpp b/include/modules/sway/language.hpp index b310b7f3..5cceee6b 100644 --- a/include/modules/sway/language.hpp +++ b/include/modules/sway/language.hpp @@ -25,6 +25,7 @@ class Language : public ALabel, public sigc::trackable { std::string full_name; std::string short_name; std::string variant; + std::string short_description; }; class XKBContext { @@ -36,6 +37,7 @@ class Language : public ALabel, public sigc::trackable { rxkb_context* context_ = nullptr; rxkb_layout* xkb_layout_ = nullptr; Layout* layout_ = nullptr; + std::map base_layouts_by_name_; }; void onEvent(const struct Ipc::ipc_response&); @@ -50,7 +52,6 @@ class Language : public ALabel, public sigc::trackable { Layout layout_; std::string tooltip_format_ = ""; std::map layouts_map_; - XKBContext xkb_context_; bool is_variant_displayed; util::JsonParser parser_; diff --git a/man/waybar-sway-language.5.scd b/man/waybar-sway-language.5.scd index 76bc7208..92a647e6 100644 --- a/man/waybar-sway-language.5.scd +++ b/man/waybar-sway-language.5.scd @@ -29,11 +29,13 @@ Addressed by *sway/language* # FORMAT REPLACEMENTS -*{short}*: Short name of layout (e.g. "en"). Equals to {}. +*{short}*: Short name of layout (e.g. "us"). Equals to {}. + +*{shortDescription}*: Short description of layout (e.g. "en"). *{long}*: Long name of layout (e.g. "English (Dvorak)"). -*{variant}*: Variant of layout (e.g. "Dvorak"). +*{variant}*: Variant of layout (e.g. "dvorak"). # EXAMPLES diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index 5f3ce065..f7be4cbc 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -90,6 +90,7 @@ void Language::onEvent(const struct Ipc::ipc_response& res) { auto Language::update() -> void { auto display_layout = trim(fmt::format(format_, fmt::arg("short", layout_.short_name), + fmt::arg("shortDescription", layout_.short_description), fmt::arg("long", layout_.full_name), fmt::arg("variant", layout_.variant))); label_.set_markup(display_layout); @@ -97,10 +98,10 @@ auto Language::update() -> void { if (tooltip_format_ != "") { auto tooltip_display_layout = trim(fmt::format(tooltip_format_, fmt::arg("short", layout_.short_name), + fmt::arg("shortDescription", layout_.short_description), fmt::arg("long", layout_.full_name), fmt::arg("variant", layout_.variant))); label_.set_tooltip_markup(tooltip_display_layout); - } else { label_.set_tooltip_markup(display_layout); } @@ -118,8 +119,9 @@ auto Language::set_current_layout(std::string current_layout) -> void { auto Language::init_layouts_map(const std::vector& used_layouts) -> void { std::map> found_by_short_names; - auto layout = xkb_context_.next_layout(); - for (; layout != nullptr; layout = xkb_context_.next_layout()) { + XKBContext* xkb_context_ = new XKBContext(); + auto layout = xkb_context_->next_layout(); + for (; layout != nullptr; layout = xkb_context_->next_layout()) { if (std::find(used_layouts.begin(), used_layouts.end(), layout->full_name) == used_layouts.end()) { continue; @@ -136,6 +138,7 @@ auto Language::init_layouts_map(const std::vector& used_layouts) -> layouts_map_.emplace(layout->full_name, *layout); } + //delete xkb_context_; if (is_variant_displayed || found_by_short_names.size() == 0) { return; @@ -145,7 +148,6 @@ auto Language::init_layouts_map(const std::vector& used_layouts) -> for (const auto& used_layout_name : used_layouts) { auto used_layout = &layouts_map_.find(used_layout_name)->second; auto layouts_with_same_name_list = found_by_short_names[used_layout->short_name]; - spdlog::info("SIZE: " + std::to_string(layouts_with_same_name_list.size())); if (layouts_with_same_name_list.size() < 2) { continue; } @@ -180,8 +182,17 @@ auto Language::XKBContext::next_layout() -> Layout* { auto name = std::string(rxkb_layout_get_name(xkb_layout_)); auto variant_ = rxkb_layout_get_variant(xkb_layout_); std::string variant = variant_ == nullptr ? "" : std::string(variant_); + auto short_description_ = rxkb_layout_get_brief(xkb_layout_); + std::string short_description; + if (short_description_ != nullptr) { + short_description = std::string(short_description_); + base_layouts_by_name_.emplace(name, xkb_layout_); + } else { + auto base_layout = base_layouts_by_name_[name]; + short_description = base_layout == nullptr ? "" : std::string(rxkb_layout_get_brief(base_layout)); + } - layout_ = new Layout{description, name, variant}; + layout_ = new Layout{description, name, variant, short_description}; return layout_; } From a87a967a97c48472a6b8bc632b0ad87c0988ac0d Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 17 Aug 2021 05:29:35 +0300 Subject: [PATCH 296/355] Fix leak --- src/modules/sway/language.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index f7be4cbc..0b56dad5 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -138,7 +138,7 @@ auto Language::init_layouts_map(const std::vector& used_layouts) -> layouts_map_.emplace(layout->full_name, *layout); } - //delete xkb_context_; + delete xkb_context_; if (is_variant_displayed || found_by_short_names.size() == 0) { return; From 2d80d3152797e53b2b7176e498d5c02f69b3cff8 Mon Sep 17 00:00:00 2001 From: Michael Swiger Date: Mon, 16 Aug 2021 23:33:29 -0700 Subject: [PATCH 297/355] Fix tray icon scaling on multi-display setups --- include/modules/sni/host.hpp | 5 ++++- include/modules/sni/item.hpp | 5 ++++- src/modules/sni/host.cpp | 5 +++-- src/modules/sni/item.cpp | 9 ++++++++- src/modules/sni/tray.cpp | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/include/modules/sni/host.hpp b/include/modules/sni/host.hpp index f97900fd..8d321036 100644 --- a/include/modules/sni/host.hpp +++ b/include/modules/sni/host.hpp @@ -5,13 +5,15 @@ #include #include #include +#include "bar.hpp" #include "modules/sni/item.hpp" namespace waybar::modules::SNI { class Host { public: - Host(const std::size_t id, const Json::Value&, const std::function&)>&, + Host(const std::size_t id, const Json::Value&, const Bar&, + const std::function&)>&, const std::function&)>&); ~Host(); @@ -36,6 +38,7 @@ class Host { GCancellable* cancellable_ = nullptr; SnWatcher* watcher_ = nullptr; const Json::Value& config_; + const Bar& bar_; const std::function&)> on_add_; const std::function&)> on_remove_; }; diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp index 1115145d..430c351c 100644 --- a/include/modules/sni/item.hpp +++ b/include/modules/sni/item.hpp @@ -14,6 +14,8 @@ #include #include +#include "bar.hpp" + namespace waybar::modules::SNI { struct ToolTip { @@ -23,7 +25,7 @@ struct ToolTip { class Item : public sigc::trackable { public: - Item(const std::string&, const std::string&, const Json::Value&); + Item(const std::string&, const std::string&, const Json::Value&, const Bar&); ~Item() = default; std::string bus_name; @@ -56,6 +58,7 @@ class Item : public sigc::trackable { bool item_is_menu = true; private: + void onConfigure(GdkEventConfigure* ev); void proxyReady(Glib::RefPtr& result); void setProperty(const Glib::ustring& name, Glib::VariantBase& value); void setStatus(const Glib::ustring& value); diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp index 868fcd6e..414f1515 100644 --- a/src/modules/sni/host.cpp +++ b/src/modules/sni/host.cpp @@ -4,7 +4,7 @@ namespace waybar::modules::SNI { -Host::Host(const std::size_t id, const Json::Value& config, +Host::Host(const std::size_t id, const Json::Value& config, const Bar& bar, const std::function&)>& on_add, const std::function&)>& on_remove) : bus_name_("org.kde.StatusNotifierHost-" + std::to_string(getpid()) + "-" + @@ -13,6 +13,7 @@ Host::Host(const std::size_t id, const Json::Value& config, bus_name_id_(Gio::DBus::own_name(Gio::DBus::BusType::BUS_TYPE_SESSION, bus_name_, sigc::mem_fun(*this, &Host::busAcquired))), config_(config), + bar_(bar), on_add_(on_add), on_remove_(on_remove) {} @@ -136,7 +137,7 @@ void Host::addRegisteredItem(std::string service) { return bus_name == item->bus_name && object_path == item->object_path; }); if (it == items_.end()) { - items_.emplace_back(new Item(bus_name, object_path, config_)); + items_.emplace_back(new Item(bus_name, object_path, config_, bar_)); on_add_(items_.back()); } } diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index d40f0ddf..991ccc4d 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -39,7 +39,7 @@ namespace waybar::modules::SNI { static const Glib::ustring SNI_INTERFACE_NAME = sn_item_interface_info()->name; static const unsigned UPDATE_DEBOUNCE_TIME = 10; -Item::Item(const std::string& bn, const std::string& op, const Json::Value& config) +Item::Item(const std::string& bn, const std::string& op, const Json::Value& config, const Bar& bar) : bus_name(bn), object_path(op), icon_size(16), @@ -54,6 +54,9 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf if (config["show-passive-items"].isBool()) { show_passive_ = config["show-passive-items"].asBool(); } + + auto &window = const_cast(bar).window; + window.signal_configure_event().connect_notify(sigc::mem_fun(*this, &Item::onConfigure)); event_box.add(image); event_box.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK); event_box.signal_button_press_event().connect(sigc::mem_fun(*this, &Item::handleClick)); @@ -73,6 +76,10 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf interface); } +void Item::onConfigure(GdkEventConfigure* ev) { + this->updateImage(); +} + void Item::proxyReady(Glib::RefPtr& result) { try { this->proxy_ = Gio::DBus::Proxy::create_for_bus_finish(result); diff --git a/src/modules/sni/tray.cpp b/src/modules/sni/tray.cpp index ae3702c2..e73c9eb4 100644 --- a/src/modules/sni/tray.cpp +++ b/src/modules/sni/tray.cpp @@ -7,7 +7,7 @@ Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config) : AModule(config, "tray", id), box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0), watcher_(SNI::Watcher::getInstance()), - host_(nb_hosts_, config, std::bind(&Tray::onAdd, this, std::placeholders::_1), + host_(nb_hosts_, config, bar, std::bind(&Tray::onAdd, this, std::placeholders::_1), std::bind(&Tray::onRemove, this, std::placeholders::_1)) { spdlog::warn( "For a functional tray you must have libappindicator-* installed and export " From 024fd42e272f79cb08e594eb3af86c93b1446c91 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 19 Aug 2021 14:59:25 +0200 Subject: [PATCH 298/355] river/tags: support urgent tags Upstream river has a concept of urgent views/tags as of commit e59c2a73. Introduce a new urgent style to expose this in the waybar module. --- include/modules/river/tags.hpp | 1 + man/waybar-river-tags.5.scd | 6 ++++-- protocol/river-status-unstable-v1.xml | 17 +++++++++++++---- src/modules/river/tags.cpp | 27 +++++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/include/modules/river/tags.hpp b/include/modules/river/tags.hpp index f80b3c59..9b75fbd3 100644 --- a/include/modules/river/tags.hpp +++ b/include/modules/river/tags.hpp @@ -18,6 +18,7 @@ class Tags : public waybar::AModule { // Handlers for wayland events void handle_focused_tags(uint32_t tags); void handle_view_tags(struct wl_array *tags); + void handle_urgent_tags(uint32_t tags); struct zriver_status_manager_v1 *status_manager_; diff --git a/man/waybar-river-tags.5.scd b/man/waybar-river-tags.5.scd index 0f027249..65b90332 100644 --- a/man/waybar-river-tags.5.scd +++ b/man/waybar-river-tags.5.scd @@ -15,7 +15,7 @@ Addressed by *river/tags* *num-tags*: ++ typeof: uint ++ default: 9 ++ - The number of tags that should be displayed. + The number of tags that should be displayed. Max 32. *tag-labels*: ++ typeof: array ++ @@ -34,8 +34,10 @@ Addressed by *river/tags* - *#tags button* - *#tags button.occupied* - *#tags button.focused* +- *#tags button.urgent* -Note that a tag can be both occupied and focused at the same time. +Note that occupied/focused/urgent status may overlap. That is, a tag may be +both occupied and focused at the same time. # SEE ALSO diff --git a/protocol/river-status-unstable-v1.xml b/protocol/river-status-unstable-v1.xml index a4d6f4e5..13affaa7 100644 --- a/protocol/river-status-unstable-v1.xml +++ b/protocol/river-status-unstable-v1.xml @@ -1,7 +1,7 @@ - Copyright 2020 Isaac Freund + Copyright 2020 The River Developers Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - + A global factory for objects that receive status information specific to river. It could be used to implement, for example, a status bar. @@ -47,7 +47,7 @@ - + This interface allows clients to receive information about the current windowing state of an output. @@ -75,12 +75,21 @@ + + + + Sent once on binding the interface and again whenever the set of + tags with at least one urgent view changes. + + + This interface allows clients to receive information about the current - focus of a seat. + focus of a seat. Note that (un)focused_output events will only be sent + if the client has bound the relevant wl_output globals. diff --git a/src/modules/river/tags.cpp b/src/modules/river/tags.cpp index e96b2016..2628af2d 100644 --- a/src/modules/river/tags.cpp +++ b/src/modules/river/tags.cpp @@ -22,14 +22,24 @@ static void listen_view_tags(void *data, struct zriver_output_status_v1 *zriver_ static_cast(data)->handle_view_tags(tags); } +static void listen_urgent_tags(void *data, struct zriver_output_status_v1 *zriver_output_status_v1, + uint32_t tags) { + static_cast(data)->handle_urgent_tags(tags); +} + static const zriver_output_status_v1_listener output_status_listener_impl{ .focused_tags = listen_focused_tags, .view_tags = listen_view_tags, + .urgent_tags = listen_urgent_tags, }; static void handle_global(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) { if (std::strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { + version = std::min(version, 2); + if (version < ZRIVER_OUTPUT_STATUS_V1_URGENT_TAGS_SINCE_VERSION) { + spdlog::warn("river server does not support urgent tags"); + } static_cast(data)->status_manager_ = static_cast( wl_registry_bind(registry, name, &zriver_status_manager_v1_interface, version)); } @@ -64,8 +74,9 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con } event_box_.add(box_); - // Default to 9 tags - const uint32_t num_tags = config["num-tags"].isUInt() ? config_["num-tags"].asUInt() : 9; + // Default to 9 tags, cap at 32 + const uint32_t num_tags = + config["num-tags"].isUInt() ? std::min(32, config_["num-tags"].asUInt()) : 9; std::vector tag_labels(num_tags); for (uint32_t tag = 0; tag < num_tags; ++tag) { @@ -129,4 +140,16 @@ void Tags::handle_view_tags(struct wl_array *view_tags) { } } +void Tags::handle_urgent_tags(uint32_t tags) { + uint32_t i = 0; + for (auto &button : buttons_) { + if ((1 << i) & tags) { + button.get_style_context()->add_class("urgent"); + } else { + button.get_style_context()->remove_class("urgent"); + } + ++i; + } +} + } /* namespace waybar::modules::river */ From c058a2d196509c15de6c85c241052f5ddc37c430 Mon Sep 17 00:00:00 2001 From: dmitry Date: Fri, 20 Aug 2021 01:09:16 +0300 Subject: [PATCH 299/355] Add number to shortDescripton --- include/modules/sway/language.hpp | 7 +++++++ src/modules/sway/language.cpp | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/modules/sway/language.hpp b/include/modules/sway/language.hpp index 5cceee6b..1faf52b3 100644 --- a/include/modules/sway/language.hpp +++ b/include/modules/sway/language.hpp @@ -21,6 +21,12 @@ class Language : public ALabel, public sigc::trackable { auto update() -> void; private: + enum class DispayedShortFlag { + None = 0, + ShortName = 1, + ShortDescription = 1 << 1 + }; + struct Layout { std::string full_name; std::string short_name; @@ -53,6 +59,7 @@ class Language : public ALabel, public sigc::trackable { std::string tooltip_format_ = ""; std::map layouts_map_; bool is_variant_displayed; + std::byte displayed_short_flag = static_cast(DispayedShortFlag::None); util::JsonParser parser_; std::mutex mutex_; diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index 0b56dad5..c13c636e 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -20,6 +20,12 @@ const std::string Language::XKB_ACTIVE_LAYOUT_NAME_KEY = "xkb_active_layout_name Language::Language(const std::string& id, const Json::Value& config) : ALabel(config, "language", id, "{}", 0, true) { is_variant_displayed = format_.find("{variant}") != std::string::npos; + if (format_.find("{}") != std::string::npos || format_.find("{short}") != std::string::npos) { + displayed_short_flag |= static_cast(DispayedShortFlag::ShortName); + } + if (format_.find("{shortDescription}") != std::string::npos) { + displayed_short_flag |= static_cast(DispayedShortFlag::ShortDescription); + } if (config.isMember("tooltip-format")) { tooltip_format_ = config["tooltip-format"].asString(); } @@ -155,9 +161,15 @@ auto Language::init_layouts_map(const std::vector& used_layouts) -> if (short_name_to_number_map.count(used_layout->short_name) == 0) { short_name_to_number_map[used_layout->short_name] = 1; } - - used_layout->short_name = - used_layout->short_name + std::to_string(short_name_to_number_map[used_layout->short_name]++); + + if (displayed_short_flag != static_cast(0)) { + int& number = short_name_to_number_map[used_layout->short_name]; + used_layout->short_name = + used_layout->short_name + std::to_string(number); + used_layout->short_description = + used_layout->short_description + std::to_string(number); + ++number; + } } } From 9ee701974fc23f82fd0f719ae4b2f2b50aca4f62 Mon Sep 17 00:00:00 2001 From: Gavin Beatty Date: Fri, 20 Aug 2021 10:06:35 -0500 Subject: [PATCH 300/355] Fix memory leak and data race - Delete previous Layout before creating next one, and in destructor - Use stack XKBContext instead of local new+delete - Lock mutex in update() as it is called from a different thread than onEvent(res) --- src/modules/sway/language.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index c13c636e..85dc769e 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -94,6 +94,7 @@ void Language::onEvent(const struct Ipc::ipc_response& res) { } auto Language::update() -> void { + std::lock_guard lock(mutex_); auto display_layout = trim(fmt::format(format_, fmt::arg("short", layout_.short_name), fmt::arg("shortDescription", layout_.short_description), @@ -125,9 +126,9 @@ auto Language::set_current_layout(std::string current_layout) -> void { auto Language::init_layouts_map(const std::vector& used_layouts) -> void { std::map> found_by_short_names; - XKBContext* xkb_context_ = new XKBContext(); - auto layout = xkb_context_->next_layout(); - for (; layout != nullptr; layout = xkb_context_->next_layout()) { + XKBContext xkb_context; + auto layout = xkb_context.next_layout(); + for (; layout != nullptr; layout = xkb_context.next_layout()) { if (std::find(used_layouts.begin(), used_layouts.end(), layout->full_name) == used_layouts.end()) { continue; @@ -144,7 +145,6 @@ auto Language::init_layouts_map(const std::vector& used_layouts) -> layouts_map_.emplace(layout->full_name, *layout); } - delete xkb_context_; if (is_variant_displayed || found_by_short_names.size() == 0) { return; @@ -203,10 +203,13 @@ auto Language::XKBContext::next_layout() -> Layout* { auto base_layout = base_layouts_by_name_[name]; short_description = base_layout == nullptr ? "" : std::string(rxkb_layout_get_brief(base_layout)); } - + delete layout_; layout_ = new Layout{description, name, variant, short_description}; return layout_; } -Language::XKBContext::~XKBContext() { rxkb_context_unref(context_); } +Language::XKBContext::~XKBContext() { + rxkb_context_unref(context_); + delete layout_; +} } // namespace waybar::modules::sway From cb49650ea48b457e0b5a4572d794bbc1a73bc33a Mon Sep 17 00:00:00 2001 From: Michael Swiger Date: Sun, 22 Aug 2021 14:46:40 -0700 Subject: [PATCH 301/355] Use g_memdup2 instead of g_memdup This fixes a compile warning. See: https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538 --- src/modules/sni/item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index 991ccc4d..917a92a9 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -287,7 +287,7 @@ Glib::RefPtr Item::extractPixBuf(GVariant* variant) { if (array != nullptr) { g_free(array); } - array = static_cast(g_memdup(data, size)); + array = static_cast(g_memdup2(data, size)); lwidth = width; lheight = height; } From 7b4b5e55a27ffbb748c63f2ebecab7d1629f7250 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Mon, 23 Aug 2021 07:30:07 +0200 Subject: [PATCH 302/355] support format-icon for cpu und memory --- man/waybar-cpu.5.scd | 5 +++++ man/waybar-memory.5.scd | 5 +++++ src/modules/cpu/common.cpp | 2 ++ src/modules/memory/common.cpp | 2 ++ 4 files changed, 14 insertions(+) diff --git a/man/waybar-cpu.5.scd b/man/waybar-cpu.5.scd index fbf6206f..679ca2ce 100644 --- a/man/waybar-cpu.5.scd +++ b/man/waybar-cpu.5.scd @@ -20,6 +20,11 @@ The *cpu* module displays the current cpu utilization. default: {usage}% ++ The format, how information should be displayed. On {} data gets inserted. +*format-icons*: ++ + typeof: array/object ++ + Based on the current usage, the corresponding icon gets selected. ++ + The order is *low* to *high*. Or by the state if it is an object. + *max-length*: ++ typeof: integer ++ The maximum length in character the module should display. diff --git a/man/waybar-memory.5.scd b/man/waybar-memory.5.scd index 3ff4c35b..0639c07c 100644 --- a/man/waybar-memory.5.scd +++ b/man/waybar-memory.5.scd @@ -22,6 +22,11 @@ Addressed by *memory* default: {percentage}% ++ The format, how information should be displayed. +*format-icons*: ++ + typeof: array/object ++ + Based on the current percentage, the corresponding icon gets selected. ++ + The order is *low* to *high*. Or by the state if it is an object. + *rotate*: ++ typeof: integer ++ Positive value to rotate the text label. diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index 2ca74212..767cde92 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -26,9 +26,11 @@ auto waybar::modules::Cpu::update() -> void { event_box_.hide(); } else { event_box_.show(); + auto icons = std::vector{state}; label_.set_markup(fmt::format(format, fmt::arg("load", cpu_load), fmt::arg("usage", cpu_usage), + fmt::arg("icon", getIcon(cpu_usage, icons)), fmt::arg("max_frequency", max_frequency), fmt::arg("min_frequency", min_frequency), fmt::arg("avg_frequency", avg_frequency))); diff --git a/src/modules/memory/common.cpp b/src/modules/memory/common.cpp index 09ce8e83..31219ed6 100644 --- a/src/modules/memory/common.cpp +++ b/src/modules/memory/common.cpp @@ -38,8 +38,10 @@ auto waybar::modules::Memory::update() -> void { event_box_.hide(); } else { event_box_.show(); + auto icons = std::vector{state}; label_.set_markup(fmt::format(format, used_ram_percentage, + fmt::arg("icon", getIcon(used_ram_percentage, icons)), fmt::arg("total", total_ram_gigabytes), fmt::arg("percentage", used_ram_percentage), fmt::arg("used", used_ram_gigabytes), From e0260ac4fc05b533210e35ef9b016ea3838f845b Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Mon, 23 Aug 2021 08:02:08 +0200 Subject: [PATCH 303/355] rm travis-ci shield --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37c0cfc7..98b99a2d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Waybar [![Travis](https://travis-ci.org/Alexays/Waybar.svg?branch=master)](https://travis-ci.org/Alexays/Waybar) [![Licence](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) [![Paypal Donate](https://img.shields.io/badge/Donate-Paypal-2244dd.svg)](https://paypal.me/ARouillard)
![Waybar](https://raw.githubusercontent.com/alexays/waybar/master/preview-2.png) +# Waybar [![Licence](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) [![Paypal Donate](https://img.shields.io/badge/Donate-Paypal-2244dd.svg)](https://paypal.me/ARouillard)
![Waybar](https://raw.githubusercontent.com/alexays/waybar/master/preview-2.png) > Highly customizable Wayland bar for Sway and Wlroots based compositors.
> Available in Arch [community](https://www.archlinux.org/packages/community/x86_64/waybar/) or From 9d9f95976926d5817837d03344b9506d700cee16 Mon Sep 17 00:00:00 2001 From: Ciaran Downey Date: Wed, 25 Aug 2021 14:47:51 -0700 Subject: [PATCH 304/355] Switch network module to read /proc/net/dev This fixes issue #610 by reading bandwidth usage per-interface from /proc/net/dev instead of globally via /proc/net/netstat. It supports the same matching logic as elsewhere, so setting interface to '*' should display the same sum-total bandwidth usage as the previous implementation. --- include/modules/network.hpp | 1 + src/modules/network.cpp | 168 +++++++++++++++++------------------- 2 files changed, 79 insertions(+), 90 deletions(-) diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 009ae5a3..183c9e2c 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -43,6 +43,7 @@ class Network : public ALabel { const std::string getNetworkState() const; void clearIface(); bool wildcardMatch(const std::string& pattern, const std::string& text) const; + std::optional> readBandwidthUsage(); int ifid_; sa_family_t family_; diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 7d0f6382..22b9f713 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -1,87 +1,79 @@ -#include "modules/network.hpp" +#include #include #include -#include -#include + #include +#include +#include #include + +#include "modules/network.hpp" #include "util/format.hpp" #ifdef WANT_RFKILL #include "util/rfkill.hpp" #endif namespace { - using namespace waybar::util; - -constexpr const char *NETSTAT_FILE = - "/proc/net/netstat"; // std::ifstream does not take std::string_view as param -constexpr std::string_view BANDWIDTH_CATEGORY = "IpExt"; -constexpr std::string_view BANDWIDTH_DOWN_TOTAL_KEY = "InOctets"; -constexpr std::string_view BANDWIDTH_UP_TOTAL_KEY = "OutOctets"; constexpr const char *DEFAULT_FORMAT = "{ifname}"; - -std::ifstream netstat(NETSTAT_FILE); -std::optional read_netstat(std::string_view category, std::string_view key) { - if (!netstat) { - spdlog::warn("Failed to open netstat file {}", NETSTAT_FILE); - return {}; - } - netstat.seekg(std::ios_base::beg); - - // finding corresponding line (category) - // looks into the file for the first line starting by the 'category' string - auto starts_with = [](const std::string &str, std::string_view start) { - return start == std::string_view{str.data(), std::min(str.size(), start.size())}; - }; - - std::string read; - while (std::getline(netstat, read) && !starts_with(read, category)) - ; - if (!starts_with(read, category)) { - spdlog::warn("Category '{}' not found in netstat file {}", category, NETSTAT_FILE); - return {}; - } - - // finding corresponding column (key) - // looks into the fetched line for the first word (space separated) equal to 'key' - int index = 0; - auto r_it = read.begin(); - auto k_it = key.begin(); - while (k_it != key.end() && r_it != read.end()) { - if (*r_it != *k_it) { - r_it = std::find(r_it, read.end(), ' '); - if (r_it != read.end()) { - ++r_it; - } - k_it = key.begin(); - ++index; - } else { - ++r_it; - ++k_it; - } - } - - if (r_it == read.end() && k_it != key.end()) { - spdlog::warn( - "Key '{}' not found in category '{}' of netstat file {}", key, category, NETSTAT_FILE); - return {}; - } - - // finally accessing value - // accesses the line right under the fetched one - std::getline(netstat, read); - assert(starts_with(read, category)); - std::istringstream iss(read); - while (index--) { - std::getline(iss, read, ' '); - } - unsigned long long value; - iss >> value; - return value; -} } // namespace +constexpr const char *NETDEV_FILE = + "/proc/net/dev"; // std::ifstream does not take std::string_view as param +std::optional> +waybar::modules::Network::readBandwidthUsage() { + std::ifstream netdev(NETDEV_FILE); + if (!netdev) { + spdlog::warn("Failed to open netdev file {}", NETDEV_FILE); + return {}; + } + + // skip the headers + std::string line; + std::getline(netdev, line); + std::getline(netdev, line); + if (!netdev) { + spdlog::warn("Unexpectedly short netdev file {}", NETDEV_FILE); + return {}; + } + + unsigned long long receivedBytes = 0ull; + unsigned long long transmittedBytes = 0ull; + for (std::getline(netdev, line); netdev; std::getline(netdev, line)) { + std::istringstream iss(line); + + std::string ifacename; + iss >> ifacename; // ifacename contains "eth0:" + ifacename.pop_back(); // remove trailing ':' + if (!checkInterface(ifacename)) { + continue; + } + + // The rest of the line consists of whitespace separated counts divided + // into two groups (receive and transmit). The first column in each group + // is bytes, which is the only one we care about. + unsigned long long r = 0ull; + unsigned long long t = 0ull; + // Read received bytes + iss >> r; + // Skip all the other columns in the received group + for (int colsToSkip = 7; colsToSkip > 0; colsToSkip--) { + // skip whitespace between columns + while (iss.peek() == ' ') { iss.ignore(); } + // skip the irrelevant column + while (iss.peek() != ' ') { iss.ignore(); } + } + // Read transmit bytes + iss >> t; + spdlog::trace("read r={}, t={}, iface={}", r, t, ifacename); + + receivedBytes += r; + transmittedBytes += t; + } + + return {{receivedBytes, transmittedBytes}}; +} + waybar::modules::Network::Network(const std::string &id, const Json::Value &config) : ALabel(config, "network", id, DEFAULT_FORMAT, 60), ifid_(-1), @@ -106,17 +98,12 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf // the module start with no text, but the the event_box_ is shown. label_.set_markup(""); - auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY); - auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY); - if (down_octets) { - bandwidth_down_total_ = *down_octets; + auto bandwidth = readBandwidthUsage(); + if (bandwidth.has_value()) { + bandwidth_down_total_ = (*bandwidth).first; + bandwidth_up_total_ = (*bandwidth).second; } else { bandwidth_down_total_ = 0; - } - - if (up_octets) { - bandwidth_up_total_ = *up_octets; - } else { bandwidth_up_total_ = 0; } @@ -303,20 +290,21 @@ const std::string waybar::modules::Network::getNetworkState() const { auto waybar::modules::Network::update() -> void { std::lock_guard lock(mutex_); std::string tooltip_format; - auto down_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_DOWN_TOTAL_KEY); - auto up_octets = read_netstat(BANDWIDTH_CATEGORY, BANDWIDTH_UP_TOTAL_KEY); - unsigned long long bandwidth_down = 0; - if (down_octets) { - bandwidth_down = *down_octets - bandwidth_down_total_; - bandwidth_down_total_ = *down_octets; + auto bandwidth = readBandwidthUsage(); + auto bandwidth_down = 0ull; + auto bandwidth_up = 0ull; + if (bandwidth.has_value()) { + auto down_octets = (*bandwidth).first; + auto up_octets = (*bandwidth).second; + + bandwidth_down = down_octets - bandwidth_down_total_; + bandwidth_down_total_ = down_octets; + + bandwidth_up = up_octets - bandwidth_up_total_; + bandwidth_up_total_ = up_octets; } - unsigned long long bandwidth_up = 0; - if (up_octets) { - bandwidth_up = *up_octets - bandwidth_up_total_; - bandwidth_up_total_ = *up_octets; - } if (!alt_) { auto state = getNetworkState(); if (!state_.empty() && label_.get_style_context()->has_class(state_)) { From 5186dd27e64b00b19736a2fa3bd6b325c4fcd555 Mon Sep 17 00:00:00 2001 From: Ciaran Downey Date: Thu, 26 Aug 2021 11:30:06 -0700 Subject: [PATCH 305/355] Use while (getline) instead of a for loop Also make the comments surrounding the /proc/net/dev parsing clearer and remove the apparently redundant "is the netdev file still good?" check. --- src/modules/network.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 22b9f713..5818f025 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -28,18 +28,14 @@ waybar::modules::Network::readBandwidthUsage() { return {}; } - // skip the headers std::string line; + // skip the headers (first two lines) std::getline(netdev, line); std::getline(netdev, line); - if (!netdev) { - spdlog::warn("Unexpectedly short netdev file {}", NETDEV_FILE); - return {}; - } unsigned long long receivedBytes = 0ull; unsigned long long transmittedBytes = 0ull; - for (std::getline(netdev, line); netdev; std::getline(netdev, line)) { + while (std::getline(netdev, line)) { std::istringstream iss(line); std::string ifacename; @@ -50,8 +46,11 @@ waybar::modules::Network::readBandwidthUsage() { } // The rest of the line consists of whitespace separated counts divided - // into two groups (receive and transmit). The first column in each group - // is bytes, which is the only one we care about. + // into two groups (receive and transmit). Each group has the following + // columns: bytes, packets, errs, drop, fifo, frame, compressed, multicast + // + // We only care about the bytes count, so we'll just ignore the 7 other + // columns. unsigned long long r = 0ull; unsigned long long t = 0ull; // Read received bytes @@ -65,7 +64,6 @@ waybar::modules::Network::readBandwidthUsage() { } // Read transmit bytes iss >> t; - spdlog::trace("read r={}, t={}, iface={}", r, t, ifacename); receivedBytes += r; transmittedBytes += t; From 4f76c9bd43dd7ff8108ffe81c690fe3e6232ee6a Mon Sep 17 00:00:00 2001 From: Michael Swiger Date: Sun, 29 Aug 2021 13:11:04 -0700 Subject: [PATCH 306/355] Only use g_memdup2 for glib >= 2.68 --- src/modules/sni/item.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index 917a92a9..d9748eda 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -287,7 +287,11 @@ Glib::RefPtr Item::extractPixBuf(GVariant* variant) { if (array != nullptr) { g_free(array); } +#if GLIB_MAJOR_VERSION >= 2 && GLIB_MINOR_VERSION >= 68 array = static_cast(g_memdup2(data, size)); +#else + array = static_cast(g_memdup(data, size)); +#endif lwidth = width; lheight = height; } From aacd0fcc652f36901632a252bd91e7f0c5f73cf1 Mon Sep 17 00:00:00 2001 From: Matan1x Date: Wed, 8 Sep 2021 17:12:30 +0300 Subject: [PATCH 307/355] round brightness --- src/modules/backlight.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp index 3ebc6e7b..fcd668c5 100644 --- a/src/modules/backlight.cpp +++ b/src/modules/backlight.cpp @@ -173,7 +173,7 @@ auto waybar::modules::Backlight::update() -> void { return; } - const auto percent = best->get_max() == 0 ? 100 : best->get_actual() * 100 / best->get_max(); + const uint8_t percent = best->get_max() == 0 ? 100 : round(best->get_actual() * 100.0f / best->get_max()); label_.set_markup(fmt::format( format_, fmt::arg("percent", std::to_string(percent)), fmt::arg("icon", getIcon(percent)))); getState(percent); From 2c380a53caabfc831d832985becb95b69d202eed Mon Sep 17 00:00:00 2001 From: Rolf Vidar Mazunki Hoksaas Date: Thu, 9 Sep 2021 20:05:18 +0200 Subject: [PATCH 308/355] added support for the {gwaddr} variable --- Makefile | 3 +++ include/modules/network.hpp | 1 + man/waybar-network.5.scd | 2 ++ src/modules/network.cpp | 10 +++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d7182c18..ccf05073 100644 --- a/Makefile +++ b/Makefile @@ -16,5 +16,8 @@ install: build run: build ./build/waybar +debug-run: build + ./build/waybar --log-level debug + clean: rm -rf build diff --git a/include/modules/network.hpp b/include/modules/network.hpp index 009ae5a3..ad28520e 100644 --- a/include/modules/network.hpp +++ b/include/modules/network.hpp @@ -67,6 +67,7 @@ class Network : public ALabel { bool carrier_; std::string ifname_; std::string ipaddr_; + std::string gwaddr_; std::string netmask_; int cidr_; int32_t signal_strength_dbm_; diff --git a/man/waybar-network.5.scd b/man/waybar-network.5.scd index f274881e..f8bdd65d 100644 --- a/man/waybar-network.5.scd +++ b/man/waybar-network.5.scd @@ -131,6 +131,8 @@ Addressed by *network* *{ipaddr}*: The first IP of the interface. +*{gwaddr}*: The default gateway for the interface + *{netmask}*: The subnetmask corresponding to the IP. *{cidr}*: The subnetmask corresponding to the IP in CIDR notation. diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 7d0f6382..a45f2b87 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -348,6 +348,7 @@ auto waybar::modules::Network::update() -> void { fmt::arg("ifname", ifname_), fmt::arg("netmask", netmask_), fmt::arg("ipaddr", ipaddr_), + fmt::arg("gwaddr", gwaddr_), fmt::arg("cidr", cidr_), fmt::arg("frequency", frequency_), fmt::arg("icon", getIcon(signal_strength_, state_)), @@ -376,6 +377,7 @@ auto waybar::modules::Network::update() -> void { fmt::arg("ifname", ifname_), fmt::arg("netmask", netmask_), fmt::arg("ipaddr", ipaddr_), + fmt::arg("gwaddr", gwaddr_), fmt::arg("cidr", cidr_), fmt::arg("frequency", frequency_), fmt::arg("icon", getIcon(signal_strength_, state_)), @@ -409,6 +411,7 @@ void waybar::modules::Network::clearIface() { ifname_.clear(); essid_.clear(); ipaddr_.clear(); + gwaddr_.clear(); netmask_.clear(); carrier_ = false; cidr_ = 0; @@ -581,6 +584,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { break; } + char temp_gw_addr[INET6_ADDRSTRLEN]; case RTM_DELROUTE: is_del_event = true; case RTM_NEWROUTE: { @@ -595,6 +599,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { int temp_idx = -1; uint32_t priority = 0; + /* Find the message(s) concerting the main routing table, each message * corresponds to a single routing table entry. */ @@ -612,9 +617,10 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { case RTA_GATEWAY: /* The gateway of the route. * - * If someone every needs to figure out the gateway address as well, + * If someone ever needs to figure out the gateway address as well, * it's here as the attribute payload. */ + inet_ntop(net->family_, RTA_DATA(attr), temp_gw_addr, sizeof(temp_gw_addr)); has_gateway = true; break; case RTA_DST: { @@ -655,6 +661,8 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->clearIface(); net->ifid_ = temp_idx; net->route_priority = priority; + net->gwaddr_ = temp_gw_addr; + spdlog::debug("netwok: gateway {}", net->gwaddr_); spdlog::debug("network: new default route via if{} metric {}", temp_idx, priority); From 95ecff05511f71fc542429059b843ecd369854ef Mon Sep 17 00:00:00 2001 From: Rolf Vidar Mazunki Hoksaas Date: Thu, 9 Sep 2021 20:12:20 +0200 Subject: [PATCH 309/355] added example tooltip usage --- resources/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/config b/resources/config index 87f24c04..b3157212 100644 --- a/resources/config +++ b/resources/config @@ -117,7 +117,8 @@ "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ifname}: {ipaddr}/{cidr} ", + "format-ethernet": "{ipaddr}/{cidr} ", + "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", "format-disconnected": "Disconnected ⚠", "format-alt": "{ifname}: {ipaddr}/{cidr}" From b377520a38dd0a2aa68301039e9f649d98a94f5f Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 13 Aug 2021 06:08:27 -0700 Subject: [PATCH 310/355] refactor(client): extract config handling into a new class --- include/client.hpp | 14 +--- include/config.hpp | 31 +++++++++ meson.build | 1 + src/client.cpp | 148 +--------------------------------------- src/config.cpp | 166 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 204 insertions(+), 156 deletions(-) create mode 100644 include/config.hpp create mode 100644 src/config.cpp diff --git a/include/client.hpp b/include/client.hpp index e7fa1db0..e68e4ad0 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -3,11 +3,10 @@ #include #include #include -#include #include -#include #include "bar.hpp" +#include "config.hpp" struct zwlr_layer_shell_v1; struct zwp_idle_inhibitor_v1; @@ -32,15 +31,8 @@ class Client { private: Client() = default; - std::tuple getConfigs(const std::string &config, - const std::string &style) const; - void bindInterfaces(); - const std::string getValidPath(const std::vector &paths) const; + void bindInterfaces(); void handleOutput(struct waybar_output &output); - bool isValidOutput(const Json::Value &config, struct waybar_output &output); - auto setupConfig(const std::string &config_file, int depth) -> void; - auto resolveConfigIncludes(Json::Value &config, int depth) -> void; - auto mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void; auto setupCss(const std::string &css_file) -> void; struct waybar_output & getOutput(void *); std::vector getOutputConfigs(struct waybar_output &output); @@ -55,7 +47,7 @@ class Client { void handleMonitorRemoved(Glib::RefPtr monitor); void handleDeferredMonitorRemoval(Glib::RefPtr monitor); - Json::Value config_; + Config config_; Glib::RefPtr style_context_; Glib::RefPtr css_provider_; std::list outputs_; diff --git a/include/config.hpp b/include/config.hpp new file mode 100644 index 00000000..bb7b9068 --- /dev/null +++ b/include/config.hpp @@ -0,0 +1,31 @@ +#pragma once + +#include + +#include + +namespace waybar { + +class Config { + public: + Config() = default; + + void load(const std::string &config, const std::string &style); + + const std::string &getStyle() { return css_file_; } + + Json::Value &getConfig() { return config_; } + + std::vector getOutputConfigs(const std::string &name, const std::string &identifier); + + private: + void setupConfig(const std::string &config_file, int depth); + void resolveConfigIncludes(Json::Value &config, int depth); + void mergeConfig(Json::Value &a_config_, Json::Value &b_config_); + + std::string config_file_; + std::string css_file_; + + Json::Value config_; +}; +} // namespace waybar diff --git a/meson.build b/meson.build index 835b70e3..641607d6 100644 --- a/meson.build +++ b/meson.build @@ -149,6 +149,7 @@ src_files = files( 'src/main.cpp', 'src/bar.cpp', 'src/client.cpp', + 'src/config.cpp', 'src/util/ustring_clen.cpp' ) diff --git a/src/client.cpp b/src/client.cpp index ff6e7bf2..b50faff7 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -3,12 +3,10 @@ #include #include -#include #include #include "idle-inhibit-unstable-v1-client-protocol.h" #include "util/clara.hpp" -#include "util/json.hpp" #include "wlr-layer-shell-unstable-v1-client-protocol.h" waybar::Client *waybar::Client::inst() { @@ -16,23 +14,6 @@ waybar::Client *waybar::Client::inst() { return c; } -const std::string waybar::Client::getValidPath(const std::vector &paths) const { - wordexp_t p; - - for (const std::string &path : paths) { - if (wordexp(path.c_str(), &p, 0) == 0) { - if (access(*p.we_wordv, F_OK) == 0) { - std::string result = *p.we_wordv; - wordfree(&p); - return result; - } - wordfree(&p); - } - } - - return std::string(); -} - void waybar::Client::handleGlobal(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) { auto client = static_cast(data); @@ -70,29 +51,6 @@ void waybar::Client::handleOutput(struct waybar_output &output) { zxdg_output_v1_add_listener(output.xdg_output.get(), &xdgOutputListener, &output); } -bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_output &output) { - if (config["output"].isArray()) { - for (auto const &output_conf : config["output"]) { - if (output_conf.isString() && - (output_conf.asString() == output.name || output_conf.asString() == output.identifier)) { - return true; - } - } - return false; - } else if (config["output"].isString()) { - auto config_output = config["output"].asString(); - if (!config_output.empty()) { - if (config_output.substr(0, 1) == "!") { - return config_output.substr(1) != output.name && - config_output.substr(1) != output.identifier; - } - return config_output == output.name || config_output == output.identifier; - } - } - - return true; -} - struct waybar::waybar_output &waybar::Client::getOutput(void *addr) { auto it = std::find_if( outputs_.begin(), outputs_.end(), [&addr](const auto &output) { return &output == addr; }); @@ -103,17 +61,7 @@ struct waybar::waybar_output &waybar::Client::getOutput(void *addr) { } std::vector waybar::Client::getOutputConfigs(struct waybar_output &output) { - std::vector configs; - if (config_.isArray()) { - for (auto const &config : config_) { - if (config.isObject() && isValidOutput(config, output)) { - configs.push_back(config); - } - } - } else if (isValidOutput(config_, output)) { - configs.push_back(config_); - } - return configs; + return config_.getOutputConfigs(output.name, output.identifier); } void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_output*/) { @@ -203,95 +151,6 @@ void waybar::Client::handleDeferredMonitorRemoval(Glib::RefPtr mon outputs_.remove_if([&monitor](const auto &output) { return output.monitor == monitor; }); } -std::tuple waybar::Client::getConfigs( - const std::string &config, const std::string &style) const { - auto config_file = config.empty() ? getValidPath({ - "$XDG_CONFIG_HOME/waybar/config", - "$XDG_CONFIG_HOME/waybar/config.jsonc", - "$HOME/.config/waybar/config", - "$HOME/.config/waybar/config.jsonc", - "$HOME/waybar/config", - "$HOME/waybar/config.jsonc", - "/etc/xdg/waybar/config", - "/etc/xdg/waybar/config.jsonc", - SYSCONFDIR "/xdg/waybar/config", - "./resources/config", - }) - : config; - auto css_file = style.empty() ? getValidPath({ - "$XDG_CONFIG_HOME/waybar/style.css", - "$HOME/.config/waybar/style.css", - "$HOME/waybar/style.css", - "/etc/xdg/waybar/style.css", - SYSCONFDIR "/xdg/waybar/style.css", - "./resources/style.css", - }) - : style; - if (css_file.empty() || config_file.empty()) { - throw std::runtime_error("Missing required resources files"); - } - spdlog::info("Resources files: {}, {}", config_file, css_file); - return {config_file, css_file}; -} - -auto waybar::Client::setupConfig(const std::string &config_file, int depth) -> void { - if (depth > 100) { - throw std::runtime_error("Aborting due to likely recursive include in config files"); - } - std::ifstream file(config_file); - if (!file.is_open()) { - throw std::runtime_error("Can't open config file"); - } - std::string str((std::istreambuf_iterator(file)), std::istreambuf_iterator()); - util::JsonParser parser; - Json::Value tmp_config_ = parser.parse(str); - if (tmp_config_.isArray()) { - for (auto &config_part : tmp_config_) { - resolveConfigIncludes(config_part, depth); - } - } else { - resolveConfigIncludes(tmp_config_, depth); - } - mergeConfig(config_, tmp_config_); -} - -auto waybar::Client::resolveConfigIncludes(Json::Value &config, int depth) -> void { - Json::Value includes = config["include"]; - if (includes.isArray()) { - for (const auto &include : includes) { - spdlog::info("Including resource file: {}", include.asString()); - setupConfig(getValidPath({include.asString()}), ++depth); - } - } else if (includes.isString()) { - spdlog::info("Including resource file: {}", includes.asString()); - setupConfig(getValidPath({includes.asString()}), ++depth); - } -} - -auto waybar::Client::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) -> void { - if (!a_config_) { - // For the first config - a_config_ = b_config_; - } else if (a_config_.isObject() && b_config_.isObject()) { - for (const auto &key : b_config_.getMemberNames()) { - if (a_config_[key].isObject() && b_config_[key].isObject()) { - mergeConfig(a_config_[key], b_config_[key]); - } else { - a_config_[key] = b_config_[key]; - } - } - } else if (a_config_.isArray() && b_config_.isArray()) { - // This can happen only on the top-level array of a multi-bar config - for (Json::Value::ArrayIndex i = 0; i < b_config_.size(); i++) { - if (a_config_[i].isObject() && b_config_[i].isObject()) { - mergeConfig(a_config_[i], b_config_[i]); - } - } - } else { - spdlog::error("Cannot merge config, conflicting or invalid JSON types"); - } -} - auto waybar::Client::setupCss(const std::string &css_file) -> void { css_provider_ = Gtk::CssProvider::create(); style_context_ = Gtk::StyleContext::create(); @@ -367,9 +226,8 @@ int waybar::Client::main(int argc, char *argv[]) { throw std::runtime_error("Bar need to run under Wayland"); } wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj()); - auto [config_file, css_file] = getConfigs(config, style); - setupConfig(config_file, 0); - setupCss(css_file); + config_.load(config, style); + setupCss(config_.getStyle()); bindInterfaces(); gtk_app->hold(); gtk_app->run(); diff --git a/src/config.cpp b/src/config.cpp new file mode 100644 index 00000000..6c7fa179 --- /dev/null +++ b/src/config.cpp @@ -0,0 +1,166 @@ +#include "config.hpp" + +#include +#include +#include + +#include +#include + +#include "util/json.hpp" + +#ifndef SYSCONFDIR +#define SYSCONFDIR "/etc" +#endif + +namespace waybar { + +const std::string getValidPath(const std::vector &paths) { + wordexp_t p; + + for (const std::string &path : paths) { + if (wordexp(path.c_str(), &p, 0) == 0) { + if (access(*p.we_wordv, F_OK) == 0) { + std::string result = *p.we_wordv; + wordfree(&p); + return result; + } + wordfree(&p); + } + } + + return std::string(); +} + +std::tuple getConfigs(const std::string &config, + const std::string &style) { + auto config_file = config.empty() ? getValidPath({ + "$XDG_CONFIG_HOME/waybar/config", + "$XDG_CONFIG_HOME/waybar/config.jsonc", + "$HOME/.config/waybar/config", + "$HOME/.config/waybar/config.jsonc", + "$HOME/waybar/config", + "$HOME/waybar/config.jsonc", + "/etc/xdg/waybar/config", + "/etc/xdg/waybar/config.jsonc", + SYSCONFDIR "/xdg/waybar/config", + "./resources/config", + }) + : config; + auto css_file = style.empty() ? getValidPath({ + "$XDG_CONFIG_HOME/waybar/style.css", + "$HOME/.config/waybar/style.css", + "$HOME/waybar/style.css", + "/etc/xdg/waybar/style.css", + SYSCONFDIR "/xdg/waybar/style.css", + "./resources/style.css", + }) + : style; + if (css_file.empty() || config_file.empty()) { + throw std::runtime_error("Missing required resources files"); + } + spdlog::info("Resources files: {}, {}", config_file, css_file); + return {config_file, css_file}; +} + +void Config::setupConfig(const std::string &config_file, int depth) { + if (depth > 100) { + throw std::runtime_error("Aborting due to likely recursive include in config files"); + } + std::ifstream file(config_file); + if (!file.is_open()) { + throw std::runtime_error("Can't open config file"); + } + std::string str((std::istreambuf_iterator(file)), std::istreambuf_iterator()); + util::JsonParser parser; + Json::Value tmp_config = parser.parse(str); + if (tmp_config.isArray()) { + for (auto &config_part : tmp_config) { + resolveConfigIncludes(config_part, depth); + } + } else { + resolveConfigIncludes(tmp_config, depth); + } + mergeConfig(config_, tmp_config); +} + +void Config::resolveConfigIncludes(Json::Value &config, int depth) { + Json::Value includes = config["include"]; + if (includes.isArray()) { + for (const auto &include : includes) { + spdlog::info("Including resource file: {}", include.asString()); + setupConfig(getValidPath({include.asString()}), ++depth); + } + } else if (includes.isString()) { + spdlog::info("Including resource file: {}", includes.asString()); + setupConfig(getValidPath({includes.asString()}), ++depth); + } +} + +void Config::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) { + if (!a_config_) { + // For the first config + a_config_ = b_config_; + } else if (a_config_.isObject() && b_config_.isObject()) { + for (const auto &key : b_config_.getMemberNames()) { + if (a_config_[key].isObject() && b_config_[key].isObject()) { + mergeConfig(a_config_[key], b_config_[key]); + } else { + a_config_[key] = b_config_[key]; + } + } + } else if (a_config_.isArray() && b_config_.isArray()) { + // This can happen only on the top-level array of a multi-bar config + for (Json::Value::ArrayIndex i = 0; i < b_config_.size(); i++) { + if (a_config_[i].isObject() && b_config_[i].isObject()) { + mergeConfig(a_config_[i], b_config_[i]); + } + } + } else { + spdlog::error("Cannot merge config, conflicting or invalid JSON types"); + } +} +bool isValidOutput(const Json::Value &config, const std::string &name, + const std::string &identifier) { + if (config["output"].isArray()) { + for (auto const &output_conf : config["output"]) { + if (output_conf.isString() && + (output_conf.asString() == name || output_conf.asString() == identifier)) { + return true; + } + } + return false; + } else if (config["output"].isString()) { + auto config_output = config["output"].asString(); + if (!config_output.empty()) { + if (config_output.substr(0, 1) == "!") { + return config_output.substr(1) != name && config_output.substr(1) != identifier; + } + return config_output == name || config_output == identifier; + } + } + + return true; +} + +void Config::load(const std::string &config, const std::string &style) { + std::tie(config_file_, css_file_) = getConfigs(config, style); + setupConfig(config_file_, 0); +} + +std::vector Config::getOutputConfigs(const std::string &name, + const std::string &identifier) { + std::vector configs; + if (config_.isArray()) { + for (auto const &config : config_) { + if (config.isObject() && isValidOutput(config, name, identifier)) { + configs.push_back(config); + } + } + } else if (isValidOutput(config_, name, identifier)) { + configs.push_back(config_); + } + return configs; +} + +} // namespace waybar From 4fff2eaaa0851c559fabd5b04ef08de8b9604fe1 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 15 Sep 2021 21:24:45 +0700 Subject: [PATCH 311/355] refactor(client): change config visibility to public --- include/client.hpp | 2 +- src/client.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index e68e4ad0..1124cbba 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -28,6 +28,7 @@ class Client { struct zxdg_output_manager_v1 * xdg_output_manager = nullptr; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager = nullptr; std::vector> bars; + Config config; private: Client() = default; @@ -47,7 +48,6 @@ class Client { void handleMonitorRemoved(Glib::RefPtr monitor); void handleDeferredMonitorRemoval(Glib::RefPtr monitor); - Config config_; Glib::RefPtr style_context_; Glib::RefPtr css_provider_; std::list outputs_; diff --git a/src/client.cpp b/src/client.cpp index b50faff7..07648839 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -61,7 +61,7 @@ struct waybar::waybar_output &waybar::Client::getOutput(void *addr) { } std::vector waybar::Client::getOutputConfigs(struct waybar_output &output) { - return config_.getOutputConfigs(output.name, output.identifier); + return config.getOutputConfigs(output.name, output.identifier); } void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_output*/) { @@ -188,14 +188,14 @@ void waybar::Client::bindInterfaces() { int waybar::Client::main(int argc, char *argv[]) { bool show_help = false; bool show_version = false; - std::string config; - std::string style; + std::string config_opt; + std::string style_opt; std::string bar_id; std::string log_level; auto cli = clara::detail::Help(show_help) | clara::detail::Opt(show_version)["-v"]["--version"]("Show version") | - clara::detail::Opt(config, "config")["-c"]["--config"]("Config path") | - clara::detail::Opt(style, "style")["-s"]["--style"]("Style path") | + clara::detail::Opt(config_opt, "config")["-c"]["--config"]("Config path") | + clara::detail::Opt(style_opt, "style")["-s"]["--style"]("Style path") | clara::detail::Opt( log_level, "trace|debug|info|warning|error|critical|off")["-l"]["--log-level"]("Log level") | @@ -226,8 +226,8 @@ int waybar::Client::main(int argc, char *argv[]) { throw std::runtime_error("Bar need to run under Wayland"); } wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj()); - config_.load(config, style); - setupCss(config_.getStyle()); + config.load(config_opt, style_opt); + setupCss(config.getStyle()); bindInterfaces(); gtk_app->hold(); gtk_app->run(); From 1f7d399b8edd3ea76612e674ee1b3fb1a365e483 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 13 Aug 2021 07:19:47 -0700 Subject: [PATCH 312/355] refactor(config): remove style handling from Config --- include/client.hpp | 1 + include/config.hpp | 16 ++++++--- src/client.cpp | 14 ++++++-- src/config.cpp | 84 ++++++++++++++++++++++------------------------ 4 files changed, 66 insertions(+), 49 deletions(-) diff --git a/include/client.hpp b/include/client.hpp index 1124cbba..bd80d0bd 100644 --- a/include/client.hpp +++ b/include/client.hpp @@ -32,6 +32,7 @@ class Client { private: Client() = default; + const std::string getStyle(const std::string &style); void bindInterfaces(); void handleOutput(struct waybar_output &output); auto setupCss(const std::string &css_file) -> void; diff --git a/include/config.hpp b/include/config.hpp index bb7b9068..25b78ab2 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -2,17 +2,26 @@ #include +#include #include +#ifndef SYSCONFDIR +#define SYSCONFDIR "/etc" +#endif + namespace waybar { class Config { public: + static const std::vector CONFIG_DIRS; + + /* Try to find any of provided names in the supported set of config directories */ + static std::optional findConfigPath( + const std::vector &names, const std::vector &dirs = CONFIG_DIRS); + Config() = default; - void load(const std::string &config, const std::string &style); - - const std::string &getStyle() { return css_file_; } + void load(const std::string &config); Json::Value &getConfig() { return config_; } @@ -24,7 +33,6 @@ class Config { void mergeConfig(Json::Value &a_config_, Json::Value &b_config_); std::string config_file_; - std::string css_file_; Json::Value config_; }; diff --git a/src/client.cpp b/src/client.cpp index 07648839..95f5a295 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -151,6 +151,15 @@ void waybar::Client::handleDeferredMonitorRemoval(Glib::RefPtr mon outputs_.remove_if([&monitor](const auto &output) { return output.monitor == monitor; }); } +const std::string waybar::Client::getStyle(const std::string &style) { + auto css_file = style.empty() ? Config::findConfigPath({"style.css"}) : style; + if (!css_file) { + throw std::runtime_error("Missing required resource files"); + } + spdlog::info("Using CSS file {}", css_file.value()); + return css_file.value(); +}; + auto waybar::Client::setupCss(const std::string &css_file) -> void { css_provider_ = Gtk::CssProvider::create(); style_context_ = Gtk::StyleContext::create(); @@ -226,8 +235,9 @@ int waybar::Client::main(int argc, char *argv[]) { throw std::runtime_error("Bar need to run under Wayland"); } wl_display = gdk_wayland_display_get_wl_display(gdk_display->gobj()); - config.load(config_opt, style_opt); - setupCss(config.getStyle()); + config.load(config_opt); + auto css_file = getStyle(style_opt); + setupCss(css_file); bindInterfaces(); gtk_app->hold(); gtk_app->run(); diff --git a/src/config.cpp b/src/config.cpp index 6c7fa179..ed7168dc 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -9,58 +9,51 @@ #include "util/json.hpp" -#ifndef SYSCONFDIR -#define SYSCONFDIR "/etc" -#endif - namespace waybar { -const std::string getValidPath(const std::vector &paths) { - wordexp_t p; +const std::vector Config::CONFIG_DIRS = { + "$XDG_CONFIG_HOME/waybar/", + "$HOME/.config/waybar/", + "$HOME/waybar/", + "/etc/xdg/waybar/", + SYSCONFDIR "/xdg/waybar/", + "./resources/", +}; - for (const std::string &path : paths) { - if (wordexp(path.c_str(), &p, 0) == 0) { - if (access(*p.we_wordv, F_OK) == 0) { - std::string result = *p.we_wordv; - wordfree(&p); - return result; - } +std::optional tryExpandPath(const std::string &path) { + wordexp_t p; + if (wordexp(path.c_str(), &p, 0) == 0) { + if (access(*p.we_wordv, F_OK) == 0) { + std::string result = *p.we_wordv; wordfree(&p); + return result; + } + wordfree(&p); + } + return std::nullopt; +} + +const std::string getValidPath(const std::vector &paths) { + for (const std::string &path : paths) { + if (auto res = tryExpandPath(path); res) { + return res.value(); } } return std::string(); } -std::tuple getConfigs(const std::string &config, - const std::string &style) { - auto config_file = config.empty() ? getValidPath({ - "$XDG_CONFIG_HOME/waybar/config", - "$XDG_CONFIG_HOME/waybar/config.jsonc", - "$HOME/.config/waybar/config", - "$HOME/.config/waybar/config.jsonc", - "$HOME/waybar/config", - "$HOME/waybar/config.jsonc", - "/etc/xdg/waybar/config", - "/etc/xdg/waybar/config.jsonc", - SYSCONFDIR "/xdg/waybar/config", - "./resources/config", - }) - : config; - auto css_file = style.empty() ? getValidPath({ - "$XDG_CONFIG_HOME/waybar/style.css", - "$HOME/.config/waybar/style.css", - "$HOME/waybar/style.css", - "/etc/xdg/waybar/style.css", - SYSCONFDIR "/xdg/waybar/style.css", - "./resources/style.css", - }) - : style; - if (css_file.empty() || config_file.empty()) { - throw std::runtime_error("Missing required resources files"); +std::optional Config::findConfigPath(const std::vector &names, + const std::vector &dirs) { + std::vector paths; + for (const auto &dir : dirs) { + for (const auto &name : names) { + if (auto res = tryExpandPath(dir + name); res) { + return res; + } + } } - spdlog::info("Resources files: {}, {}", config_file, css_file); - return {config_file, css_file}; + return std::nullopt; } void Config::setupConfig(const std::string &config_file, int depth) { @@ -143,8 +136,13 @@ bool isValidOutput(const Json::Value &config, const std::string &name, return true; } -void Config::load(const std::string &config, const std::string &style) { - std::tie(config_file_, css_file_) = getConfigs(config, style); +void Config::load(const std::string &config) { + auto file = config.empty() ? findConfigPath({"config", "config.jsonc"}) : config; + if (!file) { + throw std::runtime_error("Missing required resource files"); + } + config_file_ = file.value(); + spdlog::info("Using configuration file {}", config_file_); setupConfig(config_file_, 0); } From 1f16d7955d7832e2fcdc3317d42034ac0c772dac Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 13 Aug 2021 08:19:12 -0700 Subject: [PATCH 313/355] refactor(config): drop getValidPath --- src/config.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index ed7168dc..207e1bd1 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -33,16 +33,6 @@ std::optional tryExpandPath(const std::string &path) { return std::nullopt; } -const std::string getValidPath(const std::vector &paths) { - for (const std::string &path : paths) { - if (auto res = tryExpandPath(path); res) { - return res.value(); - } - } - - return std::string(); -} - std::optional Config::findConfigPath(const std::vector &names, const std::vector &dirs) { std::vector paths; @@ -82,11 +72,11 @@ void Config::resolveConfigIncludes(Json::Value &config, int depth) { if (includes.isArray()) { for (const auto &include : includes) { spdlog::info("Including resource file: {}", include.asString()); - setupConfig(getValidPath({include.asString()}), ++depth); + setupConfig(tryExpandPath(include.asString()).value_or(""), ++depth); } } else if (includes.isString()) { spdlog::info("Including resource file: {}", includes.asString()); - setupConfig(getValidPath({includes.asString()}), ++depth); + setupConfig(tryExpandPath(includes.asString()).value_or(""), ++depth); } } From 6eba62f0600379f9d594dea1fa5c41024f55fe8e Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 13 Aug 2021 18:33:24 -0700 Subject: [PATCH 314/355] test: add build configs for catch2 --- meson.build | 9 +++++++++ meson_options.txt | 1 + subprojects/catch2.wrap | 12 ++++++++++++ test/config.cpp | 4 ++++ test/meson.build | 21 +++++++++++++++++++++ 5 files changed, 47 insertions(+) create mode 100644 subprojects/catch2.wrap create mode 100644 test/config.cpp create mode 100644 test/meson.build diff --git a/meson.build b/meson.build index 641607d6..c09fbb61 100644 --- a/meson.build +++ b/meson.build @@ -360,6 +360,15 @@ if scdoc.found() endforeach endif +catch2 = dependency( + 'catch2', + fallback: ['catch2', 'catch2_dep'], + required: get_option('tests'), +) +if catch2.found() + subdir('test') +endif + clangtidy = find_program('clang-tidy', required: false) if clangtidy.found() diff --git a/meson_options.txt b/meson_options.txt index fefb3dc3..81e44689 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,3 +10,4 @@ option('mpd', type: 'feature', value: 'auto', description: 'Enable support for t option('gtk-layer-shell', type: 'feature', value: 'auto', description: 'Use gtk-layer-shell library for popups support') option('rfkill', type: 'feature', value: 'auto', description: 'Enable support for RFKILL') option('sndio', type: 'feature', value: 'auto', description: 'Enable support for sndio') +option('tests', type: 'feature', value: 'auto', description: 'Enable tests') diff --git a/subprojects/catch2.wrap b/subprojects/catch2.wrap new file mode 100644 index 00000000..356c4063 --- /dev/null +++ b/subprojects/catch2.wrap @@ -0,0 +1,12 @@ +[wrap-file] +directory = Catch2-2.13.3 +source_url = https://github.com/catchorg/Catch2/archive/v2.13.3.zip +source_filename = Catch2-2.13.3.zip +source_hash = 1804feb72bc15c0856b4a43aa586c661af9c3685a75973b6a8fc0b950c7cfd13 +patch_url = https://github.com/mesonbuild/catch2/releases/download/2.13.3-2/catch2.zip +patch_filename = catch2-2.13.3-2-wrap.zip +patch_hash = 21b590ab8c65b593ad5ee8f8e5b822bf9877b2c2672f97fbb52459751053eadf + +[provide] +catch2 = catch2_dep + diff --git a/test/config.cpp b/test/config.cpp new file mode 100644 index 00000000..41180bb7 --- /dev/null +++ b/test/config.cpp @@ -0,0 +1,4 @@ +#define CATCH_CONFIG_MAIN +#include "config.hpp" + +#include diff --git a/test/meson.build b/test/meson.build new file mode 100644 index 00000000..85b9771f --- /dev/null +++ b/test/meson.build @@ -0,0 +1,21 @@ +test_inc = include_directories('../include') +test_dep = [ + catch2, + fmt, + jsoncpp, + spdlog, +] + +config_test = executable( + 'config_test', + 'config.cpp', + '../src/config.cpp', + dependencies: test_dep, + include_directories: test_inc, +) + +test( + 'Configuration test', + config_test, + workdir: meson.source_root(), +) From 9f3b34e4d9c47eae5c3a7179e70952d5c6ba3f61 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 13 Aug 2021 18:50:36 -0700 Subject: [PATCH 315/355] test: validate configuration load --- test/config.cpp | 74 ++++++++++++++++++++++++++++++++++++++ test/config/include-1.json | 6 ++++ test/config/include-2.json | 3 ++ test/config/include.json | 4 +++ test/config/multi.json | 25 +++++++++++++ test/config/simple.json | 5 +++ 6 files changed, 117 insertions(+) create mode 100644 test/config/include-1.json create mode 100644 test/config/include-2.json create mode 100644 test/config/include.json create mode 100644 test/config/multi.json create mode 100644 test/config/simple.json diff --git a/test/config.cpp b/test/config.cpp index 41180bb7..78ea0e13 100644 --- a/test/config.cpp +++ b/test/config.cpp @@ -2,3 +2,77 @@ #include "config.hpp" #include + +TEST_CASE("Load simple config", "[config]") { + waybar::Config conf; + conf.load("test/config/simple.json"); + + SECTION("validate the config data") { + auto& data = conf.getConfig(); + REQUIRE(data["layer"].asString() == "top"); + REQUIRE(data["height"].asInt() == 30); + } + SECTION("select configs for configured output") { + auto configs = conf.getOutputConfigs("HDMI-0", "Fake HDMI output #0"); + REQUIRE(configs.size() == 1); + } + SECTION("select configs for missing output") { + auto configs = conf.getOutputConfigs("HDMI-1", "Fake HDMI output #1"); + REQUIRE(configs.empty()); + } +} + +TEST_CASE("Load config with multiple bars", "[config]") { + waybar::Config conf; + conf.load("test/config/multi.json"); + + SECTION("select multiple configs #1") { + auto data = conf.getOutputConfigs("DP-0", "Fake DisplayPort output #0"); + REQUIRE(data.size() == 3); + REQUIRE(data[0]["layer"].asString() == "bottom"); + REQUIRE(data[0]["height"].asInt() == 20); + REQUIRE(data[1]["layer"].asString() == "top"); + REQUIRE(data[1]["position"].asString() == "bottom"); + REQUIRE(data[1]["height"].asInt() == 21); + REQUIRE(data[2]["layer"].asString() == "overlay"); + REQUIRE(data[2]["position"].asString() == "right"); + REQUIRE(data[2]["height"].asInt() == 23); + } + SECTION("select multiple configs #2") { + auto data = conf.getOutputConfigs("HDMI-0", "Fake HDMI output #0"); + REQUIRE(data.size() == 2); + REQUIRE(data[0]["layer"].asString() == "bottom"); + REQUIRE(data[0]["height"].asInt() == 20); + REQUIRE(data[1]["layer"].asString() == "overlay"); + REQUIRE(data[1]["position"].asString() == "right"); + REQUIRE(data[1]["height"].asInt() == 23); + } + SECTION("select single config by output description") { + auto data = conf.getOutputConfigs("HDMI-1", "Fake HDMI output #1"); + REQUIRE(data.size() == 1); + REQUIRE(data[0]["layer"].asString() == "overlay"); + REQUIRE(data[0]["position"].asString() == "left"); + REQUIRE(data[0]["height"].asInt() == 22); + } +} + +TEST_CASE("Load simple config with include", "[config]") { + waybar::Config conf; + conf.load("test/config/include.json"); + + SECTION("validate the config data") { + auto& data = conf.getConfig(); + REQUIRE(data["layer"].asString() == "bottom"); + REQUIRE(data["height"].asInt() == 30); + // config override behavior: preserve value from the top config + REQUIRE(data["position"].asString() == "top"); + } + SECTION("select configs for configured output") { + auto configs = conf.getOutputConfigs("HDMI-0", "Fake HDMI output #0"); + REQUIRE(configs.size() == 1); + } + SECTION("select configs for missing output") { + auto configs = conf.getOutputConfigs("HDMI-1", "Fake HDMI output #1"); + REQUIRE(configs.empty()); + } +} diff --git a/test/config/include-1.json b/test/config/include-1.json new file mode 100644 index 00000000..853111c7 --- /dev/null +++ b/test/config/include-1.json @@ -0,0 +1,6 @@ +{ + "layer": "top", + "position": "bottom", + "height": 30, + "output": ["HDMI-0", "DP-0"] +} diff --git a/test/config/include-2.json b/test/config/include-2.json new file mode 100644 index 00000000..741194f1 --- /dev/null +++ b/test/config/include-2.json @@ -0,0 +1,3 @@ +{ + "layer": "bottom" +} diff --git a/test/config/include.json b/test/config/include.json new file mode 100644 index 00000000..098cae01 --- /dev/null +++ b/test/config/include.json @@ -0,0 +1,4 @@ +{ + "include": ["test/config/include-1.json", "test/config/include-2.json"], + "position": "top" +} diff --git a/test/config/multi.json b/test/config/multi.json new file mode 100644 index 00000000..ed43a39e --- /dev/null +++ b/test/config/multi.json @@ -0,0 +1,25 @@ +[ + { + "layer": "bottom", + "height": 20, + "output": ["HDMI-0", "DP-0"] + }, + { + "position": "bottom", + "layer": "top", + "height": 21, + "output": ["DP-0"] + }, + { + "position": "left", + "layer": "overlay", + "height": 22, + "output": "Fake HDMI output #1" + }, + { + "position": "right", + "layer": "overlay", + "height": 23, + "output": "!HDMI-1" + } +] diff --git a/test/config/simple.json b/test/config/simple.json new file mode 100644 index 00000000..1cb1e3a1 --- /dev/null +++ b/test/config/simple.json @@ -0,0 +1,5 @@ +{ + "layer": "top", + "height": 30, + "output": ["HDMI-0", "DP-0"] +} From 8912bd3ed0734aeaf4db961e1cfab28a42ac4cb2 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Mon, 16 Aug 2021 21:11:46 +0700 Subject: [PATCH 316/355] test: multi-bar config with includes --- test/config.cpp | 34 ++++++++++++++++++++++++++++++ test/config/include-multi-0.json | 9 ++++++++ test/config/include-multi-1.json | 8 +++++++ test/config/include-multi-2.json | 9 ++++++++ test/config/include-multi-3-0.json | 8 +++++++ test/config/include-multi-3.json | 9 ++++++++ test/config/include-multi.json | 16 ++++++++++++++ 7 files changed, 93 insertions(+) create mode 100644 test/config/include-multi-0.json create mode 100644 test/config/include-multi-1.json create mode 100644 test/config/include-multi-2.json create mode 100644 test/config/include-multi-3-0.json create mode 100644 test/config/include-multi-3.json create mode 100644 test/config/include-multi.json diff --git a/test/config.cpp b/test/config.cpp index 78ea0e13..0dc0b42a 100644 --- a/test/config.cpp +++ b/test/config.cpp @@ -76,3 +76,37 @@ TEST_CASE("Load simple config with include", "[config]") { REQUIRE(configs.empty()); } } + +TEST_CASE("Load multiple bar config with include", "[config]") { + waybar::Config conf; + conf.load("test/config/include-multi.json"); + + SECTION("bar config with sole include") { + auto data = conf.getOutputConfigs("OUT-0", "Fake ouptut #0"); + REQUIRE(data.size() == 1); + REQUIRE(data[0]["height"].asInt() == 20); + } + + SECTION("bar config with output and include") { + auto data = conf.getOutputConfigs("OUT-1", "Fake output #1"); + REQUIRE(data.size() == 1); + REQUIRE(data[0]["height"].asInt() == 21); + } + + SECTION("bar config with output override") { + auto data = conf.getOutputConfigs("OUT-2", "Fake output #2"); + REQUIRE(data.size() == 1); + REQUIRE(data[0]["height"].asInt() == 22); + } + + SECTION("multiple levels of include") { + auto data = conf.getOutputConfigs("OUT-3", "Fake output #3"); + REQUIRE(data.size() == 1); + REQUIRE(data[0]["height"].asInt() == 23); + } + + auto& data = conf.getConfig(); + REQUIRE(data.isArray()); + REQUIRE(data.size() == 4); + REQUIRE(data[0]["output"].asString() == "OUT-0"); +} diff --git a/test/config/include-multi-0.json b/test/config/include-multi-0.json new file mode 100644 index 00000000..87b6cabe --- /dev/null +++ b/test/config/include-multi-0.json @@ -0,0 +1,9 @@ +[ + { + "output": "OUT-0", + "height": 20 + }, + {}, + {}, + {} +] diff --git a/test/config/include-multi-1.json b/test/config/include-multi-1.json new file mode 100644 index 00000000..d816a0fd --- /dev/null +++ b/test/config/include-multi-1.json @@ -0,0 +1,8 @@ +[ + {}, + { + "height": 21 + }, + {}, + {} +] diff --git a/test/config/include-multi-2.json b/test/config/include-multi-2.json new file mode 100644 index 00000000..47616ef1 --- /dev/null +++ b/test/config/include-multi-2.json @@ -0,0 +1,9 @@ +[ + {}, + {}, + { + "output": "OUT-1", + "height": 22 + }, + {} +] diff --git a/test/config/include-multi-3-0.json b/test/config/include-multi-3-0.json new file mode 100644 index 00000000..3f4da0c9 --- /dev/null +++ b/test/config/include-multi-3-0.json @@ -0,0 +1,8 @@ +[ + {}, + {}, + {}, + { + "height": 23 + } +] diff --git a/test/config/include-multi-3.json b/test/config/include-multi-3.json new file mode 100644 index 00000000..d0951894 --- /dev/null +++ b/test/config/include-multi-3.json @@ -0,0 +1,9 @@ +[ + {}, + {}, + {}, + { + "output": "OUT-3", + "include": "test/config/include-multi-3-0.json" + } +] diff --git a/test/config/include-multi.json b/test/config/include-multi.json new file mode 100644 index 00000000..e128aba5 --- /dev/null +++ b/test/config/include-multi.json @@ -0,0 +1,16 @@ +[ + { + "include": "test/config/include-multi-0.json" + }, + { + "output": "OUT-1", + "include": "test/config/include-multi-1.json" + }, + { + "output": "OUT-2", + "include": "test/config/include-multi-2.json" + }, + { + "include": "test/config/include-multi-3.json" + } +] From ccc60b42459b29fed266759bd668b697636d5253 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 14 Sep 2021 12:16:37 +0700 Subject: [PATCH 317/355] refactor(config): more sensible multi-bar include behavior --- include/config.hpp | 2 +- src/config.cpp | 20 +++++++------------- test/config.cpp | 3 ++- test/config/include-multi-0.json | 13 ++++--------- test/config/include-multi-1.json | 11 +++-------- test/config/include-multi-2.json | 13 ++++--------- test/config/include-multi-3-0.json | 11 +++-------- test/config/include-multi-3.json | 13 ++++--------- 8 files changed, 28 insertions(+), 58 deletions(-) diff --git a/include/config.hpp b/include/config.hpp index 25b78ab2..82d55995 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -28,7 +28,7 @@ class Config { std::vector getOutputConfigs(const std::string &name, const std::string &identifier); private: - void setupConfig(const std::string &config_file, int depth); + void setupConfig(Json::Value &dst, const std::string &config_file, int depth); void resolveConfigIncludes(Json::Value &config, int depth); void mergeConfig(Json::Value &a_config_, Json::Value &b_config_); diff --git a/src/config.cpp b/src/config.cpp index 207e1bd1..63f18c26 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -46,7 +46,7 @@ std::optional Config::findConfigPath(const std::vector return std::nullopt; } -void Config::setupConfig(const std::string &config_file, int depth) { +void Config::setupConfig(Json::Value &dst, const std::string &config_file, int depth) { if (depth > 100) { throw std::runtime_error("Aborting due to likely recursive include in config files"); } @@ -64,7 +64,7 @@ void Config::setupConfig(const std::string &config_file, int depth) { } else { resolveConfigIncludes(tmp_config, depth); } - mergeConfig(config_, tmp_config); + mergeConfig(dst, tmp_config); } void Config::resolveConfigIncludes(Json::Value &config, int depth) { @@ -72,11 +72,11 @@ void Config::resolveConfigIncludes(Json::Value &config, int depth) { if (includes.isArray()) { for (const auto &include : includes) { spdlog::info("Including resource file: {}", include.asString()); - setupConfig(tryExpandPath(include.asString()).value_or(""), ++depth); + setupConfig(config, tryExpandPath(include.asString()).value_or(""), ++depth); } } else if (includes.isString()) { spdlog::info("Including resource file: {}", includes.asString()); - setupConfig(tryExpandPath(includes.asString()).value_or(""), ++depth); + setupConfig(config, tryExpandPath(includes.asString()).value_or(""), ++depth); } } @@ -88,17 +88,11 @@ void Config::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) { for (const auto &key : b_config_.getMemberNames()) { if (a_config_[key].isObject() && b_config_[key].isObject()) { mergeConfig(a_config_[key], b_config_[key]); - } else { + } else if (a_config_[key].isNull()) { + // do not allow overriding value set by top or previously included config a_config_[key] = b_config_[key]; } } - } else if (a_config_.isArray() && b_config_.isArray()) { - // This can happen only on the top-level array of a multi-bar config - for (Json::Value::ArrayIndex i = 0; i < b_config_.size(); i++) { - if (a_config_[i].isObject() && b_config_[i].isObject()) { - mergeConfig(a_config_[i], b_config_[i]); - } - } } else { spdlog::error("Cannot merge config, conflicting or invalid JSON types"); } @@ -133,7 +127,7 @@ void Config::load(const std::string &config) { } config_file_ = file.value(); spdlog::info("Using configuration file {}", config_file_); - setupConfig(config_file_, 0); + setupConfig(config_, config_file_, 0); } std::vector Config::getOutputConfigs(const std::string &name, diff --git a/test/config.cpp b/test/config.cpp index 0dc0b42a..343a1c11 100644 --- a/test/config.cpp +++ b/test/config.cpp @@ -62,7 +62,8 @@ TEST_CASE("Load simple config with include", "[config]") { SECTION("validate the config data") { auto& data = conf.getConfig(); - REQUIRE(data["layer"].asString() == "bottom"); + // config override behavior: preserve first included value + REQUIRE(data["layer"].asString() == "top"); REQUIRE(data["height"].asInt() == 30); // config override behavior: preserve value from the top config REQUIRE(data["position"].asString() == "top"); diff --git a/test/config/include-multi-0.json b/test/config/include-multi-0.json index 87b6cabe..a4c3fc17 100644 --- a/test/config/include-multi-0.json +++ b/test/config/include-multi-0.json @@ -1,9 +1,4 @@ -[ - { - "output": "OUT-0", - "height": 20 - }, - {}, - {}, - {} -] +{ + "output": "OUT-0", + "height": 20 +} diff --git a/test/config/include-multi-1.json b/test/config/include-multi-1.json index d816a0fd..2b28d6c5 100644 --- a/test/config/include-multi-1.json +++ b/test/config/include-multi-1.json @@ -1,8 +1,3 @@ -[ - {}, - { - "height": 21 - }, - {}, - {} -] +{ + "height": 21 +} diff --git a/test/config/include-multi-2.json b/test/config/include-multi-2.json index 47616ef1..f74c2b4e 100644 --- a/test/config/include-multi-2.json +++ b/test/config/include-multi-2.json @@ -1,9 +1,4 @@ -[ - {}, - {}, - { - "output": "OUT-1", - "height": 22 - }, - {} -] +{ + "output": "OUT-1", + "height": 22 +} diff --git a/test/config/include-multi-3-0.json b/test/config/include-multi-3-0.json index 3f4da0c9..11cdd3f9 100644 --- a/test/config/include-multi-3-0.json +++ b/test/config/include-multi-3-0.json @@ -1,8 +1,3 @@ -[ - {}, - {}, - {}, - { - "height": 23 - } -] +{ + "height": 23 +} diff --git a/test/config/include-multi-3.json b/test/config/include-multi-3.json index d0951894..309fe15e 100644 --- a/test/config/include-multi-3.json +++ b/test/config/include-multi-3.json @@ -1,9 +1,4 @@ -[ - {}, - {}, - {}, - { - "output": "OUT-3", - "include": "test/config/include-multi-3-0.json" - } -] +{ + "output": "OUT-3", + "include": "test/config/include-multi-3-0.json" +} From 0c1d3e30b62dc7c94b7ae32b97089309de7ff956 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 15 Sep 2021 22:14:12 +0700 Subject: [PATCH 318/355] fix(config): preserve explicit null when merging objects --- src/config.cpp | 9 +++++++-- test/config.cpp | 2 ++ test/config/include-1.json | 3 ++- test/config/include.json | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 63f18c26..63149cbd 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1,5 +1,6 @@ #include "config.hpp" +#include #include #include #include @@ -86,11 +87,15 @@ void Config::mergeConfig(Json::Value &a_config_, Json::Value &b_config_) { a_config_ = b_config_; } else if (a_config_.isObject() && b_config_.isObject()) { for (const auto &key : b_config_.getMemberNames()) { - if (a_config_[key].isObject() && b_config_[key].isObject()) { + // [] creates key with default value. Use `get` to avoid that. + if (a_config_.get(key, Json::Value::nullSingleton()).isObject() && + b_config_[key].isObject()) { mergeConfig(a_config_[key], b_config_[key]); - } else if (a_config_[key].isNull()) { + } else if (!a_config_.isMember(key)) { // do not allow overriding value set by top or previously included config a_config_[key] = b_config_[key]; + } else { + spdlog::trace("Option {} is already set; ignoring value {}", key, b_config_[key]); } } } else { diff --git a/test/config.cpp b/test/config.cpp index 343a1c11..f09f5da6 100644 --- a/test/config.cpp +++ b/test/config.cpp @@ -67,6 +67,8 @@ TEST_CASE("Load simple config with include", "[config]") { REQUIRE(data["height"].asInt() == 30); // config override behavior: preserve value from the top config REQUIRE(data["position"].asString() == "top"); + // config override behavior: explicit null is still a value and should be preserved + REQUIRE((data.isMember("nullOption") && data["nullOption"].isNull())); } SECTION("select configs for configured output") { auto configs = conf.getOutputConfigs("HDMI-0", "Fake HDMI output #0"); diff --git a/test/config/include-1.json b/test/config/include-1.json index 853111c7..7c47a882 100644 --- a/test/config/include-1.json +++ b/test/config/include-1.json @@ -2,5 +2,6 @@ "layer": "top", "position": "bottom", "height": 30, - "output": ["HDMI-0", "DP-0"] + "output": ["HDMI-0", "DP-0"], + "nullOption": "not null" } diff --git a/test/config/include.json b/test/config/include.json index 098cae01..c46aaf24 100644 --- a/test/config/include.json +++ b/test/config/include.json @@ -1,4 +1,5 @@ { "include": ["test/config/include-1.json", "test/config/include-2.json"], - "position": "top" + "position": "top", + "nullOption": null } From d7d606b72152da08c4a68dcbb36b92f070419159 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 15 Sep 2021 22:00:23 +0700 Subject: [PATCH 319/355] doc: update documentation for 'include' --- man/waybar.5.scd.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index 9dc6925f..997a48d8 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -87,8 +87,9 @@ Also a minimal example configuration can be found on the at the bottom of this m *include* ++ typeof: string|array ++ - Paths to additional configuration files. In case of duplicate options, the including file's value takes precedence. Make sure to avoid circular imports. - For a multi-bar config, specify at least an empty object for each bar also in every file being included. + Paths to additional configuration files. + Each file can contain a single object with any of the bar configuration options. In case of duplicate options, the first defined value takes precedence, i.e. including file -> first included file -> etc. Nested includes are permitted, but make sure to avoid circular imports. + For a multi-bar config, the include directive affects only current bar configuration object. # MODULE FORMAT From 5991bbb741fed4756e6efdec473b56a5c9767840 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 14 Sep 2021 14:02:38 +0700 Subject: [PATCH 320/355] ci: run unit-tests --- .github/workflows/freebsd.yml | 7 ++++--- .github/workflows/linux.yml | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index f02c9b57..8af7a04a 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -15,9 +15,10 @@ jobs: export CPPFLAGS=-isystem/usr/local/include LDFLAGS=-L/usr/local/lib # sndio sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf pkg install -y git # subprojects/date - pkg install -y evdev-proto gtk-layer-shell gtkmm30 jsoncpp libdbusmenu \ - libevdev libfmt libmpdclient libudev-devd meson pkgconf pulseaudio \ - scdoc sndio spdlog + pkg install -y catch evdev-proto gtk-layer-shell gtkmm30 jsoncpp \ + libdbusmenu libevdev libfmt libmpdclient libudev-devd meson \ + pkgconf pulseaudio scdoc sndio spdlog run: | meson build -Dman-pages=enabled ninja -C build + meson test -C build --no-rebuild --print-errorlogs --suite waybar diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e550e20b..d4efbf8c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,3 +23,5 @@ jobs: run: meson -Dman-pages=enabled build - name: build run: ninja -C build + - name: test + run: meson test -C build --no-rebuild --print-errorlogs --suite waybar From 4bf577e89bfc2c7c816cda99e1b5a68e63ae9d5a Mon Sep 17 00:00:00 2001 From: Darkclainer Date: Fri, 17 Sep 2021 21:18:21 +0300 Subject: [PATCH 321/355] Add CPU usage for every core --- include/modules/cpu.hpp | 11 ++++++----- src/modules/cpu/common.cpp | 32 +++++++++++++++++++++----------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp index 866b5af7..1fe1199b 100644 --- a/include/modules/cpu.hpp +++ b/include/modules/cpu.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -19,11 +20,11 @@ class Cpu : public ALabel { auto update() -> void; private: - double getCpuLoad(); - std::tuple getCpuUsage(); - std::tuple getCpuFrequency(); - std::vector> parseCpuinfo(); - std::vector parseCpuFrequencies(); + double getCpuLoad(); + std::tuple, std::string> getCpuUsage(); + std::tuple getCpuFrequency(); + std::vector> parseCpuinfo(); + std::vector parseCpuFrequencies(); std::vector> prev_times_; diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index 767cde92..5869e13f 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -17,7 +17,8 @@ auto waybar::modules::Cpu::update() -> void { label_.set_tooltip_text(tooltip); } auto format = format_; - auto state = getState(cpu_usage); + auto total_usage = cpu_usage.empty() ? 0 : cpu_usage[0]; + auto state = getState(total_usage); if (!state.empty() && config_["format-" + state].isString()) { format = config_["format-" + state].asString(); } @@ -27,13 +28,22 @@ auto waybar::modules::Cpu::update() -> void { } else { event_box_.show(); auto icons = std::vector{state}; - label_.set_markup(fmt::format(format, - fmt::arg("load", cpu_load), - fmt::arg("usage", cpu_usage), - fmt::arg("icon", getIcon(cpu_usage, icons)), - fmt::arg("max_frequency", max_frequency), - fmt::arg("min_frequency", min_frequency), - fmt::arg("avg_frequency", avg_frequency))); + fmt::dynamic_format_arg_store store; + store.push_back(fmt::arg("load", cpu_load)); + store.push_back(fmt::arg("load", cpu_load)); + store.push_back(fmt::arg("usage", total_usage)); + store.push_back(fmt::arg("icon", getIcon(total_usage, icons))); + store.push_back(fmt::arg("max_frequency", max_frequency)); + store.push_back(fmt::arg("min_frequency", min_frequency)); + store.push_back(fmt::arg("avg_frequency", avg_frequency)); + for (size_t i = 1; i < cpu_usage.size(); ++i) { + auto core_i = i - 1; + auto core_format = fmt::format("usage{}", core_i); + store.push_back(fmt::arg(core_format.c_str(), cpu_usage[i])); + auto icon_format = fmt::format("icon{}", core_i); + store.push_back(fmt::arg(icon_format.c_str(), getIcon(cpu_usage[i], icons))); + } + label_.set_markup(fmt::vformat(format, store)); } // Call parent update @@ -48,14 +58,14 @@ double waybar::modules::Cpu::getCpuLoad() { throw std::runtime_error("Can't get Cpu load"); } -std::tuple waybar::modules::Cpu::getCpuUsage() { +std::tuple, std::string> waybar::modules::Cpu::getCpuUsage() { if (prev_times_.empty()) { prev_times_ = parseCpuinfo(); std::this_thread::sleep_for(std::chrono::milliseconds(100)); } std::vector> curr_times = parseCpuinfo(); std::string tooltip; - uint16_t usage = 0; + std::vector usage; for (size_t i = 0; i < curr_times.size(); ++i) { auto [curr_idle, curr_total] = curr_times[i]; auto [prev_idle, prev_total] = prev_times_[i]; @@ -63,11 +73,11 @@ std::tuple waybar::modules::Cpu::getCpuUsage() { const float delta_total = curr_total - prev_total; uint16_t tmp = 100 * (1 - delta_idle / delta_total); if (i == 0) { - usage = tmp; tooltip = fmt::format("Total: {}%", tmp); } else { tooltip = tooltip + fmt::format("\nCore{}: {}%", i - 1, tmp); } + usage.push_back(tmp); } prev_times_ = curr_times; return {usage, tooltip}; From 8da940f929bd8c06a30fd3d02de53e6fac2ac5f8 Mon Sep 17 00:00:00 2001 From: Darkclainer Date: Fri, 17 Sep 2021 22:22:14 +0300 Subject: [PATCH 322/355] Update man pages for cpu usage --- man/waybar-cpu.5.scd | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/man/waybar-cpu.5.scd b/man/waybar-cpu.5.scd index 679ca2ce..2e0d6c71 100644 --- a/man/waybar-cpu.5.scd +++ b/man/waybar-cpu.5.scd @@ -82,7 +82,9 @@ The *cpu* module displays the current cpu utilization. *{load}*: Current cpu load. -*{usage}*: Current cpu usage. +*{usage}*: Current overall cpu usage. + +*{usage*{n}*}*: Current cpu core n usage. Cores are numbered from zero, so first core will be {usage0} and 4th will be {usage3}. *{avg_frequency}*: Current cpu average frequency (based on all cores) in GHz. @@ -90,7 +92,13 @@ The *cpu* module displays the current cpu utilization. *{min_frequency}*: Current cpu min frequency (based on the core with the lowest frequency) in GHz. -# EXAMPLE +*{icon}*: Icon for overall cpu usage. + +*{icon*{n}*}*: Icon for cpu core n usage. Use like {icon0}. + +# EXAMPLES + +Basic configuration: ``` "cpu": { @@ -100,6 +108,16 @@ The *cpu* module displays the current cpu utilization. } ``` +Cpu usage per core rendered as icons: + +``` +"cpu": { + "interval": 1, + "format": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% ", + "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], +}, +``` + # STYLE - *#cpu* From 5f083193e4202e616d587b53050111fef1fa031f Mon Sep 17 00:00:00 2001 From: mazunki Date: Sat, 18 Sep 2021 01:12:58 +0200 Subject: [PATCH 323/355] fixed tab indentation to spaces, removed debug --- src/modules/network.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index a45f2b87..0fccf091 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -661,9 +661,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->clearIface(); net->ifid_ = temp_idx; net->route_priority = priority; - net->gwaddr_ = temp_gw_addr; - spdlog::debug("netwok: gateway {}", net->gwaddr_); - + net->gwaddr_ = temp_gw_addr; spdlog::debug("network: new default route via if{} metric {}", temp_idx, priority); /* Ask ifname associated with temp_idx as well as carrier status */ From 13239417d817460eee8dd46bd09ddae0fc8dcf5a Mon Sep 17 00:00:00 2001 From: mazunki Date: Sat, 18 Sep 2021 01:20:16 +0200 Subject: [PATCH 324/355] fixed wrong dependency for make target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccf05073..94f8ee6e 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ install: build run: build ./build/waybar -debug-run: build +debug-run: build-debug ./build/waybar --log-level debug clean: From 6142dfba6a1ffc5e08ac68df172291d926fa8b03 Mon Sep 17 00:00:00 2001 From: mazunki Date: Sat, 18 Sep 2021 01:51:16 +0200 Subject: [PATCH 325/355] updated original debug message with gateway ip, similar, yet not identical to default via 10.13.37.100 dev enp7s0 metric 2 10.13.37.0/24 dev enp7s0 proto kernel scope link src 10.13.37.97 's output --- src/modules/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 0fccf091..3b9fb187 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -662,7 +662,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->ifid_ = temp_idx; net->route_priority = priority; net->gwaddr_ = temp_gw_addr; - spdlog::debug("network: new default route via if{} metric {}", temp_idx, priority); + spdlog::debug("network: new default route via {} on if{} metric {}", temp_gw_addr, temp_idx, priority); /* Ask ifname associated with temp_idx as well as carrier status */ struct ifinfomsg ifinfo_hdr = { From 1c91c71dcde2d77506989b407eefcd18b20f34a3 Mon Sep 17 00:00:00 2001 From: mazunki Date: Sat, 18 Sep 2021 01:51:16 +0200 Subject: [PATCH 326/355] updated original debug message with gateway ip, similar, yet not identical to `ip route` --- src/modules/network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 0fccf091..3b9fb187 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -662,7 +662,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { net->ifid_ = temp_idx; net->route_priority = priority; net->gwaddr_ = temp_gw_addr; - spdlog::debug("network: new default route via if{} metric {}", temp_idx, priority); + spdlog::debug("network: new default route via {} on if{} metric {}", temp_gw_addr, temp_idx, priority); /* Ask ifname associated with temp_idx as well as carrier status */ struct ifinfomsg ifinfo_hdr = { From 67c730293885684a954632a70fe041abd2288685 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 Sep 2021 13:50:16 +0200 Subject: [PATCH 327/355] Revert "Add CPU usage for every core" --- include/modules/cpu.hpp | 11 +++++------ man/waybar-cpu.5.scd | 22 ++-------------------- src/modules/cpu/common.cpp | 32 +++++++++++--------------------- 3 files changed, 18 insertions(+), 47 deletions(-) diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp index 1fe1199b..866b5af7 100644 --- a/include/modules/cpu.hpp +++ b/include/modules/cpu.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #include #include #include @@ -20,11 +19,11 @@ class Cpu : public ALabel { auto update() -> void; private: - double getCpuLoad(); - std::tuple, std::string> getCpuUsage(); - std::tuple getCpuFrequency(); - std::vector> parseCpuinfo(); - std::vector parseCpuFrequencies(); + double getCpuLoad(); + std::tuple getCpuUsage(); + std::tuple getCpuFrequency(); + std::vector> parseCpuinfo(); + std::vector parseCpuFrequencies(); std::vector> prev_times_; diff --git a/man/waybar-cpu.5.scd b/man/waybar-cpu.5.scd index 2e0d6c71..679ca2ce 100644 --- a/man/waybar-cpu.5.scd +++ b/man/waybar-cpu.5.scd @@ -82,9 +82,7 @@ The *cpu* module displays the current cpu utilization. *{load}*: Current cpu load. -*{usage}*: Current overall cpu usage. - -*{usage*{n}*}*: Current cpu core n usage. Cores are numbered from zero, so first core will be {usage0} and 4th will be {usage3}. +*{usage}*: Current cpu usage. *{avg_frequency}*: Current cpu average frequency (based on all cores) in GHz. @@ -92,13 +90,7 @@ The *cpu* module displays the current cpu utilization. *{min_frequency}*: Current cpu min frequency (based on the core with the lowest frequency) in GHz. -*{icon}*: Icon for overall cpu usage. - -*{icon*{n}*}*: Icon for cpu core n usage. Use like {icon0}. - -# EXAMPLES - -Basic configuration: +# EXAMPLE ``` "cpu": { @@ -108,16 +100,6 @@ Basic configuration: } ``` -Cpu usage per core rendered as icons: - -``` -"cpu": { - "interval": 1, - "format": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% ", - "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], -}, -``` - # STYLE - *#cpu* diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index 5869e13f..767cde92 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -17,8 +17,7 @@ auto waybar::modules::Cpu::update() -> void { label_.set_tooltip_text(tooltip); } auto format = format_; - auto total_usage = cpu_usage.empty() ? 0 : cpu_usage[0]; - auto state = getState(total_usage); + auto state = getState(cpu_usage); if (!state.empty() && config_["format-" + state].isString()) { format = config_["format-" + state].asString(); } @@ -28,22 +27,13 @@ auto waybar::modules::Cpu::update() -> void { } else { event_box_.show(); auto icons = std::vector{state}; - fmt::dynamic_format_arg_store store; - store.push_back(fmt::arg("load", cpu_load)); - store.push_back(fmt::arg("load", cpu_load)); - store.push_back(fmt::arg("usage", total_usage)); - store.push_back(fmt::arg("icon", getIcon(total_usage, icons))); - store.push_back(fmt::arg("max_frequency", max_frequency)); - store.push_back(fmt::arg("min_frequency", min_frequency)); - store.push_back(fmt::arg("avg_frequency", avg_frequency)); - for (size_t i = 1; i < cpu_usage.size(); ++i) { - auto core_i = i - 1; - auto core_format = fmt::format("usage{}", core_i); - store.push_back(fmt::arg(core_format.c_str(), cpu_usage[i])); - auto icon_format = fmt::format("icon{}", core_i); - store.push_back(fmt::arg(icon_format.c_str(), getIcon(cpu_usage[i], icons))); - } - label_.set_markup(fmt::vformat(format, store)); + label_.set_markup(fmt::format(format, + fmt::arg("load", cpu_load), + fmt::arg("usage", cpu_usage), + fmt::arg("icon", getIcon(cpu_usage, icons)), + fmt::arg("max_frequency", max_frequency), + fmt::arg("min_frequency", min_frequency), + fmt::arg("avg_frequency", avg_frequency))); } // Call parent update @@ -58,14 +48,14 @@ double waybar::modules::Cpu::getCpuLoad() { throw std::runtime_error("Can't get Cpu load"); } -std::tuple, std::string> waybar::modules::Cpu::getCpuUsage() { +std::tuple waybar::modules::Cpu::getCpuUsage() { if (prev_times_.empty()) { prev_times_ = parseCpuinfo(); std::this_thread::sleep_for(std::chrono::milliseconds(100)); } std::vector> curr_times = parseCpuinfo(); std::string tooltip; - std::vector usage; + uint16_t usage = 0; for (size_t i = 0; i < curr_times.size(); ++i) { auto [curr_idle, curr_total] = curr_times[i]; auto [prev_idle, prev_total] = prev_times_[i]; @@ -73,11 +63,11 @@ std::tuple, std::string> waybar::modules::Cpu::getCpuUsage const float delta_total = curr_total - prev_total; uint16_t tmp = 100 * (1 - delta_idle / delta_total); if (i == 0) { + usage = tmp; tooltip = fmt::format("Total: {}%", tmp); } else { tooltip = tooltip + fmt::format("\nCore{}: {}%", i - 1, tmp); } - usage.push_back(tmp); } prev_times_ = curr_times; return {usage, tooltip}; From fe547901fae1f536d047b468d8c35d3afb70a6e2 Mon Sep 17 00:00:00 2001 From: Gavin Beatty Date: Sat, 18 Sep 2021 15:28:27 -0500 Subject: [PATCH 328/355] sway/language: remove tabs, indent with 2 spaces --- src/modules/sway/language.cpp | 74 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/modules/sway/language.cpp b/src/modules/sway/language.cpp index 85dc769e..186fa4bb 100644 --- a/src/modules/sway/language.cpp +++ b/src/modules/sway/language.cpp @@ -20,15 +20,15 @@ const std::string Language::XKB_ACTIVE_LAYOUT_NAME_KEY = "xkb_active_layout_name Language::Language(const std::string& id, const Json::Value& config) : ALabel(config, "language", id, "{}", 0, true) { is_variant_displayed = format_.find("{variant}") != std::string::npos; - if (format_.find("{}") != std::string::npos || format_.find("{short}") != std::string::npos) { - displayed_short_flag |= static_cast(DispayedShortFlag::ShortName); - } - if (format_.find("{shortDescription}") != std::string::npos) { - displayed_short_flag |= static_cast(DispayedShortFlag::ShortDescription); - } - if (config.isMember("tooltip-format")) { - tooltip_format_ = config["tooltip-format"].asString(); - } + if (format_.find("{}") != std::string::npos || format_.find("{short}") != std::string::npos) { + displayed_short_flag |= static_cast(DispayedShortFlag::ShortName); + } + if (format_.find("{shortDescription}") != std::string::npos) { + displayed_short_flag |= static_cast(DispayedShortFlag::ShortDescription); + } + if (config.isMember("tooltip-format")) { + tooltip_format_ = config["tooltip-format"].asString(); + } ipc_.subscribe(R"(["input"])"); ipc_.signal_event.connect(sigc::mem_fun(*this, &Language::onEvent)); ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Language::onCmd)); @@ -102,16 +102,16 @@ auto Language::update() -> void { fmt::arg("variant", layout_.variant))); label_.set_markup(display_layout); if (tooltipEnabled()) { - if (tooltip_format_ != "") { - auto tooltip_display_layout = trim(fmt::format(tooltip_format_, - fmt::arg("short", layout_.short_name), - fmt::arg("shortDescription", layout_.short_description), - fmt::arg("long", layout_.full_name), - fmt::arg("variant", layout_.variant))); - label_.set_tooltip_markup(tooltip_display_layout); - } else { - label_.set_tooltip_markup(display_layout); - } + if (tooltip_format_ != "") { + auto tooltip_display_layout = trim(fmt::format(tooltip_format_, + fmt::arg("short", layout_.short_name), + fmt::arg("shortDescription", layout_.short_description), + fmt::arg("long", layout_.full_name), + fmt::arg("variant", layout_.variant))); + label_.set_tooltip_markup(tooltip_display_layout); + } else { + label_.set_tooltip_markup(display_layout); + } } event_box_.show(); @@ -126,7 +126,7 @@ auto Language::set_current_layout(std::string current_layout) -> void { auto Language::init_layouts_map(const std::vector& used_layouts) -> void { std::map> found_by_short_names; - XKBContext xkb_context; + XKBContext xkb_context; auto layout = xkb_context.next_layout(); for (; layout != nullptr; layout = xkb_context.next_layout()) { if (std::find(used_layouts.begin(), used_layouts.end(), layout->full_name) == @@ -161,15 +161,15 @@ auto Language::init_layouts_map(const std::vector& used_layouts) -> if (short_name_to_number_map.count(used_layout->short_name) == 0) { short_name_to_number_map[used_layout->short_name] = 1; } - - if (displayed_short_flag != static_cast(0)) { - int& number = short_name_to_number_map[used_layout->short_name]; - used_layout->short_name = - used_layout->short_name + std::to_string(number); - used_layout->short_description = - used_layout->short_description + std::to_string(number); - ++number; - } + + if (displayed_short_flag != static_cast(0)) { + int& number = short_name_to_number_map[used_layout->short_name]; + used_layout->short_name = + used_layout->short_name + std::to_string(number); + used_layout->short_description = + used_layout->short_description + std::to_string(number); + ++number; + } } } @@ -195,14 +195,14 @@ auto Language::XKBContext::next_layout() -> Layout* { auto variant_ = rxkb_layout_get_variant(xkb_layout_); std::string variant = variant_ == nullptr ? "" : std::string(variant_); auto short_description_ = rxkb_layout_get_brief(xkb_layout_); - std::string short_description; - if (short_description_ != nullptr) { - short_description = std::string(short_description_); - base_layouts_by_name_.emplace(name, xkb_layout_); - } else { - auto base_layout = base_layouts_by_name_[name]; - short_description = base_layout == nullptr ? "" : std::string(rxkb_layout_get_brief(base_layout)); - } + std::string short_description; + if (short_description_ != nullptr) { + short_description = std::string(short_description_); + base_layouts_by_name_.emplace(name, xkb_layout_); + } else { + auto base_layout = base_layouts_by_name_[name]; + short_description = base_layout == nullptr ? "" : std::string(rxkb_layout_get_brief(base_layout)); + } delete layout_; layout_ = new Layout{description, name, variant, short_description}; return layout_; From 6e5a0bc80a3301f4f30ce58909eadb7d54bd739e Mon Sep 17 00:00:00 2001 From: Darkclainer Date: Sun, 19 Sep 2021 13:41:59 +0300 Subject: [PATCH 329/355] Add cpu usage for every core --- include/modules/cpu.hpp | 10 +++++----- man/waybar-cpu.5.scd | 22 ++++++++++++++++++-- src/modules/cpu/common.cpp | 41 ++++++++++++++++++++++++++++---------- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp index 866b5af7..7e32a43f 100644 --- a/include/modules/cpu.hpp +++ b/include/modules/cpu.hpp @@ -19,11 +19,11 @@ class Cpu : public ALabel { auto update() -> void; private: - double getCpuLoad(); - std::tuple getCpuUsage(); - std::tuple getCpuFrequency(); - std::vector> parseCpuinfo(); - std::vector parseCpuFrequencies(); + double getCpuLoad(); + std::tuple, std::string> getCpuUsage(); + std::tuple getCpuFrequency(); + std::vector> parseCpuinfo(); + std::vector parseCpuFrequencies(); std::vector> prev_times_; diff --git a/man/waybar-cpu.5.scd b/man/waybar-cpu.5.scd index 679ca2ce..2e0d6c71 100644 --- a/man/waybar-cpu.5.scd +++ b/man/waybar-cpu.5.scd @@ -82,7 +82,9 @@ The *cpu* module displays the current cpu utilization. *{load}*: Current cpu load. -*{usage}*: Current cpu usage. +*{usage}*: Current overall cpu usage. + +*{usage*{n}*}*: Current cpu core n usage. Cores are numbered from zero, so first core will be {usage0} and 4th will be {usage3}. *{avg_frequency}*: Current cpu average frequency (based on all cores) in GHz. @@ -90,7 +92,13 @@ The *cpu* module displays the current cpu utilization. *{min_frequency}*: Current cpu min frequency (based on the core with the lowest frequency) in GHz. -# EXAMPLE +*{icon}*: Icon for overall cpu usage. + +*{icon*{n}*}*: Icon for cpu core n usage. Use like {icon0}. + +# EXAMPLES + +Basic configuration: ``` "cpu": { @@ -100,6 +108,16 @@ The *cpu* module displays the current cpu utilization. } ``` +Cpu usage per core rendered as icons: + +``` +"cpu": { + "interval": 1, + "format": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% ", + "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], +}, +``` + # STYLE - *#cpu* diff --git a/src/modules/cpu/common.cpp b/src/modules/cpu/common.cpp index 767cde92..4cf67eba 100644 --- a/src/modules/cpu/common.cpp +++ b/src/modules/cpu/common.cpp @@ -1,5 +1,14 @@ #include "modules/cpu.hpp" +// In the 80000 version of fmt library authors decided to optimize imports +// and moved declarations required for fmt::dynamic_format_arg_store in new +// header fmt/args.h +#if (FMT_VERSION >= 80000) +#include +#else +#include +#endif + waybar::modules::Cpu::Cpu(const std::string& id, const Json::Value& config) : ALabel(config, "cpu", id, "{usage}%", 10) { thread_ = [this] { @@ -17,7 +26,8 @@ auto waybar::modules::Cpu::update() -> void { label_.set_tooltip_text(tooltip); } auto format = format_; - auto state = getState(cpu_usage); + auto total_usage = cpu_usage.empty() ? 0 : cpu_usage[0]; + auto state = getState(total_usage); if (!state.empty() && config_["format-" + state].isString()) { format = config_["format-" + state].asString(); } @@ -27,13 +37,22 @@ auto waybar::modules::Cpu::update() -> void { } else { event_box_.show(); auto icons = std::vector{state}; - label_.set_markup(fmt::format(format, - fmt::arg("load", cpu_load), - fmt::arg("usage", cpu_usage), - fmt::arg("icon", getIcon(cpu_usage, icons)), - fmt::arg("max_frequency", max_frequency), - fmt::arg("min_frequency", min_frequency), - fmt::arg("avg_frequency", avg_frequency))); + fmt::dynamic_format_arg_store store; + store.push_back(fmt::arg("load", cpu_load)); + store.push_back(fmt::arg("load", cpu_load)); + store.push_back(fmt::arg("usage", total_usage)); + store.push_back(fmt::arg("icon", getIcon(total_usage, icons))); + store.push_back(fmt::arg("max_frequency", max_frequency)); + store.push_back(fmt::arg("min_frequency", min_frequency)); + store.push_back(fmt::arg("avg_frequency", avg_frequency)); + for (size_t i = 1; i < cpu_usage.size(); ++i) { + auto core_i = i - 1; + auto core_format = fmt::format("usage{}", core_i); + store.push_back(fmt::arg(core_format.c_str(), cpu_usage[i])); + auto icon_format = fmt::format("icon{}", core_i); + store.push_back(fmt::arg(icon_format.c_str(), getIcon(cpu_usage[i], icons))); + } + label_.set_markup(fmt::vformat(format, store)); } // Call parent update @@ -48,14 +67,14 @@ double waybar::modules::Cpu::getCpuLoad() { throw std::runtime_error("Can't get Cpu load"); } -std::tuple waybar::modules::Cpu::getCpuUsage() { +std::tuple, std::string> waybar::modules::Cpu::getCpuUsage() { if (prev_times_.empty()) { prev_times_ = parseCpuinfo(); std::this_thread::sleep_for(std::chrono::milliseconds(100)); } std::vector> curr_times = parseCpuinfo(); std::string tooltip; - uint16_t usage = 0; + std::vector usage; for (size_t i = 0; i < curr_times.size(); ++i) { auto [curr_idle, curr_total] = curr_times[i]; auto [prev_idle, prev_total] = prev_times_[i]; @@ -63,11 +82,11 @@ std::tuple waybar::modules::Cpu::getCpuUsage() { const float delta_total = curr_total - prev_total; uint16_t tmp = 100 * (1 - delta_idle / delta_total); if (i == 0) { - usage = tmp; tooltip = fmt::format("Total: {}%", tmp); } else { tooltip = tooltip + fmt::format("\nCore{}: {}%", i - 1, tmp); } + usage.push_back(tmp); } prev_times_ = curr_times; return {usage, tooltip}; From 8d04da1551bdfae54d17e16c6e49e7e0819e1f71 Mon Sep 17 00:00:00 2001 From: WuerfelDev Date: Tue, 21 Sep 2021 13:15:36 +0200 Subject: [PATCH 330/355] dont escape essid in tooltip just like https://github.com/Alexays/Waybar/pull/834 but for the network name. --- src/modules/network.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 3b9fb187..14a6d869 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -342,7 +342,7 @@ auto waybar::modules::Network::update() -> void { auto text = fmt::format( format_, - fmt::arg("essid", essid_), + fmt::arg("essid", Glib::Markup::escape_text(essid_)), fmt::arg("signaldBm", signal_strength_dbm_), fmt::arg("signalStrength", signal_strength_), fmt::arg("ifname", ifname_), @@ -793,7 +793,7 @@ void waybar::modules::Network::parseEssid(struct nlattr **bss) { auto essid_end = essid_begin + ies[1]; std::string essid_raw; std::copy(essid_begin, essid_end, std::back_inserter(essid_raw)); - essid_ = Glib::Markup::escape_text(essid_raw); + essid_ = essid_raw; } } } From f638fe473a54e62d0ec41e143b4cf616ce388099 Mon Sep 17 00:00:00 2001 From: Ryan Walklin Date: Wed, 22 Sep 2021 11:43:25 +1200 Subject: [PATCH 331/355] Update catch2 dependency 2.13.3 -> 2.13.7 --- subprojects/catch2.wrap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/subprojects/catch2.wrap b/subprojects/catch2.wrap index 356c4063..c82b310f 100644 --- a/subprojects/catch2.wrap +++ b/subprojects/catch2.wrap @@ -1,11 +1,11 @@ [wrap-file] -directory = Catch2-2.13.3 -source_url = https://github.com/catchorg/Catch2/archive/v2.13.3.zip -source_filename = Catch2-2.13.3.zip -source_hash = 1804feb72bc15c0856b4a43aa586c661af9c3685a75973b6a8fc0b950c7cfd13 -patch_url = https://github.com/mesonbuild/catch2/releases/download/2.13.3-2/catch2.zip -patch_filename = catch2-2.13.3-2-wrap.zip -patch_hash = 21b590ab8c65b593ad5ee8f8e5b822bf9877b2c2672f97fbb52459751053eadf +directory = Catch2-2.13.7 +source_url = https://github.com/catchorg/Catch2/archive/v2.13.7.zip +source_filename = Catch2-2.13.7.zip +source_hash = 3f3ccd90ad3a8fbb1beeb15e6db440ccdcbebe378dfd125d07a1f9a587a927e9 +patch_filename = catch2_2.13.7-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/catch2_2.13.7-1/get_patch +patch_hash = 2f7369645d747e5bd866317ac1dd4c3d04dc97d3aad4fc6b864bdf75d3b57158 [provide] catch2 = catch2_dep From fbedc3d133d627b8ff4f8c9fe5744739bf8dd0b3 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sun, 19 Sep 2021 18:30:41 +0300 Subject: [PATCH 332/355] fix(tray): fix visibility of Passive items `show_all` call from `Tray::update` attempts to walk the widget tree and make every widget visible. Since we control individual tray item visibility based on `Status` SNI property, we don't want that to happen. Modify `Tray::update` to control the visibility of a whole tray module only and ensure that the children of `Item` are still visible when necessary. --- src/modules/sni/item.cpp | 1 + src/modules/sni/tray.cpp | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp index d9748eda..b504c8d0 100644 --- a/src/modules/sni/item.cpp +++ b/src/modules/sni/item.cpp @@ -62,6 +62,7 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf event_box.signal_button_press_event().connect(sigc::mem_fun(*this, &Item::handleClick)); event_box.signal_scroll_event().connect(sigc::mem_fun(*this, &Item::handleScroll)); // initial visibility + event_box.show_all(); event_box.set_visible(show_passive_); cancellable_ = Gio::Cancellable::create(); diff --git a/src/modules/sni/tray.cpp b/src/modules/sni/tray.cpp index e73c9eb4..70b0d375 100644 --- a/src/modules/sni/tray.cpp +++ b/src/modules/sni/tray.cpp @@ -35,11 +35,8 @@ void Tray::onRemove(std::unique_ptr& item) { } auto Tray::update() -> void { - if (box_.get_children().empty()) { - box_.hide(); - } else { - box_.show_all(); - } + // Show tray only when items are availale + box_.set_visible(!box_.get_children().empty()); // Call parent update AModule::update(); } From f18eb71ad7b6b1a523fdbb8416bbc713213b6ccd Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sat, 2 Oct 2021 18:13:17 +0200 Subject: [PATCH 333/355] Fix spelling errors Signed-off-by: Elyes HAOUAS --- resources/custom_modules/mediaplayer.py | 2 +- src/modules/clock.cpp | 2 +- src/modules/network.cpp | 2 +- src/modules/sni/tray.cpp | 2 +- test/config.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/custom_modules/mediaplayer.py b/resources/custom_modules/mediaplayer.py index cf3df4b6..fa9aa58b 100755 --- a/resources/custom_modules/mediaplayer.py +++ b/resources/custom_modules/mediaplayer.py @@ -79,7 +79,7 @@ def signal_handler(sig, frame): def parse_arguments(): parser = argparse.ArgumentParser() - # Increase verbosity with every occurence of -v + # Increase verbosity with every occurrence of -v parser.add_argument('-v', '--verbose', action='count', default=0) # Define for which player we're listening diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index 82c57010..0c38cb6d 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -16,7 +16,7 @@ using waybar::modules::waybar_time; waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config) : ALabel(config, "clock", id, "{:%H:%M}", 60, false, false, true), fixed_time_zone_(false) { if (config_["timezone"].isString()) { - spdlog::warn("As using a timezone, some format args may be missing as the date library havn't got a release since 2018."); + spdlog::warn("As using a timezone, some format args may be missing as the date library haven't got a release since 2018."); time_zone_ = date::locate_zone(config_["timezone"].asString()); fixed_time_zone_ = true; } diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 3b9fb187..99ccd8e0 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -469,7 +469,7 @@ int waybar::modules::Network::handleEvents(struct nl_msg *msg, void *data) { } if (!is_del_event && ifi->ifi_index == net->ifid_) { - // Update inferface information + // Update interface information if (net->ifname_.empty() && ifname != NULL) { std::string new_ifname (ifname, ifname_len); net->ifname_ = new_ifname; diff --git a/src/modules/sni/tray.cpp b/src/modules/sni/tray.cpp index 70b0d375..c32c0d6a 100644 --- a/src/modules/sni/tray.cpp +++ b/src/modules/sni/tray.cpp @@ -35,7 +35,7 @@ void Tray::onRemove(std::unique_ptr& item) { } auto Tray::update() -> void { - // Show tray only when items are availale + // Show tray only when items are available box_.set_visible(!box_.get_children().empty()); // Call parent update AModule::update(); diff --git a/test/config.cpp b/test/config.cpp index f09f5da6..edd6d6b8 100644 --- a/test/config.cpp +++ b/test/config.cpp @@ -85,7 +85,7 @@ TEST_CASE("Load multiple bar config with include", "[config]") { conf.load("test/config/include-multi.json"); SECTION("bar config with sole include") { - auto data = conf.getOutputConfigs("OUT-0", "Fake ouptut #0"); + auto data = conf.getOutputConfigs("OUT-0", "Fake output #0"); REQUIRE(data.size() == 1); REQUIRE(data[0]["height"].asInt() == 20); } From 99723845976fb577a057b86e36b502c966bf254f Mon Sep 17 00:00:00 2001 From: "Rene D. Obermueller" Date: Sat, 2 Oct 2021 18:35:38 +0200 Subject: [PATCH 334/355] sway/window: include floating_nodes when considering window count for class --- src/modules/sway/window.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index b6779585..fc81b2cf 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -68,15 +68,22 @@ auto Window::update() -> void { int leafNodesInWorkspace(const Json::Value& node) { auto const& nodes = node["nodes"]; - if(nodes.empty()) { + auto const& floating_nodes = node["floating_nodes"]; + if(nodes.empty() && floating_nodes.empty()) { if(node["type"] == "workspace") return 0; else return 1; } int sum = 0; - for(auto const& node : nodes) - sum += leafNodesInWorkspace(node); + if (!nodes.empty()) { + for(auto const& node : nodes) + sum += leafNodesInWorkspace(node); + } + if (!floating_nodes.empty()) { + for(auto const& node : floating_nodes) + sum += leafNodesInWorkspace(node); + } return sum; } From 174db444d6a6a78814e0c93430755d92312832a0 Mon Sep 17 00:00:00 2001 From: Sergey Mishin Date: Sun, 3 Oct 2021 03:27:54 +0000 Subject: [PATCH 335/355] Fix Clock crash on empty string in timezones field Also fixed timezones behavior: now waybar starting with the first timezone in timezones list and falling back to timezone field only if timezones omit or has no elements. --- include/modules/clock.hpp | 1 + man/waybar-clock.5.scd | 3 ++- src/modules/clock.cpp | 30 +++++++++++++++++++----------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp index b3e2634f..17752e4d 100644 --- a/include/modules/clock.hpp +++ b/include/modules/clock.hpp @@ -37,6 +37,7 @@ class Clock : public ALabel { auto calendar_text(const waybar_time& wtime) -> std::string; auto weekdays_header(const date::weekday& first_dow, std::ostream& os) -> void; auto first_day_of_week() -> date::weekday; + bool setTimeZone(Json::Value zone_name); }; } // namespace waybar::modules diff --git a/man/waybar-clock.5.scd b/man/waybar-clock.5.scd index 28688ee9..2c901d2d 100644 --- a/man/waybar-clock.5.scd +++ b/man/waybar-clock.5.scd @@ -24,7 +24,8 @@ The *clock* module displays the current date and time. *timezone*: ++ typeof: string ++ default: inferred local timezone ++ - The timezone to display the time in, e.g. America/New_York. + The timezone to display the time in, e.g. America/New_York. ++ + This field will be ignored if *timezones* field is set and have at least one value. *timezones*: ++ typeof: list of strings ++ diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp index 0c38cb6d..7c94c457 100644 --- a/src/modules/clock.cpp +++ b/src/modules/clock.cpp @@ -15,10 +15,14 @@ using waybar::modules::waybar_time; waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config) : ALabel(config, "clock", id, "{:%H:%M}", 60, false, false, true), fixed_time_zone_(false) { - if (config_["timezone"].isString()) { + if (config_["timezones"].isArray() && !config_["timezones"].empty()) { + time_zone_idx_ = 0; + setTimeZone(config_["timezones"][time_zone_idx_]); + } else { + setTimeZone(config_["timezone"]); + } + if (fixed_time_zone_) { spdlog::warn("As using a timezone, some format args may be missing as the date library haven't got a release since 2018."); - time_zone_ = date::locate_zone(config_["timezone"].asString()); - fixed_time_zone_ = true; } if (config_["locale"].isString()) { @@ -72,6 +76,17 @@ auto waybar::modules::Clock::update() -> void { ALabel::update(); } +bool waybar::modules::Clock::setTimeZone(Json::Value zone_name) { + if (!zone_name.isString() || zone_name.asString().empty()) { + fixed_time_zone_ = false; + return false; + } + + time_zone_ = date::locate_zone(zone_name.asString()); + fixed_time_zone_ = true; + return true; +} + bool waybar::modules::Clock::handleScroll(GdkEventScroll *e) { // defer to user commands if set if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString()) { @@ -92,14 +107,7 @@ bool waybar::modules::Clock::handleScroll(GdkEventScroll *e) { } else { time_zone_idx_ = time_zone_idx_ == 0 ? nr_zones - 1 : time_zone_idx_ - 1; } - auto zone_name = config_["timezones"][time_zone_idx_]; - if (!zone_name.isString() || zone_name.empty()) { - fixed_time_zone_ = false; - } else { - time_zone_ = date::locate_zone(zone_name.asString()); - fixed_time_zone_ = true; - } - + setTimeZone(config_["timezones"][time_zone_idx_]); update(); return true; } From 75a6dddea5ae5f96d40e0b823ee65bf94ef329f6 Mon Sep 17 00:00:00 2001 From: dmitry Date: Wed, 20 Oct 2021 01:23:00 +0300 Subject: [PATCH 336/355] Finish --- include/modules/wlr/taskbar.hpp | 1 + man/waybar-wlr-taskbar.5.scd | 2 +- src/modules/wlr/taskbar.cpp | 20 ++++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index 891ad55b..f9233baf 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -77,6 +77,7 @@ class Task private: std::string repr() const; std::string state_string(bool = false) const; + void hide_if_ignored(); public: /* Getter functions */ diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd index 0e86238a..6645cc24 100644 --- a/man/waybar-wlr-taskbar.5.scd +++ b/man/waybar-wlr-taskbar.5.scd @@ -70,7 +70,7 @@ Addressed by *wlr/taskbar* *ignore-list*: ++ typeof: array ++ - List of app_id to be invisible. + List of app_id/titles to be invisible. # FORMAT REPLACEMENTS diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index 932a95e6..b27e9f8d 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -276,8 +276,7 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar, struct zwlr_foreign_toplevel_handle_v1 *tl_handle, struct wl_seat *seat) : bar_{bar}, config_{config}, tbar_{tbar}, handle_{tl_handle}, seat_{seat}, id_{global_id++}, - content_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0}, - button_visible_{false}, ignored_{false} + content_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0} { zwlr_foreign_toplevel_handle_v1_add_listener(handle_, &toplevel_handle_impl, this); @@ -377,13 +376,12 @@ std::string Task::state_string(bool shortened) const void Task::handle_title(const char *title) { title_ = title; + hide_if_ignored(); } -void Task::handle_app_id(const char *app_id) +void Task::hide_if_ignored() { - app_id_ = app_id; - - if (tbar_->ignore_list().count(app_id)) { + if (tbar_->ignore_list().count(app_id_) || tbar_->ignore_list().count(title_)) { ignored_ = true; if (button_visible_) { auto output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); @@ -397,6 +395,12 @@ void Task::handle_app_id(const char *app_id) handle_output_enter(output); } } +} + +void Task::handle_app_id(const char *app_id) +{ + app_id_ = app_id; + hide_if_ignored(); if (!with_icon_) return; @@ -418,13 +422,13 @@ void Task::handle_app_id(const char *app_id) void Task::handle_output_enter(struct wl_output *output) { - spdlog::debug("{} entered output {}", repr(), (void*)output); - if (ignored_) { spdlog::debug("{} is ignored", repr()); return; } + spdlog::debug("{} entered output {}", repr(), (void*)output); + if (!button_visible_ && (tbar_->all_outputs() || tbar_->show_output(output))) { /* The task entered the output of the current bar make the button visible */ tbar_->add_button(button_); From 0b66454d5c9cf526b889d16cd656cd2c4834c7ee Mon Sep 17 00:00:00 2001 From: Robin Ebert Date: Wed, 20 Oct 2021 11:11:49 +0200 Subject: [PATCH 337/355] Add spacing config option This option allows to add spaces between the modules. It uses Gtk:Box's spacing property. --- src/bar.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/bar.cpp b/src/bar.cpp index 7d763599..54e487de 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -438,6 +438,13 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config) center_.get_style_context()->add_class("modules-center"); right_.get_style_context()->add_class("modules-right"); + if (config["spacing"].isInt()) { + int spacing = config["spacing"].asInt(); + left_.set_spacing(spacing); + center_.set_spacing(spacing); + right_.set_spacing(spacing); + } + uint32_t height = config["height"].isUInt() ? config["height"].asUInt() : 0; uint32_t width = config["width"].isUInt() ? config["width"].asUInt() : 0; From 7669029bfece53d171eead18baff0520a52859fb Mon Sep 17 00:00:00 2001 From: Robin Ebert Date: Wed, 20 Oct 2021 11:15:49 +0200 Subject: [PATCH 338/355] Add man documentation for spacing config option --- man/waybar.5.scd.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index 997a48d8..eaa8d783 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -64,6 +64,10 @@ Also a minimal example configuration can be found on the at the bottom of this m typeof: integer ++ Margins value without units. +*spacing* ++ + typeof: integer ++ + Size of gaps in between of the different modules. + *name* ++ typeof: string ++ Optional name added as a CSS class, for styling multiple waybars. From 01bfbc46560bf2daac3317b9541b46196e6673fd Mon Sep 17 00:00:00 2001 From: Robin Ebert Date: Wed, 20 Oct 2021 11:23:57 +0200 Subject: [PATCH 339/355] Use spacing in config --- resources/config | 1 + resources/style.css | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/config b/resources/config index b3157212..063393b0 100644 --- a/resources/config +++ b/resources/config @@ -3,6 +3,7 @@ // "position": "bottom", // Waybar position (top|bottom|left|right) "height": 30, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width + "spacing": 4, // Gaps between modules (4px) // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "custom/media"], "modules-center": ["sway/window"], diff --git a/resources/style.css b/resources/style.css index c0d4d9b9..0235942b 100644 --- a/resources/style.css +++ b/resources/style.css @@ -80,7 +80,6 @@ window#waybar.chromium { #idle_inhibitor, #mpd { padding: 0 10px; - margin: 0 4px; color: #ffffff; } From a015b2e3db979fa4603f8d942d0f2e2877b9327b Mon Sep 17 00:00:00 2001 From: jonbakke <49371446+jonbakke@users.noreply.github.com> Date: Thu, 28 Oct 2021 09:37:11 -0700 Subject: [PATCH 340/355] Clarify less than/greater than in warning. I was seeing "[warning] Requested height: 20 exceeds the minimum height: 30 required..." Lines 114-134 are relevant; 133 overrides the requested height with the minimum height when GTK wants more pixels to work with. So, the code is behaving as expected, and "less than" matches the code's logic. --- src/bar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bar.cpp b/src/bar.cpp index 54e487de..a8b230e1 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -13,10 +13,10 @@ namespace waybar { static constexpr const char* MIN_HEIGHT_MSG = - "Requested height: {} exceeds the minimum height: {} required by the modules"; + "Requested height: {} is less than the minimum height: {} required by the modules"; static constexpr const char* MIN_WIDTH_MSG = - "Requested width: {} exceeds the minimum width: {} required by the modules"; + "Requested width: {} is less than the minimum width: {} required by the modules"; static constexpr const char* BAR_SIZE_MSG = "Bar configured (width: {}, height: {}) for output: {}"; From decb13eef0a3c42d5bf7356c0d21f6fc5af93585 Mon Sep 17 00:00:00 2001 From: Marwin Glaser Date: Thu, 28 Oct 2021 19:10:46 +0200 Subject: [PATCH 341/355] mark zfs arc size as free in memory --- src/modules/memory/common.cpp | 4 ++-- src/modules/memory/linux.cpp | 25 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/modules/memory/common.cpp b/src/modules/memory/common.cpp index 31219ed6..75e05302 100644 --- a/src/modules/memory/common.cpp +++ b/src/modules/memory/common.cpp @@ -15,11 +15,11 @@ auto waybar::modules::Memory::update() -> void { unsigned long memfree; if (meminfo_.count("MemAvailable")) { // New kernels (3.4+) have an accurate available memory field. - memfree = meminfo_["MemAvailable"]; + memfree = meminfo_["MemAvailable"] + meminfo_["zfs_size"]; } else { // Old kernel; give a best-effort approximation of available memory. memfree = meminfo_["MemFree"] + meminfo_["Buffers"] + meminfo_["Cached"] + - meminfo_["SReclaimable"] - meminfo_["Shmem"]; + meminfo_["SReclaimable"] - meminfo_["Shmem"] + meminfo_["zfs_size"]; } if (memtotal > 0 && memfree >= 0) { diff --git a/src/modules/memory/linux.cpp b/src/modules/memory/linux.cpp index 75f05fe3..34d55c93 100644 --- a/src/modules/memory/linux.cpp +++ b/src/modules/memory/linux.cpp @@ -1,8 +1,29 @@ #include "modules/memory.hpp" +static unsigned zfsArcSize() { + std::ifstream zfs_arc_stats{"/proc/spl/kstat/zfs/arcstats"}; + + if (zfs_arc_stats.is_open()) { + std::string name; + std::string type; + unsigned long data{0}; + + std::string line; + while (std::getline(zfs_arc_stats, line)) { + std::stringstream(line) >> name >> type >> data; + + if (name == "size") { + return data / 1024; // convert to kB + } + } + } + + return 0; +} + void waybar::modules::Memory::parseMeminfo() { const std::string data_dir_ = "/proc/meminfo"; - std::ifstream info(data_dir_); + std::ifstream info(data_dir_); if (!info.is_open()) { throw std::runtime_error("Can't open " + data_dir_); } @@ -17,4 +38,6 @@ void waybar::modules::Memory::parseMeminfo() { int64_t value = std::stol(line.substr(posDelim + 1)); meminfo_[name] = value; } + + meminfo_["zfs_size"] = zfsArcSize(); } From 48117a2e971e3d64dd1a7321802da9019a1fc9e1 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Fri, 29 Oct 2021 14:12:48 +0330 Subject: [PATCH 342/355] Fix divide by zero (#1303) --- src/ALabel.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ALabel.cpp b/src/ALabel.cpp index dd41a32c..b9b3d1d2 100644 --- a/src/ALabel.cpp +++ b/src/ALabel.cpp @@ -67,8 +67,10 @@ std::string ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_ } if (format_icons.isArray()) { auto size = format_icons.size(); - auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1); - format_icons = format_icons[idx]; + if (size) { + auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1); + format_icons = format_icons[idx]; + } } if (format_icons.isString()) { return format_icons.asString(); @@ -90,8 +92,10 @@ std::string ALabel::getIcon(uint16_t percentage, const std::vector& } if (format_icons.isArray()) { auto size = format_icons.size(); - auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1); - format_icons = format_icons[idx]; + if (size) { + auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1); + format_icons = format_icons[idx]; + } } if (format_icons.isString()) { return format_icons.asString(); From 769b12f16a05f1c86c9966810dee93185bbc8a15 Mon Sep 17 00:00:00 2001 From: Birger Schacht <1143280+b1rger@users.noreply.github.com> Date: Sat, 6 Nov 2021 09:00:15 +0000 Subject: [PATCH 343/355] Fix typo --- man/waybar-battery.5.scd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar-battery.5.scd b/man/waybar-battery.5.scd index 48c2ee19..e8053c91 100644 --- a/man/waybar-battery.5.scd +++ b/man/waybar-battery.5.scd @@ -120,7 +120,7 @@ The two arguments are: # CUSTOM FORMATS -The *battery* module allows to define custom formats based on up to two factors. The best fitting format will be selected. +The *battery* module allows one to define custom formats based on up to two factors. The best fitting format will be selected. *format-*: With *states*, a custom format can be set depending on the capacity of your battery. From b24f9ea5690a949f91f367eb90bbe25472f55a74 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 11 Nov 2021 21:42:05 +0100 Subject: [PATCH 344/355] Ensure MPD volume is not negative If the primary output does not support changing volume MPD will report -1. Ensure that negative volume levels will be represented as 0 instead. Signed-off-by: Sefa Eyeoglu --- src/modules/mpd/mpd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index 0a7c9706..6d272867 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -131,6 +131,9 @@ void waybar::modules::MPD::setLabel() { date = getTag(MPD_TAG_DATE); song_pos = mpd_status_get_song_pos(status_.get()); volume = mpd_status_get_volume(status_.get()); + if (volume < 0) { + volume = 0; + } queue_length = mpd_status_get_queue_length(status_.get()); elapsedTime = std::chrono::seconds(mpd_status_get_elapsed_time(status_.get())); totalTime = std::chrono::seconds(mpd_status_get_total_time(status_.get())); From ad3f46214d791b98364dd95719ee49c9446f20a5 Mon Sep 17 00:00:00 2001 From: John Fredriksson <94405030+jfred9@users.noreply.github.com> Date: Mon, 15 Nov 2021 21:23:36 +0100 Subject: [PATCH 345/355] river/tags: Add possibility for mouse clicks Left mouse click - set-focused-tags Right mouse click - toggle-focused-tags --- include/modules/river/tags.hpp | 6 ++ man/waybar-river-tags.5.scd | 5 ++ protocol/meson.build | 1 + protocol/river-control-unstable-v1.xml | 85 ++++++++++++++++++++++++++ src/modules/river/tags.cpp | 72 +++++++++++++++++++++- 5 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 protocol/river-control-unstable-v1.xml diff --git a/include/modules/river/tags.hpp b/include/modules/river/tags.hpp index 9b75fbd3..c49ec60d 100644 --- a/include/modules/river/tags.hpp +++ b/include/modules/river/tags.hpp @@ -6,6 +6,7 @@ #include "AModule.hpp" #include "bar.hpp" #include "river-status-unstable-v1-client-protocol.h" +#include "river-control-unstable-v1-client-protocol.h" #include "xdg-output-unstable-v1-client-protocol.h" namespace waybar::modules::river { @@ -20,7 +21,12 @@ class Tags : public waybar::AModule { void handle_view_tags(struct wl_array *tags); void handle_urgent_tags(uint32_t tags); + void handle_primary_clicked(uint32_t tag); + bool handle_button_press(GdkEventButton *event_button, uint32_t tag); + struct zriver_status_manager_v1 *status_manager_; + struct zriver_control_v1 *control_; + struct wl_seat *seat_; private: const waybar::Bar & bar_; diff --git a/man/waybar-river-tags.5.scd b/man/waybar-river-tags.5.scd index 65b90332..7814ee49 100644 --- a/man/waybar-river-tags.5.scd +++ b/man/waybar-river-tags.5.scd @@ -21,6 +21,11 @@ Addressed by *river/tags* typeof: array ++ The label to display for each tag. +*disable-click*: ++ + typeof: bool ++ + default: false ++ + If set to false, you can left click to set focused tag. Right click to toggle tag focus. If set to true this behaviour is disabled. + # EXAMPLE ``` diff --git a/protocol/meson.build b/protocol/meson.build index 07d524ae..ea988efc 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -28,6 +28,7 @@ client_protocols = [ ['wlr-layer-shell-unstable-v1.xml'], ['wlr-foreign-toplevel-management-unstable-v1.xml'], ['river-status-unstable-v1.xml'], + ['river-control-unstable-v1.xml'], ] client_protos_src = [] diff --git a/protocol/river-control-unstable-v1.xml b/protocol/river-control-unstable-v1.xml new file mode 100644 index 00000000..b8faa45c --- /dev/null +++ b/protocol/river-control-unstable-v1.xml @@ -0,0 +1,85 @@ + + + + Copyright 2020 The River Developers + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + + + This interface allows clients to run compositor commands and receive a + success/failure response with output or a failure message respectively. + + Each command is built up in a series of add_argument requests and + executed with a run_command request. The first argument is the command + to be run. + + A complete list of commands should be made available in the man page of + the compositor. + + + + + This request indicates that the client will not use the + river_control object any more. Objects that have been created + through this instance are not affected. + + + + + + Arguments are stored by the server in the order they were sent until + the run_command request is made. + + + + + + + Execute the command built up using the add_argument request for the + given seat. + + + + + + + + + This object is created by the run_command request. Exactly one of the + success or failure events will be sent. This object will be destroyed + by the compositor after one of the events is sent. + + + + + Sent when the command has been successfully received and executed by + the compositor. Some commands may produce output, in which case the + output argument will be a non-empty string. + + + + + + + Sent when the command could not be carried out. This could be due to + sending a non-existent command, no command, not enough arguments, too + many arguments, invalid arguments, etc. + + + + + diff --git a/src/modules/river/tags.cpp b/src/modules/river/tags.cpp index 2628af2d..87655beb 100644 --- a/src/modules/river/tags.cpp +++ b/src/modules/river/tags.cpp @@ -7,7 +7,6 @@ #include "client.hpp" #include "modules/river/tags.hpp" -#include "river-status-unstable-v1-client-protocol.h" #include "xdg-output-unstable-v1-client-protocol.h" namespace waybar::modules::river { @@ -33,6 +32,23 @@ static const zriver_output_status_v1_listener output_status_listener_impl{ .urgent_tags = listen_urgent_tags, }; +static void listen_command_success(void *data, + struct zriver_command_callback_v1 *zriver_command_callback_v1, + const char *output) { + // Do nothing but keep listener to avoid crashing when command was successful +} + +static void listen_command_failure(void *data, + struct zriver_command_callback_v1 *zriver_command_callback_v1, + const char *output) { + spdlog::error("failure when selecting/toggling tags {}", output); +} + +static const zriver_command_callback_v1_listener command_callback_listener_impl { + .success = listen_command_success, + .failure = listen_command_failure, +}; + static void handle_global(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) { if (std::strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { @@ -43,18 +59,33 @@ static void handle_global(void *data, struct wl_registry *registry, uint32_t nam static_cast(data)->status_manager_ = static_cast( wl_registry_bind(registry, name, &zriver_status_manager_v1_interface, version)); } + + if (std::strcmp(interface, zriver_control_v1_interface.name) == 0) { + version = std::min(version, 1); + static_cast(data)->control_ = static_cast( + wl_registry_bind(registry, name, &zriver_control_v1_interface, version)); + } + + if (std::strcmp(interface, wl_seat_interface.name) == 0) { + version = std::min(version, 1); + static_cast(data)->seat_ = static_cast( + wl_registry_bind(registry, name, &wl_seat_interface, version)); + } } static void handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) { /* Ignore event */ } + static const wl_registry_listener registry_listener_impl = {.global = handle_global, .global_remove = handle_global_remove}; Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &config) : waybar::AModule(config, "tags", id, false, false), status_manager_{nullptr}, + control_{nullptr}, + seat_{nullptr}, bar_(bar), box_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0}, output_status_{nullptr} { @@ -68,6 +99,14 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con return; } + if (!control_) { + spdlog::error("river_control_v1 not advertised"); + } + + if (!seat_) { + spdlog::error("wl_seat not advertised"); + } + box_.set_name("tags"); if (!id.empty()) { box_.get_style_context()->add_class(id); @@ -89,11 +128,17 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con } } + uint32_t i = 1; for (const auto &tag_label : tag_labels) { Gtk::Button &button = buttons_.emplace_back(tag_label); button.set_relief(Gtk::RELIEF_NONE); box_.pack_start(button, false, false, 0); + if (!config_["disable-click"].asBool()) { + button.signal_clicked().connect(sigc::bind(sigc::mem_fun(*this, &Tags::handle_primary_clicked), i)); + button.signal_button_press_event().connect(sigc::bind(sigc::mem_fun(*this, &Tags::handle_button_press), i)); + } button.show(); + i <<= 1; } struct wl_output *output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); @@ -107,6 +152,31 @@ Tags::~Tags() { if (output_status_) { zriver_output_status_v1_destroy(output_status_); } + + if (control_) { + zriver_control_v1_destroy(control_); + } +} + +void Tags::handle_primary_clicked(uint32_t tag) { + // Send river command to select tag on left mouse click + zriver_command_callback_v1 *callback; + zriver_control_v1_add_argument(control_, "set-focused-tags"); + zriver_control_v1_add_argument(control_, std::to_string(tag).c_str()); + callback = zriver_control_v1_run_command(control_, seat_); + zriver_command_callback_v1_add_listener(callback, &command_callback_listener_impl, nullptr); +} + +bool Tags::handle_button_press(GdkEventButton *event_button, uint32_t tag) { + if (event_button->type == GDK_BUTTON_PRESS && event_button->button == 3) { + // Send river command to toggle tag on right mouse click + zriver_command_callback_v1 *callback; + zriver_control_v1_add_argument(control_, "toggle-focused-tags"); + zriver_control_v1_add_argument(control_, std::to_string(tag).c_str()); + callback = zriver_control_v1_run_command(control_, seat_); + zriver_command_callback_v1_add_listener(callback, &command_callback_listener_impl, nullptr); + } + return true; } void Tags::handle_focused_tags(uint32_t tags) { From 23955fdcc25ea40cc8d7b4d1386cc83f0ed0ddff Mon Sep 17 00:00:00 2001 From: Anakael Date: Fri, 19 Nov 2021 18:38:59 +0300 Subject: [PATCH 346/355] Update taskbar.hpp --- include/modules/wlr/taskbar.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index f9233baf..cdef9f18 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -77,7 +77,7 @@ class Task private: std::string repr() const; std::string state_string(bool = false) const; - void hide_if_ignored(); + void hide_if_ignored(); public: /* Getter functions */ From 18ea53fcbcefe445f98a6f8575bcd1944d2c7710 Mon Sep 17 00:00:00 2001 From: Anakael Date: Fri, 19 Nov 2021 18:39:49 +0300 Subject: [PATCH 347/355] Update taskbar.hpp --- include/modules/wlr/taskbar.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index cdef9f18..c7e66286 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -77,7 +77,7 @@ class Task private: std::string repr() const; std::string state_string(bool = false) const; - void hide_if_ignored(); + void hide_if_ignored(); public: /* Getter functions */ From cb6af026f632d4cb56546bbce73ad114c01a9957 Mon Sep 17 00:00:00 2001 From: Anakael Date: Fri, 19 Nov 2021 18:51:28 +0300 Subject: [PATCH 348/355] Update taskbar.hpp --- include/modules/wlr/taskbar.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/modules/wlr/taskbar.hpp b/include/modules/wlr/taskbar.hpp index c7e66286..3fe032f8 100644 --- a/include/modules/wlr/taskbar.hpp +++ b/include/modules/wlr/taskbar.hpp @@ -61,8 +61,8 @@ class Task Gtk::Image icon_; Gtk::Label text_before_; Gtk::Label text_after_; - bool button_visible_; - bool ignored_; + bool button_visible_ = false; + bool ignored_ = false; bool with_icon_; std::string format_before_; From 60c1706273808937ab460367d350f217e31ebfb0 Mon Sep 17 00:00:00 2001 From: Anakael Date: Fri, 19 Nov 2021 18:54:37 +0300 Subject: [PATCH 349/355] Update taskbar.cpp --- src/modules/wlr/taskbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp index b27e9f8d..af1b0da0 100644 --- a/src/modules/wlr/taskbar.cpp +++ b/src/modules/wlr/taskbar.cpp @@ -376,7 +376,7 @@ std::string Task::state_string(bool shortened) const void Task::handle_title(const char *title) { title_ = title; - hide_if_ignored(); + hide_if_ignored(); } void Task::hide_if_ignored() @@ -400,7 +400,7 @@ void Task::hide_if_ignored() void Task::handle_app_id(const char *app_id) { app_id_ = app_id; - hide_if_ignored(); + hide_if_ignored(); if (!with_icon_) return; From 4154492603ddec3fc8e091cf34bcbc8081fa780a Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 19 Nov 2021 20:35:51 -0800 Subject: [PATCH 350/355] ci: update FreeBSD configuration Use latest action v0.1.5. Pin runner to macos-10.15. macos-latest will start using macos-11 images without VirtualBox in less than a month[1]. [1] https://github.com/actions/virtual-environments/issues/4060 --- .github/workflows/freebsd.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 8af7a04a..03e5d707 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -4,11 +4,14 @@ on: [ push, pull_request ] jobs: clang: - runs-on: macos-latest # until https://github.com/actions/runner/issues/385 + # Run actions in a FreeBSD vm on the macos-10.15 runner + # https://github.com/actions/runner/issues/385 - for FreeBSD runner support + # https://github.com/actions/virtual-environments/issues/4060 - for lack of VirtualBox on MacOS 11 runners + runs-on: macos-10.15 steps: - uses: actions/checkout@v2 - name: Test in FreeBSD VM - uses: vmactions/freebsd-vm@v0.1.4 # aka FreeBSD 12.2 + uses: vmactions/freebsd-vm@v0.1.5 # aka FreeBSD 13.0 with: usesh: true prepare: | From ffeecf626ceaaa3dfd2ac4f2a9bd6b0c3f5a40ae Mon Sep 17 00:00:00 2001 From: dmitry Date: Sun, 21 Nov 2021 15:01:25 +0300 Subject: [PATCH 351/355] Update names --- include/modules/wlr/workspace_manager.hpp | 16 +-- .../modules/wlr/workspace_manager_binding.hpp | 10 +- ...e-v1.xml => ext-workspace-unstable-v1.xml} | 104 ++++++++++++------ protocol/meson.build | 2 +- src/modules/wlr/workspace_manager.cpp | 28 ++--- src/modules/wlr/workspace_manager_binding.cpp | 54 ++++----- 6 files changed, 125 insertions(+), 89 deletions(-) rename protocol/{wlr-workspace-unstable-v1.xml => ext-workspace-unstable-v1.xml} (73%) diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp index 73c5893f..02f4e37f 100644 --- a/include/modules/wlr/workspace_manager.hpp +++ b/include/modules/wlr/workspace_manager.hpp @@ -11,7 +11,7 @@ #include "AModule.hpp" #include "bar.hpp" -#include "wlr-workspace-unstable-v1-client-protocol.h" +#include "ext-workspace-unstable-v1-client-protocol.h" namespace waybar::modules::wlr { @@ -21,7 +21,7 @@ class WorkspaceGroup; class Workspace { public: Workspace(const waybar::Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, - zwlr_workspace_handle_v1 *workspace, uint32_t id); + zext_workspace_handle_v1 *workspace, uint32_t id); ~Workspace(); auto update() -> void; @@ -51,7 +51,7 @@ class Workspace { WorkspaceGroup & workspace_group_; // wlr stuff - zwlr_workspace_handle_v1 *workspace_handle_; + zext_workspace_handle_v1 *workspace_handle_; uint32_t state_ = 0; uint32_t id_; @@ -69,7 +69,7 @@ class Workspace { class WorkspaceGroup { public: WorkspaceGroup(const waybar::Bar &bar, Gtk::Box &box, const Json::Value &config, - WorkspaceManager &manager, zwlr_workspace_group_handle_v1 *workspace_group_handle, + WorkspaceManager &manager, zext_workspace_group_handle_v1 *workspace_group_handle, uint32_t id); ~WorkspaceGroup(); auto update() -> void; @@ -79,7 +79,7 @@ class WorkspaceGroup { auto remove_workspace(uint32_t id_) -> void; // wlr stuff - auto handle_workspace_create(zwlr_workspace_handle_v1 *workspace_handle) -> void; + auto handle_workspace_create(zext_workspace_handle_v1 *workspace_handle) -> void; auto handle_remove() -> void; auto handle_output_enter(wl_output *output) -> void; auto handle_output_leave() -> void; @@ -98,7 +98,7 @@ class WorkspaceGroup { WorkspaceManager & workspace_manager_; // wlr stuff - zwlr_workspace_group_handle_v1 *workspace_group_handle_; + zext_workspace_group_handle_v1 *workspace_group_handle_; wl_output * output_ = nullptr; uint32_t id_; @@ -117,7 +117,7 @@ class WorkspaceManager : public AModule { // wlr stuff auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void; - auto handle_workspace_group_create(zwlr_workspace_group_handle_v1 *workspace_group_handle) + auto handle_workspace_group_create(zext_workspace_group_handle_v1 *workspace_group_handle) -> void; auto handle_done() -> void; auto handle_finished() -> void; @@ -130,7 +130,7 @@ class WorkspaceManager : public AModule { std::vector> groups_; // wlr stuff - zwlr_workspace_manager_v1 *workspace_manager_ = nullptr; + zext_workspace_manager_v1 *workspace_manager_ = nullptr; static uint32_t group_global_id; }; diff --git a/include/modules/wlr/workspace_manager_binding.hpp b/include/modules/wlr/workspace_manager_binding.hpp index 1cef652f..0bfe663f 100644 --- a/include/modules/wlr/workspace_manager_binding.hpp +++ b/include/modules/wlr/workspace_manager_binding.hpp @@ -1,8 +1,8 @@ -#include "wlr-workspace-unstable-v1-client-protocol.h" +#include "ext-workspace-unstable-v1-client-protocol.h" namespace waybar::modules::wlr { void add_registry_listener(void *data); - void add_workspace_listener(zwlr_workspace_handle_v1 *workspace_handle, void *data); - void add_workspace_group_listener(zwlr_workspace_group_handle_v1 *workspace_group_handle, void *data); - zwlr_workspace_manager_v1* workspace_manager_bind(wl_registry *registry, uint32_t name, uint32_t version, void *data); -} \ No newline at end of file + void add_workspace_listener(zext_workspace_handle_v1 *workspace_handle, void *data); + void add_workspace_group_listener(zext_workspace_group_handle_v1 *workspace_group_handle, void *data); + zext_workspace_manager_v1* workspace_manager_bind(wl_registry *registry, uint32_t name, uint32_t version, void *data); +} diff --git a/protocol/wlr-workspace-unstable-v1.xml b/protocol/ext-workspace-unstable-v1.xml similarity index 73% rename from protocol/wlr-workspace-unstable-v1.xml rename to protocol/ext-workspace-unstable-v1.xml index ae0e44db..24410b62 100644 --- a/protocol/wlr-workspace-unstable-v1.xml +++ b/protocol/ext-workspace-unstable-v1.xml @@ -1,5 +1,5 @@ - + Copyright © 2019 Christopher Billington Copyright © 2020 Ilia Bozhinov @@ -26,7 +26,7 @@ THIS SOFTWARE. - + Workspaces, also called virtual desktops, are groups of surfaces. A compositor with a concept of workspaces may only show some such groups of @@ -45,7 +45,7 @@ docks by providing them with a list of workspaces and their properties, and allowing them to activate and deactivate workspaces. - After a client binds the zwlr_workspace_manager_v1, each workspace will be + After a client binds the zext_workspace_manager_v1, each workspace will be sent via the workspace event. @@ -55,9 +55,9 @@ All initial details of the workspace group (workspaces, outputs) will be sent immediately after this event via the corresponding events in - zwlr_workspace_group_handle_v1. + zext_workspace_group_handle_v1. - + @@ -68,21 +68,21 @@ This allows changes to the workspace properties to be seen as atomic, even if they happen via multiple events, and even if they involve - multiple zwlr_workspace_handle_v1 objects, for example, deactivating one + multiple zext_workspace_handle_v1 objects, for example, deactivating one workspace and activating another. - This event is sent after all changes in all workspace groups have been - sent. + This event is sent after all changes in all workspace groups have been + sent. - This allows changes to one or more zwlr_workspace_group_handle_v1 + This allows changes to one or more zext_workspace_group_handle_v1 properties to be seen as atomic, even if they happen via multiple events. In particular, an output moving from one workspace group to another sends an output_enter event and an output_leave event to the two - zwlr_workspace_group_handle_v1 objects in question. The compositor sends + zext_workspace_group_handle_v1 objects in question. The compositor sends the done event only after updating the output information in both workspace groups. @@ -91,7 +91,7 @@ This event indicates that the compositor is done sending events to the - zwlr_workspace_manager_v1. The server will destroy the object + zext_workspace_manager_v1. The server will destroy the object immediately after sending this request, so it will become invalid and the client should free any resources associated with it. @@ -108,14 +108,19 @@ - + - A zwlr_workspace_group_handle_v1 object represents a a workspace group + A zext_workspace_group_handle_v1 object represents a a workspace group that is assigned a set of outputs and contains a number of workspaces. The set of outputs assigned to the workspace group is conveyed to the client via output_enter and output_leave events, and its workspaces are conveyed with workspace events. + + For example, a compositor which has a set of workspaces for each output may + advertise a workspace group (and its workspaces) per output, whereas a compositor + where a workspace spans all outputs may advertise a single workspace group for all + outputs. @@ -140,26 +145,36 @@ All initial details of the workspace (name, coordinates, state) will be sent immediately after this event via the corresponding events in - zwlr_workspace_handle_v1. + zext_workspace_handle_v1. - + - This event means the zwlr_workspace_group_handle_v1 has been destroyed. - It is guaranteed there won't be any more events for this - zwlr_workspace_group_handle_v1. The zwlr_workspace_group_handle_v1 becomes - inert so any requests will be ignored except the destroy request. + This event means the zext_workspace_group_handle_v1 has been destroyed. + It is guaranteed there won't be any more events for this + zext_workspace_group_handle_v1. The zext_workspace_group_handle_v1 becomes + inert so any requests will be ignored except the destroy request. - The compositor must remove all workspaces belonging to a workspace group - before removing the workspace group. + The compositor must remove all workspaces belonging to a workspace group + before removing the workspace group. + + + Request that the compositor create a new workspace with the given name. + + There is no guarantee that the compositor will create a new workspace, + or that the created workspace will have the provided name. + + + + - - Destroys the zwlr_workspace_handle_v1 object. + + Destroys the zext_workspace_handle_v1 object. This request should be called either when the client does not want to use the workspace object any more or after the remove event to finalize @@ -168,9 +183,9 @@ - + - A zwlr_workspace_handle_v1 object represents a a workspace that handles a + A zext_workspace_handle_v1 object represents a a workspace that handles a group of surfaces. Each workspace has a name, conveyed to the client with the name event; a @@ -178,11 +193,16 @@ optionally a set of coordinates, conveyed to the client with the coordinates event. The client may request that the compositor activate or deactivate the workspace. + + Each workspace can belong to only a single workspace group. + Depepending on the compositor policy, there might be workspaces with + the same name in different workspace groups, but these workspaces are still + separate (e.g. one of them might be active while the other is not). - This event is emitted immediately after the zwlr_workspace_handle_v1 is + This event is emitted immediately after the zext_workspace_handle_v1 is created and whenever the name of the workspace changes. @@ -192,13 +212,13 @@ This event is used to organize workspaces into an N-dimensional grid within a workspace group, and if supported, is emitted immediately after - the zwlr_workspace_handle_v1 is created and whenever the coordinates of + the zext_workspace_handle_v1 is created and whenever the coordinates of the workspace change. Compositors may not send this event if they do not conceptually arrange workspaces in this way. If compositors simply number workspaces, without any geometric interpretation, they may send 1D coordinates, which clients should not interpret as implying any - geometry. Sending an empty array means that the compositor no longer - orders the workspace geometrically. + geometry. Sending an empty array means that the compositor no longer + orders the workspace geometrically. Coordinates have an arbitrary number of dimensions N with an uint32 position along each dimension. By convention if N > 1, the first @@ -214,7 +234,7 @@ - This event is emitted immediately after the zwlr_workspace_handle_v1 is + This event is emitted immediately after the zext_workspace_handle_v1 is created and each time the workspace state changes, either because of a compositor action or because of a request in this protocol. @@ -227,20 +247,28 @@ + + + + The workspace is not visible in its workspace group, and clients + attempting to visualize the compositor workspace state should not + display such workspaces. + + - This event means the zwlr_workspace_handle_v1 has been destroyed. It is + This event means the zext_workspace_handle_v1 has been destroyed. It is guaranteed there won't be any more events for this - zwlr_workspace_handle_v1. The zwlr_workspace_handle_v1 becomes inert so + zext_workspace_handle_v1. The zext_workspace_handle_v1 becomes inert so any requests will be ignored except the destroy request. - - Destroys the zwlr_workspace_handle_v1 object. + + Destroys the zext_workspace_handle_v1 object. This request should be called either when the client does not want to use the workspace object any more or after the remove event to finalize @@ -266,5 +294,13 @@ There is no guarantee the workspace will be actually deactivated. + + + + Request that this workspace be removed. + + There is no guarantee the workspace will be actually removed. + + diff --git a/protocol/meson.build b/protocol/meson.build index 467260bc..f81cb0d4 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -27,7 +27,7 @@ client_protocols = [ [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'], ['wlr-foreign-toplevel-management-unstable-v1.xml'], - ['wlr-workspace-unstable-v1.xml'], + ['ext-workspace-unstable-v1.xml'], ['river-status-unstable-v1.xml'], ] diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index 20294f4a..26556ece 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -44,7 +44,7 @@ auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, ui } auto WorkspaceManager::handle_workspace_group_create( - zwlr_workspace_group_handle_v1 *workspace_group_handle) -> void { + zext_workspace_group_handle_v1 *workspace_group_handle) -> void { auto new_id = ++group_global_id; groups_.push_back( std::make_unique(bar_, box_, config_, *this, workspace_group_handle, new_id)); @@ -52,7 +52,7 @@ auto WorkspaceManager::handle_workspace_group_create( } auto WorkspaceManager::handle_finished() -> void { - zwlr_workspace_manager_v1_destroy(workspace_manager_); + zext_workspace_manager_v1_destroy(workspace_manager_); workspace_manager_ = nullptr; } @@ -75,7 +75,7 @@ WorkspaceManager::~WorkspaceManager() { return; } - zwlr_workspace_manager_v1_destroy(workspace_manager_); + zext_workspace_manager_v1_destroy(workspace_manager_); workspace_manager_ = nullptr; } @@ -91,11 +91,11 @@ auto WorkspaceManager::remove_workspace_group(uint32_t id) -> void { groups_.erase(it); } -auto WorkspaceManager::commit() -> void { zwlr_workspace_manager_v1_commit(workspace_manager_); } +auto WorkspaceManager::commit() -> void { zext_workspace_manager_v1_commit(workspace_manager_); } WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value &config, WorkspaceManager & manager, - zwlr_workspace_group_handle_v1 *workspace_group_handle, uint32_t id) + zext_workspace_group_handle_v1 *workspace_group_handle, uint32_t id) : bar_(bar), box_(box), config_(config), @@ -123,18 +123,18 @@ WorkspaceGroup::~WorkspaceGroup() { return; } - zwlr_workspace_group_handle_v1_destroy(workspace_group_handle_); + zext_workspace_group_handle_v1_destroy(workspace_group_handle_); workspace_group_handle_ = nullptr; } -auto WorkspaceGroup::handle_workspace_create(zwlr_workspace_handle_v1 *workspace) -> void { +auto WorkspaceGroup::handle_workspace_create(zext_workspace_handle_v1 *workspace) -> void { auto new_id = ++workspace_global_id; workspaces_.push_back(std::make_unique(bar_, config_, *this, workspace, new_id)); spdlog::debug("Workspace {} created", new_id); } auto WorkspaceGroup::handle_remove() -> void { - zwlr_workspace_group_handle_v1_destroy(workspace_group_handle_); + zext_workspace_group_handle_v1_destroy(workspace_group_handle_); workspace_group_handle_ = nullptr; workspace_manager_.remove_workspace_group(id_); } @@ -226,7 +226,7 @@ auto WorkspaceGroup::remove_button(Gtk::Button &button) -> void { } Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, - zwlr_workspace_handle_v1 *workspace, uint32_t id) + zext_workspace_handle_v1 *workspace, uint32_t id) : bar_(bar), config_(config), workspace_group_(workspace_group), @@ -267,7 +267,7 @@ Workspace::~Workspace() { return; } - zwlr_workspace_handle_v1_destroy(workspace_handle_); + zext_workspace_handle_v1_destroy(workspace_handle_); workspace_handle_ = nullptr; } @@ -280,7 +280,7 @@ auto Workspace::handle_state(const std::vector &state) -> void { state_ = 0; for (auto state_entry : state) { switch (state_entry) { - case ZWLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE: + case ZEXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE: state_ |= (uint32_t)State::ACTIVE; break; } @@ -288,7 +288,7 @@ auto Workspace::handle_state(const std::vector &state) -> void { } auto Workspace::handle_remove() -> void { - zwlr_workspace_handle_v1_destroy(workspace_handle_); + zext_workspace_handle_v1_destroy(workspace_handle_); workspace_handle_ = nullptr; workspace_group_.remove_workspace(id_); } @@ -326,7 +326,7 @@ auto Workspace::get_icon() -> std::string { auto Workspace::handle_clicked() -> void { spdlog::debug("Workspace {} clicked", (void *)workspace_handle_); - zwlr_workspace_handle_v1_activate(workspace_handle_); + zext_workspace_handle_v1_activate(workspace_handle_); workspace_group_.commit(); } @@ -339,4 +339,4 @@ auto Workspace::handle_coordinates(const std::vector &coordinates) -> coordinates_ = coordinates; workspace_group_.sort_workspaces(); } -} // namespace waybar::modules::wlr \ No newline at end of file +} // namespace waybar::modules::wlr diff --git a/src/modules/wlr/workspace_manager_binding.cpp b/src/modules/wlr/workspace_manager_binding.cpp index c7d84bbb..6a339735 100644 --- a/src/modules/wlr/workspace_manager_binding.cpp +++ b/src/modules/wlr/workspace_manager_binding.cpp @@ -9,7 +9,7 @@ namespace waybar::modules::wlr { static void handle_global(void *data, wl_registry *registry, uint32_t name, const char *interface, uint32_t version) { - if (std::strcmp(interface, zwlr_workspace_manager_v1_interface.name) == 0) { + if (std::strcmp(interface, zext_workspace_manager_v1_interface.name) == 0) { static_cast(data)->register_manager(registry, name, version); } } @@ -31,72 +31,72 @@ void add_registry_listener(void *data) { } static void workspace_manager_handle_workspace_group( - void *data, zwlr_workspace_manager_v1 *_, zwlr_workspace_group_handle_v1 *workspace_group) { + void *data, zext_workspace_manager_v1 *_, zext_workspace_group_handle_v1 *workspace_group) { static_cast(data)->handle_workspace_group_create(workspace_group); } -static void workspace_manager_handle_done(void *data, zwlr_workspace_manager_v1 *_) { +static void workspace_manager_handle_done(void *data, zext_workspace_manager_v1 *_) { static_cast(data)->handle_done(); } -static void workspace_manager_handle_finished(void *data, zwlr_workspace_manager_v1 *_) { +static void workspace_manager_handle_finished(void *data, zext_workspace_manager_v1 *_) { static_cast(data)->handle_finished(); } -static const zwlr_workspace_manager_v1_listener workspace_manager_impl = { +static const zext_workspace_manager_v1_listener workspace_manager_impl = { .workspace_group = workspace_manager_handle_workspace_group, .done = workspace_manager_handle_done, .finished = workspace_manager_handle_finished, }; -zwlr_workspace_manager_v1 *workspace_manager_bind(wl_registry *registry, uint32_t name, +zext_workspace_manager_v1 *workspace_manager_bind(wl_registry *registry, uint32_t name, uint32_t version, void *data) { - auto *workspace_manager = static_cast( - wl_registry_bind(registry, name, &zwlr_workspace_manager_v1_interface, version)); + auto *workspace_manager = static_cast( + wl_registry_bind(registry, name, &zext_workspace_manager_v1_interface, version)); if (workspace_manager) - zwlr_workspace_manager_v1_add_listener(workspace_manager, &workspace_manager_impl, data); + zext_workspace_manager_v1_add_listener(workspace_manager, &workspace_manager_impl, data); else spdlog::error("Failed to register manager"); return workspace_manager; } -static void workspace_group_handle_output_enter(void *data, zwlr_workspace_group_handle_v1 *_, +static void workspace_group_handle_output_enter(void *data, zext_workspace_group_handle_v1 *_, wl_output *output) { static_cast(data)->handle_output_enter(output); } -static void workspace_group_handle_output_leave(void *data, zwlr_workspace_group_handle_v1 *_, +static void workspace_group_handle_output_leave(void *data, zext_workspace_group_handle_v1 *_, wl_output *output) { static_cast(data)->handle_output_leave(); } -static void workspace_group_handle_workspace(void *data, zwlr_workspace_group_handle_v1 *_, - zwlr_workspace_handle_v1 *workspace) { +static void workspace_group_handle_workspace(void *data, zext_workspace_group_handle_v1 *_, + zext_workspace_handle_v1 *workspace) { static_cast(data)->handle_workspace_create(workspace); } -static void workspace_group_handle_remove(void *data, zwlr_workspace_group_handle_v1 *_) { +static void workspace_group_handle_remove(void *data, zext_workspace_group_handle_v1 *_) { static_cast(data)->handle_remove(); } -static const zwlr_workspace_group_handle_v1_listener workspace_group_impl = { +static const zext_workspace_group_handle_v1_listener workspace_group_impl = { .output_enter = workspace_group_handle_output_enter, .output_leave = workspace_group_handle_output_leave, .workspace = workspace_group_handle_workspace, .remove = workspace_group_handle_remove}; -void add_workspace_group_listener(zwlr_workspace_group_handle_v1 *workspace_group_handle, +void add_workspace_group_listener(zext_workspace_group_handle_v1 *workspace_group_handle, void * data) { - zwlr_workspace_group_handle_v1_add_listener(workspace_group_handle, &workspace_group_impl, data); + zext_workspace_group_handle_v1_add_listener(workspace_group_handle, &workspace_group_impl, data); } -void workspace_handle_name(void *data, struct zwlr_workspace_handle_v1 *_, const char *name) { +void workspace_handle_name(void *data, struct zext_workspace_handle_v1 *_, const char *name) { static_cast(data)->handle_name(name); } -void workspace_handle_coordinates(void *data, struct zwlr_workspace_handle_v1 *_, +void workspace_handle_coordinates(void *data, struct zext_workspace_handle_v1 *_, struct wl_array *coordinates) { std::vector coords_vec; auto coords = static_cast(coordinates->data); @@ -107,16 +107,16 @@ void workspace_handle_coordinates(void *data, struct zwlr_workspace_handle_v1 *_ static_cast(data)->handle_coordinates(coords_vec); } -void workspace_handle_state(void *data, struct zwlr_workspace_handle_v1 *workspace_handle, +void workspace_handle_state(void *data, struct zext_workspace_handle_v1 *workspace_handle, struct wl_array *state) { std::vector state_vec; auto states = static_cast(state->data); for (size_t i = 0; i < state->size; ++i) { // To sync server and pending states - if (states[i] == ZWLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE) { - zwlr_workspace_handle_v1_activate(workspace_handle); + if (states[i] == ZEXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE) { + zext_workspace_handle_v1_activate(workspace_handle); } else { - zwlr_workspace_handle_v1_deactivate(workspace_handle); + zext_workspace_handle_v1_deactivate(workspace_handle); } state_vec.push_back(states[i]); } @@ -124,17 +124,17 @@ void workspace_handle_state(void *data, struct zwlr_workspace_handle_v1 *workspa static_cast(data)->handle_state(state_vec); } -void workspace_handle_remove(void *data, struct zwlr_workspace_handle_v1 *_) { +void workspace_handle_remove(void *data, struct zext_workspace_handle_v1 *_) { static_cast(data)->handle_remove(); } -static const zwlr_workspace_handle_v1_listener workspace_impl = { +static const zext_workspace_handle_v1_listener workspace_impl = { .name = workspace_handle_name, .coordinates = workspace_handle_coordinates, .state = workspace_handle_state, .remove = workspace_handle_remove}; -void add_workspace_listener(zwlr_workspace_handle_v1 *workspace_handle, void *data) { - zwlr_workspace_handle_v1_add_listener(workspace_handle, &workspace_impl, data); +void add_workspace_listener(zext_workspace_handle_v1 *workspace_handle, void *data) { + zext_workspace_handle_v1_add_listener(workspace_handle, &workspace_impl, data); } } // namespace waybar::modules::wlr From ef4c6a9ba3c65235e0af0c6456a14f39a4974408 Mon Sep 17 00:00:00 2001 From: dmitry Date: Mon, 22 Nov 2021 01:12:55 +0300 Subject: [PATCH 352/355] Update to proto. Fix displaying. Rename classes. --- include/modules/wlr/workspace_manager.hpp | 15 ++- man/waybar-wlr-workspaces.5.scd | 11 ++- src/modules/wlr/workspace_manager.cpp | 99 ++++++++++++++----- src/modules/wlr/workspace_manager_binding.cpp | 6 -- 4 files changed, 98 insertions(+), 33 deletions(-) diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp index 02f4e37f..1fcfc229 100644 --- a/include/modules/wlr/workspace_manager.hpp +++ b/include/modules/wlr/workspace_manager.hpp @@ -27,6 +27,8 @@ class Workspace { auto id() const -> uint32_t { return id_; } auto is_active() const -> bool { return state_ & static_cast(State::ACTIVE); } + auto is_urgent() const -> bool { return state_ & static_cast(State::URGENT); } + auto is_hidden() const -> bool { return state_ & static_cast(State::HIDDEN); } // wlr stuff auto handle_name(const std::string &name) -> void; auto handle_coordinates(const std::vector &coordinates) -> void; @@ -34,14 +36,19 @@ class Workspace { auto handle_remove() -> void; auto handle_done() -> void; - auto handle_clicked() -> void; + auto handle_clicked(GdkEventButton *bt) -> bool; auto show() -> void { button_.show(); } auto hide() -> void { button_.hide(); } auto get_button_ref() -> Gtk::Button & { return button_; } auto get_name() -> std::string & { return name_; } auto get_coords() -> std::vector & { return coordinates_; } - enum class State { ACTIVE = 1 << 0 }; + enum class State + { + ACTIVE = 1 << 0, + URGENT = 1 << 1, + HIDDEN = 1 << 2, + }; private: auto get_icon() -> std::string; @@ -75,7 +82,7 @@ class WorkspaceGroup { auto update() -> void; auto id() const -> uint32_t { return id_; } - auto is_visible() const -> bool { return output_ != nullptr; } + auto is_visible() const -> bool; auto remove_workspace(uint32_t id_) -> void; // wlr stuff @@ -89,6 +96,7 @@ class WorkspaceGroup { auto handle_done() -> void; auto commit() -> void; auto sort_workspaces() -> void; + auto set_need_to_sort() -> void { need_to_sort = true; } private: static uint32_t workspace_global_id; @@ -105,6 +113,7 @@ class WorkspaceGroup { std::vector> workspaces_; bool sort_by_name = true; bool sort_by_coordinates = true; + bool need_to_sort = false; }; class WorkspaceManager : public AModule { diff --git a/man/waybar-wlr-workspaces.5.scd b/man/waybar-wlr-workspaces.5.scd index c1e827f3..344d932c 100644 --- a/man/waybar-wlr-workspaces.5.scd +++ b/man/waybar-wlr-workspaces.5.scd @@ -28,7 +28,7 @@ Addressed by *wlr/workspaces* *sort-by-coordinates*: ++ typeof: bool ++ - default: false ++ + default: true ++ Should workspaces be sorted by coordinates. Note that if both *sort-by-name* and *sort-by-coordinates* are true sort by name will be first. If both are false - sort by id will be performed. @@ -39,6 +39,11 @@ Addressed by *wlr/workspaces* *{icon}*: Icon, as defined in *format-icons*. +# CLICK ACTIONS + +*activate*: Switch to workspace. +*close*: Close the workspace. + # ICONS Additional to workspace name matching, the following *format-icons* can be set. @@ -67,4 +72,6 @@ Additional to workspace name matching, the following *format-icons* can be set. - *#workspaces* - *#workspaces button* -- *#workspaces button.focused* +- *#workspaces button.active* +- *#workspaces button.urgent* +- *#workspaces button.hidden* diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index 26556ece..1d67b046 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -143,15 +143,19 @@ auto WorkspaceGroup::handle_output_enter(wl_output *output) -> void { spdlog::debug("Output {} assigned to {} group", (void *)output, id_); output_ = output; - if (output != gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj())) { - return; + if (!is_visible()) { + return; } for (auto &workspace : workspaces_) { - workspace->show(); + add_button(workspace->get_button_ref()); } } +auto WorkspaceGroup::is_visible() const -> bool { + return output_ != nullptr && output_ == gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); +} + auto WorkspaceGroup::handle_output_leave() -> void { spdlog::debug("Output {} remove from {} group", (void *)output_, id_); output_ = nullptr; @@ -161,7 +165,7 @@ auto WorkspaceGroup::handle_output_leave() -> void { } for (auto &workspace : workspaces_) { - workspace->hide(); + remove_button(workspace->get_button_ref()); } } @@ -185,9 +189,16 @@ auto WorkspaceGroup::remove_workspace(uint32_t id) -> void { } auto WorkspaceGroup::handle_done() -> void { + need_to_sort = false; + if (!is_visible()) { + return; + } + for (auto &workspace : workspaces_) { workspace->handle_done(); } + + sort_workspaces(); } auto WorkspaceGroup::commit() -> void { workspace_manager_.commit(); } @@ -215,9 +226,7 @@ auto WorkspaceGroup::sort_workspaces() -> void { std::sort(workspaces_.begin(), workspaces_.end(), cmp); for (size_t i = 0; i < workspaces_.size(); ++i) { - for (auto &workspace : workspaces_) { - box_.reorder_child(workspace->get_button_ref(), i); - } + box_.reorder_child(workspaces_[i]->get_button_ref(), i); } } @@ -246,16 +255,23 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup & } } - button_.signal_clicked().connect(sigc::mem_fun(this, &Workspace::handle_clicked)); + /* Handle click events if configured */ + if (config_["on-click"].isString() || config_["on-click-middle"].isString() + || config_["on-click-right"].isString()) { + button_.add_events(Gdk::BUTTON_PRESS_MASK); + button_.signal_button_press_event().connect( + sigc::mem_fun(*this, &Workspace::handle_clicked), false); + } - workspace_group.add_button(button_); button_.set_relief(Gtk::RELIEF_NONE); content_.set_center_widget(label_); button_.add(content_); + if (!workspace_group.is_visible()) { return; } + workspace_group.add_button(button_); button_.show(); label_.show(); content_.show(); @@ -283,6 +299,12 @@ auto Workspace::handle_state(const std::vector &state) -> void { case ZEXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE: state_ |= (uint32_t)State::ACTIVE; break; + case ZEXT_WORKSPACE_HANDLE_V1_STATE_URGENT: + state_ |= (uint32_t)State::URGENT; + break; + case ZEXT_WORKSPACE_HANDLE_V1_STATE_HIDDEN: + state_ |= (uint32_t)State::URGENT; + break; } } } @@ -293,21 +315,27 @@ auto Workspace::handle_remove() -> void { workspace_group_.remove_workspace(id_); } +auto add_or_remove_class(Glib::RefPtr context, bool condition, const std::string& class_name) { + if (condition) { + context->add_class(class_name); + } else { + context->remove_class(class_name); + } +} + auto Workspace::handle_done() -> void { spdlog::debug("Workspace {} changed to state {}", id_, state_); auto style_context = button_.get_style_context(); - if (is_active()) { - style_context->add_class("focused"); - } else { - style_context->remove_class("focused"); - } + add_or_remove_class(style_context, is_active(), "active"); + add_or_remove_class(style_context, is_urgent(), "urgent"); + add_or_remove_class(style_context, is_hidden(), "hidden"); } auto Workspace::get_icon() -> std::string { if (is_active()) { - auto focused_icon_it = icons_map_.find("focused"); - if (focused_icon_it != icons_map_.end()) { - return focused_icon_it->second; + auto active_icon_it = icons_map_.find("active"); + if (active_icon_it != icons_map_.end()) { + return active_icon_it->second; } } @@ -324,19 +352,46 @@ auto Workspace::get_icon() -> std::string { return name_; } -auto Workspace::handle_clicked() -> void { - spdlog::debug("Workspace {} clicked", (void *)workspace_handle_); - zext_workspace_handle_v1_activate(workspace_handle_); +auto Workspace::handle_clicked(GdkEventButton *bt) -> bool { + std::string action; + if (config_["on-click"].isString() && bt->button == 1) { + action = config_["on-click"].asString(); + } + else if (config_["on-click-middle"].isString() && bt->button == 2) { + action = config_["on-click-middle"].asString(); + } + else if (config_["on-click-right"].isString() && bt->button == 3) { + action = config_["on-click-right"].asString(); + } + + if (action.empty()) + return true; + else if (action == "activate") { + zext_workspace_handle_v1_activate(workspace_handle_); + } + else if (action == "close") { + zext_workspace_handle_v1_remove(workspace_handle_); + } + else { + spdlog::warn("Unknown action {}", action); + } + workspace_group_.commit(); + + return true; } auto Workspace::handle_name(const std::string &name) -> void { + if (name_ != name) { + workspace_group_.set_need_to_sort(); + } name_ = name; - workspace_group_.sort_workspaces(); } auto Workspace::handle_coordinates(const std::vector &coordinates) -> void { + if (coordinates_ != coordinates) { + workspace_group_.set_need_to_sort(); + } coordinates_ = coordinates; - workspace_group_.sort_workspaces(); } } // namespace waybar::modules::wlr diff --git a/src/modules/wlr/workspace_manager_binding.cpp b/src/modules/wlr/workspace_manager_binding.cpp index 6a339735..1005d5c8 100644 --- a/src/modules/wlr/workspace_manager_binding.cpp +++ b/src/modules/wlr/workspace_manager_binding.cpp @@ -112,12 +112,6 @@ void workspace_handle_state(void *data, struct zext_workspace_handle_v1 *workspa std::vector state_vec; auto states = static_cast(state->data); for (size_t i = 0; i < state->size; ++i) { - // To sync server and pending states - if (states[i] == ZEXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE) { - zext_workspace_handle_v1_activate(workspace_handle); - } else { - zext_workspace_handle_v1_deactivate(workspace_handle); - } state_vec.push_back(states[i]); } From 23991b65430c8b06e360ef289c0db6d9f3e297ec Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 23 Nov 2021 03:10:44 +0300 Subject: [PATCH 353/355] Finish --- include/modules/wlr/workspace_manager.hpp | 55 +++-- man/waybar-wlr-workspaces.5.scd | 10 + src/modules/wlr/workspace_manager.cpp | 198 ++++++++++++------ src/modules/wlr/workspace_manager_binding.cpp | 5 +- 4 files changed, 183 insertions(+), 85 deletions(-) diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp index 1fcfc229..e4cdb4da 100644 --- a/include/modules/wlr/workspace_manager.hpp +++ b/include/modules/wlr/workspace_manager.hpp @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -37,25 +38,24 @@ class Workspace { auto handle_done() -> void; auto handle_clicked(GdkEventButton *bt) -> bool; - auto show() -> void { button_.show(); } - auto hide() -> void { button_.hide(); } + auto show() -> void; + auto hide() -> void; auto get_button_ref() -> Gtk::Button & { return button_; } auto get_name() -> std::string & { return name_; } auto get_coords() -> std::vector & { return coordinates_; } - enum class State - { - ACTIVE = 1 << 0, - URGENT = 1 << 1, - HIDDEN = 1 << 2, + enum class State { + ACTIVE = (1 << 0), + URGENT = (1 << 1), + HIDDEN = (1 << 2), }; private: auto get_icon() -> std::string; - const Bar & bar_; + const Bar &bar_; const Json::Value &config_; - WorkspaceGroup & workspace_group_; + WorkspaceGroup &workspace_group_; // wlr stuff zext_workspace_handle_v1 *workspace_handle_; @@ -84,35 +84,36 @@ class WorkspaceGroup { auto id() const -> uint32_t { return id_; } auto is_visible() const -> bool; auto remove_workspace(uint32_t id_) -> void; + auto active_only() const -> bool; + auto creation_delayed() const -> bool; + auto workspaces() -> std::vector> & { return workspaces_; } + + auto sort_workspaces() -> void; + auto set_need_to_sort() -> void { need_to_sort = true; } + auto add_button(Gtk::Button &button) -> void; + auto remove_button(Gtk::Button &button) -> void; // wlr stuff auto handle_workspace_create(zext_workspace_handle_v1 *workspace_handle) -> void; auto handle_remove() -> void; auto handle_output_enter(wl_output *output) -> void; auto handle_output_leave() -> void; - - auto add_button(Gtk::Button &button) -> void; - auto remove_button(Gtk::Button &button) -> void; auto handle_done() -> void; auto commit() -> void; - auto sort_workspaces() -> void; - auto set_need_to_sort() -> void { need_to_sort = true; } private: static uint32_t workspace_global_id; const waybar::Bar &bar_; - Gtk::Box & box_; + Gtk::Box &box_; const Json::Value &config_; - WorkspaceManager & workspace_manager_; + WorkspaceManager &workspace_manager_; // wlr stuff zext_workspace_group_handle_v1 *workspace_group_handle_; - wl_output * output_ = nullptr; + wl_output *output_ = nullptr; uint32_t id_; std::vector> workspaces_; - bool sort_by_name = true; - bool sort_by_coordinates = true; bool need_to_sort = false; }; @@ -122,6 +123,13 @@ class WorkspaceManager : public AModule { ~WorkspaceManager() override; auto update() -> void override; + auto all_outputs() const -> bool { return all_outputs_; } + auto active_only() const -> bool { return active_only_; } + auto workspace_comparator() const + -> std::function &, std::unique_ptr &)>; + auto creation_delayed() const -> bool { return creation_delayed_; } + + auto sort_workspaces() -> void; auto remove_workspace_group(uint32_t id_) -> void; // wlr stuff @@ -130,11 +138,10 @@ class WorkspaceManager : public AModule { -> void; auto handle_done() -> void; auto handle_finished() -> void; - auto commit() -> void; private: - const waybar::Bar & bar_; + const waybar::Bar &bar_; Gtk::Box box_; std::vector> groups_; @@ -142,6 +149,12 @@ class WorkspaceManager : public AModule { zext_workspace_manager_v1 *workspace_manager_ = nullptr; static uint32_t group_global_id; + + bool sort_by_name_ = true; + bool sort_by_coordinates_ = true; + bool all_outputs_ = false; + bool active_only_ = false; + bool creation_delayed_ = false; }; } // namespace waybar::modules::wlr diff --git a/man/waybar-wlr-workspaces.5.scd b/man/waybar-wlr-workspaces.5.scd index 344d932c..f0df5e94 100644 --- a/man/waybar-wlr-workspaces.5.scd +++ b/man/waybar-wlr-workspaces.5.scd @@ -33,6 +33,16 @@ Addressed by *wlr/workspaces* Note that if both *sort-by-name* and *sort-by-coordinates* are true sort by name will be first. If both are false - sort by id will be performed. +*all-outputs*: ++ + typeof: bool ++ + default: false ++ + If set to false workspaces group will be shown only in assigned output. Otherwise all workspace groups are shown. + +*active-only*: ++ + typeof: bool ++ + default: false ++ + If set to true only active or urgent workspaces will be shown. + # FORMAT REPLACEMENTS *{name}*: Name of workspace assigned by compositor diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index 1d67b046..9077dc87 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -5,7 +5,10 @@ #include #include +#include +#include +#include "gtkmm/widget.h" #include "modules/wlr/workspace_manager_binding.hpp" namespace waybar::modules::wlr { @@ -19,6 +22,27 @@ WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar : waybar::AModule(config, "workspaces", id, false, false), bar_(bar), box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) { + auto config_sort_by_name = config_["sort-by-name"]; + if (config_sort_by_name.isBool()) { + sort_by_name_ = config_sort_by_name.asBool(); + } + + auto config_sort_by_coordinates = config_["sort-by-coordinates"]; + if (config_sort_by_coordinates.isBool()) { + sort_by_coordinates_ = config_sort_by_coordinates.asBool(); + } + + auto config_all_outputs = config_["all-outputs"]; + if (config_all_outputs.isBool()) { + all_outputs_ = config_all_outputs.asBool(); + } + + auto config_active_only = config_["active-only"]; + if (config_active_only.isBool()) { + active_only_ = config_active_only.asBool(); + creation_delayed_ = active_only_; + } + box_.set_name("workspaces"); if (!id.empty()) { box_.get_style_context()->add_class(id); @@ -31,6 +55,54 @@ WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar } } +auto WorkspaceManager::workspace_comparator() const + -> std::function &, std::unique_ptr &)> { + return [=](std::unique_ptr &lhs, std::unique_ptr &rhs) { + auto is_name_less = lhs->get_name() < rhs->get_name(); + auto is_name_eq = lhs->get_name() == rhs->get_name(); + auto is_coords_less = lhs->get_coords() < rhs->get_coords(); + if (sort_by_name_) { + if (sort_by_coordinates_) { + return is_name_eq ? is_coords_less : is_name_less; + } else { + return is_name_less; + } + } + + if (sort_by_coordinates_) { + return is_coords_less; + } + + return lhs->id() < rhs->id(); + }; +} + +auto WorkspaceManager::sort_workspaces() -> void { + std::vector>> all_workspaces; + for (auto &group : groups_) { + auto &group_workspaces = group->workspaces(); + all_workspaces.reserve(all_workspaces.size() + + std::distance(group_workspaces.begin(), group_workspaces.end())); + if (!active_only()) { + all_workspaces.insert(all_workspaces.end(), group_workspaces.begin(), group_workspaces.end()); + continue; + } + + for (auto &workspace : group_workspaces) { + if (!workspace->is_active()) { + continue; + } + + all_workspaces.push_back(workspace); + } + } + + std::sort(all_workspaces.begin(), all_workspaces.end(), workspace_comparator()); + for (size_t i = 0; i < all_workspaces.size(); ++i) { + box_.reorder_child(all_workspaces[i].get()->get_button_ref(), i); + } +} + auto WorkspaceManager::register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void { if (workspace_manager_) { @@ -67,6 +139,9 @@ auto WorkspaceManager::update() -> void { for (auto &group : groups_) { group->update(); } + if (creation_delayed()) { + creation_delayed_ = false; + } AModule::update(); } @@ -94,7 +169,7 @@ auto WorkspaceManager::remove_workspace_group(uint32_t id) -> void { auto WorkspaceManager::commit() -> void { zext_workspace_manager_v1_commit(workspace_manager_); } WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value &config, - WorkspaceManager & manager, + WorkspaceManager &manager, zext_workspace_group_handle_v1 *workspace_group_handle, uint32_t id) : bar_(bar), box_(box), @@ -103,15 +178,11 @@ WorkspaceGroup::WorkspaceGroup(const Bar &bar, Gtk::Box &box, const Json::Value workspace_group_handle_(workspace_group_handle), id_(id) { add_workspace_group_listener(workspace_group_handle, this); - auto config_sort_by_name = config_["sort-by-name"]; - if (config_sort_by_name.isBool()) { - sort_by_name = config_sort_by_name.asBool(); - } +} - auto config_sort_by_coordinates = config_["sort-by-coordinates"]; - if (config_sort_by_coordinates.isBool()) { - sort_by_coordinates = config_sort_by_coordinates.asBool(); - } +auto WorkspaceGroup::active_only() const -> bool { return workspace_manager_.active_only(); } +auto WorkspaceGroup::creation_delayed() const -> bool { + return workspace_manager_.creation_delayed(); } auto WorkspaceGroup::add_button(Gtk::Button &button) -> void { @@ -143,8 +214,8 @@ auto WorkspaceGroup::handle_output_enter(wl_output *output) -> void { spdlog::debug("Output {} assigned to {} group", (void *)output, id_); output_ = output; - if (!is_visible()) { - return; + if (!is_visible() || workspace_manager_.creation_delayed()) { + return; } for (auto &workspace : workspaces_) { @@ -153,7 +224,9 @@ auto WorkspaceGroup::handle_output_enter(wl_output *output) -> void { } auto WorkspaceGroup::is_visible() const -> bool { - return output_ != nullptr && output_ == gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); + return output_ != nullptr && + (workspace_manager_.all_outputs() || + output_ == gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj())); } auto WorkspaceGroup::handle_output_leave() -> void { @@ -171,6 +244,13 @@ auto WorkspaceGroup::handle_output_leave() -> void { auto WorkspaceGroup::update() -> void { for (auto &workspace : workspaces_) { + if (workspace_manager_.creation_delayed()) { + add_button(workspace->get_button_ref()); + if (is_visible() && (workspace->is_active() || workspace->is_urgent())) { + workspace->show(); + } + } + workspace->update(); } } @@ -198,41 +278,27 @@ auto WorkspaceGroup::handle_done() -> void { workspace->handle_done(); } - sort_workspaces(); + if (creation_delayed()) { + return; + } + + if (!workspace_manager_.all_outputs()) { + //sort_workspaces(); + } else { + workspace_manager_.sort_workspaces(); + } } auto WorkspaceGroup::commit() -> void { workspace_manager_.commit(); } auto WorkspaceGroup::sort_workspaces() -> void { - auto cmp = [=](std::unique_ptr &lhs, std::unique_ptr &rhs) { - auto is_name_less = lhs->get_name() < rhs->get_name(); - auto is_name_eq = lhs->get_name() == rhs->get_name(); - auto is_coords_less = lhs->get_coords() < rhs->get_coords(); - if (sort_by_name) { - if (sort_by_coordinates) { - return is_name_eq ? is_coords_less : is_name_less; - } - else { - return is_name_less; - } - } - - if (sort_by_coordinates) { - return is_coords_less; - } - - return lhs->id() < rhs->id(); - }; - - std::sort(workspaces_.begin(), workspaces_.end(), cmp); + std::sort(workspaces_.begin(), workspaces_.end(), workspace_manager_.workspace_comparator()); for (size_t i = 0; i < workspaces_.size(); ++i) { box_.reorder_child(workspaces_[i]->get_button_ref(), i); } } -auto WorkspaceGroup::remove_button(Gtk::Button &button) -> void { - box_.remove(button); -} +auto WorkspaceGroup::remove_button(Gtk::Button &button) -> void { box_.remove(button); } Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &workspace_group, zext_workspace_handle_v1 *workspace, uint32_t id) @@ -256,11 +322,11 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup & } /* Handle click events if configured */ - if (config_["on-click"].isString() || config_["on-click-middle"].isString() - || config_["on-click-right"].isString()) { + if (config_["on-click"].isString() || config_["on-click-middle"].isString() || + config_["on-click-right"].isString()) { button_.add_events(Gdk::BUTTON_PRESS_MASK); - button_.signal_button_press_event().connect( - sigc::mem_fun(*this, &Workspace::handle_clicked), false); + button_.signal_button_press_event().connect(sigc::mem_fun(*this, &Workspace::handle_clicked), + false); } button_.set_relief(Gtk::RELIEF_NONE); @@ -272,9 +338,7 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup & } workspace_group.add_button(button_); - button_.show(); - label_.show(); - content_.show(); + button_.show_all(); } Workspace::~Workspace() { @@ -303,7 +367,7 @@ auto Workspace::handle_state(const std::vector &state) -> void { state_ |= (uint32_t)State::URGENT; break; case ZEXT_WORKSPACE_HANDLE_V1_STATE_HIDDEN: - state_ |= (uint32_t)State::URGENT; + state_ |= (uint32_t)State::HIDDEN; break; } } @@ -315,7 +379,8 @@ auto Workspace::handle_remove() -> void { workspace_group_.remove_workspace(id_); } -auto add_or_remove_class(Glib::RefPtr context, bool condition, const std::string& class_name) { +auto add_or_remove_class(Glib::RefPtr context, bool condition, + const std::string &class_name) { if (condition) { context->add_class(class_name); } else { @@ -329,6 +394,16 @@ auto Workspace::handle_done() -> void { add_or_remove_class(style_context, is_active(), "active"); add_or_remove_class(style_context, is_urgent(), "urgent"); add_or_remove_class(style_context, is_hidden(), "hidden"); + + if (workspace_group_.creation_delayed()) { + return; + } + + if (workspace_group_.active_only() && (is_active() || is_urgent())) { + button_.show_all(); + } else if (workspace_group_.active_only() && !(is_active() || is_urgent())) { + button_.hide(); + } } auto Workspace::get_icon() -> std::string { @@ -355,24 +430,20 @@ auto Workspace::get_icon() -> std::string { auto Workspace::handle_clicked(GdkEventButton *bt) -> bool { std::string action; if (config_["on-click"].isString() && bt->button == 1) { - action = config_["on-click"].asString(); - } - else if (config_["on-click-middle"].isString() && bt->button == 2) { - action = config_["on-click-middle"].asString(); - } - else if (config_["on-click-right"].isString() && bt->button == 3) { - action = config_["on-click-right"].asString(); + action = config_["on-click"].asString(); + } else if (config_["on-click-middle"].isString() && bt->button == 2) { + action = config_["on-click-middle"].asString(); + } else if (config_["on-click-right"].isString() && bt->button == 3) { + action = config_["on-click-right"].asString(); } if (action.empty()) - return true; + return true; else if (action == "activate") { - zext_workspace_handle_v1_activate(workspace_handle_); - } - else if (action == "close") { - zext_workspace_handle_v1_remove(workspace_handle_); - } - else { + zext_workspace_handle_v1_activate(workspace_handle_); + } else if (action == "close") { + zext_workspace_handle_v1_remove(workspace_handle_); + } else { spdlog::warn("Unknown action {}", action); } @@ -381,16 +452,19 @@ auto Workspace::handle_clicked(GdkEventButton *bt) -> bool { return true; } +auto Workspace::show() -> void { button_.show_all(); } +auto Workspace::hide() -> void { button_.hide(); } + auto Workspace::handle_name(const std::string &name) -> void { if (name_ != name) { - workspace_group_.set_need_to_sort(); + workspace_group_.set_need_to_sort(); } name_ = name; } auto Workspace::handle_coordinates(const std::vector &coordinates) -> void { if (coordinates_ != coordinates) { - workspace_group_.set_need_to_sort(); + workspace_group_.set_need_to_sort(); } coordinates_ = coordinates; } diff --git a/src/modules/wlr/workspace_manager_binding.cpp b/src/modules/wlr/workspace_manager_binding.cpp index 1005d5c8..30c60413 100644 --- a/src/modules/wlr/workspace_manager_binding.cpp +++ b/src/modules/wlr/workspace_manager_binding.cpp @@ -1,6 +1,7 @@ #include "modules/wlr/workspace_manager_binding.hpp" #include +#include #include "client.hpp" #include "modules/wlr/workspace_manager.hpp" @@ -100,7 +101,7 @@ void workspace_handle_coordinates(void *data, struct zext_workspace_handle_v1 *_ struct wl_array *coordinates) { std::vector coords_vec; auto coords = static_cast(coordinates->data); - for (size_t i = 0; i < coordinates->size; ++i) { + for (size_t i = 0; i < coordinates->size / sizeof(uint32_t); ++i) { coords_vec.push_back(coords[i]); } @@ -111,7 +112,7 @@ void workspace_handle_state(void *data, struct zext_workspace_handle_v1 *workspa struct wl_array *state) { std::vector state_vec; auto states = static_cast(state->data); - for (size_t i = 0; i < state->size; ++i) { + for (size_t i = 0; i < state->size / sizeof(uint32_t); ++i) { state_vec.push_back(states[i]); } From 98f7a10a51d6cecc1422edfcb0bc3886e0a1121a Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 23 Nov 2021 03:18:00 +0300 Subject: [PATCH 354/355] Fix sort --- src/modules/wlr/workspace_manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp index 9077dc87..bacef355 100644 --- a/src/modules/wlr/workspace_manager.cpp +++ b/src/modules/wlr/workspace_manager.cpp @@ -141,6 +141,7 @@ auto WorkspaceManager::update() -> void { } if (creation_delayed()) { creation_delayed_ = false; + sort_workspaces(); } AModule::update(); } @@ -283,7 +284,7 @@ auto WorkspaceGroup::handle_done() -> void { } if (!workspace_manager_.all_outputs()) { - //sort_workspaces(); + sort_workspaces(); } else { workspace_manager_.sort_workspaces(); } From c51a973d602fb448aa0e11e37ddd7f3df0d588ee Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 23 Nov 2021 10:10:14 +0100 Subject: [PATCH 355/355] Revert "dont escape essid in tooltip" --- src/modules/network.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 020478a6..e7b20ab5 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -328,7 +328,7 @@ auto waybar::modules::Network::update() -> void { auto text = fmt::format( format_, - fmt::arg("essid", Glib::Markup::escape_text(essid_)), + fmt::arg("essid", essid_), fmt::arg("signaldBm", signal_strength_dbm_), fmt::arg("signalStrength", signal_strength_), fmt::arg("ifname", ifname_), @@ -779,7 +779,7 @@ void waybar::modules::Network::parseEssid(struct nlattr **bss) { auto essid_end = essid_begin + ies[1]; std::string essid_raw; std::copy(essid_begin, essid_end, std::back_inserter(essid_raw)); - essid_ = essid_raw; + essid_ = Glib::Markup::escape_text(essid_raw); } } }