diff options
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/cursor.c | 12 | ||||
| -rw-r--r-- | sway/input/seat.c | 12 |
2 files changed, 23 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index bf9bf2da..4b2d99e6 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -90,6 +90,16 @@ struct sway_node *node_at_coords( double ox = lx, oy = ly; wlr_output_layout_output_coords(root->output_layout, wlr_output, &ox, &oy); + if (root->fullscreen_global) { + // Try fullscreen container + struct sway_container *con = tiling_container_at( + &root->fullscreen_global->node, lx, ly, surface, sx, sy); + if (con) { + return &con->node; + } + return NULL; + } + // find the focused workspace on the output for this seat struct sway_workspace *ws = output_get_active_workspace(output); @@ -659,7 +669,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor, // Handle moving a tiling container if (config->tiling_drag && (mod_pressed || on_titlebar) && state == WLR_BUTTON_PRESSED && !is_floating_or_child && - cont && !cont->is_fullscreen) { + cont && cont->fullscreen_mode == FULLSCREEN_NONE) { struct sway_container *focus = seat_get_focused_container(seat); bool focused = focus == cont || container_has_ancestor(focus, cont); if (on_titlebar && !focused) { diff --git a/sway/input/seat.c b/sway/input/seat.c index fd5eda2d..f216810b 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -753,6 +753,18 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) { return; } } + // Deny setting focus to a workspace node when using fullscreen global + if (root->fullscreen_global && !container && new_workspace) { + return; + } + // Deny setting focus to a view which is hidden by a fullscreen global + if (root->fullscreen_global && container != root->fullscreen_global && + !container_has_ancestor(container, root->fullscreen_global)) { + // Unless it's a transient container + if (!container_is_transient_for(container, root->fullscreen_global)) { + return; + } + } struct sway_output *new_output = new_workspace->output; |