mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-02-05 04:06:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-socket-fd' into 'main'

Browse source 
server: add wl_display_remove_socket_fd()

See merge request wayland/wayland!322
This commit is contained in:
Simon Ser 2026-01-24 17:48:58 +00:00
commit 4529587dfb
2 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/wayland-server-core.h
View file

@ -205,6 +205,9 @@ wl_display_add_socket_auto(struct wl_display *display);
int
wl_display_add_socket_fd(struct wl_display *display, int sock_fd);
int
wl_display_remove_socket_fd(struct wl_display *display, int sock_fd);
void
wl_display_terminate(struct wl_display *display);

31
src/wayland-server.c
View file

@ -1935,6 +1935,37 @@ wl_display_add_socket_fd(struct wl_display *display, int sock_fd)
return 0;
}
/** Remove a socket fd from the Wayland display.
*
* \param display Wayland display to which the socket should be added.
* \param sock_fd The socket file descriptor to be removed
* \return 0 if success. -1 if failed.
*
* Remove a socket fd previously added via wl_display_add_socket_fd().
*
* \memberof wl_display
* \since 1.22.90
*/
WL_EXPORT int
wl_display_remove_socket_fd(struct wl_display *display, int sock_fd)
{
struct wl_socket *s;
bool found;
found = false;
wl_list_for_each(s, &display->socket_list, link) {
if (s->fd == sock_fd) {
found = true;
break;
}
}
if (!found)
return -1;
wl_socket_destroy(s);
return 0;
}
/** Add a socket to Wayland display for the clients to connect.
*
* \param display Wayland display to which the socket should be added.