Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 3284: wlr/taskbar: deal with "sh: line 1: activate not found" #3420

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue 3284: wlr/taskbar: deal with "sh: line 1: activate not found" #3420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2ce2e2
Issue 3284: deal with "sh: line 1: activate not found"
RobertMueller2 Jul 2, 2024
c9f6c6e
Issue 3284: fix potentially eating drag+drop and add trace logging
RobertMueller2 Jul 8, 2024
838059a
wlr/taskbar: fix some build warnings
RobertMueller2 Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion include/modules/wlr/taskbar.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ class Taskbar : public waybar::AModule {
public:
Taskbar(const std::string &, const waybar::Bar &, const Json::Value &);
~Taskbar();
void update();
auto update() -> void override;
auto doAction(const std::string &) -> void override;

private:
const waybar::Bar &bar_;
Expand All @@ -156,6 +157,7 @@ class Taskbar : public waybar::AModule {
std::vector<Glib::RefPtr<Gtk::IconTheme>> icon_themes_;
std::unordered_set<std::string> ignore_list_;
std::map<std::string, std::string> app_ids_replace_map_;
std::map<std::string, std::string> task_actions_;

struct zwlr_foreign_toplevel_manager_v1 *manager_;
struct wl_seat *seat_;
Expand All @@ -181,6 +183,7 @@ class Taskbar : public waybar::AModule {
const std::vector<Glib::RefPtr<Gtk::IconTheme>> &icon_themes() const;
const std::unordered_set<std::string> &ignore_list() const;
const std::map<std::string, std::string> &app_ids_replace_map() const;
const std::map<std::string, std::string> &task_actions() const;
};

} /* namespace waybar::modules::wlr */
12 changes: 7 additions & 5 deletions man/waybar-wlr-taskbar.5.scd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ Addressed by *wlr/taskbar*

*on-click*: ++
typeof: string ++
The action which should be triggered when clicking on the application button with the left mouse button.
The action which should be triggered when clicking on the application button with the left mouse button. Needs to be defined in actions object.

*on-click-middle*: ++
typeof: string ++
The action which should be triggered when clicking on the application button with the middle mouse button.
The action which should be triggered when clicking on the application button with the middle mouse button. Needs to be defined in actions object.

*on-click-right*: ++
typeof: string ++
The action which should be triggered when clicking on the application button with the right mouse button.
The action which should be triggered when clicking on the application button with the right mouse button. Needs to be defined in actions object.

*on-update*: ++
typeof: string ++
Expand Down Expand Up @@ -133,8 +133,10 @@ Invalid expressions (e.g., mismatched parentheses) are skipped.
"icon-size": 14,
"icon-theme": "Numix-Circle",
"tooltip-format": "{title}",
"on-click": "activate",
"on-click-middle": "close",
"actions" : {
"on-click": "activate",
"on-click-middle": "close",
},
"ignore-list": [
"Alacritty"
],
Expand Down
80 changes: 61 additions & 19 deletions src/modules/wlr/taskbar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,6 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar,
format_tooltip_ = "{title}";
}

/* 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_release_event().connect(sigc::mem_fun(*this, &Task::handle_clicked), false);

Expand Down Expand Up @@ -556,36 +551,48 @@ 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())
auto actions = tbar_->task_actions();

if (actions.contains("on-click") && bt->button == 1)
action = actions["on-click"];
else if (actions.contains("on-click-middle") && bt->button == 2)
action = actions["on-click-middle"];
else if (actions.contains("on-click-right") && bt->button == 3)
action = actions["on-click-right"];

if (action.empty()) {
spdlog::trace("wlr/taskbar: no action bound");
return true;
else if (action == "activate")
} else if (action == "activate") {
spdlog::trace("wlr/taskbar: activate");
activate();
else if (action == "minimize") {
} else if (action == "minimize") {
spdlog::trace("wlr/taskbar: minimize");
set_minimize_hint();
minimize(!minimized());
} else if (action == "minimize-raise") {
spdlog::trace("wlr/taskbar: minimize-raise");
set_minimize_hint();
if (minimized())
minimize(false);
else if (active())
minimize(true);
else
activate();
} else if (action == "maximize")
} else if (action == "maximize") {
spdlog::trace("wlr/taskbar: maximize");
maximize(!maximized());
else if (action == "fullscreen")
} else if (action == "fullscreen") {
spdlog::trace("wlr/taskbar: fullscreen");
fullscreen(!fullscreen());
else if (action == "close")
} else if (action == "close") {
spdlog::trace("wlr/taskbar: close");
close();
else
} else {
// this should probably not happen anymore
spdlog::trace("wlr/taskbar: unknown action");
spdlog::warn("Unknown action {}", action);
}

drag_start_button = -1;
return true;
Expand Down Expand Up @@ -803,6 +810,37 @@ Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Valu
}
}

// valid actions
const std::vector<std::string> actions = {"activate", "minimize", "minimize-raise",
"maximize", "fullscreen", "close"};
// valid triggers for the actions
const std::vector<std::string> triggers = {"on-click", "on-click-right", "on-click-middle"};

for (auto &t : triggers) {
if (config_["actions"].isObject() && config["actions"][t].isString()) {
if (std::find(actions.begin(), actions.end(), config_["actions"][t].asString()) !=
actions.end()) {
task_actions_.emplace(t, config["actions"][t].asString());
} else {
spdlog::warn("wlr/taskbar: unknown action {}", config["actions"][t].asString());
}
}

// commands can still be executed by AModule on the whole module.
// But if it is an action, it should ideally be within "actions", give a warning.
// If there was an action within the actions object, ignore this one.
if (config_[t].isString() &&
std::find(actions.begin(), actions.end(), config_[t].asString()) != actions.end()) {
if (task_actions_.emplace(t, config_[t].asString()).second) {
spdlog::warn("wlr/taskbar: {} action should be within actions object", t);
} else {
spdlog::warn(
"wlr/taskbar: ignoring action {} because there is another within the actions object",
t);
}
}
}

icon_themes_.push_back(Gtk::IconTheme::get_default());

for (auto &t : tasks_) {
Expand Down Expand Up @@ -862,6 +900,8 @@ static const struct zwlr_foreign_toplevel_manager_v1_listener toplevel_manager_i
.finished = tm_handle_finished,
};

auto Taskbar::doAction(const std::string &name) -> void {}

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!");
Expand Down Expand Up @@ -949,4 +989,6 @@ const std::map<std::string, std::string> &Taskbar::app_ids_replace_map() const {
return app_ids_replace_map_;
}

const std::map<std::string, std::string> &Taskbar::task_actions() const { return task_actions_; }

} /* namespace waybar::modules::wlr */
Loading