aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-08-04 16:21:43 -0400
committerGitHub <noreply@github.com>2017-08-04 16:21:43 -0400
commitde17ce19bed4fd8b9f7322e275cdc3cc349db5ab (patch)
treef0f78587c5815a984811d11b3b5ce50d46f49909 /examples
parent359042081f7b97ae79dbfba21680e5e5f505c649 (diff)
parenteffea557bbd7ea4d4dda76eaf050cddf54a90346 (diff)
Merge pull request #41 from acrisci/feature/surface-interface-stub
Add surface interface stubs in compositor example
Diffstat (limited to 'examples')
-rw-r--r--examples/compositor.h6
-rw-r--r--examples/compositor/main.c16
-rw-r--r--examples/compositor/wl_compositor.c119
3 files changed, 134 insertions, 7 deletions
diff --git a/examples/compositor.h b/examples/compositor.h
index 4773b83d..abe1a743 100644
--- a/examples/compositor.h
+++ b/examples/compositor.h
@@ -1,14 +1,18 @@
#ifndef _EXAMPLE_COMPOSITOR_H
#define _EXAMPLE_COMPOSITOR_H
#include <wayland-server.h>
+#include <wlr/render.h>
struct wl_compositor_state {
struct wl_global *wl_global;
struct wl_list wl_resources;
+ struct wlr_renderer *renderer;
+ struct wl_list surfaces;
+ struct wl_listener destroy_surface_listener;
};
void wl_compositor_init(struct wl_display *display,
- struct wl_compositor_state *state);
+ struct wl_compositor_state *state, struct wlr_renderer *renderer);
struct wl_shell_state {
struct wl_global *wl_global;
diff --git a/examples/compositor/main.c b/examples/compositor/main.c
index 6a689669..e13fda24 100644
--- a/examples/compositor/main.c
+++ b/examples/compositor/main.c
@@ -11,6 +11,7 @@
#include <wlr/render/gles2.h>
#include <wlr/types/wlr_output.h>
#include <xkbcommon/xkbcommon.h>
+#include <wlr/util/log.h>
#include "shared.h"
#include "compositor.h"
@@ -27,7 +28,18 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) {
wlr_output_make_current(wlr_output);
wlr_renderer_begin(sample->renderer, wlr_output);
- // TODO: render surfaces
+
+ struct wl_resource *_res;
+ float matrix[16];
+ wl_list_for_each(_res, &sample->compositor.surfaces, link) {
+ struct wlr_surface *surface = wl_resource_get_user_data(_res);
+ if (surface->valid) {
+ wlr_surface_get_matrix(surface, &matrix,
+ &wlr_output->transform_matrix, 200, 200);
+ wlr_render_with_matrix(sample->renderer, surface, &matrix);
+ }
+ }
+
wlr_renderer_end(sample->renderer);
wlr_output_swap_buffers(wlr_output);
}
@@ -42,7 +54,7 @@ int main() {
state.renderer = wlr_gles2_renderer_init();
wl_display_init_shm(compositor.display);
- wl_compositor_init(compositor.display, &state.compositor);
+ wl_compositor_init(compositor.display, &state.compositor, state.renderer);
wl_shell_init(compositor.display, &state.shell);
compositor_run(&compositor);
diff --git a/examples/compositor/wl_compositor.c b/examples/compositor/wl_compositor.c
index 0cd73afb..c9dfda56 100644
--- a/examples/compositor/wl_compositor.c
+++ b/examples/compositor/wl_compositor.c
@@ -3,13 +3,121 @@
#include <wlr/util/log.h>
#include "compositor.h"
+static void surface_destroy(struct wl_client *client, struct wl_resource *resource) {
+ wl_resource_destroy(resource);
+}
+
+static void surface_attach(struct wl_client *client,
+ struct wl_resource *resource,
+ struct wl_resource *buffer_resource, int32_t sx, int32_t sy) {
+ struct wlr_surface *surface = wl_resource_get_user_data(resource);
+ struct wl_shm_buffer *buffer = wl_shm_buffer_get(buffer_resource);
+ uint32_t format = wl_shm_buffer_get_format(buffer);
+ wlr_surface_attach_shm(surface, format, buffer);
+}
+
+static void surface_damage(struct wl_client *client,
+ struct wl_resource *resource,
+ int32_t x, int32_t y, int32_t width, int32_t height) {
+ wlr_log(L_DEBUG, "TODO: surface damage");
+}
+
+static void surface_frame(struct wl_client *client,
+ struct wl_resource *resource, uint32_t callback) {
+ wlr_log(L_DEBUG, "TODO: surface frame");
+}
+
+static void surface_set_opaque_region(struct wl_client *client,
+ struct wl_resource *resource,
+ struct wl_resource *region_resource) {
+ wlr_log(L_DEBUG, "TODO: surface opaque region");
+}
+
+static void surface_set_input_region(struct wl_client *client,
+ struct wl_resource *resource,
+ struct wl_resource *region_resource) {
+
+ wlr_log(L_DEBUG, "TODO: surface input region");
+}
+
+static void surface_commit(struct wl_client *client,
+ struct wl_resource *resource) {
+ wlr_log(L_DEBUG, "TODO: surface surface commit");
+}
+
+static void surface_set_buffer_transform(struct wl_client *client,
+ struct wl_resource *resource, int transform) {
+ wlr_log(L_DEBUG, "TODO: surface surface buffer transform");
+}
+
+static void surface_set_buffer_scale(struct wl_client *client,
+ struct wl_resource *resource,
+ int32_t scale) {
+ wlr_log(L_DEBUG, "TODO: surface set buffer scale");
+}
+
+
+static void surface_damage_buffer(struct wl_client *client,
+ struct wl_resource *resource,
+ int32_t x, int32_t y, int32_t width,
+ int32_t height) {
+ wlr_log(L_DEBUG, "TODO: surface damage buffer");
+}
+
+struct wl_surface_interface surface_interface = {
+ surface_destroy,
+ surface_attach,
+ surface_damage,
+ surface_frame,
+ surface_set_opaque_region,
+ surface_set_input_region,
+ surface_commit,
+ surface_set_buffer_transform,
+ surface_set_buffer_scale,
+ surface_damage_buffer
+};
+
+static void destroy_surface(struct wl_resource *resource) {
+ struct wlr_surface *surface = wl_resource_get_user_data(resource);
+ wlr_surface_destroy(surface);
+}
+
+static void destroy_surface_listener(struct wl_listener *listener, void *data) {
+ struct wl_compositor_state *state;
+ struct wlr_surface *surface = data;
+ state = wl_container_of(listener, state, destroy_surface_listener);
+
+ struct wl_resource *res = NULL, *_res;
+ wl_list_for_each(_res, &state->surfaces, link) {
+ if (_res == surface->resource) {
+ res = _res;
+ break;
+ }
+ }
+
+ if (!res) {
+ return;
+ }
+
+ wl_list_remove(&res->link);
+}
+
static void wl_compositor_create_surface(struct wl_client *client,
- struct wl_resource *resource, uint32_t id) {
- wlr_log(L_DEBUG, "TODO: implement create_surface");
+ struct wl_resource *resource, uint32_t id) {
+ struct wl_compositor_state *state = 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_render_surface_init(state->renderer);
+ surface->resource = surface_resource;
+ wl_resource_set_implementation(surface_resource, &surface_interface,
+ surface, destroy_surface);
+ wl_resource_set_user_data(surface_resource, surface);
+ wl_list_insert(&state->surfaces, wl_resource_get_link(surface_resource));
+ wl_signal_add(&surface->destroy_signal, &state->destroy_surface_listener);
}
static void wl_compositor_create_region(struct wl_client *client,
- struct wl_resource *resource, uint32_t id) {
+ struct wl_resource *resource, uint32_t id) {
wlr_log(L_DEBUG, "TODO: implement create_region");
}
@@ -47,9 +155,12 @@ static void wl_compositor_bind(struct wl_client *wl_client, void *_state,
}
void wl_compositor_init(struct wl_display *display,
- struct wl_compositor_state *state) {
+ struct wl_compositor_state *state, 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;
+ state->destroy_surface_listener.notify = destroy_surface_listener;
wl_list_init(&state->wl_resources);
+ wl_list_init(&state->surfaces);
}