mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: rename wl_display.id to next_global_name

Browse source 
This is much more descriptive. This value is a counter incremented
each time a new global is created.

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2023-01-24 23:55:29 +01:00
parent be31c5a8c8
commit 83e9c9e117
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/wayland-server.c
View file

@ -91,7 +91,7 @@ struct wl_display {
struct wl_event_loop *loop; struct wl_event_loop *loop;
int run; int run;
uint32_t id; uint32_t next_global_name;
uint32_t serial; uint32_t serial;
struct wl_list registry_resource_list; struct wl_list registry_resource_list;
@ -1139,7 +1139,7 @@ wl_display_create(void)
wl_priv_signal_init(&display->destroy_signal); wl_priv_signal_init(&display->destroy_signal);
wl_priv_signal_init(&display->create_client_signal); wl_priv_signal_init(&display->create_client_signal);
display->id = 1; display->next_global_name = 1;
display->serial = 0; display->serial = 0;
display->global_filter = NULL; display->global_filter = NULL;
@ -1285,7 +1285,7 @@ wl_global_create(struct wl_display *display,
return NULL; return NULL;
} }
if (display->id >= UINT32_MAX) { if (display->next_global_name >= UINT32_MAX) {
wl_log("wl_global_create: ran out of global names\n"); wl_log("wl_global_create: ran out of global names\n");
return NULL; return NULL;
} }
@ -1295,7 +1295,7 @@ wl_global_create(struct wl_display *display,
return NULL; return NULL;
global->display = display; global->display = display;
global->name = display->id++; global->name = display->next_global_name++;
global->interface = interface; global->interface = interface;
global->version = version; global->version = version;
global->data = data; global->data = data;