diff options
-rw-r--r-- | include/sway/server.h | 2 | ||||
-rw-r--r-- | sway/desktop/output.c | 6 | ||||
-rw-r--r-- | sway/server.c | 2 | ||||
-rw-r--r-- | sway/tree/container.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 3fcdb1ba..eb7fa2ff 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <wlr/types/wlr_compositor.h> | 7 | #include <wlr/types/wlr_compositor.h> |
8 | #include <wlr/types/wlr_data_device.h> | 8 | #include <wlr/types/wlr_data_device.h> |
9 | #include <wlr/types/wlr_xdg_shell_v6.h> | 9 | #include <wlr/types/wlr_xdg_shell_v6.h> |
10 | #include <wlr/render.h> | 10 | #include <wlr/render/wlr_renderer.h> |
11 | // TODO WLR: make Xwayland optional | 11 | // TODO WLR: make Xwayland optional |
12 | #include <wlr/xwayland.h> | 12 | #include <wlr/xwayland.h> |
13 | 13 | ||
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 @@ | |||
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <time.h> | 4 | #include <time.h> |
5 | #include <wayland-server.h> | 5 | #include <wayland-server.h> |
6 | #include <wlr/render.h> | 6 | #include <wlr/render/wlr_renderer.h> |
7 | #include <wlr/types/wlr_matrix.h> | 7 | #include <wlr/types/wlr_matrix.h> |
8 | #include <wlr/types/wlr_output.h> | 8 | #include <wlr/types/wlr_output.h> |
9 | #include <wlr/types/wlr_surface.h> | 9 | #include <wlr/types/wlr_surface.h> |
@@ -152,8 +152,8 @@ static void output_frame_view(swayc_t *view, void *data) { | |||
152 | 152 | ||
153 | switch (sway_view->type) { | 153 | switch (sway_view->type) { |
154 | case SWAY_XDG_SHELL_V6_VIEW: { | 154 | case SWAY_XDG_SHELL_V6_VIEW: { |
155 | int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry->x; | 155 | int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry.x; |
156 | int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry->y; | 156 | int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry.y; |
157 | render_surface(surface, wlr_output, &output->last_frame, | 157 | render_surface(surface, wlr_output, &output->last_frame, |
158 | view->x - window_offset_x, | 158 | view->x - window_offset_x, |
159 | view->y - window_offset_y, | 159 | 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 @@ | |||
4 | #include <wayland-server.h> | 4 | #include <wayland-server.h> |
5 | #include <wlr/backend.h> | 5 | #include <wlr/backend.h> |
6 | #include <wlr/backend/session.h> | 6 | #include <wlr/backend/session.h> |
7 | #include <wlr/render.h> | 7 | #include <wlr/render/wlr_renderer.h> |
8 | #include <wlr/render/gles2.h> | 8 | #include <wlr/render/gles2.h> |
9 | #include <wlr/types/wlr_compositor.h> | 9 | #include <wlr/types/wlr_compositor.h> |
10 | #include <wlr/types/wlr_wl_shell.h> | 10 | #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, | |||
325 | case SWAY_XDG_SHELL_V6_VIEW: | 325 | case SWAY_XDG_SHELL_V6_VIEW: |
326 | // the top left corner of the sway container is the | 326 | // the top left corner of the sway container is the |
327 | // coordinate of the top left corner of the window geometry | 327 | // coordinate of the top left corner of the window geometry |
328 | view_sx += sview->wlr_xdg_surface_v6->geometry->x; | 328 | view_sx += sview->wlr_xdg_surface_v6->geometry.x; |
329 | view_sy += sview->wlr_xdg_surface_v6->geometry->y; | 329 | view_sy += sview->wlr_xdg_surface_v6->geometry.y; |
330 | 330 | ||
331 | // check for popups | 331 | // check for popups |
332 | double popup_sx, popup_sy; | 332 | double popup_sx, popup_sy; |