diff options
| -rw-r--r-- | include/sway/tree/container.h | 4 | ||||
| -rw-r--r-- | sway/input/cursor.c | 2 | ||||
| -rw-r--r-- | sway/server.c | 2 | ||||
| -rw-r--r-- | sway/tree/container.c | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 12ff8a5a..c3942e9e 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -234,6 +234,10 @@ struct sway_container *container_at(struct sway_container *workspace, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy); +struct sway_container *container_at_view(struct sway_container *view, + double lx, double ly, struct wlr_surface **surface, + double *sx, double *sy); + /** * Apply the function for each descendant of the container breadth first. */ diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 79f6ec46..c2fc4e9e 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -99,7 +99,7 @@ static struct sway_container *container_at_coords( return ws; } if (ws->sway_workspace->fullscreen) { - return container_at(ws->sway_workspace->fullscreen, lx, ly, + return container_at_view(ws->sway_workspace->fullscreen, lx, ly, surface, sx, sy); } if ((*surface = layer_surface_at(output, diff --git a/sway/server.c b/sway/server.c index 10ca9614..e8755360 100644 --- a/sway/server.c +++ b/sway/server.c @@ -9,6 +9,7 @@ #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_export_dmabuf_v1.h> #include <wlr/types/wlr_gamma_control.h> +#include <wlr/types/wlr_gamma_control_v1.h> #include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_layer_shell.h> #include <wlr/types/wlr_linux_dmabuf_v1.h> @@ -56,6 +57,7 @@ bool server_init(struct sway_server *server) { wlr_data_device_manager_create(server->wl_display); wlr_gamma_control_manager_create(server->wl_display); + wlr_gamma_control_manager_v1_create(server->wl_display); wlr_primary_selection_device_manager_create(server->wl_display); server->new_output.notify = handle_new_output; diff --git a/sway/tree/container.c b/sway/tree/container.c index b980c5e9..46c54e2d 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -535,7 +535,7 @@ struct sway_container *container_parent(struct sway_container *container, return container; } -static struct sway_container *container_at_view(struct sway_container *swayc, +struct sway_container *container_at_view(struct sway_container *swayc, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy) { if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) { |