xwayland: embed wlr_xwayland_server_options in server struct

As more options are added, more fields will be duplicated. Let's
just embed the struct in wlr_xwayland_server so that we don't need
to keep both in sync.
This commit is contained in:
Simon Ser 2021-06-25 11:46:57 +02:00 committed by Kenny Levinsen
parent 4b316a3823
commit 770a561bce
2 changed files with 12 additions and 14 deletions

View file

@ -19,6 +19,11 @@
struct wlr_xwm;
struct wlr_xwayland_cursor;
struct wlr_xwayland_server_options {
bool lazy;
bool enable_wm;
};
struct wlr_xwayland_server {
pid_t pid;
struct wl_client *client;
@ -33,8 +38,7 @@ struct wlr_xwayland_server {
char display_name[16];
int x_fd[2];
struct wl_event_source *x_fd_read_event[2];
bool lazy;
bool enable_wm;
struct wlr_xwayland_server_options options;
struct wl_display *wl_display;
@ -49,11 +53,6 @@ struct wlr_xwayland_server {
void *data;
};
struct wlr_xwayland_server_options {
bool lazy;
bool enable_wm;
};
struct wlr_xwayland_server_ready_event {
struct wlr_xwayland_server *server;
int wm_fd;