blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xdg-shell: rename wlr_xdg_surface.next_configure_serial 

Rename it to scheduled_serial for consistency with the rest of
wlroots.
This commit is contained in:
Simon Ser 2021-09-30 21:44:38 +02:00 committed by Kirill Primak
parent 0e34208344
commit 665a164f27
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_xdg_shell.h
View File

@ -192,7 +192,7 @@ struct wlr_xdg_surface {
bool added, configured, mapped; bool added, configured, mapped;
struct wl_event_source *configure_idle; struct wl_event_source *configure_idle;
uint32_t configure_next_serial; uint32_t scheduled_serial;
struct wl_list configure_list; struct wl_list configure_list;
struct wlr_xdg_surface_state current, pending; struct wlr_xdg_surface_state current, pending;

8
types/xdg_shell/wlr_xdg_surface.c
View File

@ -85,7 +85,7 @@ void unmap_xdg_surface(struct wlr_xdg_surface *surface) {
wl_event_source_remove(surface->configure_idle); wl_event_source_remove(surface->configure_idle);
surface->configure_idle = NULL; 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->current, 0, sizeof(struct wlr_xdg_surface_state));
memset(&surface->pending, 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); wl_list_insert(surface->configure_list.prev, &configure->link);
configure->serial = surface->configure_next_serial; configure->serial = surface->scheduled_serial;
configure->surface = surface; configure->surface = surface;
switch (surface->role) { 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); struct wl_event_loop *loop = wl_display_get_event_loop(display);
if (surface->configure_idle == NULL) { 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->configure_idle = wl_event_loop_add_idle(loop,
surface_send_configure, surface); surface_send_configure, surface);
if (surface->configure_idle == NULL) { if (surface->configure_idle == NULL) {
wl_client_post_no_memory(surface->client->client); 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, static void xdg_surface_handle_get_popup(struct wl_client *client,