diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-08-02 22:18:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 22:18:14 -0400 |
| commit | b16043aeebd92cca12b21fa36b99799f80bdfc31 (patch) | |
| tree | 745c117217c20dc05a447c5e34db1d35fec5b62b /sway | |
| parent | 94888e58a24f5cab6d3f05dbe6d335b0869cda55 (diff) | |
| parent | 4eadf9f3ae73637e1479d84331786e3c3676cf65 (diff) | |
Merge branch 'master' into exit-nag
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/input/cursor.c | 2 | ||||
| -rw-r--r-- | sway/server.c | 2 | ||||
| -rw-r--r-- | sway/tree/container.c | 2 |
3 files changed, 4 insertions, 2 deletions
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")) { |