Implemented AAppIconLabel for sway/window
This commit is contained in:
parent
00e143d47e
commit
31683d9e2a
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
||||||
#include "AIconLabel.hpp"
|
#include "AAppIconLabel.hpp"
|
||||||
#include "bar.hpp"
|
#include "bar.hpp"
|
||||||
#include "client.hpp"
|
#include "client.hpp"
|
||||||
#include "modules/sway/ipc/client.hpp"
|
#include "modules/sway/ipc/client.hpp"
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
class Window : public AIconLabel, public sigc::trackable {
|
class Window : public AAppIconLabel, public sigc::trackable {
|
||||||
public:
|
public:
|
||||||
Window(const std::string&, const waybar::Bar&, const Json::Value&);
|
Window(const std::string&, const waybar::Bar&, const Json::Value&);
|
||||||
virtual ~Window() = default;
|
virtual ~Window() = default;
|
||||||
|
@ -25,8 +25,6 @@ class Window : public AIconLabel, public sigc::trackable {
|
||||||
std::tuple<std::size_t, int, int, std::string, std::string, std::string, std::string, std::string>
|
std::tuple<std::size_t, int, int, std::string, std::string, std::string, std::string, std::string>
|
||||||
getFocusedNode(const Json::Value& nodes, std::string& output);
|
getFocusedNode(const Json::Value& nodes, std::string& output);
|
||||||
void getTree();
|
void getTree();
|
||||||
void updateAppIconName();
|
|
||||||
void updateAppIcon();
|
|
||||||
|
|
||||||
const Bar& bar_;
|
const Bar& bar_;
|
||||||
std::string window_;
|
std::string window_;
|
||||||
|
@ -37,9 +35,6 @@ class Window : public AIconLabel, public sigc::trackable {
|
||||||
std::string old_app_id_;
|
std::string old_app_id_;
|
||||||
std::size_t app_nb_;
|
std::size_t app_nb_;
|
||||||
std::string shell_;
|
std::string shell_;
|
||||||
unsigned app_icon_size_{24};
|
|
||||||
bool update_app_icon_{true};
|
|
||||||
std::string app_icon_name_;
|
|
||||||
int floating_count_;
|
int floating_count_;
|
||||||
util::JsonParser parser_;
|
util::JsonParser parser_;
|
||||||
std::mutex mutex_;
|
std::mutex mutex_;
|
||||||
|
|
|
@ -17,13 +17,7 @@
|
||||||
namespace waybar::modules::sway {
|
namespace waybar::modules::sway {
|
||||||
|
|
||||||
Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
|
Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
|
||||||
: AIconLabel(config, "window", id, "{}", 0, true), bar_(bar), windowId_(-1) {
|
: AAppIconLabel(config, "window", id, "{}", 0, true), bar_(bar), windowId_(-1) {
|
||||||
// Icon size
|
|
||||||
if (config_["icon-size"].isUInt()) {
|
|
||||||
app_icon_size_ = config["icon-size"].asUInt();
|
|
||||||
}
|
|
||||||
image_.set_pixel_size(app_icon_size_);
|
|
||||||
|
|
||||||
ipc_.subscribe(R"(["window","workspace"])");
|
ipc_.subscribe(R"(["window","workspace"])");
|
||||||
ipc_.signal_event.connect(sigc::mem_fun(*this, &Window::onEvent));
|
ipc_.signal_event.connect(sigc::mem_fun(*this, &Window::onEvent));
|
||||||
ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Window::onCmd));
|
ipc_.signal_cmd.connect(sigc::mem_fun(*this, &Window::onCmd));
|
||||||
|
@ -49,7 +43,7 @@ void Window::onCmd(const struct Ipc::ipc_response& res) {
|
||||||
auto output = payload["output"].isString() ? payload["output"].asString() : "";
|
auto output = payload["output"].isString() ? payload["output"].asString() : "";
|
||||||
std::tie(app_nb_, floating_count_, windowId_, window_, app_id_, app_class_, shell_, layout_) =
|
std::tie(app_nb_, floating_count_, windowId_, window_, app_id_, app_class_, shell_, layout_) =
|
||||||
getFocusedNode(payload["nodes"], output);
|
getFocusedNode(payload["nodes"], output);
|
||||||
updateAppIconName();
|
updateAppIconName(app_id_);
|
||||||
dp.emit();
|
dp.emit();
|
||||||
} catch (const std::exception& e) {
|
} catch (const std::exception& e) {
|
||||||
spdlog::error("Window: {}", e.what());
|
spdlog::error("Window: {}", e.what());
|
||||||
|
@ -57,105 +51,6 @@ void Window::onCmd(const struct Ipc::ipc_response& res) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<std::string> getDesktopFilePath(const std::string& app_id,
|
|
||||||
const std::string& app_class) {
|
|
||||||
const auto data_dirs = Glib::get_system_data_dirs();
|
|
||||||
for (const auto& data_dir : data_dirs) {
|
|
||||||
const auto data_app_dir = data_dir + "applications/";
|
|
||||||
auto desktop_file_path = data_app_dir + app_id + ".desktop";
|
|
||||||
if (std::filesystem::exists(desktop_file_path)) {
|
|
||||||
return desktop_file_path;
|
|
||||||
}
|
|
||||||
if (!app_class.empty()) {
|
|
||||||
desktop_file_path = data_app_dir + app_class + ".desktop";
|
|
||||||
if (std::filesystem::exists(desktop_file_path)) {
|
|
||||||
return desktop_file_path;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
std::optional<Glib::ustring> getIconName(const std::string& app_id, const std::string& app_class) {
|
|
||||||
const auto desktop_file_path = getDesktopFilePath(app_id, app_class);
|
|
||||||
if (!desktop_file_path.has_value()) {
|
|
||||||
// Try some heuristics to find a matching icon
|
|
||||||
|
|
||||||
if (DefaultGtkIconThemeWrapper::has_icon(app_id)) {
|
|
||||||
return app_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto app_id_desktop = app_id + "-desktop";
|
|
||||||
if (DefaultGtkIconThemeWrapper::has_icon(app_id_desktop)) {
|
|
||||||
return app_id_desktop;
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto to_lower = [](const std::string& str) {
|
|
||||||
auto str_cpy = str;
|
|
||||||
std::transform(str_cpy.begin(), str_cpy.end(), str_cpy.begin(),
|
|
||||||
[](unsigned char c) { return std::tolower(c); });
|
|
||||||
return str;
|
|
||||||
};
|
|
||||||
|
|
||||||
const auto first_space = app_id.find_first_of(' ');
|
|
||||||
if (first_space != std::string::npos) {
|
|
||||||
const auto first_word = to_lower(app_id.substr(0, first_space));
|
|
||||||
if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
|
|
||||||
return first_word;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto first_dash = app_id.find_first_of('-');
|
|
||||||
if (first_dash != std::string::npos) {
|
|
||||||
const auto first_word = to_lower(app_id.substr(0, first_dash));
|
|
||||||
if (DefaultGtkIconThemeWrapper::has_icon(first_word)) {
|
|
||||||
return first_word;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
Glib::KeyFile desktop_file;
|
|
||||||
desktop_file.load_from_file(desktop_file_path.value());
|
|
||||||
return desktop_file.get_string("Desktop Entry", "Icon");
|
|
||||||
} catch (Glib::FileError& error) {
|
|
||||||
spdlog::warn("Error while loading desktop file {}: {}", desktop_file_path.value(),
|
|
||||||
error.what().c_str());
|
|
||||||
} catch (Glib::KeyFileError& error) {
|
|
||||||
spdlog::warn("Error while loading desktop file {}: {}", desktop_file_path.value(),
|
|
||||||
error.what().c_str());
|
|
||||||
}
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
void Window::updateAppIconName() {
|
|
||||||
if (!iconEnabled()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto icon_name = getIconName(app_id_, app_class_);
|
|
||||||
if (icon_name.has_value()) {
|
|
||||||
app_icon_name_ = icon_name.value();
|
|
||||||
} else {
|
|
||||||
app_icon_name_ = "";
|
|
||||||
}
|
|
||||||
update_app_icon_ = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Window::updateAppIcon() {
|
|
||||||
if (update_app_icon_) {
|
|
||||||
update_app_icon_ = false;
|
|
||||||
if (app_icon_name_.empty()) {
|
|
||||||
image_.set_visible(false);
|
|
||||||
} else {
|
|
||||||
image_.set_from_icon_name(app_icon_name_, Gtk::ICON_SIZE_INVALID);
|
|
||||||
image_.set_visible(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto Window::update() -> void {
|
auto Window::update() -> void {
|
||||||
spdlog::trace("workspace layout {}, tiled count {}, floating count {}", layout_, app_nb_,
|
spdlog::trace("workspace layout {}, tiled count {}, floating count {}", layout_, app_nb_,
|
||||||
floating_count_);
|
floating_count_);
|
||||||
|
@ -210,7 +105,7 @@ auto Window::update() -> void {
|
||||||
updateAppIcon();
|
updateAppIcon();
|
||||||
|
|
||||||
// Call parent update
|
// Call parent update
|
||||||
AIconLabel::update();
|
AAppIconLabel::update();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Window::setClass(std::string classname, bool enable) {
|
void Window::setClass(std::string classname, bool enable) {
|
||||||
|
|
Loading…
Reference in New Issue