From 454ba610f45cc53347fe71f7cbe50137d51e4b51 Mon Sep 17 00:00:00 2001 From: Dordovel Date: Fri, 11 Nov 2022 15:15:12 +0300 Subject: [PATCH] clicking on the user label opens the default file manager --- include/modules/user.hpp | 8 +++++--- src/modules/user.cpp | 24 ++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/include/modules/user.hpp b/include/modules/user.hpp index 41e7884..38b09c4 100644 --- a/include/modules/user.hpp +++ b/include/modules/user.hpp @@ -22,10 +22,12 @@ class User : public AIconLabel { static constexpr inline int defaultUserImageWidth_ = 20; static constexpr inline int defaultUserImageHeight_ = 20; + bool signal_label(GdkEventButton* button) const; + long uptime_as_seconds(); - std::string get_user_login(); - std::string get_user_home_dir(); - std::string get_default_user_avatar_path(); + std::string get_user_login() const; + std::string get_user_home_dir() const; + std::string get_default_user_avatar_path() const; void init_default_user_avatar(int width, int height); void init_user_avatar(const std::string& path, int width, int height); void init_avatar(const Json::Value& config); diff --git a/src/modules/user.cpp b/src/modules/user.cpp index 88da0a4..7e3223c 100644 --- a/src/modules/user.cpp +++ b/src/modules/user.cpp @@ -6,7 +6,11 @@ #include #include -#include + +#include "gdkmm/event.h" +#include "gdkmm/types.h" +#include "sigc++/functors/mem_fun.h" +#include "sigc++/functors/ptr_fun.h" #if HAVE_CPU_LINUX #include @@ -16,6 +20,8 @@ #include #endif +#define LEFT_MOUSE_BUTTON 1 + namespace waybar::modules { User::User(const std::string& id, const Json::Value& config) : AIconLabel(config, "user", id, "{user} {work_H}:{work_M}", 60, false, false, true) { @@ -23,6 +29,16 @@ User::User(const std::string& id, const Json::Value& config) this->init_avatar(AIconLabel::config_); } this->init_update_worker(); + AModule::event_box_.signal_button_press_event().connect(sigc::mem_fun(this, &User::signal_label)); +} + +bool User::signal_label(GdkEventButton* button) const { + if (button->type != GDK_BUTTON_PRESS) return true; + + if (button->button == LEFT_MOUSE_BUTTON) { + Gio::AppInfo::launch_default_for_uri("file:///" + this->get_user_home_dir()); + } + return false; } long User::uptime_as_seconds() { @@ -45,9 +61,9 @@ long User::uptime_as_seconds() { return uptime; } -std::string User::get_user_login() { return Glib::get_user_name(); } +std::string User::get_user_login() const { return Glib::get_user_name(); } -std::string User::get_user_home_dir() { return Glib::get_home_dir(); } +std::string User::get_user_home_dir() const { return Glib::get_home_dir(); } void User::init_update_worker() { this->thread_ = [this] { @@ -74,7 +90,7 @@ void User::init_avatar(const Json::Value& config) { this->init_default_user_avatar(width, width); } -std::string User::get_default_user_avatar_path() { +std::string User::get_default_user_avatar_path() const { return this->get_user_home_dir() + "/" + ".face"; }