mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

layer-shell: implement configure scheduling

Browse source 
This commit introduces wlr_layer_surface_v1.scheduled and implements
configure scheduling mechanism used by xdg-surface, unifying the API.
This commit is contained in:
Kirill Primak 2021-09-21 15:50:28 +03:00
parent 59fa3637c3
commit 9a36c89e5a
2 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wlr/types/wlr_layer_shell_v1.h
View file

@ -77,6 +77,10 @@ struct wlr_layer_surface_v1 {
struct wlr_layer_surface_v1_state current, pending; struct wlr_layer_surface_v1_state current, pending;
// Properties to be sent to the client in the next configure event.
struct wlr_layer_surface_v1_configure scheduled;
struct wl_event_source *configure_idle;
struct wl_listener surface_destroy; struct wl_listener surface_destroy;
struct { struct {
@ -117,7 +121,7 @@ struct wlr_layer_shell_v1 *wlr_layer_shell_v1_create(struct wl_display *display)
* layer_surface will signal its map event when the surface is ready to assume * layer_surface will signal its map event when the surface is ready to assume
* this size. Returns the associated configure serial. * this size. Returns the associated configure serial.
*/ */
uint32_t wlr_layer_surface_v1_configure(struct wlr_layer_surface_v1 *surface, uint32_t wlr_layer_surface_v1_set_size(struct wlr_layer_surface_v1 *surface,
uint32_t width, uint32_t height); uint32_t width, uint32_t height);
/** /**

50
types/wlr_layer_shell_v1.c
View file

@ -234,6 +234,10 @@ static void layer_surface_unmap(struct wlr_layer_surface_v1 *surface) {
} }
surface->configured = surface->mapped = false; surface->configured = surface->mapped = false;
if (surface->configure_idle) {
wl_event_source_remove(surface->configure_idle);
surface->configure_idle = NULL;
}
} }
static void layer_surface_destroy(struct wlr_layer_surface_v1 *surface) { static void layer_surface_destroy(struct wlr_layer_surface_v1 *surface) {
@ -256,24 +260,44 @@ static void layer_surface_resource_destroy(struct wl_resource *resource) {
} }
} }
uint32_t wlr_layer_surface_v1_configure(struct wlr_layer_surface_v1 *surface, static void surface_send_configure(void *data) {
uint32_t width, uint32_t height) { struct wlr_layer_surface_v1 *surface = data;
struct wl_display *display =
wl_client_get_display(wl_resource_get_client(surface->resource)); surface->configure_idle = NULL;
struct wlr_layer_surface_v1_configure *configure = struct wlr_layer_surface_v1_configure *configure =
calloc(1, sizeof(struct wlr_layer_surface_v1_configure)); calloc(1, sizeof(*configure));
if (configure == NULL) { if (configure == NULL) {
wl_client_post_no_memory(wl_resource_get_client(surface->resource)); wl_resource_post_no_memory(surface->resource);
return surface->pending.configure_serial; return;
} }
*configure = surface->scheduled;
wl_list_insert(surface->configure_list.prev, &configure->link); wl_list_insert(surface->configure_list.prev, &configure->link);
configure->width = width;
configure->height = height;
configure->serial = wl_display_next_serial(display);
zwlr_layer_surface_v1_send_configure(surface->resource, zwlr_layer_surface_v1_send_configure(surface->resource,
configure->serial, configure->width, configure->serial, configure->width, configure->height);
configure->height); }
return configure->serial;
static uint32_t schedule_configure(struct wlr_layer_surface_v1 *surface) {
struct wl_client *client = wl_resource_get_client(surface->resource);
struct wl_display *display = wl_client_get_display(client);
struct wl_event_loop *loop = wl_display_get_event_loop(display);
if (surface->configure_idle == NULL) {
surface->scheduled.serial = wl_display_next_serial(display);
surface->configure_idle = wl_event_loop_add_idle(loop,
surface_send_configure, surface);
if (surface->configure_idle == NULL) {
wl_client_post_no_memory(client);
}
}
return surface->scheduled.serial;
}
uint32_t wlr_layer_surface_v1_set_size(struct wlr_layer_surface_v1 *surface,
uint32_t width, uint32_t height) {
surface->scheduled.width = width;
surface->scheduled.height = height;
return schedule_configure(surface);
} }
void wlr_layer_surface_v1_destroy(struct wlr_layer_surface_v1 *surface) { void wlr_layer_surface_v1_destroy(struct wlr_layer_surface_v1 *surface) {