mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
refactor: remove useless tmp variable
This commit is contained in:
parent
0670225e69
commit
9d4048983d
@ -18,9 +18,6 @@ class ALabel : public IModule {
|
||||
Gtk::Label label_;
|
||||
const Json::Value& config_;
|
||||
std::string format_;
|
||||
std::string button_press_cmd_ = "";
|
||||
std::string scroll_up_cmd_ = "";
|
||||
std::string scroll_down_cmd_ = "";
|
||||
std::mutex mutex_;
|
||||
|
||||
private:
|
||||
|
@ -35,7 +35,6 @@ inline struct res exec(const std::string cmd)
|
||||
inline bool forkExec(std::string cmd) {
|
||||
if (cmd == "") return true;
|
||||
|
||||
printf("fork exec command %s\n", cmd.c_str());
|
||||
int32_t pid = fork();
|
||||
|
||||
if (pid < 0) {
|
||||
|
@ -69,7 +69,8 @@
|
||||
"portable": "",
|
||||
"car": "",
|
||||
"default": ["", ""]
|
||||
}
|
||||
},
|
||||
"on-click": "pavucontrol"
|
||||
},
|
||||
"custom/spotify": {
|
||||
"format": " {}",
|
||||
|
@ -21,28 +21,19 @@ waybar::ALabel::ALabel(const Json::Value& config, const std::string format)
|
||||
|
||||
// configure events' user commands
|
||||
if (config_["on-click"].isString()) {
|
||||
std::string cmd = config_["on-click"].asString();
|
||||
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
||||
event_box_.signal_button_press_event().connect(
|
||||
sigc::mem_fun(*this, &ALabel::handleToggle));
|
||||
|
||||
button_press_cmd_ = cmd;
|
||||
}
|
||||
if (config_["on-scroll-up"].isString()) {
|
||||
std::string cmd = config_["on-scroll-up"].asString();
|
||||
event_box_.add_events(Gdk::SCROLL_MASK);
|
||||
event_box_.signal_scroll_event().connect(
|
||||
sigc::mem_fun(*this, &ALabel::handleScroll));
|
||||
|
||||
scroll_up_cmd_ = cmd;
|
||||
}
|
||||
if (config_["on-scroll-down"].isString()) {
|
||||
std::string cmd = config_["on-scroll-down"].asString();
|
||||
event_box_.add_events(Gdk::SCROLL_MASK);
|
||||
event_box_.signal_scroll_event().connect(
|
||||
sigc::mem_fun(*this, &ALabel::handleScroll));
|
||||
|
||||
scroll_down_cmd_ = cmd;
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,8 +42,8 @@ auto waybar::ALabel::update() -> void {
|
||||
}
|
||||
|
||||
bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
|
||||
if (button_press_cmd_ != "" && e->button == 1) {
|
||||
waybar::util::command::forkExec(button_press_cmd_);
|
||||
if (config_["on-click"].isString() && e->button == 1) {
|
||||
waybar::util::command::forkExec(config_["on-click"].asString());
|
||||
} else {
|
||||
alt = !alt;
|
||||
if (alt) {
|
||||
@ -69,7 +60,6 @@ bool waybar::ALabel::handleToggle(GdkEventButton* const& e) {
|
||||
bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
|
||||
|
||||
// Avoid concurrent scroll event
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(mutex_);
|
||||
bool direction_up = false;
|
||||
|
||||
@ -89,15 +79,12 @@ bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
|
||||
direction_up = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (direction_up)
|
||||
waybar::util::command::forkExec(scroll_up_cmd_);
|
||||
else
|
||||
waybar::util::command::forkExec(scroll_down_cmd_);
|
||||
|
||||
dp.emit();
|
||||
if (direction_up && config_["on-scroll-up"].isString()) {
|
||||
waybar::util::command::forkExec(config_["on-scroll-up"].asString());
|
||||
} else if (config_["on-scroll-down"].isString()) {
|
||||
waybar::util::command::forkExec(config_["on-scroll-down"].asString());
|
||||
}
|
||||
|
||||
dp.emit();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user