Skip to content

wlr/taskbar: activate window on drag & drop #4656

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

Open
ArcPlayz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wlr/taskbar: activate window on drag & drop #4656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions include/modules/wlr/taskbar.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ class Task {
void handle_drag_data_received(const Glib::RefPtr<Gdk::DragContext> &context, int x, int y,
Gtk::SelectionData selection_data, guint info, guint time);

sigc::connection activate_timer;
bool handle_activate_timer();

bool handle_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time);
void handle_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time);

public:
bool operator==(const Task &) const;
bool operator!=(const Task &) const;
Expand Down
40 changes: 35 additions & 5 deletions src/modules/wlr/taskbar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ static const struct zwlr_foreign_toplevel_handle_v1_listener toplevel_handle_imp
.parent = tl_handle_parent,
};

static const std::vector<Gtk::TargetEntry> target_entries = {
Gtk::TargetEntry("WAYBAR_TOPLEVEL", Gtk::TARGET_SAME_APP, 0)};
static const std::vector<Gtk::TargetEntry> source_entries = {
Gtk::TargetEntry("WAYBAR_TOPLEVEL", Gtk::TARGET_SAME_APP, 0)
};

Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar,
struct zwlr_foreign_toplevel_handle_v1 *tl_handle, struct wl_seat *seat)
Expand Down Expand Up @@ -146,12 +147,39 @@ Task::Task(const waybar::Bar &bar, const Json::Value &config, Taskbar *tbar,
button.signal_motion_notify_event().connect(sigc::mem_fun(*this, &Task::handle_motion_notify),
false);

button.drag_source_set(target_entries, Gdk::BUTTON1_MASK, Gdk::ACTION_MOVE);
button.drag_dest_set(target_entries, Gtk::DEST_DEFAULT_ALL, Gdk::ACTION_MOVE);
button.drag_source_set(source_entries, Gdk::BUTTON1_MASK, Gdk::ACTION_MOVE);
button.drag_dest_set(source_entries, Gtk::DEST_DEFAULT_ALL, Gdk::ACTION_MOVE);
gtk_drag_dest_set_track_motion(GTK_WIDGET(button.gobj()), TRUE);

button.signal_drag_data_get().connect(sigc::mem_fun(*this, &Task::handle_drag_data_get), false);
button.signal_drag_data_received().connect(sigc::mem_fun(*this, &Task::handle_drag_data_received),
false);

button.signal_drag_motion().connect(sigc::mem_fun(*this, &Task::handle_drag_motion));
button.signal_drag_leave().connect(sigc::mem_fun(*this, &Task::handle_drag_leave));
}

bool Task::handle_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time) {
auto targets = context->list_targets();
for (const auto& target : targets) {
if (target == "WAYBAR_TOPLEVEL") return true;
}
if (!activate_timer.connected()) {
activate_timer = Glib::signal_timeout().connect(
sigc::mem_fun(*this, &Task::handle_activate_timer),
500
);
}
return true;
}

bool Task::handle_activate_timer() {
activate();
return true;
}

void Task::handle_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time) {
activate_timer.disconnect();
}

Task::~Task() {
Expand Down Expand Up @@ -417,7 +445,7 @@ bool Task::handle_motion_notify(GdkEventMotion *mn) {

if (button.drag_check_threshold(drag_start_x, drag_start_y, mn->x, mn->y)) {
/* start drag in addition to other assigned action */
auto target_list = Gtk::TargetList::create(target_entries);
auto target_list = Gtk::TargetList::create(source_entries);
auto refptr = Glib::RefPtr<Gtk::TargetList>(target_list);
auto drag_context =
button.drag_begin(refptr, Gdk::DragAction::ACTION_MOVE, drag_start_button, (GdkEvent *)mn);
Expand All @@ -437,6 +465,8 @@ void Task::handle_drag_data_get(const Glib::RefPtr<Gdk::DragContext> &context,
void Task::handle_drag_data_received(const Glib::RefPtr<Gdk::DragContext> &context, int x, int y,
Gtk::SelectionData selection_data, guint info, guint time) {
spdlog::debug("drag_data_received");
auto type = selection_data.get_data_type();
if (type != "WAYBAR_TOPLEVEL") return;
gpointer handle = *(gpointer *)selection_data.get_data();
auto dragged_button = (Gtk::Button *)handle;

Expand Down