mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: split server

Browse source 
Split the server part of wlr_xwayland into wlr_xwayland_server. This
allows compositors to implement their own XWM when wlroots' isn't a good
fit.
This commit is contained in:
Simon Ser 2020-05-05 10:24:08 +02:00 • committed by Drew DeVault
parent d28a7da95d
commit 27609ba0d9
6 changed files with 503 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

39
include/wlr/xwayland.h
View file

@ -18,14 +18,11 @@
struct wlr_xwm;
struct wlr_xwayland_cursor;
struct wlr_gtk_primary_selection_device_manager;
struct wlr_xwayland {
struct wlr_xwayland_server {
pid_t pid;
struct wl_client *client;
struct wl_event_source *sigusr1_source;
struct wlr_xwm *xwm;
struct wlr_xwayland_cursor *cursor;
int wm_fd[2], wl_fd[2];
time_t server_start;
@ -38,6 +35,31 @@ struct wlr_xwayland {
struct wl_event_source *x_fd_read_event[2];
bool lazy;
struct wl_display *wl_display;
struct {
struct wl_signal ready;
struct wl_signal destroy;
} events;
struct wl_listener client_destroy;
struct wl_listener display_destroy;
void *data;
};
struct wlr_xwayland_server_ready_event {
struct wlr_xwayland_server *server;
int wm_fd;
};
struct wlr_xwayland {
struct wlr_xwayland_server *server;
struct wlr_xwm *xwm;
struct wlr_xwayland_cursor *cursor;
const char *display_name;
struct wl_display *wl_display;
struct wlr_compositor *compositor;
struct wlr_seat *seat;
@ -54,8 +76,9 @@ struct wlr_xwayland {
*/
int (*user_event_handler)(struct wlr_xwm *xwm, xcb_generic_event_t *event);
struct wl_listener server_ready;
struct wl_listener server_destroy;
struct wl_listener client_destroy;
struct wl_listener display_destroy;
struct wl_listener seat_destroy;
void *data;
@ -192,7 +215,11 @@ struct wlr_xwayland_resize_event {
uint32_t edges;
};
/** Create an Xwayland server.
struct wlr_xwayland_server *wlr_xwayland_server_create(
struct wl_display *display, bool lazy);
void wlr_xwayland_server_destroy(struct wlr_xwayland_server *server);
/** Create an Xwayland server and XWM.
*
* The server supports a lazy mode in which Xwayland is only started when a
* client tries to connect.