mirror of
https://github.com/swaywm/sway.git
synced 2024-11-10 12:33:50 +01:00
view: make request_activate take a seat
This way we can move focus on the same seat an activation token originates from.
This commit is contained in:
parent
0780d3a465
commit
842609da64
@ -271,7 +271,7 @@ void view_set_activated(struct sway_view *view, bool activated);
|
||||
/**
|
||||
* Called when the view requests to be focused.
|
||||
*/
|
||||
void view_request_activate(struct sway_view *view);
|
||||
void view_request_activate(struct sway_view *view, struct sway_seat *seat);
|
||||
|
||||
/**
|
||||
* If possible, instructs the client to change their decoration mode.
|
||||
|
@ -630,7 +630,7 @@ static void handle_request_activate(struct wl_listener *listener, void *data) {
|
||||
if (!xsurface->mapped) {
|
||||
return;
|
||||
}
|
||||
view_request_activate(view);
|
||||
view_request_activate(view, NULL);
|
||||
|
||||
transaction_commit_dirty();
|
||||
}
|
||||
|
@ -366,12 +366,14 @@ void view_set_activated(struct sway_view *view, bool activated) {
|
||||
}
|
||||
}
|
||||
|
||||
void view_request_activate(struct sway_view *view) {
|
||||
void view_request_activate(struct sway_view *view, struct sway_seat *seat) {
|
||||
struct sway_workspace *ws = view->container->pending.workspace;
|
||||
if (!ws) { // hidden scratchpad container
|
||||
return;
|
||||
}
|
||||
struct sway_seat *seat = input_manager_current_seat();
|
||||
if (!seat) {
|
||||
seat = input_manager_current_seat();
|
||||
}
|
||||
|
||||
switch (config->focus_on_window_activation) {
|
||||
case FOWA_SMART:
|
||||
|
@ -31,5 +31,10 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
|
||||
return;
|
||||
}
|
||||
|
||||
view_request_activate(view);
|
||||
struct wlr_seat *wlr_seat = event->token->seat;
|
||||
// The requesting seat may have been destroyed.
|
||||
if (wlr_seat) {
|
||||
struct sway_seat *seat = wlr_seat->data;
|
||||
view_request_activate(view, seat);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user