hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

xwayland: add wlr_xwayland_shell_v1_set_client()

Browse source
This commit is contained in:
Simon Ser 2022-10-18 12:43:45 +02:00 committed by Simon Zeni
parent 69b0b296a2
commit 44c7e233ff
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/wlr/xwayland/shell.h
View file

@ -26,7 +26,10 @@ struct wlr_xwayland_shell_v1 {
// private state // private state
struct wl_client *client;
struct wl_listener display_destroy; struct wl_listener display_destroy;
struct wl_listener client_destroy;
}; };
/** /**
@ -54,4 +57,10 @@ struct wlr_xwayland_surface_v1 {
struct wlr_xwayland_shell_v1 *wlr_xwayland_shell_v1_create( struct wlr_xwayland_shell_v1 *wlr_xwayland_shell_v1_create(
struct wl_display *display, uint32_t version); struct wl_display *display, uint32_t version);
/**
* Allow a client to bind to the xwayland_shell_v1 global.
*/
void wlr_xwayland_shell_v1_set_client(struct wlr_xwayland_shell_v1 *shell,
struct wl_client *client);
#endif #endif

27
xwayland/shell.c
View file

@ -143,6 +143,12 @@ static void shell_bind(struct wl_client *client, void *data, uint32_t version,
uint32_t id) { uint32_t id) {
struct wlr_xwayland_shell_v1 *shell = data; struct wlr_xwayland_shell_v1 *shell = data;
if (client != shell->client) {
wl_client_post_implementation_error(client,
"Permission denied to bind to %s", xwayland_shell_v1_interface.name);
return;
}
struct wl_resource *resource = wl_resource_create(client, struct wl_resource *resource = wl_resource_create(client,
&xwayland_shell_v1_interface, version, id); &xwayland_shell_v1_interface, version, id);
if (resource == NULL) { if (resource == NULL) {
@ -156,6 +162,7 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
struct wlr_xwayland_shell_v1 *shell = struct wlr_xwayland_shell_v1 *shell =
wl_container_of(listener, shell, display_destroy); wl_container_of(listener, shell, display_destroy);
wl_list_remove(&shell->display_destroy.link); wl_list_remove(&shell->display_destroy.link);
wl_list_remove(&shell->client_destroy.link);
wl_global_destroy(shell->global); wl_global_destroy(shell->global);
free(shell); free(shell);
} }
@ -181,5 +188,25 @@ struct wlr_xwayland_shell_v1 *wlr_xwayland_shell_v1_create(
shell->display_destroy.notify = handle_display_destroy; shell->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &shell->display_destroy); wl_display_add_destroy_listener(display, &shell->display_destroy);
wl_list_init(&shell->client_destroy.link);
return shell; return shell;
} }
static void shell_handle_client_destroy(struct wl_listener *listener, void *data) {
struct wlr_xwayland_shell_v1 *shell =
wl_container_of(listener, shell, client_destroy);
wlr_xwayland_shell_v1_set_client(shell, NULL);
}
void wlr_xwayland_shell_v1_set_client(struct wlr_xwayland_shell_v1 *shell,
struct wl_client *client) {
wl_list_remove(&shell->client_destroy.link);
shell->client = client;
if (client != NULL) {
shell->client_destroy.notify = shell_handle_client_destroy;
wl_client_add_destroy_listener(client, &shell->client_destroy);
} else {
wl_list_init(&shell->client_destroy.link);
}
}