diff options
| author | emersion <contact@emersion.fr> | 2018-03-19 23:31:18 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-03-19 23:31:18 +0100 |
| commit | 01beee58263a3d1de6eb30951332f31ca46eb4d3 (patch) | |
| tree | b428c88b3a4be0507ba9f83e94c607b94618b547 /sway | |
| parent | 9823a7c6c8cd5556390d2a53f34e30c3689bc6fd (diff) | |
Update wlroots API
Breaking changes in wlr_xdg_shell_v6 and wlr_renderer have been
made upstream.
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/desktop/output.c | 6 | ||||
| -rw-r--r-- | sway/server.c | 2 | ||||
| -rw-r--r-- | sway/tree/container.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 247c279f..96635db4 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <time.h> #include <wayland-server.h> -#include <wlr/render.h> +#include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_surface.h> @@ -152,8 +152,8 @@ static void output_frame_view(swayc_t *view, void *data) { switch (sway_view->type) { case SWAY_XDG_SHELL_V6_VIEW: { - int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry->x; - int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry->y; + int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry.x; + int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry.y; render_surface(surface, wlr_output, &output->last_frame, view->x - window_offset_x, view->y - window_offset_y, diff --git a/sway/server.c b/sway/server.c index 495769ee..ca08d7fb 100644 --- a/sway/server.c +++ b/sway/server.c @@ -4,7 +4,7 @@ #include <wayland-server.h> #include <wlr/backend.h> #include <wlr/backend/session.h> -#include <wlr/render.h> +#include <wlr/render/wlr_renderer.h> #include <wlr/render/gles2.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_wl_shell.h> diff --git a/sway/tree/container.c b/sway/tree/container.c index b424dd0a..705221d7 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -325,8 +325,8 @@ swayc_t *swayc_at(swayc_t *parent, double lx, double ly, case SWAY_XDG_SHELL_V6_VIEW: // the top left corner of the sway container is the // coordinate of the top left corner of the window geometry - view_sx += sview->wlr_xdg_surface_v6->geometry->x; - view_sy += sview->wlr_xdg_surface_v6->geometry->y; + view_sx += sview->wlr_xdg_surface_v6->geometry.x; + view_sy += sview->wlr_xdg_surface_v6->geometry.y; // check for popups double popup_sx, popup_sy; |