aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-04-18 13:06:10 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-04-18 13:06:10 +1000
commit8d06b222f048e5a27c4c5b0bc46ceaab7639502f (patch)
treef75d4225aef33dadae0a8d60ab98cdef343ccb62 /sway/input
parent35ccdd67a89280c1d906ed914d67918cfb382e1f (diff)
Fullscreen rendering and input fixes.
* Render background when using fullscreen, because transparency. * Check that fullscreen surface allows input. * Don't look for surfaces in top layer if there's a fullscreen view.
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/cursor.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 6d14c12c..a19f0752 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -84,19 +84,22 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
ox, oy, sx, sy))) {
return ws;
}
+ if (ws->sway_workspace->fullscreen) {
+ struct wlr_surface *wlr_surface = ws->sway_workspace->fullscreen->surface;
+ if (wlr_surface_point_accepts_input(wlr_surface, ox, oy)) {
+ *sx = ox;
+ *sy = oy;
+ *surface = wlr_surface;
+ return ws->sway_workspace->fullscreen->swayc;
+ }
+ return NULL;
+ }
if ((*surface = layer_surface_at(output,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
ox, oy, sx, sy))) {
return ws;
}
- if (ws->sway_workspace->fullscreen) {
- *sx = ox;
- *sy = oy;
- *surface = ws->sway_workspace->fullscreen->surface;
- return ws->sway_workspace->fullscreen->swayc;
- }
-
struct sway_container *c;
if ((c = container_at(ws, cursor->cursor->x, cursor->cursor->y,
surface, sx, sy))) {