blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1787 from Dordovel/master

This commit is contained in:
Alex 2022-11-15 08:41:12 +01:00 committed by GitHub
parent 5250123dcb 49afb87e34
commit 2695815bcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/modules/user.hpp
View File

@ -22,10 +22,12 @@ class User : public AIconLabel {
static constexpr inline int defaultUserImageWidth_ = 20; static constexpr inline int defaultUserImageWidth_ = 20;
static constexpr inline int defaultUserImageHeight_ = 20; static constexpr inline int defaultUserImageHeight_ = 20;
bool signal_label(GdkEventButton* button) const;
long uptime_as_seconds(); long uptime_as_seconds();
std::string get_user_login(); std::string get_user_login() const;
std::string get_user_home_dir(); std::string get_user_home_dir() const;
std::string get_default_user_avatar_path(); std::string get_default_user_avatar_path() const;
void init_default_user_avatar(int width, int height); void init_default_user_avatar(int width, int height);
void init_user_avatar(const std::string& path, int width, int height); void init_user_avatar(const std::string& path, int width, int height);
void init_avatar(const Json::Value& config); void init_avatar(const Json::Value& config);

24
src/modules/user.cpp
View File

@ -6,7 +6,11 @@
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>
#include <iostream>
#include "gdkmm/event.h"
#include "gdkmm/types.h"
#include "sigc++/functors/mem_fun.h"
#include "sigc++/functors/ptr_fun.h"
#if HAVE_CPU_LINUX #if HAVE_CPU_LINUX
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
@ -16,6 +20,8 @@
#include <time.h> #include <time.h>
#endif #endif
#define LEFT_MOUSE_BUTTON 1
namespace waybar::modules { namespace waybar::modules {
User::User(const std::string& id, const Json::Value& config) User::User(const std::string& id, const Json::Value& config)
: AIconLabel(config, "user", id, "{user} {work_H}:{work_M}", 60, false, false, true) { : 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_avatar(AIconLabel::config_);
} }
this->init_update_worker(); 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() { long User::uptime_as_seconds() {
@ -45,9 +61,9 @@ long User::uptime_as_seconds() {
return uptime; 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() { void User::init_update_worker() {
this->thread_ = [this] { this->thread_ = [this] {
@ -74,7 +90,7 @@ void User::init_avatar(const Json::Value& config) {
this->init_default_user_avatar(width, width); 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"; return this->get_user_home_dir() + "/" + ".face";
} }