mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 03:45:58 +01:00
Implement destroying surfaces
Add a signal for wlr_surface destruction on the wlr_surface that compositors can listen to to remove the surface from their state. Implement a listener for this in the example wl_compositor to remove the surface from its internal list of surfaces. Destroy the surface in the compositor destroy_surface callback given when the surface resource was created. Add a reference to the surface resource to the wlr_surface so a compositor can find it in its list of resources upon wlr_resource destruction.
This commit is contained in:
parent
6610aa7ca7
commit
effea557bb
4 changed files with 30 additions and 1 deletions
|
@ -8,6 +8,7 @@ struct wl_compositor_state {
|
||||||
struct wl_list wl_resources;
|
struct wl_list wl_resources;
|
||||||
struct wlr_renderer *renderer;
|
struct wlr_renderer *renderer;
|
||||||
struct wl_list surfaces;
|
struct wl_list surfaces;
|
||||||
|
struct wl_listener destroy_surface_listener;
|
||||||
};
|
};
|
||||||
|
|
||||||
void wl_compositor_init(struct wl_display *display,
|
void wl_compositor_init(struct wl_display *display,
|
||||||
|
|
|
@ -78,7 +78,28 @@ struct wl_surface_interface surface_interface = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static void destroy_surface(struct wl_resource *resource) {
|
static void destroy_surface(struct wl_resource *resource) {
|
||||||
wlr_log(L_DEBUG, "TODO: destroy surface");
|
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,
|
static void wl_compositor_create_surface(struct wl_client *client,
|
||||||
|
@ -87,10 +108,12 @@ static void wl_compositor_create_surface(struct wl_client *client,
|
||||||
struct wl_resource *surface_resource = wl_resource_create(client,
|
struct wl_resource *surface_resource = wl_resource_create(client,
|
||||||
&wl_surface_interface, wl_resource_get_version(resource), id);
|
&wl_surface_interface, wl_resource_get_version(resource), id);
|
||||||
struct wlr_surface *surface = wlr_render_surface_init(state->renderer);
|
struct wlr_surface *surface = wlr_render_surface_init(state->renderer);
|
||||||
|
surface->resource = surface_resource;
|
||||||
wl_resource_set_implementation(surface_resource, &surface_interface,
|
wl_resource_set_implementation(surface_resource, &surface_interface,
|
||||||
surface, destroy_surface);
|
surface, destroy_surface);
|
||||||
wl_resource_set_user_data(surface_resource, surface);
|
wl_resource_set_user_data(surface_resource, surface);
|
||||||
wl_list_insert(&state->surfaces, wl_resource_get_link(surface_resource));
|
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,
|
static void wl_compositor_create_region(struct wl_client *client,
|
||||||
|
@ -137,6 +160,7 @@ void wl_compositor_init(struct wl_display *display,
|
||||||
&wl_compositor_interface, 4, state, wl_compositor_bind);
|
&wl_compositor_interface, 4, state, wl_compositor_bind);
|
||||||
state->wl_global = wl_global;
|
state->wl_global = wl_global;
|
||||||
state->renderer = renderer;
|
state->renderer = renderer;
|
||||||
|
state->destroy_surface_listener.notify = destroy_surface_listener;
|
||||||
wl_list_init(&state->wl_resources);
|
wl_list_init(&state->wl_resources);
|
||||||
wl_list_init(&state->surfaces);
|
wl_list_init(&state->surfaces);
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,6 +57,8 @@ struct wlr_surface {
|
||||||
bool valid;
|
bool valid;
|
||||||
uint32_t format;
|
uint32_t format;
|
||||||
int width, height;
|
int width, height;
|
||||||
|
struct wl_signal destroy_signal;
|
||||||
|
struct wl_resource *resource;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -84,6 +84,7 @@ static void gles2_surface_bind(struct wlr_surface_state *surface) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gles2_surface_destroy(struct wlr_surface_state *surface) {
|
static void gles2_surface_destroy(struct wlr_surface_state *surface) {
|
||||||
|
wl_signal_emit(&surface->wlr_surface->destroy_signal, surface->wlr_surface);
|
||||||
GL_CALL(glDeleteTextures(1, &surface->tex_id));
|
GL_CALL(glDeleteTextures(1, &surface->tex_id));
|
||||||
free(surface);
|
free(surface);
|
||||||
}
|
}
|
||||||
|
@ -100,5 +101,6 @@ struct wlr_surface *gles2_surface_init() {
|
||||||
struct wlr_surface_state *state = calloc(sizeof(struct wlr_surface_state), 1);
|
struct wlr_surface_state *state = calloc(sizeof(struct wlr_surface_state), 1);
|
||||||
struct wlr_surface *surface = wlr_surface_init(state, &wlr_surface_impl);
|
struct wlr_surface *surface = wlr_surface_init(state, &wlr_surface_impl);
|
||||||
state->wlr_surface = surface;
|
state->wlr_surface = surface;
|
||||||
|
wl_signal_init(&surface->destroy_signal);
|
||||||
return surface;
|
return surface;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue