aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/compositor/main.c2
-rw-r--r--examples/compositor/wl_compositor.c2
-rw-r--r--examples/compositor/wlr_surface.c120
-rw-r--r--examples/compositor/wlr_surface.h24
-rw-r--r--examples/meson.build3
5 files changed, 3 insertions, 148 deletions
diff --git a/examples/compositor/main.c b/examples/compositor/main.c
index 01292f51..8e5fcc34 100644
--- a/examples/compositor/main.c
+++ b/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;
diff --git a/examples/compositor/wl_compositor.c b/examples/compositor/wl_compositor.c
index 8c8ee3b6..89d23d6a 100644
--- a/examples/compositor/wl_compositor.c
+++ b/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;
diff --git a/examples/compositor/wlr_surface.c b/examples/compositor/wlr_surface.c
deleted file mode 100644
index 5a5c3e0d..00000000
--- a/examples/compositor/wlr_surface.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <assert.h>
-#include <stdlib.h>
-#include <wayland-server.h>
-#include <wlr/util/log.h>
-#include <wlr/render/interface.h>
-#include "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);
- wl_signal_emit(&surface->signals.destroy, surface);
- wl_resource_destroy(resource);
-}
-
-static void surface_attach(struct wl_client *client,
- struct wl_resource *resource,
- struct wl_resource *buffer, int32_t sx, int32_t sy) {
- struct wlr_surface *surface = wl_resource_get_user_data(resource);
- surface->pending_buffer = buffer;
- surface->pending_attached = true;
-}
-
-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) {
- struct wlr_surface *surface = wl_resource_get_user_data(resource);
-
- // apply pending state
- if (surface->pending_attached) {
- surface->attached = surface->pending_buffer;
- if (surface->pending_buffer) {
- struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->pending_buffer);
- if (!buffer) {
- wlr_log(L_INFO, "Unknown buffer handle attached");
- } else {
- uint32_t format = wl_shm_buffer_get_format(buffer);
- wlr_texture_upload_shm(surface->texture, format, buffer);
- }
- }
- }
-
- // reset pending state
- surface->pending_buffer = NULL;
- surface->pending_attached = false;
-
- wl_signal_emit(&surface->signals.commit, surface);
-}
-
-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");
-}
-
-const 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);
- wl_signal_emit(&surface->signals.destroy, surface);
- wlr_texture_destroy(surface->texture);
-}
-
-struct wlr_surface *wlr_surface_create(struct wl_resource *res,
- struct wlr_renderer *renderer) {
- struct wlr_surface *surface = calloc(1, sizeof(struct wlr_surface));
- surface->texture = wlr_render_texture_init(renderer);
- surface->resource = res;
- wl_signal_init(&surface->signals.commit);
- wl_signal_init(&surface->signals.destroy);
- wl_resource_set_implementation(res, &surface_interface,
- surface, destroy_surface);
-
- return surface;
-}
diff --git a/examples/compositor/wlr_surface.h b/examples/compositor/wlr_surface.h
deleted file mode 100644
index d294bdef..00000000
--- a/examples/compositor/wlr_surface.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _EXAMPLES_COMPOSITOR_SURFACE_H
-#define _EXAMPLES_COMPOSITOR_SURFACE_H
-
-#include <wayland-server.h>
-
-struct wlr_surface {
- struct wl_resource *pending_buffer;
- bool pending_attached;
- bool attached; // whether the surface currently has a buffer attached
-
- struct wlr_texture *texture;
- const char *role; // the lifetime-bound role or null
- struct wl_resource *resource;
-
- struct {
- struct wl_signal destroy;
- struct wl_signal commit;
- } signals;
-};
-
-struct wlr_surface *wlr_surface_create(struct wl_resource *res,
- struct wlr_renderer *renderer);
-
-#endif
diff --git a/examples/meson.build b/examples/meson.build
index 6e52a920..a44a4946 100644
--- a/examples/meson.build
+++ b/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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-04 18:27:39 +0000