aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/cursor.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2019-01-25 08:29:21 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2019-01-25 08:29:21 +1000
commit20aa8ee67dc528299dbc8735220a1c081c7ff9f6 (patch)
tree685de48be3db51fc01510ccf051e2b63a4655fba /sway/input/cursor.c
parentUpdate for swaywm/wlroots#1402 (diff)
downloadsway-20aa8ee67dc528299dbc8735220a1c081c7ff9f6.tar.gz
sway-20aa8ee67dc528299dbc8735220a1c081c7ff9f6.tar.zst
sway-20aa8ee67dc528299dbc8735220a1c081c7ff9f6.zip
Implement fullscreen global
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r--sway/input/cursor.c12
1 files changed, 11 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(
90 double ox = lx, oy = ly; 90 double ox = lx, oy = ly;
91 wlr_output_layout_output_coords(root->output_layout, wlr_output, &ox, &oy); 91 wlr_output_layout_output_coords(root->output_layout, wlr_output, &ox, &oy);
92 92
93 if (root->fullscreen_global) {
94 // Try fullscreen container
95 struct sway_container *con = tiling_container_at(
96 &root->fullscreen_global->node, lx, ly, surface, sx, sy);
97 if (con) {
98 return &con->node;
99 }
100 return NULL;
101 }
102
93 // find the focused workspace on the output for this seat 103 // find the focused workspace on the output for this seat
94 struct sway_workspace *ws = output_get_active_workspace(output); 104 struct sway_workspace *ws = output_get_active_workspace(output);
95 105
@@ -659,7 +669,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
659 // Handle moving a tiling container 669 // Handle moving a tiling container
660 if (config->tiling_drag && (mod_pressed || on_titlebar) && 670 if (config->tiling_drag && (mod_pressed || on_titlebar) &&
661 state == WLR_BUTTON_PRESSED && !is_floating_or_child && 671 state == WLR_BUTTON_PRESSED && !is_floating_or_child &&
662 cont && !cont->is_fullscreen) { 672 cont && cont->fullscreen_mode == FULLSCREEN_NONE) {
663 struct sway_container *focus = seat_get_focused_container(seat); 673 struct sway_container *focus = seat_get_focused_container(seat);
664 bool focused = focus == cont || container_has_ancestor(focus, cont); 674 bool focused = focus == cont || container_has_ancestor(focus, cont);
665 if (on_titlebar && !focused) { 675 if (on_titlebar && !focused) {