mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-24 06:59:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3423 from RyanDwyer/fullscreen-global

Browse source 
Implement fullscreen global
This commit is contained in:
Drew DeVault 2019-01-27 18:06:50 -05:00 • committed by GitHub
commit 783fadab28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 331 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sway/input/cursor.c
View file

@ -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) {

12
sway/input/seat.c
View file

@ -752,6 +752,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;