Move wlr_surface into wlr

examples/compositor/main.c

@@ -10,11 +10,11 @@
 #include <wlr/render.h>
 #include <wlr/render/gles2.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_surface.h>
 #include <xkbcommon/xkbcommon.h>
 #include <wlr/util/log.h>
 #include "shared.h"
 #include "compositor.h"
-#include "wlr_surface.h"
 
 struct sample_state {
 	struct wlr_renderer *renderer;

examples/compositor/wl_compositor.c

@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <wayland-server.h>
 #include <wlr/util/log.h>
+#include <wlr/types/wlr_surface.h>
 #include "compositor.h"
-#include "compositor/wlr_surface.h"
 
 static void destroy_surface_listener(struct wl_listener *listener, void *data) {
 	struct wl_compositor_state *state;

examples/meson.build

@@ -11,8 +11,7 @@ executable('tablet', 'tablet.c', dependencies: dep_wlr, link_with: lib_shared)
 compositor_src = [
     'compositor/main.c',
     'compositor/wl_compositor.c',
-    'compositor/wl_shell.c',
-    'compositor/wlr_surface.c',
+    'compositor/wl_shell.c'
 ]
 
 executable('compositor', compositor_src, dependencies: dep_wlr, link_with: lib_shared)

include/wlr/types/wlr_surface.h

@@ -1,5 +1,5 @@
-#ifndef _EXAMPLES_COMPOSITOR_SURFACE_H
-#define _EXAMPLES_COMPOSITOR_SURFACE_H
+#ifndef _WLR_TYPES_WLR_SURFACE_H
+#define _WLR_TYPES_WLR_SURFACE_H
 
 #include <wayland-server.h>
 
@@ -18,6 +18,7 @@ struct wlr_surface {
 	} signals;
 };
 
+struct wlr_renderer;
 struct wlr_surface *wlr_surface_create(struct wl_resource *res,
 		struct wlr_renderer *renderer);
 

types/meson.build

@@ -4,6 +4,7 @@ wlr_files += files(
     'wlr_output.c',
     'wlr_pointer.c',
     'wlr_region.c',
+    'wlr_surface.c',
     'wlr_tablet_pad.c',
     'wlr_tablet_tool.c',
     'wlr_touch.c',

types/wlr_surface.c

@@ -3,7 +3,7 @@
 #include <wayland-server.h>
 #include <wlr/util/log.h>
 #include <wlr/render/interface.h>
-#include "wlr_surface.h"
+#include <wlr/types/wlr_surface.h>
 
 static void surface_destroy(struct wl_client *client, struct wl_resource *resource) {
 	struct wlr_surface *surface = wl_resource_get_user_data(resource);