mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

example compositor: only iterate over wl_shell and xdg_shell surfaces

Browse source
This commit is contained in:
Dominique Martinet 2017-08-15 02:08:32 +02:00
parent f4e6b138fb
commit 5dae8e1be8
5 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
examples/compositor/main.c
View file

@ -33,19 +33,12 @@ static inline int64_t timespec_to_msec(const struct timespec *a) {
return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000; return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
} }
void handle_output_frame(struct output_state *output, struct timespec *ts) { void output_frame_handle_surface(struct sample_state *sample,
struct compositor_state *state = output->compositor; struct wlr_output *wlr_output, struct timespec *ts,
struct sample_state *sample = state->data; struct wl_resource *_res) {
struct wlr_output *wlr_output = output->output; struct wlr_surface *surface = wl_resource_get_user_data(_res);
wlr_output_make_current(wlr_output);
wlr_renderer_begin(sample->renderer, wlr_output);
struct wl_resource *_res;
float matrix[16]; float matrix[16];
float transform[16]; float transform[16];
wl_list_for_each(_res, &sample->compositor.surfaces, link) {
struct wlr_surface *surface = wl_resource_get_user_data(_res);
wlr_surface_flush_damage(surface); wlr_surface_flush_damage(surface);
if (surface->texture->valid) { if (surface->texture->valid) {
wlr_matrix_translate(&transform, 200, 200, 0); wlr_matrix_translate(&transform, 200, 200, 0);
@ -59,6 +52,22 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) {
wl_resource_destroy(cb->resource); wl_resource_destroy(cb->resource);
} }
} }
}
void handle_output_frame(struct output_state *output, struct timespec *ts) {
struct compositor_state *state = output->compositor;
struct sample_state *sample = state->data;
struct wlr_output *wlr_output = output->output;
wlr_output_make_current(wlr_output);
wlr_renderer_begin(sample->renderer, wlr_output);
struct wlr_wl_shell_surface *wl_shell_surface;
wl_list_for_each(wl_shell_surface, &sample->wl_shell.surfaces, link) {
output_frame_handle_surface(sample, wlr_output, ts, wl_shell_surface->surface);
}
struct wlr_xdg_surface_v6 *xdg_surface;
wl_list_for_each(xdg_surface, &sample->xdg_shell->surfaces, link) {
output_frame_handle_surface(sample, wlr_output, ts, xdg_surface->surface);
} }
wlr_renderer_end(sample->renderer); wlr_renderer_end(sample->renderer);

3
examples/compositor/wl_compositor.c
View file

@ -9,11 +9,12 @@
static void destroy_surface_listener(struct wl_listener *listener, void *data) { static void destroy_surface_listener(struct wl_listener *listener, void *data) {
struct wlr_surface *surface = wl_resource_get_user_data(data); struct wlr_surface *surface = wl_resource_get_user_data(data);
struct wl_compositor_state *state = surface->compositor_data; struct wl_compositor_state *state = surface->compositor_data;
assert(data == surface->resource);
struct wl_resource *res = NULL; struct wl_resource *res = NULL;
wl_list_for_each(res, &state->surfaces, link) { wl_list_for_each(res, &state->surfaces, link) {
if (res == surface->resource) { if (res == surface->resource) {
wl_list_remove(&res->link); wl_list_remove(wl_resource_get_link(res));
break; break;
} }
} }

3
include/wlr/types/wlr_wl_shell.h
View file

@ -5,12 +5,15 @@
struct wlr_wl_shell { struct wlr_wl_shell {
struct wl_global *wl_global; struct wl_global *wl_global;
struct wl_list wl_resources; struct wl_list wl_resources;
struct wl_list surfaces;
void *data; void *data;
}; };
struct wlr_wl_shell_surface { struct wlr_wl_shell_surface {
struct wl_resource *surface;
struct wlr_texture *wlr_texture; struct wlr_texture *wlr_texture;
struct wl_list link;
void *data; void *data;
}; };

10
types/wlr_wl_shell.c
View file

@ -73,7 +73,7 @@ struct wl_shell_surface_interface shell_surface_interface = {
static void destroy_shell_surface(struct wl_resource *resource) { static void destroy_shell_surface(struct wl_resource *resource) {
struct wlr_wl_shell_surface *state = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *state = wl_resource_get_user_data(resource);
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(&state->link);
free(state); free(state);
} }
@ -81,13 +81,16 @@ static void wl_shell_get_shell_surface(struct wl_client *client,
struct wl_resource *resource, uint32_t id, struct wl_resource *resource, uint32_t id,
struct wl_resource *surface) { struct wl_resource *surface) {
struct wlr_texture *wlr_texture = wl_resource_get_user_data(surface); struct wlr_texture *wlr_texture = wl_resource_get_user_data(surface);
struct wlr_wl_shell *wlr_wl_shell = wl_resource_get_user_data(resource);
struct wlr_wl_shell_surface *state = struct wlr_wl_shell_surface *state =
calloc(1, sizeof(struct wlr_wl_shell_surface)); calloc(1, sizeof(struct wlr_wl_shell_surface));
state->wlr_texture = wlr_texture; state->wlr_texture = wlr_texture;
state->surface = surface;
struct wl_resource *shell_surface_resource = wl_resource_create(client, struct wl_resource *shell_surface_resource = wl_resource_create(client,
&wl_shell_surface_interface, wl_resource_get_version(resource), id); &wl_shell_surface_interface, wl_resource_get_version(resource), id);
wl_resource_set_implementation(shell_surface_resource, wl_resource_set_implementation(shell_surface_resource,
&shell_surface_interface, state, destroy_shell_surface); &shell_surface_interface, state, destroy_shell_surface);
wl_list_insert(&wlr_wl_shell->surfaces, &state->link);
} }
static struct wl_shell_interface wl_shell_impl = { static struct wl_shell_interface wl_shell_impl = {
@ -126,8 +129,13 @@ void wlr_wl_shell_init(struct wlr_wl_shell *wlr_wl_shell,
struct wl_display *display) { struct wl_display *display) {
struct wl_global *wl_global = wl_global_create(display, struct wl_global *wl_global = wl_global_create(display,
&wl_shell_interface, 1, wlr_wl_shell, wl_shell_bind); &wl_shell_interface, 1, wlr_wl_shell, wl_shell_bind);
if (!wl_global) {
// TODO: return failure somehow
return;
}
wlr_wl_shell->wl_global = wl_global; wlr_wl_shell->wl_global = wl_global;
wl_list_init(&wlr_wl_shell->wl_resources); wl_list_init(&wlr_wl_shell->wl_resources);
wl_list_init(&wlr_wl_shell->surfaces);
} }
void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) { void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) {

1
types/wlr_xdg_shell_v6.c
View file

@ -93,6 +93,7 @@ static const struct zxdg_toplevel_v6_interface zxdg_toplevel_v6_implementation =
static void xdg_surface_destroy(struct wl_resource *resource) { static void xdg_surface_destroy(struct wl_resource *resource) {
struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource); struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
wl_list_remove(&surface->link);
free(surface); free(surface);
} }