diff options
| author | Simon Ser <contact@emersion.fr> | 2021-09-30 21:44:38 +0200 |
|---|---|---|
| committer | Kirill Primak <vyivel@posteo.net> | 2021-09-30 23:17:32 +0300 |
| commit | 665a164f27495f89d6924156b652b837d11ddd98 (patch) | |
| tree | 4b51249d2dad7a054868b78407098435e6e2e200 | |
| parent | 0e342083440db978463dbf43795bfed8a5a11cd6 (diff) | |
xdg-shell: rename wlr_xdg_surface.next_configure_serial
Rename it to scheduled_serial for consistency with the rest of
wlroots.
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 2 | ||||
| -rw-r--r-- | types/xdg_shell/wlr_xdg_surface.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index 3df2aa96..d63132c4 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -192,7 +192,7 @@ struct wlr_xdg_surface { bool added, configured, mapped; struct wl_event_source *configure_idle; - uint32_t configure_next_serial; + uint32_t scheduled_serial; struct wl_list configure_list; struct wlr_xdg_surface_state current, pending; diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c index 4f7d6e24..71335f0a 100644 --- a/types/xdg_shell/wlr_xdg_surface.c +++ b/types/xdg_shell/wlr_xdg_surface.c @@ -85,7 +85,7 @@ void unmap_xdg_surface(struct wlr_xdg_surface *surface) { wl_event_source_remove(surface->configure_idle); surface->configure_idle = NULL; } - surface->configure_next_serial = 0; + surface->scheduled_serial = 0; memset(&surface->current, 0, sizeof(struct wlr_xdg_surface_state)); memset(&surface->pending, 0, sizeof(struct wlr_xdg_surface_state)); @@ -160,7 +160,7 @@ static void surface_send_configure(void *user_data) { } wl_list_insert(surface->configure_list.prev, &configure->link); - configure->serial = surface->configure_next_serial; + configure->serial = surface->scheduled_serial; configure->surface = surface; switch (surface->role) { @@ -189,14 +189,14 @@ uint32_t wlr_xdg_surface_schedule_configure(struct wlr_xdg_surface *surface) { struct wl_event_loop *loop = wl_display_get_event_loop(display); if (surface->configure_idle == NULL) { - surface->configure_next_serial = wl_display_next_serial(display); + 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(surface->client->client); } } - return surface->configure_next_serial; + return surface->scheduled_serial; } static void xdg_surface_handle_get_popup(struct wl_client *client, |