Merge pull request #1626 from emersion/wlroots-update

Update wlroots API

include/sway/server.h

@@ -7,7 +7,7 @@
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
-#include <wlr/render.h>
+#include <wlr/render/wlr_renderer.h>
 // TODO WLR: make Xwayland optional
 #include <wlr/xwayland.h>
 

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,

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>

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;