move wl_compositor into wlroots as wlr_compositor

5 files changed, 35 insertions, 32 deletions

diff --git a/examples/compositor/main.c b/examples/compositor.c
index 4c6e213d..54ab5d5f 100644
--- a/examples/compositor/main.c
+++ b/examples/compositor.c
@@ -18,17 +18,17 @@
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_data_device_manager.h>
+#include "wlr/types/wlr_compositor.h"
 #include <xkbcommon/xkbcommon.h>
 #include <wlr/util/log.h>
 #include "shared.h"
-#include "compositor.h"
 
 // TODO: move to common header?
 int os_create_anonymous_file(off_t size);
 
 struct sample_state {
 	struct wlr_renderer *renderer;
-	struct wl_compositor_state compositor;
+	struct wlr_compositor compositor;
 	struct wlr_wl_shell *wl_shell;
 	struct wlr_seat *wl_seat;
 	struct wlr_xdg_shell_v6 *xdg_shell;
@@ -153,7 +153,7 @@ int main() {
 		exit(EXIT_FAILURE);
 	}
 	wl_display_init_shm(compositor.display);
-	wl_compositor_init(compositor.display, &state.compositor, state.renderer);
+	wlr_compositor_init(&state.compositor, compositor.display, state.renderer);
 	state.wl_shell = wlr_wl_shell_create(compositor.display);
 	state.xdg_shell = wlr_xdg_shell_v6_create(compositor.display);
 	state.data_device_manager = wlr_data_device_manager_create(compositor.display);
@@ -185,6 +185,7 @@ int main() {
 	wlr_data_device_manager_destroy(state.data_device_manager);
 	wlr_xdg_shell_v6_destroy(state.xdg_shell);
 	wlr_wl_shell_destroy(state.wl_shell);
+	wlr_compositor_finish(&state.compositor);
 	wlr_renderer_destroy(state.renderer);
 	compositor_fini(&compositor);
 }
diff --git a/examples/meson.build b/examples/meson.build
index e2c0189c..d4d96984 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -9,11 +9,6 @@ executable('touch', 'touch.c', dependencies: wlroots, link_with: lib_shared)
 executable('tablet', 'tablet.c', dependencies: wlroots, link_with: lib_shared)
 executable('output-layout', 'output-layout.c', dependencies: wlroots, link_with: lib_shared)
 
-compositor_src = [
-  'compositor/main.c',
-  'compositor/wl_compositor.c',
-]
-
-executable('compositor', compositor_src,
+executable('compositor', 'compositor.c',
   dependencies: wlroots,
   link_with: lib_shared)
diff --git a/examples/compositor.h b/include/wlr/types/wlr_compositor.h
index b382cc7f..47abeeac 100644
--- a/examples/compositor.h
+++ b/include/wlr/types/wlr_compositor.h
@@ -3,7 +3,7 @@
 #include <wayland-server.h>
 #include <wlr/render.h>
 
-struct wl_compositor_state {
+struct wlr_compositor {
 	struct wl_global *wl_global;
 	struct wl_list wl_resources;
 	struct wlr_renderer *renderer;
@@ -11,10 +11,11 @@ struct wl_compositor_state {
 	struct wl_listener destroy_surface_listener;
 };
 
-void wl_compositor_init(struct wl_display *display,
-		struct wl_compositor_state *state, struct wlr_renderer *renderer);
+void wlr_compositor_finish(struct wlr_compositor *wlr_compositor);
+void wlr_compositor_init(struct wlr_compositor *wlr_compositor,
+		struct wl_display *display, struct wlr_renderer *renderer);
 
 struct wlr_surface;
-void wl_compositor_surface_destroyed(struct wl_compositor_state *compositor,
+void wl_compositor_surface_destroyed(struct wlr_compositor *wlr_compositor,
 		struct wlr_surface *surface);
 #endif
diff --git a/types/meson.build b/types/meson.build
index 82175f6d..83b4647c 100644
--- a/types/meson.build
+++ b/types/meson.build
@@ -14,6 +14,7 @@ lib_wlr_types = static_library('wlr_types', files(
     'wlr_touch.c',
     'wlr_xdg_shell_v6.c',
     'wlr_wl_shell.c',
+    'wlr_compositor.c',
   ),
   include_directories: wlr_inc,
   dependencies: [wayland_server, pixman, wlr_protos])
diff --git a/examples/compositor/wl_compositor.c b/types/wlr_compositor.c
index 0bab345d..e3b2199e 100644
--- a/examples/compositor/wl_compositor.c
+++ b/types/wlr_compositor.c
@@ -4,7 +4,7 @@
 #include <wlr/util/log.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_region.h>
-#include "compositor.h"
+#include <wlr/types/wlr_compositor.h>
 
 static void destroy_surface_listener(struct wl_listener *listener, void *data) {
 	wl_list_remove(wl_resource_get_link(data));
@@ -12,15 +12,16 @@ static void destroy_surface_listener(struct wl_listener *listener, void *data) {
 
 static void wl_compositor_create_surface(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id) {
-	struct wl_compositor_state *state = wl_resource_get_user_data(resource);
+	struct wlr_compositor *compositor = wl_resource_get_user_data(resource);
 	struct wl_resource *surface_resource = wl_resource_create(client,
 			&wl_surface_interface, wl_resource_get_version(resource), id);
-	struct wlr_surface *surface = wlr_surface_create(surface_resource, state->renderer);
-	surface->compositor_data = state;
+	struct wlr_surface *surface = wlr_surface_create(surface_resource,
+			compositor->renderer);
+	surface->compositor_data = compositor;
 	surface->compositor_listener.notify = &destroy_surface_listener;
 	wl_resource_add_destroy_listener(surface_resource, &surface->compositor_listener);
 
-	wl_list_insert(&state->surfaces, wl_resource_get_link(surface_resource));
+	wl_list_insert(&compositor->surfaces, wl_resource_get_link(surface_resource));
 }
 
 static void wl_compositor_create_region(struct wl_client *client,
@@ -34,9 +35,9 @@ struct wl_compositor_interface wl_compositor_impl = {
 };
 
 static void wl_compositor_destroy(struct wl_resource *resource) {
-	struct wl_compositor_state *state = wl_resource_get_user_data(resource);
+	struct wlr_compositor *compositor = wl_resource_get_user_data(resource);
 	struct wl_resource *_resource = NULL;
-	wl_resource_for_each(_resource, &state->wl_resources) {
+	wl_resource_for_each(_resource, &compositor->wl_resources) {
 		if (_resource == resource) {
 			struct wl_list *link = wl_resource_get_link(_resource);
 			wl_list_remove(link);
@@ -45,10 +46,10 @@ static void wl_compositor_destroy(struct wl_resource *resource) {
 	}
 }
 
-static void wl_compositor_bind(struct wl_client *wl_client, void *_state,
+static void wl_compositor_bind(struct wl_client *wl_client, void *_compositor,
 		uint32_t version, uint32_t id) {
-	struct wl_compositor_state *state = _state;
-	assert(wl_client && state);
+	struct wlr_compositor *compositor = _compositor;
+	assert(wl_client && compositor);
 	if (version > 4) {
 		wlr_log(L_ERROR, "Client requested unsupported wl_compositor version, disconnecting");
 		wl_client_destroy(wl_client);
@@ -57,16 +58,20 @@ static void wl_compositor_bind(struct wl_client *wl_client, void *_state,
 	struct wl_resource *wl_resource = wl_resource_create(
 			wl_client, &wl_compositor_interface, version, id);
 	wl_resource_set_implementation(wl_resource, &wl_compositor_impl,
-			state, wl_compositor_destroy);
-	wl_list_insert(&state->wl_resources, wl_resource_get_link(wl_resource));
+			compositor, wl_compositor_destroy);
+	wl_list_insert(&compositor->wl_resources, wl_resource_get_link(wl_resource));
 }
 
-void wl_compositor_init(struct wl_display *display,
-		struct wl_compositor_state *state, struct wlr_renderer *renderer) {
+void wlr_compositor_finish(struct wlr_compositor *compositor) {
+	wl_global_destroy(compositor->wl_global);
+}
+
+void wlr_compositor_init(struct wlr_compositor *compositor,
+		struct wl_display *display, struct wlr_renderer *renderer) {
 	struct wl_global *wl_global = wl_global_create(display,
-		&wl_compositor_interface, 4, state, wl_compositor_bind);
-	state->wl_global = wl_global;
-	state->renderer = renderer;
-	wl_list_init(&state->wl_resources);
-	wl_list_init(&state->surfaces);
+		&wl_compositor_interface, 4, compositor, wl_compositor_bind);
+	compositor->wl_global = wl_global;
+	compositor->renderer = renderer;
+	wl_list_init(&compositor->wl_resources);
+	wl_list_init(&compositor->surfaces);
 }