Merge branch 'foreign-request' into 'master'

Draft: ext-image-capture-request-v1: new protocol

See merge request wlroots/wlroots!5072
This commit is contained in:
navi 2025-08-08 03:26:42 +00:00
commit 906a740186
7 changed files with 407 additions and 14 deletions

View file

@ -0,0 +1,12 @@
#ifndef TYPES_WLR_FOREIGN_TOPLEVEL_H
#define TYPES_WLR_FOREIGN_TOPLEVEL_H
#include <wayland-server-core.h>
#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
struct wl_resource *foreign_toplevel_create_resource_for_client(
struct wlr_ext_foreign_toplevel_handle_v1 *toplevel, struct wl_client *client);
void foreign_toplevel_send_details_to_resource(
struct wlr_ext_foreign_toplevel_handle_v1 *toplevel, struct wl_resource *resource);
#endif

View file

@ -32,6 +32,7 @@ struct wlr_ext_foreign_toplevel_handle_v1 {
struct wl_list resources; // wl_resource_get_link()
struct wl_list link; // wlr_ext_foreign_toplevel_list_v1.toplevels
uint32_t version;
char *title;
char *app_id;
char *identifier;
@ -62,9 +63,8 @@ struct wlr_ext_foreign_toplevel_handle_v1 *wlr_ext_foreign_toplevel_handle_v1_cr
void wlr_ext_foreign_toplevel_handle_v1_destroy(
struct wlr_ext_foreign_toplevel_handle_v1 *toplevel);
void wlr_ext_foreign_toplevel_handle_v1_update_state(
struct wlr_ext_foreign_toplevel_handle_v1 *toplevel,
const struct wlr_ext_foreign_toplevel_handle_v1_state *state);
void wlr_ext_foreign_toplevel_handle_v1_update_state(struct wlr_ext_foreign_toplevel_handle_v1 *toplevel,
const struct wlr_ext_foreign_toplevel_handle_v1_state *state, uint32_t version);
struct wlr_ext_foreign_toplevel_handle_v1 *wlr_ext_foreign_toplevel_handle_v1_from_resource(
struct wl_resource *resource);

View file

@ -0,0 +1,73 @@
/*
* This an unstable interface of wlroots. No guarantees are made regarding the
* future consistency of this API.
*/
#ifndef WLR_USE_UNSTABLE
#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
#endif
#ifndef WLR_TYPES_WLR_FOREIGN_TOPLEVEL_REQUEST_V1_H
#define WLR_TYPES_WLR_FOREIGN_TOPLEVEL_REQUEST_V1_H
#include <wayland-server-core.h>
struct wlr_ext_foreign_toplevel_request_manager_v1 {
struct wl_global *global;
struct wl_list resources; // wl_resource_get_link()
struct {
struct wl_signal request;
struct wl_signal destroy;
} events;
void *data;
struct {
struct wl_listener display_destroy;
} WLR_PRIVATE;
};
struct wlr_ext_foreign_toplevel_request_v1 {
struct wl_resource *manager;
struct wl_resource *resource;
struct {
struct wl_signal destroy;
} events;
};
struct wlr_ext_foreign_toplevel_request_source_v1 {
struct wl_global *global;
struct wl_list resources; // wl_resource_get_link()
struct {
struct wl_signal toplevel;
struct wl_signal cancel;
struct wl_signal destroy;
} events;
struct {
struct wl_listener display_destroy;
} WLR_PRIVATE;
};
struct wlr_ext_foreign_toplevel_request_pending_v1 {
struct wlr_ext_foreign_toplevel_request_source_v1 *source;
struct wlr_ext_foreign_toplevel_request_v1 *request;
struct wlr_ext_foreign_toplevel_handle_v1 *handle;
struct wl_resource *resource;
};
struct wlr_ext_foreign_toplevel_request_manager_v1 *
wlr_ext_foreign_toplevel_request_manager_v1_create(struct wl_display *display, uint32_t version);
void wlr_ext_foreign_toplevel_request_v1_send_toplevel(
struct wlr_ext_foreign_toplevel_request_v1 *request, struct wlr_ext_foreign_toplevel_handle_v1 *toplevel);
void wlr_ext_foreign_toplevel_request_v1_cancel(struct wlr_ext_foreign_toplevel_request_v1 *request);
struct wlr_ext_foreign_toplevel_request_source_v1 *
wlr_ext_foreign_toplevel_request_source_v1_create(struct wl_display *display, uint32_t version);
void wlr_ext_foreign_toplevel_request_source_v1_request(
struct wlr_ext_foreign_toplevel_request_source_v1 *source, struct wlr_ext_foreign_toplevel_request_v1 *request);
#endif